From 76b1f0ca86a72faaf72eb5195ef3e571658caa84 Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Sat, 28 Nov 2015 22:16:45 +0100
Subject: [PATCH 001/421] modifs to fichinter/card.php
 FICHINTER_EMPTY_LINE_DESC

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

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 3cb613934b9..d0535d81c50 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 201		Charlie Benke           <charlies@patas-monkey.com>
+ * Copyright (C) 2015       Abbes Bahfir            <bafbes@gmail.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
@@ -465,7 +466,7 @@ if (empty($reshook))
 	// Add line
 	else if ($action == "addline" && $user->rights->ficheinter->creer)
 	{
-		if (!GETPOST('np_desc'))
+		if (!GETPOST('np_desc')&&($conf->global->FICHINTER_EMPTY_LINE_DESC!=1))
 		{
 			$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'</div>';
 			$error++;
@@ -1568,10 +1569,12 @@ else if ($id > 0 || ! empty($ref))
 				print '<tr '.$bcnd[$var].">\n";
 				print '<td>';
 				// editeur wysiwyg
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('np_desc',GETPOST('np_desc','alpha'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70);
-				$doleditor->Create();
-				print '</td>';
+                if ($conf->global->FICHINTER_EMPTY_LINE_DESC != 1) {
+                    require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+                    $doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'alpha'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, 70);
+                    $doleditor->Create();
+                }
+                print '</td>';
 
 				// Date intervention
 				print '<td align="center" class="nowrap">';

From 05258172aac57f3db17cec11a4ca0c1c5f548858 Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Wed, 2 Dec 2015 19:08:14 +0100
Subject: [PATCH 002/421] update product.lang

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

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index b21fd88539e..f4cd0824d70 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -297,3 +297,4 @@ PropalMergePdfProductChooseFile=Select PDF files
 IncludingProductWithTag=Including product with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
+DefaultUnitToShow=Units
\ No newline at end of file

From 613209eadb9aa9bdd876c5207568d26a5595e420 Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Fri, 11 Dec 2015 12:14:46 +0100
Subject: [PATCH 003/421] confs sur filefunc

---
 htdocs/filefunc.inc.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 415a7addf4a..e4fbb602156 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -80,6 +80,12 @@ if (! empty($_GET['conf']))
 	$conffile = 'conf/'.$confname.'.php';
 }
 */
+if (!empty($_GET['conf'])) {
+    setcookie('dolconf', $_GET['conf']);
+    $conffile = 'conf/' . $_GET['conf'] . '.php';
+} else {
+    $conffile = 'conf/' . (!empty($_COOKIE['dolconf']) ? $_COOKIE['dolconf'] : 'conf') . '.php';
+}
 
 // Include configuration
 $result=@include_once $conffile;	// Keep @ because with some error reporting this break the redirect

From 1bde35f98e0ad8c2316085014a96b487a56b0985 Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Sun, 13 Dec 2015 12:10:43 +0100
Subject: [PATCH 004/421] add change customer function in customer orders

---
 htdocs/commande/card.php | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 8748b283abe..2b9163886f4 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1149,7 +1149,16 @@ if (empty($reshook))
 			$action = 'edit_extras';
 	}
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	if ($action == 'set_thirdparty' && $user->rights->commande->creer)
+	{
+		$object->fetch($id);
+		$object->setValueFrom('fk_soc', $socid);
+
+		header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
+		exit();
+	}
+
+    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 
 	/*
@@ -1812,8 +1821,19 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '</tr>';
 
 		// Third party
-		print '<tr><td>' . $langs->trans('Company') . '</td>';
-		print '<td colspan="3">' . $soc->getNomUrl(1) . '</td>';
+        print '<tr><td>';
+        print '<table class="nobordernopadding" width="100%">';
+        print '<tr><td>' . $langs->trans('Company') . '</td>';
+        print '</td><td colspan="5">';
+        if (! empty($conf->global->COMMANDE_CHANGE_THIRDPARTY) && $action != 'editthirdparty' && $object->brouillon && $user->rights->commande->creer)
+            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editthirdparty&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetLinkToThirdParty'), 1) . '</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="5">';
+        if ($action == 'editthirdparty') {
+            $form->form_thirdparty($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, 'socid','client>0');
+        } else {
+            print ' &nbsp;' . $soc->getNomUrl(1, 'compta');
+        }
 		print '</tr>';
 
 		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

From f7afbcff6894a28445bea07439d8b8a2aff02038 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Mon, 18 Jan 2016 19:45:27 +0100
Subject: [PATCH 005/421] NEW integration of multicurrency module (creation
 fields in database and admin) NEW add multicurrency_code on create, update
 and fetch company object NEW add multicurrency on propal FIX travis FIX back
 quote into sql file

---
 htdocs/admin/multicurrency.php                | 289 +++++++
 htdocs/comm/propal.php                        |  81 ++
 htdocs/comm/propal/class/propal.class.php     |  92 ++-
 htdocs/core/class/commonobject.class.php      |  99 ++-
 htdocs/core/class/html.form.class.php         | 105 +++
 htdocs/core/lib/multicurrency.lib.php         |  54 ++
 htdocs/core/lib/price.lib.php                 |  11 +-
 .../core/modules/modMultiCurrency.class.php   | 290 +++++++
 htdocs/core/tpl/objectline_create.tpl.php     |  12 +
 htdocs/core/tpl/objectline_view.tpl.php       |   9 +-
 .../install/mysql/migration/3.9.0-4.0.0.sql   |  99 +++
 htdocs/install/mysql/tables/llx_commande.sql  |   8 +-
 .../mysql/tables/llx_commande_fournisseur.sql |   8 +-
 .../tables/llx_commande_fournisseurdet.sql    |   9 +-
 .../install/mysql/tables/llx_commandedet.sql  |   9 +-
 htdocs/install/mysql/tables/llx_facture.sql   |   9 +-
 .../mysql/tables/llx_facture_fourn.sql        |   8 +-
 .../mysql/tables/llx_facture_fourn_det.sql    |   9 +-
 .../install/mysql/tables/llx_facturedet.sql   |   8 +-
 .../mysql/tables/llx_multicurrency.sql        |  28 +
 .../mysql/tables/llx_multicurrency_rate.sql   |  28 +
 .../mysql/tables/llx_paiement_facture.sql     |   6 +-
 .../tables/llx_paiementfourn_facturefourn.sql |   6 +-
 .../mysql/tables/llx_product_price.sql        |   6 +-
 htdocs/install/mysql/tables/llx_propal.sql    |   8 +-
 htdocs/install/mysql/tables/llx_propaldet.sql |   8 +-
 htdocs/install/mysql/tables/llx_societe.sql   |   5 +-
 htdocs/langs/en_US/main.lang                  |   4 +-
 .../class/multicurrency.class.php             | 726 ++++++++++++++++++
 htdocs/societe/class/societe.class.php        |  35 +-
 htdocs/societe/soc.php                        |  37 +
 .../theme/eldy/img/object_multicurrency.png   | Bin 0 -> 733 bytes
 32 files changed, 2080 insertions(+), 26 deletions(-)
 create mode 100644 htdocs/admin/multicurrency.php
 create mode 100644 htdocs/core/lib/multicurrency.lib.php
 create mode 100644 htdocs/core/modules/modMultiCurrency.class.php
 create mode 100644 htdocs/install/mysql/tables/llx_multicurrency.sql
 create mode 100644 htdocs/install/mysql/tables/llx_multicurrency_rate.sql
 create mode 100644 htdocs/multicurrency/class/multicurrency.class.php
 create mode 100644 htdocs/theme/eldy/img/object_multicurrency.png

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
new file mode 100644
index 00000000000..b5485392816
--- /dev/null
+++ b/htdocs/admin/multicurrency.php
@@ -0,0 +1,289 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2015 ATM Consulting <support@atm-consulting.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/>.
+ */
+
+/**
+ * 	\file		admin/multicurrency.php
+ * 	\ingroup	quickpriceupdate
+ * 	\brief		This file is an example module setup page
+ * 				Put some comments here
+ */
+// Dolibarr environment
+
+require '../main.inc.php';
+
+// Libraries
+dol_include_once('/core/lib/admin.lib.php');
+dol_include_once('/core/lib/multicurrency.lib.php');
+dol_include_once('/multicurrency/class/multicurrency.class.php');
+
+// Translations
+$langs->load("multicurrency");
+
+// Access control
+if (! $user->admin) {
+    accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'alpha');
+
+/*
+ * Actions
+ */
+if (preg_match('/set_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+	
+if (preg_match('/del_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, 0) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+if ($action == 'add_currency')
+{
+	$code = GETPOST('code', 'alpha');
+	$name = GETPOST('name', 'alpha');
+	$rate = GETPOST('rate', 'alpha');
+	
+	$currency = new MultiCurrency($db);
+	$currency->code = $code;
+	$currency->name = $name;
+
+	if ($currency->create($user) > 0)
+	{
+		if ($currency->addRate($rate)) setEventMessages($langs->trans('SuccessAddRate'), array());
+		else setEventMessages($langs->trans('ErrorAddRateFail'), array(), 'errors');
+	}
+	else setEventMessages($langs->trans('ErrorAddCurrencyFail'), array());
+}
+elseif ($action == 'update_currency')
+{
+	$submit = GETPOST('submit', 'alpha');
+	
+	if ($submit == $langs->trans('Modify'))
+	{
+		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
+		$rate = GETPOST('rate', 'float');
+		$currency = new MultiCurrency($db);
+		
+		if ($currency->fetch($fk_multicurrency) > 0)
+		{
+			$currency->updateRate($rate);
+		}	
+	}
+	elseif ($submit == $langs->trans('Delete'))
+	{
+		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
+		$currency = new MultiCurrency($db);
+		
+		if ($currency->fetch($fk_multicurrency) > 0)
+		{
+			if ($currency->delete() > 0) setEventMessages($langs->trans('SuccessDeleteCurrency'), array());
+			else setEventMessages($langs->trans('ErrorDeleteCurrencyFail'), array(), 'errors');
+		}
+	}
+}
+
+$TCurrency = array();
+$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity;
+$resql = $db->query($sql);
+if ($resql)
+{
+	while ($obj = $db->fetch_object($resql))
+	{
+		$currency = new MultiCurrency($db);
+		$currency->fetch($obj->rowid);
+		$TCurrency[] = $currency;
+	}
+}
+
+/*
+ * View
+ */
+$page_name = "multicurrency";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
+    . $langs->trans("BackToModuleList") . '</a>';
+print_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = multicurrencyAdminPrepareHead();
+dol_fiche_head(
+    $head,
+    'settings',
+    $langs->trans("Module500000Name"),
+    0,
+    "multicurrency"
+);
+
+// Setup page goes here
+$form=new Form($db);
+
+$var=false;
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameters").'</td>'."\n";
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useRateOnInvoiceDate").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="400">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_USE_RATE_ON_INVOICE_DATE">';
+print $form->selectyesno("MULTICURRENCY_USE_RATE_ON_INVOICE_DATE",$conf->global->MULTICURRENCY_USE_RATE_ON_INVOICE_DATE,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useOriginTx").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="400">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_USE_ORIGIN_TX">';
+print $form->selectyesno("MULTICURRENCY_USE_ORIGIN_TX",$conf->global->MULTICURRENCY_USE_ORIGIN_TX,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->transnoentitiesnoconv("multicurrency_buyPriceInCurrency").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="400">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_BUY_PRICE_IN_CURRENCY">';
+print $form->selectyesno("MULTICURRENCY_BUY_PRICE_IN_CURRENCY",$conf->global->MULTICURRENCY_BUY_PRICE_IN_CURRENCY,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->transnoentitiesnoconv("multicurrency_modifyRateApplication").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="400">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_MODIFY_RATE_APPLICATION">';
+print $form->selectarray('MULTICURRENCY_MODIFY_RATE_APPLICATION', array('PU_DOLIBARR' => 'PU_DOLIBARR', 'PU_CURRENCY' => 'PU_CURRENCY'));
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->transnoentitiesnoconv("multicurrency_appId").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="400">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_CURRENCY_APP_ID">';
+print '<input type="text" name="CURRENCY_APP_ID" value="'.$conf->global->MULTICURRENCY_APP_ID.'" size="28" />&nbsp;';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->transnoentitiesnoconv("multicurrency_currencyFromToRate").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="400">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_FROM_TO_RATE">';
+print '<input type="text" name="MULTICURRENCY_FROM_TO_RATE" value="'.$conf->global->MULTICURRENCY_FROM_TO_RATE.'" size="10" placeholder="USD-EUR-1" />&nbsp;'; // CURRENCY_BASE - CURRENCY_ENTITY - ID_ENTITY
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+print '</table>';
+
+print '</form>';
+
+print '<br />';
+print '<table class="noborder" width="100%">';
+
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Currencies").'</td>'."\n";
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="center" width="100">'.$langs->trans("Rate").'</td>'."\n";
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="add_currency">';
+print '<td><input type="text" name="code" value="" size="5" placeholder="'.$langs->trans('code').'" /> - <input type="text" name="name" value="" size="35" placeholder="'.$langs->trans('name').'" /></td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="300">';
+print '<input type="text" name="rate" value="" size="13" placeholder="'.$langs->trans('rate').'" />&nbsp;';
+print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+print '</td></form></tr>';
+
+foreach ($TCurrency as &$currency)
+{
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$currency->code.' - '.$currency->name.'</td>';
+	print '<td align="center" width="20">&nbsp;</td>';
+	print '<td align="right" width="400">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update_currency">';
+	print '<input type="hidden" name="fk_multicurrency" value="'.$currency->id.'">';
+	print '<input type="text" name="rate" value="'.($currency->rate->rate ? $currency->rate->rate : '').'" size="13" />&nbsp;';
+	print '<input type="submit" name="submit" class="button" value="'.$langs->trans("Modify").'">&nbsp;';
+	print '<input type="submit" name="submit" class="button" value="'.$langs->trans("Delete").'">';
+	print '</form>';
+	print '</td></tr>';
+}
+
+print '</table>';
+
+llxFooter();
+
+$db->close();
\ No newline at end of file
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index e039342dd38..d83beedc9c5 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -344,6 +344,12 @@ if (empty($reshook))
 
 				$object->origin = GETPOST('origin');
 				$object->origin_id = GETPOST('originid');
+				
+				// Multicurrency
+				if (!empty($conf->multicurrency->enabled))
+				{
+					$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+				}
 
 				for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++)
 				{
@@ -1084,6 +1090,16 @@ if (empty($reshook))
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 	}
 
+	// Multicurrency Code
+	else if ($action == 'setmulticurrencycode' && $user->rights->propal->creer) {
+		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
+	}
+
+	// Multicurrency rate
+	else if ($action == 'setmulticurrencyrate' && $user->rights->propal->creer) {
+		$result = $object->setMulticurrencyRate(GETPOST('multicurrency_tx', 'int'));
+	}
+
 	// bank account
 	else if ($action == 'setbankaccount' && $user->rights->propal->creer) {
 	    $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
@@ -1422,6 +1438,17 @@ if ($action == 'create')
 	print $form->selectarray('model', $liste, ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF));
 	print "</td></tr>";
 
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		print '<tr>';
+		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+        print '<td colspan="3" class="maxwidthonsmartphone">';
+		$currency_code = (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : ($object->multicurrency_code ? $object->multicurrency_code : $conf->currency)); 
+	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+		print '</td></tr>';
+	}
+	
 	// Public note
 	print '<tr>';
 	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
@@ -1991,6 +2018,45 @@ if ($action == 'create')
         print '</td></tr>';
 	}
 
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		// Multicurrency code
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Currency','multicurrency_code');
+		print '</td>';
+		if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencycode') {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+		} else {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+		}
+		print '</td></tr>';
+	
+		// Multicurrency rate
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Rate','multicurrency_tx');
+		print '</td>';
+		if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencyrate') {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+		} else {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+		}
+		print '</td></tr>';
+	}
+	
+
 	// Other attributes
 	$cols = 5;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
@@ -2034,6 +2100,21 @@ if ($action == 'create')
 	print '<tr><td height="10">' . $langs->trans('AmountTTC') . '</td>';
 	print '<td class="nowrap" colspan="2">' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
 	print '</tr>';
+	
+	// Multicurrency Amount HT
+	print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+	print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+	print '</tr>';
+	
+	// Multicurrency Amount VAT
+	print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+	print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+	print '</tr>';
+	
+	// Multicurrency Amount TTC
+	print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+	print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+	print '</tr>';
 
 	// Statut
 	print '<tr><td height="10">' . $langs->trans('Status') . '</td><td align="left" colspan="2">' . $object->getLibStatut(4) . '</td></tr>';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index b530b011d81..d9ba1e7ef59 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -37,6 +37,7 @@ require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php";
 require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
+dol_include_once('/multicurrency/class/multicurrency.class.php');
 
 /**
  *	Class to manage proposals
@@ -156,6 +157,14 @@ class Propal extends CommonObject
 
     var $specimen;
 
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_tx;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
+	
 	/**
 	 * Draft status
 	 */
@@ -441,7 +450,7 @@ class Propal extends CommonObject
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
             
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type);
+            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx);
 
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
@@ -449,6 +458,11 @@ class Propal extends CommonObject
             $total_localtax1 = $tabprice[9];
             $total_localtax2 = $tabprice[10];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+
             // Rang to use
             $rangtouse = $rang;
             if ($rangtouse == -1)
@@ -505,6 +519,14 @@ class Propal extends CommonObject
             $this->line->origin_id = $origin_id;
             $this->line->origin = $origin;
 
+			// Multicurrency
+			$this->line->fk_multicurrency			= $this->fk_multicurrency;
+			$this->line->multicurrency_code			= $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= price2num($pu_ht * $this->multicurrency_tx);
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+            
             // Mise en option de la ligne
             if (empty($qty) && empty($special_code)) $this->line->special_code=3;
 
@@ -756,6 +778,14 @@ class Propal extends CommonObject
         if (empty($this->availability_id)) $this->availability_id=0;
         if (empty($this->demand_reason_id)) $this->demand_reason_id=0;
 
+		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = '';
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
+		
         dol_syslog(get_class($this)."::create");
 
         // Check parameters
@@ -819,6 +849,9 @@ class Propal extends CommonObject
         $sql.= ", fk_incoterms";
         $sql.= ", location_incoterms";
         $sql.= ", entity";
+        $sql.= ", fk_multicurrency";
+        $sql.= ", multicurrency_code";
+        $sql.= ", multicurrency_tx";
         $sql.= ") ";
         $sql.= " VALUES (";
         $sql.= $this->socid;
@@ -848,6 +881,9 @@ class Propal extends CommonObject
         $sql.= ", ".(int) $this->fk_incoterms;
         $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
         $sql.= ", ".$conf->entity;
+		$sql.= ", ".(int) $this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".(double) $this->multicurrency_tx;
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -1184,6 +1220,7 @@ class Propal extends CommonObject
         $sql.= ', p.fk_account';
         $sql.= ", p.fk_shipping_method";
         $sql.= ", p.fk_incoterms, p.location_incoterms";
+		$sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
         $sql.= ", i.libelle as libelle_incoterms";
         $sql.= ", c.label as statut_label";
         $sql.= ", ca.code as availability_code, ca.label as availability";
@@ -1268,6 +1305,14 @@ class Propal extends CommonObject
 				$this->location_incoterms = $obj->location_incoterms;
 				$this->libelle_incoterms = $obj->libelle_incoterms;
 
+				// Multicurrency
+				$this->fk_multicurrency 		= $obj->fk_multicurrency;
+				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->multicurrency_tx 		= $obj->multicurrency_tx;
+				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+
                 if ($obj->fk_statut == self::STATUS_DRAFT)
                 {
                     $this->brouillon = 1;
@@ -1292,6 +1337,7 @@ class Propal extends CommonObject
 	            $sql.= " d.fk_unit,";
                 $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
                 $sql.= ' d.date_start, d.date_end';
+				$sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
                 $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d";
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
                 $sql.= " WHERE d.fk_propal = ".$this->id;
@@ -1357,6 +1403,15 @@ class Propal extends CommonObject
                         $line->date_start  		= $objp->date_start;
                         $line->date_end  		= $objp->date_end;
 
+
+						// Multicurrency
+						$line->fk_multicurrency 		= $objp->fk_multicurrency;
+						$line->multicurrency_code 		= $objp->multicurrency_code;
+						$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+						$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+						$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+						$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+
                         $line->fetch_optionals($line->id,$extralabelsline);
 
                         $this->lines[$i]        = $line;
@@ -2785,6 +2840,7 @@ class Propal extends CommonObject
         $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
         $sql.= ' p.description as product_desc,';
         $sql.= ' p.entity';
+		$sql.= ' ,pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
         $sql.= ' WHERE pt.fk_propal = '.$this->id;
@@ -2833,6 +2889,14 @@ class Propal extends CommonObject
                 $this->lines[$i]->date_start		= $this->db->jdate($obj->date_start);
                 $this->lines[$i]->date_end			= $this->db->jdate($obj->date_end);
 	            $this->lines[$i]->fk_unit			= $obj->fk_unit;
+				
+				// Multicurrency
+				$this->lines[$i]->fk_multicurrency 			= $obj->fk_multicurrency;
+				$this->lines[$i]->multicurrency_code 		= $obj->multicurrency_code;
+				$this->lines[$i]->multicurrency_subprice 	= $obj->multicurrency_subprice;
+				$this->lines[$i]->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->lines[$i]->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
                 $i++;
             }
@@ -3003,6 +3067,14 @@ class PropaleLigne  extends CommonObjectLine
 
     var $skip_update_total; // Skip update price total for special lines
 
+    // Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_subprice;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
+	
     /**
      * 	Class line Contructor
      *
@@ -3026,6 +3098,7 @@ class PropaleLigne  extends CommonObjectLine
 		$sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
 		$sql.= ' pd.fk_unit,';
 		$sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
+		$sql.= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc,';
 		$sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
 		$sql.= ' pd.date_start, pd.date_end, pd.product_type';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pd';
@@ -3078,6 +3151,14 @@ class PropaleLigne  extends CommonObjectLine
 			$this->date_start       = $this->db->jdate($objp->date_start);
             $this->date_end         = $this->db->jdate($objp->date_end);
 
+			// Multicurrency
+			$this->fk_multicurrency 		= $objp->fk_multicurrency;
+			$this->multicurrency_code 		= $objp->multicurrency_code;
+			$this->multicurrency_subprice 	= $objp->multicurrency_subprice;
+			$this->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+			$this->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+			$this->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+	
 			$this->db->free($result);
 
             return 1;
@@ -3148,7 +3229,8 @@ class PropaleLigne  extends CommonObjectLine
         $sql.= ' info_bits, ';
         $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
 	    $sql.= ' fk_unit,';
-        $sql.= ' date_start, date_end)';
+        $sql.= ' date_start, date_end';
+		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc)';
         $sql.= " VALUES (".$this->fk_propal.",";
         $sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").",";
         $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
@@ -3177,6 +3259,12 @@ class PropaleLigne  extends CommonObjectLine
 	    $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit).',';
         $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
         $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
+		$sql.= ", ".$this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".$this->multicurrency_subprice;
+		$sql.= ", ".$this->multicurrency_total_ht;
+		$sql.= ", ".$this->multicurrency_total_tva;
+		$sql.= ", ".$this->multicurrency_total_ttc;
         $sql.= ')';
 
         dol_syslog(get_class($this).'::insert', LOG_DEBUG);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6b19a8ebe44..3e04f98574d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1414,6 +1414,80 @@ abstract class CommonObject
     	}
     }
 
+	/**
+     *  Change the multicurrency code
+     *
+     *  @param		string	$code	multicurrency code
+     *  @return		int				>0 if OK, <0 if KO
+     */
+    function setMulticurrencyCode($code)
+    {
+    	dol_syslog(get_class($this).'::setMulticurrencyCode('.$id.')');
+    	if ($this->statut >= 0 || $this->element == 'societe')
+    	{
+    		$fieldname = 'multicurrency_code';
+			
+    		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+    		$sql .= ' SET '.$fieldname.' = "'.$this->db->escape($code).'"';
+    		$sql .= ' WHERE rowid='.$this->id;
+
+    		if ($this->db->query($sql))
+    		{
+    			$this->multicurrency_code = $code;
+    			return 1;
+    		}
+    		else
+    		{
+    			dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
+    			$this->error=$this->db->error();
+    			return -1;
+    		}
+    	}
+    	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;
+    	}
+    }
+	
+	/**
+     *  Change the multicurrency rate
+     *
+     *  @param		double	$rate	multicurrency rate
+     *  @return		int				>0 if OK, <0 if KO
+     */
+    function setMulticurrencyRate($rate)
+    {
+    	dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')');
+    	if ($this->statut >= 0 || $this->element == 'societe')
+    	{
+    		$fieldname = 'multicurrency_tx';
+			
+    		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+    		$sql .= ' SET '.$fieldname.' = '.$rate;
+    		$sql .= ' WHERE rowid='.$this->id;
+
+    		if ($this->db->query($sql))
+    		{
+    			$this->multicurrency_tx = $rate;
+    			return 1;
+    		}
+    		else
+    		{
+    			dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
+    			$this->error=$this->db->error();
+    			return -1;
+    		}
+    	}
+    	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;
+    	}
+    }
+
     /**
      *  Change the payments terms
      *
@@ -2076,6 +2150,7 @@ abstract class CommonObject
         $sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
         $sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
 		if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';
+		$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
         $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
         $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
         if ($exclspec)
@@ -2098,6 +2173,9 @@ abstract class CommonObject
             $total_ht_by_vats  = array();
             $total_tva_by_vats = array();
             $total_ttc_by_vats = array();
+			$this->multicurrency_total_ht	= 0;
+            $this->multicurrency_total_tva	= 0;
+           	$this->multicurrency_total_ttc	= 0;
 
             $num = $this->db->num_rows($resql);
             $i = 0;
@@ -2106,11 +2184,11 @@ abstract class CommonObject
                 $obj = $this->db->fetch_object($resql);
 
                 // Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'
-
+				$multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;
                 if ($forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
                 {
                 	$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
-                	$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100));
+                	$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
                 	$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
                 	if ($diff)
                 	{
@@ -2129,6 +2207,7 @@ abstract class CommonObject
                 $this->total_localtax1 += $obj->total_localtax1;
                 $this->total_localtax2 += $obj->total_localtax2;
                 $this->total_ttc       += $obj->total_ttc;
+                
                 if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;
                 if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;
                 if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;
@@ -2174,7 +2253,12 @@ abstract class CommonObject
 					$this->total_ttc -= $sit->total_ttc;
 				}
 			}
-
+			
+			// Multicurrency
+			$this->multicurrency_total_ht	+= $this->total_ht * $multicurrency_tx;
+            $this->multicurrency_total_tva	+= $this->total_tva * $multicurrency_tx;
+            $this->multicurrency_total_ttc	+= $this->total_ttc * $multicurrency_tx;
+			
             $this->db->free($resql);
 
             // Now update global field total_ht, total_ttc and tva
@@ -2198,6 +2282,9 @@ abstract class CommonObject
                 $sql .= " ".$fieldlocaltax1."='".price2num($this->total_localtax1)."',";
                 $sql .= " ".$fieldlocaltax2."='".price2num($this->total_localtax2)."',";
                 $sql .= " ".$fieldttc."='".price2num($this->total_ttc)."'";
+				$sql .= ", multicurrency_total_ht='".price2num($this->multicurrency_total_ht, 'MT', 1)."'";
+				$sql .= ", multicurrency_total_tva='".price2num($this->multicurrency_total_tva, 'MT', 1)."'";
+				$sql .= ", multicurrency_total_ttc='".price2num($this->multicurrency_total_ttc, 'MT', 1)."'";
                 $sql .= ' WHERE rowid = '.$this->id;
 
                 //print "xx".$sql;
@@ -3062,6 +3149,9 @@ abstract class CommonObject
 		// Price HT
 		print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
 
+		// Multicurrency
+		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency').'</td>';
+		
 		if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
 
 		// Qty
@@ -3095,6 +3185,9 @@ abstract class CommonObject
 		// Total HT
 		print '<td class="linecolht" align="right" width="50">'.$langs->trans('TotalHTShort').'</td>';
 
+		// Multicurrency
+		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right" width="50">'.$langs->trans('TotalHTShortCurrency').'</td>';
+
 		print '<td class="linecoledit"></td>';  // No width to allow autodim
 
 		print '<td class="linecoldelete" width="10"></td>';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e081d902b16..c9f9bbe9d03 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3722,6 +3722,65 @@ class Form
             }
         }
     }
+	
+	/**
+     *    Show form with multicurrency code
+     *
+     *    @param	string	$page        	Page
+     *    @param    string	$selected    	code pre-selectionne
+     *    @param    string	$htmlname    	Name of select html field
+     *    @return	void
+     */
+    function form_multicurrency_code($page, $selected='', $htmlname='multicurrency_code')
+    {
+        global $langs;
+        if ($htmlname != "none")
+        {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setmulticurrencycode">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+            print '<tr><td>';
+            print $this->selectMultiCurrency($selected,$htmlname);
+            print '</td>';
+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            print '</tr></table></form>';
+        }
+        else
+        {
+        	dol_include_once('/core/lib/company.lib.php');
+        	print !empty($selected) ? currency_name($selected,1) : '&nbsp;';
+        }
+    }
+	
+	/**
+     *    Show form with multicurrency rate
+     *
+     *    @param	string	$page        	Page
+     *    @param    double	$rate	    	Current rate
+     *    @param    string	$htmlname    	Name of select html field
+     *    @return	void
+     */
+    function form_multicurrency_rate($page, $rate='', $htmlname='multicurrency_tx')
+    {
+        global $langs;
+        if ($htmlname != "none")
+        {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setmulticurrencyrate">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+            print '<tr><td>';
+            print '<input type="text" name="'.$htmlname.'" value="'.(!empty($rate) ? $rate : 1).'" size="10" />';
+            print '</td>';
+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            print '</tr></table></form>';
+        }
+        else
+        {
+        	print !empty($rate) ? $rate : 1;
+        }
+    }
 
 
     /**
@@ -3925,7 +3984,53 @@ class Form
         return $out;
     }
 
+	/**
+     *	Return array of currencies in user language
+	 * 
+     *  @param	string	$selected    preselected currency code
+     *  @param  string	$htmlname    name of HTML select list
+     *  @param  integer	$useempty    1=Add empty line
+     * 	@return	string
+     */
+    function selectMultiCurrency($selected='',$htmlname='multicurrency_code', $useempty=0)
+    {
+        global $db,$conf,$langs,$user;
 
+        $langs->loadCacheCurrencies('');
+
+		$TCurrency = array();
+		
+		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
+		$resql = $db->query($sql);
+		
+		if ($resql)
+		{
+			while ($obj = $db->fetch_object($resql)) $TCurrency[$obj->code] = $obj->code;
+		}
+		
+		$out='';
+        $out.= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+		if ($useempty) $out .= '<option value="">&nbsp;</option>';
+		if (count($TCurrency) > 0)
+		{
+			foreach ($langs->cache_currencies as $code_iso => $currency)
+	        {
+	        	if (isset($TCurrency[$code_iso]))
+				{
+					if (!empty($selected) && $selected == $code_iso) $out.= '<option value="'.$code_iso.'" selected>';
+		        	else $out.= '<option value="'.$code_iso.'">';
+		        	
+		        	$out.= $currency['label'];
+		        	$out.= ' ('.$langs->getCurrencySymbol($code_iso).')';
+		        	$out.= '</option>';	
+				}
+	        }
+		}
+        
+        $out.= '</select>';
+        return $out;
+    }
+	
     /**
      *	Load into the cache vat rates of a country
      *
diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php
new file mode 100644
index 00000000000..c3844309dd5
--- /dev/null
+++ b/htdocs/core/lib/multicurrency.lib.php
@@ -0,0 +1,54 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2015 ATM Consulting <support@atm-consulting.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/>.
+ */
+
+/**
+ *	\file		lib/multicurrency.lib.php
+ *	\ingroup	multicurency
+ *	\brief		This file is an example module library
+ *				Put some comments here
+ */
+
+/**
+ * Prepare array with list of tabs
+ *
+ * @return  array    Array of tabs to show
+ */
+function multicurrencyAdminPrepareHead()
+{
+    global $langs, $conf;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = dol_buildpath("/admin/multicurrency.php", 1);
+    $head[$h][1] = $langs->trans("Parameters");
+    $head[$h][2] = 'settings';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    //$this->tabs = array(
+    //	'entity:+tabname:Title:@quickpriceupdate:/quickpriceupdate/mypage.php?id=__ID__'
+    //); // to add new tab
+    //$this->tabs = array(
+    //	'entity:-tabname:Title:@quickpriceupdate:/quickpriceupdate/mypage.php?id=__ID__'
+    //); // to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'multicurrency');
+
+    return $head;
+}
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 528abfcd6a5..d6ab9f51fab 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -49,6 +49,7 @@
  *		@param  Societe	$seller						Thirdparty seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
  *		@param  array	$localtaxes_array			Array with localtaxes info (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
  *		@param  integer	$progress                   Situation invoices progress (value from 0 to 100, 100 by default)
+ *		@param  double	$multicurrency_tx           Currency rate (1 by default)
  *		@return result[ 0=total_ht,
  *						 1=total_vat, (main vat only)
  *						 2=total_ttc, (total_ht + main vat + local taxes)
@@ -65,8 +66,11 @@
  *						13=!! should not be used
  *						14=total_tax1 for total_ht_without_discount,
  *						15=total_tax2 for total_ht_without_discount]
+ * 						16=multicurrency_total_ht
+ * 						17=multicurrency_total_tva
+ * 						18=multicurrency_total_ttc
  */
-function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array='', $progress=100)
+function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array='', $progress=100, $multicurrency_tx=1)
 {
 	global $conf,$mysoc,$db;
 
@@ -242,6 +246,11 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
 	}
 
+	// Multicurrency
+	$result[16] = price2num($result[0] * $multicurrency_tx, 'MT');
+	$result[17] = price2num($result[1] * $multicurrency_tx, 'MT');
+	$result[18] = price2num($result[2] * $multicurrency_tx, 'MT');
+
 	// if there's some localtax without vat, we calculate localtaxes (we will add them at end)
 
     //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
new file mode 100644
index 00000000000..6642e33719f
--- /dev/null
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -0,0 +1,290 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2016      Pierre-Henry Favre  <phf@atm-consulting.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/>.
+ */
+
+/**
+ * 	\defgroup   multicurrency     Module MultiCurrency
+ *  \brief      Handle multiple currencies on company/propal/orders ...
+ *  \file       htdocs/core/modules/modMultiCurrency.class.php
+ *  \ingroup    multicurrency
+ *  \brief      Description and activation file for module MultiCurrency
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Description and activation class for module MyModule
+ */
+class modMultiCurrency extends DolibarrModules
+{
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+        global $langs,$conf;
+
+        $this->db = $db;
+
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'multicurrency';
+
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "financial";
+		// Module position in the family
+		$this->module_position = 500;
+		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		$this->familyinfo = array('financial' => array('position'=>'009', 'label'=>$langs->trans("ModuleFamilyFinancial")));
+
+		// 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Description of module MyModule";
+		
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+		$this->version = 'development';
+		// 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);
+		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+		$this->special = 0;
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto='multicurrency';
+
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /multicurrency/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /multicurrency/core/modules/barcode)
+		// for specific css file (eg: /multicurrency/css/multicurrency.css.php)
+		//$this->module_parts = array(
+		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
+		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+		//							'css' => array('/multicurrency/css/multicurrency.css.php'),	// Set this to relative path of css file if module has its own css file
+	 	//							'js' => array('/multicurrency/js/multicurrency.js'),          // Set this to relative path of js file if module must load a js on all pages
+		//							'hooks' => array('hookcontext1','hookcontext2')  	// Set here all hooks context managed by module
+		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
+		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@multicurrency')) // Set here all workflow context managed by module
+		//                        );
+		$this->module_parts = array();
+
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/multicurrency/temp");
+		$this->dirs = array();
+
+		// Config pages. Put here list of php page, stored into multicurrency/admin directory, to use to setup module.
+		$this->config_page_url = array("multicurrency.php");
+
+		// Dependencies
+		$this->hidden = false;			// A condition to hide module
+		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array();	// List of modules id to disable if this one is disabled
+		$this->conflictwith = array();	// List of modules id this module is in conflict with
+		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->langfiles = array("multicurrency");
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array();
+
+		// Array to add new pages in new tabs
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@multicurrency:$user->rights->multicurrency->read:/multicurrency/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
+        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@multicurrency:$user->rights->othermodule->read:/multicurrency/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		// where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+        $this->tabs = array();
+
+        // Dictionaries
+	    if (! isset($conf->multicurrency->enabled))
+        {
+        	$conf->multicurrency=new stdClass();
+        	$conf->multicurrency->enabled=0;
+        }
+		$this->dictionaries=array();
+        /* Example:
+        if (! isset($conf->multicurrency->enabled)) $conf->multicurrency->enabled=0;	// This is to avoid warnings
+        $this->dictionaries=array(
+            'langs'=>'mylangfile@multicurrency',
+            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+            'tabcond'=>array($conf->multicurrency->enabled,$conf->multicurrency->enabled,$conf->multicurrency->enabled)												// Condition to show each dictionary
+        );
+        */
+
+        // Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+        $this->boxes = array();			// List of boxes
+		// Example:
+		//$this->boxes=array(
+		//    0=>array('file'=>'myboxa.php@multicurrency','note'=>'','enabledbydefaulton'=>'Home'),
+		//    1=>array('file'=>'myboxb.php@multicurrency','note'=>''),
+		//    2=>array('file'=>'myboxc.php@multicurrency','note'=>'')
+		//);
+
+		// Cronjobs
+		$this->cronjobs = array();			// List of cron jobs entries to add
+		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>3600, 'unitfrequency'=>3600),
+		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>3600, 'unitfrequency'=>3600)
+		// );
+
+		// Permissions
+		$this->rights = array();		// Permission array used by this module
+		$r=0;
+
+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		// $this->rights[$r][1] = 'Permision label';	// Permission label
+		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $r++;
+
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+
+		// Add here entries to declare new menus
+		//
+		// Example to declare a new Top Menu entry and its Left menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'top',			                // This is a Top menu entry
+		//							'titre'=>'MyModule top menu',
+		//							'mainmenu'=>'multicurrency',
+		//							'leftmenu'=>'multicurrency',
+		//							'url'=>'/multicurrency/pagetop.php',
+		//							'langs'=>'mylangfile@multicurrency',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->multicurrency->enabled',	// Define condition to show or hide menu entry. Use '$conf->multicurrency->enabled' if entry must be visible if module is enabled.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->multicurrency->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		//
+		// Example to declare a Left Menu entry into an existing Top menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'left',			                // This is a Left menu entry
+		//							'titre'=>'MyModule left menu',
+		//							'mainmenu'=>'xxx',
+		//							'leftmenu'=>'multicurrency',
+		//							'url'=>'/multicurrency/pagelevel2.php',
+		//							'langs'=>'mylangfile@multicurrency',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->multicurrency->enabled',  // Define condition to show or hide menu entry. Use '$conf->multicurrency->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->multicurrency->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+
+
+		// Exports
+		$r=1;
+
+		// Example:
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+        // $this->export_icon[$r]='generic:MyModule';
+		// $this->export_permission[$r]=array(array("multicurrency","level1","level2"));
+		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
+		// $this->export_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
+		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
+		// $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
+		// $r++;
+	}
+
+	/**
+	 *		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='')
+	{
+		$sql = array();
+
+		//$this->_load_tables('/multicurrency/sql/');
+
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 * Function called when module is disabled.
+	 * Remove from database constants, boxes and permissions from Dolibarr database.
+	 * Data directories are not deleted
+	 *
+	 * @param      string	$options    Options when enabling module ('', 'noboxes')
+	 * @return     int             	1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+
+		return $this->_remove($sql, $options);
+	}
+
+}
+
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index e17648a7643..ba1f037370e 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -61,6 +61,9 @@ if (in_array($object->element,array('propal', 'supplier_proposal','facture','inv
 	<?php } ?>
 	<td class="linecolvat" align="right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
 	<td class="linecoluht" align="right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
+	<?php if (!empty($conf->multicurrency->enabled)) { $colspan++;?>
+	<td class="linecoluht_currency" align="right"><span id="title_up_ht_currency"><?php echo $langs->trans('PriceUHTCurrency'); ?></span></td>
+	<?php } ?>
 	<?php if (! empty($inputalsopricewithtax)) { ?>
 	<td class="linecoluttc" align="right"><span id="title_up_ttc"><?php echo $langs->trans('PriceUTTC'); ?></span></td>
 	<?php } ?>
@@ -227,6 +230,13 @@ else {
 	<td class="nobottom linecoluht" align="right">
 	<input type="text" size="5" name="price_ht" id="price_ht" class="flat" value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>">
 	</td>
+	
+	<?php if (!empty($conf->multicurrency->enabled)) { $colspan++;?>
+	<td class="nobottom linecoluht_currency" align="right">
+	<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat" value="<?php echo (isset($_POST["multicurrency_price_ht"])?$_POST["multicurrency_price_ht"]:''); ?>">
+	</td>
+	<?php } ?>
+	
 	<?php if (! empty($inputalsopricewithtax)) { ?>
 	<td class="nobottom linecoluttc" align="right">
 	<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat" value="<?php echo (isset($_POST["price_ttc"])?$_POST["price_ttc"]:''); ?>">
@@ -354,6 +364,8 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
 		}
 	}
 
+	if (!empty($conf->multicurrency->enabled)) $colspan+=2;
+
 	if (! empty($usemargins))
 	{
 		$colspan++; // For the buying price
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index f71b2b484d1..3abc0fb14c0 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -130,7 +130,11 @@ if (empty($usemargins)) $usemargins=0;
 	<td align="right" class="linecolvat nowrap"><?php $coldisplay++; ?><?php echo vatrate($line->tva_tx,'%',$line->info_bits); ?></td>
 
 	<td align="right" class="linecoluht nowrap"><?php $coldisplay++; ?><?php echo price($line->subprice); ?></td>
-
+	
+	<?php if (!empty($conf->multicurrency->enabled)) { ?>
+	<td align="right" class="linecoluht_currency nowrap"><?php $coldisplay++; ?><?php echo price($line->multicurrency_subprice); ?></td>
+	<?php } ?>
+	
 	<?php if ($inputalsopricewithtax) { ?>
 	<td align="right" class="linecoluttc nowrap"><?php $coldisplay++; ?><?php echo (isset($line->pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?></td>
 	<?php } ?>
@@ -190,6 +194,9 @@ if (empty($usemargins)) $usemargins=0;
 	<td align="right" class="linecoloption nowrap"><?php $coldisplay++; ?><?php echo $langs->trans('Option'); ?></td>
 	<?php } else { ?>
 	<td align="right" class="liencolht nowrap"><?php $coldisplay++; ?><?php echo price($line->total_ht); ?></td>
+		<?php if (!empty($conf->multicurrency->enabled)) { ?>
+		<td align="right" class="linecolutotalht_currency nowrap"><?php $coldisplay++; ?><?php echo price($line->multicurrency_total_ht); ?></td>
+		<?php } ?>
 	<?php } ?>
 
 	<?php if ($this->statut == 0  && ($object_rights->creer)) { ?>
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index c6e8606c28f..7e9260c595e 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -37,3 +37,102 @@ ALTER TABLE llx_cronjob MODIFY COLUMN unitfrequency	varchar(255) NOT NULL DEFAUL
 
 ALTER TABLE llx_facture ADD INDEX idx_facture_fk_statut (fk_statut);
 
+
+CREATE TABLE IF NOT EXISTS `llx_multicurrency` 
+( 
+	`rowid` integer AUTO_INCREMENT PRIMARY KEY, 
+	`date_create` datetime DEFAULT NULL, 
+	`code` varchar(255) DEFAULT NULL, 
+	`name` varchar(255) DEFAULT NULL, 
+	`entity` integer DEFAULT NULL,
+	`fk_user` integer DEFAULT NULL,
+	KEY `code` (`code`)
+) ENGINE=innodb;
+
+CREATE TABLE IF NOT EXISTS `llx_multicurrency_rate` 
+( 
+	`rowid` integer AUTO_INCREMENT PRIMARY KEY, 
+	`date_sync` datetime DEFAULT NULL,  
+	`rate` double NOT NULL DEFAULT '0', 
+	`fk_multicurrency` integer NOT NULL DEFAULT '0', 
+	`entity` integer NOT NULL DEFAULT '0', 
+	KEY `fk_multicurrency` (`fk_multicurrency`), 
+	KEY `entity` (`entity`) 
+) ENGINE=innodb;
+
+ALTER TABLE llx_societe ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_societe ADD COLUMN multicurrency_code varchar(255);
+
+ALTER TABLE llx_product_price ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_product_price ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_product_price ADD COLUMN multicurrency_price double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_commande ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_commande ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_commande ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_commande ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_commande ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_commande ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_commandedet ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_commandedet ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_commandedet ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_commandedet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_commandedet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_commandedet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_commande_fournisseur ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_commande_fournisseur ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_commande_fournisseur ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_commande_fournisseur ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_commande_fournisseur ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_commande_fournisseurdet ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_commande_fournisseurdet ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_commande_fournisseurdet ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_commande_fournisseurdet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_commande_fournisseurdet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_commande_fournisseurdet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_facture_fourn ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_facture_fourn ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_facture_fourn ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_facture_fourn ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_facture_fourn ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_facture_fourn ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_facture_fourn_det ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_facture_fourn_det ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_facture_fourn_det ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_facture_fourn_det ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_facture_fourn_det ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_facture ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_facture ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_facture ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_facture ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_facture ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_facture ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_facturedet ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_facturedet ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_facturedet ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_propal ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_propal ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_propal ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_propal ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_propal ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_propal ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_propaldet ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_propaldet ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_propaldet ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 553b2facad7..98740c232ac 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -70,6 +70,12 @@ create table llx_commande
   fk_incoterms          integer,						-- for incoterms
   location_incoterms    varchar(255),					-- for incoterms
   import_key			varchar(14),
-  extraparams			varchar(255)					-- for stock other parameters with json format
+  extraparams			varchar(255),					-- for stock other parameters with json format
   
+  fk_multicurrency		integer,
+  multicurrency_code			varchar(255),
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 18744a8ca2f..6d291dcfa00 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -66,6 +66,12 @@ create table llx_commande_fournisseur
   fk_incoterms          integer,						-- for incoterms
   location_incoterms    varchar(255),					-- for incoterms
   import_key			varchar(14),
-  extraparams			varchar(255)					-- for stock other parameters with json format
+  extraparams			varchar(255),					-- for stock other parameters with json format
 
+  fk_multicurrency			integer,
+  multicurrency_code			varchar(255),
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
index a3dbd87d359..f7b10c8e35e 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
@@ -49,5 +49,12 @@ create table llx_commande_fournisseurdet
   special_code				 integer      DEFAULT 0,      -- code pour les lignes speciales
   rang						 integer      DEFAULT 0,
   import_key				 varchar(14),
-  fk_unit         integer    DEFAULT NULL
+  fk_unit         integer    DEFAULT NULL,
+  
+  fk_multicurrency		integer,
+  multicurrency_code			varchar(255),
+  multicurrency_subprice		double(24,8) DEFAULT 0,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql
index b01c270cc3e..9608c2ae44b 100644
--- a/htdocs/install/mysql/tables/llx_commandedet.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet.sql
@@ -55,7 +55,14 @@ create table llx_commandedet
   special_code					integer      DEFAULT 0,      -- code pour les lignes speciales
   rang							integer      DEFAULT 0,
   fk_unit            integer      DEFAULT NULL,           -- lien vers table des unités
-  import_key					varchar(14)
+  import_key					varchar(14),
+  
+  fk_multicurrency		integer,
+  multicurrency_code			varchar(255),
+  multicurrency_subprice		double(24,8) DEFAULT 0,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index e6da2bda214..b503401cd37 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -84,5 +84,12 @@ create table llx_facture
   situation_final     smallint,  -- is the situation final ?
 
   import_key			varchar(14),
-  extraparams			varchar(255)							-- for other parameters with json format
+  extraparams			varchar(255),							-- for other parameters with json format
+  
+  fk_multicurrency		integer,
+  multicurrency_code			varchar(255),
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql
index 1e7fa12d565..2517f17ad96 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql
@@ -70,6 +70,12 @@ create table llx_facture_fourn
   location_incoterms    varchar(255),					-- for incoterms
   model_pdf				varchar(255),
   import_key			varchar(14),
-  extraparams			varchar(255)					-- for stock other parameters with json format
+  extraparams			varchar(255),					-- for stock other parameters with json format
   
+  fk_multicurrency		integer,
+  multicurrency_code			varchar(255),
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
index ad066752ea0..feff72e39b9 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
@@ -49,5 +49,12 @@ create table llx_facture_fourn_det
   special_code				 integer      DEFAULT 0,      -- code pour les lignes speciales
   rang						 integer      DEFAULT 0,
   import_key        varchar(14),
-  fk_unit         integer    DEFAULT NULL
+  fk_unit         integer    DEFAULT NULL,
+  
+  fk_multicurrency		integer,
+  multicurrency_code			varchar(255),
+  multicurrency_subprice		double(24,8) DEFAULT 0,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
index 63cd9ab3bc1..81074f299e0 100644
--- a/htdocs/install/mysql/tables/llx_facturedet.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet.sql
@@ -61,8 +61,14 @@ create table llx_facturedet
 
   situation_percent real,   -- % progression of lines invoicing
   fk_prev_id        integer, -- id of the line in the previous situation,
-  fk_unit           integer DEFAULT NULL -- id of the unit code¡
+  fk_unit           integer DEFAULT NULL, -- id of the unit code¡
 
+  fk_multicurrency		integer,
+  multicurrency_code			varchar(255),
+  multicurrency_subprice		double(24,8) DEFAULT 0,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_multicurrency.sql b/htdocs/install/mysql/tables/llx_multicurrency.sql
new file mode 100644
index 00000000000..2f01236a3b9
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_multicurrency.sql
@@ -0,0 +1,28 @@
+-- ========================================================================
+-- Copyright (C) 2016		Pierre-Henry Favre		<phf@atm-consulting.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/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_multicurrency
+( 
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	date_create datetime DEFAULT NULL, 
+	code varchar(255) DEFAULT NULL, 
+	name varchar(255) DEFAULT NULL, 
+	entity integer DEFAULT NULL,
+	fk_user integer DEFAULT NULL,
+	KEY code (code)
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_multicurrency_rate.sql b/htdocs/install/mysql/tables/llx_multicurrency_rate.sql
new file mode 100644
index 00000000000..a403071930c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_multicurrency_rate.sql
@@ -0,0 +1,28 @@
+-- ========================================================================
+-- Copyright (C) 2016		Pierre-Henry Favre		<phf@atm-consulting.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/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_multicurrency_rate
+( 
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	date_sync datetime DEFAULT NULL,  
+	rate double NOT NULL DEFAULT '0', 
+	fk_multicurrency integer NOT NULL DEFAULT '0', 
+	entity integer NOT NULL DEFAULT '0', 
+	KEY fk_multicurrency (fk_multicurrency), 
+	KEY entity (entity) 
+) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql
index 2dcf95b0dfc..9526ca3aa9d 100644
--- a/htdocs/install/mysql/tables/llx_paiement_facture.sql
+++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql
@@ -21,5 +21,9 @@ create table llx_paiement_facture
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_paiement     integer,
   fk_facture      integer,
-  amount          double(24,8)     DEFAULT 0
+  amount          double(24,8)     DEFAULT 0,
+  
+  multicurrency_code		varchar(255),
+  multicurrency_tx		double(24,8) DEFAULT 1,
+  multicurrency_amount	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql
index 58d51867d96..a9e8da8a530 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql
@@ -23,5 +23,9 @@ create table llx_paiementfourn_facturefourn
   rowid integer AUTO_INCREMENT PRIMARY KEY,
   fk_paiementfourn INTEGER DEFAULT NULL,
   fk_facturefourn  INTEGER DEFAULT NULL,
-  amount double(24,8) DEFAULT 0
+  amount double(24,8) DEFAULT 0,
+  
+  multicurrency_code	varchar(255),
+  multicurrency_tx		double(24,8) DEFAULT 1,
+  multicurrency_amount	double(24,8) DEFAULT 0
 )ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
index 1341c49dcaa..b101b8b0250 100755
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -39,6 +39,10 @@ create table llx_product_price
   tosell			tinyint DEFAULT 1,
   price_by_qty		integer NOT NULL DEFAULT 0,
   fk_price_expression integer,                     -- Link to the rule for dynamic price calculation
-  import_key 		varchar(14)
+  import_key 		varchar(14),
+  
+  fk_multicurrency		integer,
+  multicurrency_code	varchar(255),
+  multicurrency_price	double(24,8) DEFAULT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index 8090b1fcb4d..2566769e7be 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -69,6 +69,12 @@ create table llx_propal
   location_incoterms    varchar(255),								-- for incoterms
   import_key			varchar(14),
   extraparams			varchar(255),					-- for stock other parameters with json format
-  fk_delivery_address	integer							-- delivery address (deprecated)
+  fk_delivery_address	integer,							-- delivery address (deprecated)
   
+  fk_multicurrency			integer,
+  multicurrency_code			varchar(255),
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql
index 299767ae2ed..3f372894182 100644
--- a/htdocs/install/mysql/tables/llx_propaldet.sql
+++ b/htdocs/install/mysql/tables/llx_propaldet.sql
@@ -53,8 +53,14 @@ create table llx_propaldet
   
   special_code						integer      DEFAULT 0,          -- code pour les lignes speciales
   rang								integer      DEFAULT 0,           -- ordre affichage sur la propal
-  fk_unit           integer      DEFAULT NULL           -- lien vers table des unités
+  fk_unit           integer      DEFAULT NULL,           -- lien vers table des unités
   
+  fk_multicurrency			integer,
+  multicurrency_code			varchar(255),
+  multicurrency_subprice		double(24,8) DEFAULT 0,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 0244b9ea757..82e3b420e29 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -99,5 +99,8 @@ create table llx_societe
   canvas				   varchar(32),			                        -- type of canvas if used (null by default)
   import_key               varchar(14),                          		-- import key
   webservices_url          varchar(255),                            -- supplier webservice url
-  webservices_key          varchar(128)                            -- supplier webservice key
+  webservices_key          varchar(128),                            -- supplier webservice key
+  
+  fk_multicurrency			integer,
+  multicurrency_code		varchar(255)
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 7a23657123f..90e84d9a271 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -310,7 +310,8 @@ UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
-PriceUHT=U.P. (net)
+PriceUHT=U.P. (net in currency)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -335,6 +336,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
new file mode 100644
index 00000000000..2000d27d3d4
--- /dev/null
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -0,0 +1,726 @@
+<?php
+/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
+ * 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>
+ *
+ * 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/>.
+ */
+
+/**
+ * \file    dev/skeletons/skeleton_class.class.php
+ * \ingroup mymodule othermodule1 othermodule2
+ * \brief   This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ *          Put some comments here
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php";
+
+/**
+ * Class Currency
+ *
+ * Put here description of your class
+ * @see CommonObject
+ */
+class MultiCurrency extends CommonObject
+{
+	/**
+	 * @var string Id to identify managed objects
+	 */
+	public $element = 'multicurrency';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'multicurrency';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element_line="multicurrency_rate";
+
+	/**
+	 * @var CurrencyRate[] rates
+	 */
+	public $rates = array();
+
+	/**
+	 * @var mixed Sample property 1
+	 */
+	public $id;
+	/**
+	 * @var mixed Sample property 1
+	 */
+	public $code;
+	/**
+	 * @var mixed Sample property 2
+	 */
+	public $name;
+	/**
+	 * @var mixed Sample property 2
+	 */
+	public $entity;
+	/**
+	 * @var mixed Sample property 2
+	 */
+	public $date_create;
+	/**
+	 * @var mixed Sample property 2
+	 */
+	public $fk_user;
+	/**
+	 * @var mixed Sample property 2
+	 */
+	public $rate;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = &$db;
+		
+		return 1;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $trigger true=launch triggers after, false=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $trigger = true)
+	{
+		global $conf;
+		
+		dol_syslog('Currency::create', LOG_DEBUG);
+
+		$error = 0;
+		
+		if (empty($this->entity) || $this->entity <= 0) $this->entity = $conf->entity;
+		$now=date('Y-m-d H:i:s');
+		
+		// Insert request
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql .= ' code,';
+		$sql .= ' name,';
+		$sql .= ' entity,';
+		$sql .= ' date_create,';
+		$sql .= ' fk_user';
+		$sql .= ') VALUES (';
+		$sql .= ' \'' . $this->db->escape($this->code) . '\',';
+		$sql .= ' \'' . $this->db->escape($this->name) . '\',';
+		$sql .= ' \'' . $this->entity . '\',';
+		$sql .= ' \'' . $now . '\',';
+		$sql .= ' \'' . $user->id . '\'';
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog('Currency::create ' . join(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->date_create = $now;
+			$this->fk_user = $user->id;
+			
+			if ($trigger) {
+				$result=$this->call_trigger('CURRENCY_CREATE', $user);
+				if ($result < 0) $error++;
+			}
+		}
+
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 * @param string $code code
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $code = null)
+	{
+		dol_syslog('Currency::fetch', LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' c.rowid, c.name, c.code, c.entity, c.date_create, c.fk_user';
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' AS c';
+		if (!empty($code)) $sql .= ' WHERE c.code = "'.$this->db->escape($code).'"';
+		else $sql .= ' WHERE c.rowid = ' . $id;
+
+		$resql = $this->db->query($sql);
+		
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->name = $obj->name;
+				$this->code = $obj->code;
+				$this->entity = $obj->entity;
+				$this->date_create = $obj->date_create;
+				$this->fk_user = $obj->fk_user;
+				
+				$this->fetchAllCurrencyRate();
+				$this->getRate();
+			}
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog('Currency::fetch ' . join(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Load all rates in object from the database
+	 *
+	 * @return int <0 if KO, >=0 if OK
+	 */
+	public function fetchAllCurrencyRate()
+	{
+		dol_syslog('Currency::fetchAllCurrencyRate', LOG_DEBUG);
+
+		$sql = 'SELECT cr.rowid';
+		$sql.= ' FROM ' . MAIN_DB_PREFIX . $this->table_element_line. ' as cr';
+		$sql.= ' WHERE cr.fk_multicurrency = '.$this->id;
+		$sql.= ' ORDER BY cr.date_sync DESC';
+		
+		$this->rates = array();
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$rate = new CurrencyRate($this->db);
+				$rate->fetch($obj->rowid);
+				
+				$this->rates[] = $rate;
+			}
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog('Currency::fetchAllCurrencyRate ' . join(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $trigger true=launch triggers after, false=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $trigger = true)
+	{
+		$error = 0;
+
+		dol_syslog('Currency::update', LOG_DEBUG);
+		
+		// Clean parameters
+		$this->name = trim($this->name);
+		$this->code = trim($this->code);
+		
+		// Check parameters
+		if (empty($this->code)) {
+			$error++;
+			dol_syslog('Currency::update $this->code can not be empty', LOG_ERR);
+			
+			return -1;
+		}
+		
+		// Update request
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql .= ' name="'.$this->db->escape($this->name).'"';
+		$sql .= ' code="'.$this->db->escape($this->code).'"';
+		$sql .= ' WHERE rowid=' . $this->id;
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog('Currency::update ' . join(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error && $trigger) {
+			$result=$this->call_trigger('CURRENCY_MODIFY',$user);
+			if ($result < 0) $error++;
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param bool $trigger true=launch triggers after, false=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete($trigger = true)
+	{
+		global $user;
+		
+		dol_syslog('Currency::delete', LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if ($trigger) {
+			$result=$this->call_trigger('CURRENCY_DELETE',$user);
+			if ($result < 0) $error++;
+		}
+
+		if (!$error) {
+			// Delete all rates before
+			if (!$this->deleteRates()) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog('Currency::delete  ' . join(',', $this->errors), LOG_ERR);
+			}
+			
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= ' WHERE rowid=' . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog('Currency::delete ' . join(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+	
+	/**
+	 * Delete rates in database
+	 *
+	 * @return bool false if KO, true if OK
+	 */
+	public function deleteRates()
+	{
+		foreach ($this->rates as &$rate)
+		{
+			if ($rate->delete() <= 0)
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Delete rate in database 
+	 * 
+	 * @param double	$rate	rate value
+	 * 
+	 * @return bool false if KO, true if OK
+	 */
+	 public function addRate($rate)
+	 {
+	 	$currencyRate = new CurrencyRate($this->db);
+		$currencyRate->rate = $rate;
+		
+		if ($currencyRate->create($this->id) > 0) 
+		{
+			$this->rate = $currencyRate;
+			return 1;
+		}
+		else 
+		{
+			$this->rate = null;
+			return -1;
+		}
+	 }
+	 
+	 /**
+	 * Update rate in database 
+	 * 
+	 * @param double	$rate	rate value
+	  * 
+	 * @return int <0 if KO, >0 if OK
+	 */
+	 public function updateRate($rate)
+	 {
+	 	if (is_object($this->rate))
+		{
+			$this->rate->rate = $rate;
+			return $this->rate->update();
+		}
+		else 
+		{
+			return $this->addRate($rate);
+		}
+	 }
+	
+	/**
+	 * Fetch CurrencyRate object in $this->rate 
+	 * 
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	 public function getRate()
+	 {
+	 	$sql = 'SELECT cr.rowid';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as cr';
+		$sql.= ' WHERE cr.fk_multicurrency = '.$this->id;
+		$sql.= ' AND cr.date_sync >= ALL (SELECT cr2.date_sync FROM '.MAIN_DB_PREFIX.$this->table_element_line.' AS cr2 WHERE cr.rowid = cr2.rowid)';
+		
+		$resql = $this->db->query($sql);
+		if ($resql && ($obj = $this->db->fetch_object($resql))) {
+			$this->rate = new CurrencyRate($this->db);
+			return $this->rate->fetch($obj->rowid);
+		}
+		
+	 }
+	 
+	 /**
+	 * Get id of currency from code 
+	 *
+	 * @param DoliDB	$db		object db
+	 * @param string	$code	code value search
+	 * 
+	 * @return 0 if not found, >0 if OK
+	 */
+	 public static function getIdFromCode(&$db, $code)
+	 {
+	 	$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE code = "'.$db->escape($code).'"';
+		$resql = $db->query($sql);
+		if ($resql && $obj = $db->fetch_object($resql)) return $obj->rowid;
+		else return 0;
+	 }
+	 
+	 /**
+	 * Get id and rate of currency from code 
+	 * 
+	 * @param DoliDB	$db		object db
+	 * @param string	$code	code value search
+	 * 
+	 * @return 	array	[0] => id currency
+	 *					[1] => rate
+	 */
+	 public static function getIdAndTxFromCode(&$db, $code)
+	 {
+	 	$sql = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'multicurrency_rate mc ON (m.rowid = mc.fk_multicurrency)';
+		$sql.= ' WHERE m.code = "'.$db->escape($code).'" AND mc.date_sync >= ALL (SELECT date_sync FROM '.MAIN_DB_PREFIX.'multicurrency_rate)';
+		$resql = $db->query($sql);
+		if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
+		else return array(0, 1);
+	 }
+}
+
+/**
+ * Class CurrencyRate
+ */
+class CurrencyRate extends CommonObjectLine
+{
+	/**
+	 * @var string Id to identify managed objects
+	 */
+	public $element = 'multicurrency_rate';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'multicurrency_rate';
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	/**
+	 * @var double Rate
+	 */
+	public $rate;
+	/**
+	 * @var date Date synchronisation
+	 */
+	public $date_sync;
+	/**
+	 * @var int Id of currency
+	 */
+	public $fk_multicurrency;
+	/**
+	 * @var int Id of entity
+	 */
+	public $entity;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = &$db;
+		
+		return 1;
+	}
+	
+	/**
+	 * Create object into database
+	 *
+	 * @param  int	$fk_multicurrency	Id of currency
+	 * @param  bool	$trigger			true=launch triggers after, false=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create($fk_multicurrency, $trigger = true)
+	{
+		global $conf, $user;
+		
+		dol_syslog('CurrencyRate::create', LOG_DEBUG);
+
+		$error = 0;
+		$this->rate = price2num($this->rate);
+		if (empty($this->entity) || $this->entity <= 0) $this->entity = $conf->entity;
+		$now=date('Y-m-d H:i:s');
+		
+		// Insert request
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql .= ' rate,';
+		$sql .= ' date_sync,';
+		$sql .= ' fk_multicurrency,';
+		$sql .= ' entity';
+		$sql .= ') VALUES (';
+		$sql .= ' '.$this->rate.',';
+		$sql .= ' \'' . $now . '\',';
+		$sql .= ' \'' . $fk_multicurrency . '\',';
+		$sql .= ' \'' . $this->entity . '\'';
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog('CurrencyRate::create ' . join(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->fk_multicurrency = $fk_multicurrency;
+			$this->date_sync = $now;
+			
+			if ($trigger) {
+				$result=$this->call_trigger('CURRENCYRATE_CREATE', $user);
+				if ($result < 0) $error++;
+			}
+		}
+
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		dol_syslog('CurrencyRate::fetch', LOG_DEBUG);
+
+		$sql = 'SELECT cr.rowid, cr.rate, cr.date_sync, cr.fk_multicurrency, cr.entity';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' AS cr';
+		$sql .= ' WHERE cr.rowid = ' . $id;
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->rate = $obj->rate;
+				$this->date_sync = $obj->date_sync;
+				$this->fk_multicurrency = $obj->fk_multicurrency;
+				$this->entity = $obj->entity;
+			}
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog('CurrencyRate::fetch ' . join(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+	
+	/**
+	 * Update object into database
+	 *
+	 * @param  bool $trigger true=launch triggers after, false=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update($trigger = true)
+	{
+		global $user;
+		
+		$error = 0;
+
+		dol_syslog('CurrencyRate::update', LOG_DEBUG);
+		
+		$this->rate = price2num($this->rate);
+		
+		// Update request
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql .= ' rate='.$this->rate;
+		$sql .= ' WHERE rowid=' . $this->id;
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog('CurrencyRate::update ' . join(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error && $trigger) {
+			$result=$this->call_trigger('CURRENCYRATE_MODIFY',$user);
+			if ($result < 0) $error++;
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+	
+	/**
+	 * Delete object in database
+	 *
+	 * @param bool $trigger true=launch triggers after, false=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete($trigger = true)
+	{
+		global $user;
+		
+		dol_syslog('CurrencyRate::delete', LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if ($trigger) {
+			$result=$this->call_trigger('CURRENCYRATE_DELETE',$user);
+			if ($result < 0) $error++;
+		}
+
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' WHERE rowid='.$this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog('CurrencyRate::delete ' . join(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+	
+}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 1184a490495..b7cd05bf93c 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -33,7 +33,7 @@
  *	\brief      File for third party class
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-
+dol_include_once('/multicurrency/class/multicurrency.class.php');
 
 /**
  *	Class to manage third parties objects (customers, suppliers, prospects...)
@@ -354,6 +354,10 @@ class Societe extends CommonObject
 	var $location_incoterms;
 	var $libelle_incoterms;  //Used into tooltip
 
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	
     /**
      * To contains a clone of this when we need to save old properties of object
      *  @var Societe
@@ -402,7 +406,14 @@ class Societe extends CommonObject
         if (empty($this->client))      $this->client=0;
         if (empty($this->fournisseur)) $this->fournisseur=0;
         $this->import_key = trim($this->import_key);
-
+		
+		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = '';
+			$this->fk_multicurrency = 0;
+		}
+		
         dol_syslog(get_class($this)."::create ".$this->name);
 
         // Check parameters
@@ -427,7 +438,7 @@ class Societe extends CommonObject
 
         if ($result >= 0)
         {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key)";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
             $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$conf->entity.", '".$this->db->idate($now)."'";
             $sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
             $sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
@@ -437,7 +448,9 @@ class Societe extends CommonObject
             $sql.= ", 0";
 			$sql.= ", ".(int) $this->fk_incoterms;
 			$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-            $sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null").")";
+            $sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
+            $sql.= ", ".(int) $this->fk_multicurrency;
+            $sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
 
             dol_syslog(get_class($this)."::create", LOG_DEBUG);
             $result=$this->db->query($sql);
@@ -670,6 +683,13 @@ class Societe extends CommonObject
         $this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
         if (empty($this->status)) $this->status = 0;
 
+		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = '';
+			$this->fk_multicurrency = 0;
+		}
+
         // Local taxes
         $this->localtax1_assuj=trim($this->localtax1_assuj);
         $this->localtax2_assuj=trim($this->localtax2_assuj);
@@ -841,6 +861,8 @@ class Societe extends CommonObject
                 $sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
             }
             $sql .= ", fk_user_modif = ".(! empty($user->id)?"'".$user->id."'":"null");
+			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
+			$sql .= ', multicurrency_code = "'.$this->db->escape($this->multicurrency_code).'"';
             $sql .= " WHERE rowid = '" . $id ."'";
 
 
@@ -992,6 +1014,7 @@ class Societe extends CommonObject
         $sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement, s.tva_assuj';
         $sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
         $sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
+		$sql .= ', s.fk_multicurrency, s.multicurrency_code';
         $sql .= ', fj.libelle as forme_juridique';
         $sql .= ', e.libelle as effectif';
         $sql .= ', c.code as country_code, c.label as country';
@@ -1142,6 +1165,10 @@ class Societe extends CommonObject
 				$this->location_incoterms = $obj->location_incoterms;
 				$this->libelle_incoterms = $obj->libelle_incoterms;
 
+				// multicurrency
+				$this->fk_multicurrency = $obj->fk_multicurrency;
+				$this->multicurrency_code = $obj->multicurrency_code;
+
                 $result = 1;
 
                 // Retreive all extrafield for thirdparty
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 1eaff21f05f..8852f22686f 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -338,6 +338,13 @@ if (empty($reshook))
 			$object->fk_incoterms 		   = GETPOST('incoterm_id', 'int');
 			$object->location_incoterms    = GETPOST('location_incoterms', 'alpha');
 		}
+		
+		// Multicurrency
+		if (!empty($conf->multicurrency->enabled))
+		{
+			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+		}
+		
         // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 		if ($ret < 0)
@@ -1249,6 +1256,16 @@ else
 			}
 		}
 
+		// Multicurrency
+		if (! empty($conf->multicurrency->enabled))
+		{
+			print '<tr>';
+			print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+	        print '<td colspan="3" class="maxwidthonsmartphone">';
+	        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+			print '</td></tr>';
+		}
+
         // Other attributes
         $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -1801,6 +1818,16 @@ else
 				}
 			}
 
+			// Multicurrency
+			if (! empty($conf->multicurrency->enabled))
+			{
+				print '<tr>';
+				print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+		        print '<td colspan="3" class="maxwidthonsmartphone">';
+		        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+				print '</td></tr>';
+			}
+
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -2212,6 +2239,16 @@ else
             print '</td></tr>';
 		}
 
+		// Multicurrency
+		if (! empty($conf->multicurrency->enabled))
+		{
+			print '<tr>';
+			print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+	        print '<td>';
+	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code,1) : '';
+			print '</td></tr>';
+		}
+		
         // Other attributes
         $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
diff --git a/htdocs/theme/eldy/img/object_multicurrency.png b/htdocs/theme/eldy/img/object_multicurrency.png
new file mode 100644
index 0000000000000000000000000000000000000000..51896a4c051a345c09fcffbe9c24d08dd8f70a88
GIT binary patch
literal 733
zcmV<30wVp1P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3lKMB^9pBi3k7y0%}P_
zK~yNug_21~RAB(e|KHnY=8dz2GnyM|R)!Rq(E?^sk!TQPhopo;&}g}N$qsqxVq~Wd
zT}0?IPzFW>j&|t~VM)>s4Kk57SvccsX5PFvZ~4BjON&a-@BTad7lJjk4?ISE=m-!Q
zL~HjRxjY&mrs?q1VwS!dJ;4CraQ_6zD(UhR;@8`-``mb-Ze!VY#`&odRjIaZY8a;T
z#59WW_)yydfWPA2-f>KibYf@ESo!9Ls%xQ;ug~xI*qpIN#<^-)ZZw}SCNgQg-_WfI
zVc+?O0D$R{P5>Zv_2on1u-a!^PArl5);Tr#u6_39=cCJ+!XP-dFv?CkE)@v??7#HL
z&s=&&E%DUX)JA)=nl7Z5^23rWE(jo^ZM$MtE4(c&3#vuaPHM}APo%zmRESiC&qgZ3
zqlzNAk|au$GH`GQ9E5W&Sf-QwKA-8CjdeZ!9Zgca3dyB)s%wQ|HKZOAB%#^Tt=o(;
z?N<jPfRAtPo&F;=b>D@=oMMA76u2YGB0vZ@2qdq30h|K>7-e=*x2~>iUz<-rqPEdN
z9c6|(#3BR%+3VTrI<CZA`kD}-Kq*gs7$3V)TG>L>4F|n)pt6{py2#1u`8O$z#|Q3<
zviF!>(68i{=3<L8F|BG>SH!oj_5f#mhht=J<x<b*$lB-Bv<z<Zg(5cv(c8u$&2!gI
za*!Z^X4lHvuA#L$=8qREMVSyW$T?MfrH#$O^-UdeNkxk&`=gAxhFi?eTKO*z@~LN&
zj<J+oDG~r8A%e^~69LHnvZjzHSS?Z4a*g!+oTGou17IM8;$IL^!T<OP7ZoHy|B~v_
P00000NkvXXu0mjfx-d`!

literal 0
HcmV?d00001


From 8487058c9812f4c864607bdddbfd0da4745b6dc8 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 21 Jan 2016 21:54:57 +0100
Subject: [PATCH 006/421] FIX add input multicurrency_subprice on edit line

---
 htdocs/core/tpl/objectline_edit.tpl.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 4316ab0b318..f34f3e52a49 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -121,6 +121,10 @@ $coldisplay=-1; // We remove first td
 	if ($this->situation_counter > 1) print ' readonly';
 	print '></td>';
 
+	if (!empty($conf->multicurrency->enabled)) {
+		print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat" size="8" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
+	}
+
 	if ($inputalsopricewithtax)
 	{
 		$coldisplay++;

From 2d4f355792284fd26d4013e8c7685ad2081d2303 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 21 Jan 2016 21:57:09 +0100
Subject: [PATCH 007/421] FIX back quote into migration sql file

---
 .../install/mysql/migration/3.9.0-4.0.0.sql   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 7e9260c595e..23da9daacb9 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -38,26 +38,26 @@ ALTER TABLE llx_cronjob MODIFY COLUMN unitfrequency	varchar(255) NOT NULL DEFAUL
 ALTER TABLE llx_facture ADD INDEX idx_facture_fk_statut (fk_statut);
 
 
-CREATE TABLE IF NOT EXISTS `llx_multicurrency` 
+CREATE TABLE IF NOT EXISTS llx_multicurrency 
 ( 
-	`rowid` integer AUTO_INCREMENT PRIMARY KEY, 
-	`date_create` datetime DEFAULT NULL, 
-	`code` varchar(255) DEFAULT NULL, 
-	`name` varchar(255) DEFAULT NULL, 
-	`entity` integer DEFAULT NULL,
-	`fk_user` integer DEFAULT NULL,
-	KEY `code` (`code`)
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	date_create datetime DEFAULT NULL, 
+	code varchar(255) DEFAULT NULL, 
+	name varchar(255) DEFAULT NULL, 
+	entity integer DEFAULT NULL,
+	fk_user integer DEFAULT NULL,
+	KEY code (code)
 ) ENGINE=innodb;
 
-CREATE TABLE IF NOT EXISTS `llx_multicurrency_rate` 
+CREATE TABLE IF NOT EXISTS llx_multicurrency_rate 
 ( 
-	`rowid` integer AUTO_INCREMENT PRIMARY KEY, 
-	`date_sync` datetime DEFAULT NULL,  
-	`rate` double NOT NULL DEFAULT '0', 
-	`fk_multicurrency` integer NOT NULL DEFAULT '0', 
-	`entity` integer NOT NULL DEFAULT '0', 
-	KEY `fk_multicurrency` (`fk_multicurrency`), 
-	KEY `entity` (`entity`) 
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	date_sync datetime DEFAULT NULL,  
+	rate double NOT NULL DEFAULT '0', 
+	fk_multicurrency integer NOT NULL DEFAULT '0', 
+	entity integer NOT NULL DEFAULT '0', 
+	KEY fk_multicurrency (fk_multicurrency), 
+	KEY entity (entity) 
 ) ENGINE=innodb;
 
 ALTER TABLE llx_societe ADD COLUMN fk_multicurrency integer;

From 68857499d75789b41df22d365495a6ea7c7334e9 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 21 Jan 2016 22:26:51 +0100
Subject: [PATCH 008/421] NEW display multicurrency price on azur pdf model

---
 htdocs/core/lib/pdf.lib.php                   | 12 +++++--
 .../modules/propale/doc/pdf_azur.modules.php  | 31 +++++++++++--------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 62a92f4d5ac..13795933962 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1414,7 +1414,11 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
 	}
 	if (empty($reshook))
 	{
-		if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * $object->lines[$i]->subprice, 0, $outputlangs);
+		if (empty($hidedetails) || $hidedetails > 1) 
+		{
+			$subprice = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
+			$result.=price($sign * $subprice, 0, $outputlangs);
+		}
 	}
 	return $result;
 }
@@ -1735,7 +1739,11 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
     	{
     		return $outputlangs->transnoentities("Option");
     	}
-        if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * $object->lines[$i]->total_ht, 0, $outputlangs);
+        if (empty($hidedetails) || $hidedetails > 1)
+        {
+        	$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
+			$result.=price($sign * $total_ht, 0, $outputlangs);
+        }
 	}
 	return $result;
 }
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 8266efe74a5..5c77944843c 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -536,14 +536,15 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					$tvaligne=$object->lines[$i]->total_tva;
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+					else $tvaligne=$object->lines[$i]->total_tva;
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
 					$localtax1_rate=$object->lines[$i]->localtax1_tx;
 					$localtax2_rate=$object->lines[$i]->localtax2_tx;
 					$localtax1_type=$object->lines[$i]->localtax1_type;
-					$localtax2_type=$object->lines[$i]->localtax2_type;
-
+					$localtax2_type=$object->lines[$i]->localtax2_type;	
+						
 					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
@@ -589,11 +590,11 @@ class pdf_azur extends ModelePDFPropales
 						$pdf->setPage($pagenb);
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$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);
 						$pagenb++;
@@ -605,11 +606,11 @@ class pdf_azur extends ModelePDFPropales
 					{
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$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);
 						// New page
@@ -623,12 +624,12 @@ class pdf_azur extends ModelePDFPropales
 				// Show square
 				if ($pagenb == 1)
 				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+					$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
 				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+					$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;
 				}
 
@@ -973,8 +974,9 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
+		$total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248,248,248);
@@ -1155,8 +1157,9 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->SetFillColor(224,224,224);
 				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
+				$total_ttc = ($conf->multicurrency->enabled && $object->multiccurency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
@@ -1220,9 +1223,10 @@ class pdf_azur extends ModelePDFPropales
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
 	{
 		global $conf;
 
@@ -1230,6 +1234,7 @@ class pdf_azur extends ModelePDFPropales
 		$hidebottom=0;
 		if ($hidetop) $hidetop=-1;
 
+		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
@@ -1238,7 +1243,7 @@ class pdf_azur extends ModelePDFPropales
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 

From 148a5947a73f2e202f75395f19fd48e0dc56b53f Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 21 Jan 2016 22:40:07 +0100
Subject: [PATCH 009/421] FIX update propal line the multicurrency price do not
 change

---
 htdocs/comm/propal/class/propal.class.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index d9ba1e7ef59..fe0c85fce04 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -625,13 +625,18 @@ class Propal extends CommonObject
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
             
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type);
+            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
             $total_localtax1 = $tabprice[9];
             $total_localtax2 = $tabprice[10];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+			
             // Anciens indicateurs: $price, $remise (a ne plus utiliser)
             $price = $pu;
             if ($remise_percent > 0)
@@ -694,6 +699,12 @@ class Propal extends CommonObject
             	$this->line->array_options=$array_options;
             }
 
+			// Multicurrency
+			$this->line->multicurrency_subprice		= price2num($pu * $this->multicurrency_tx);
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
             $result=$this->line->update();
             if ($result > 0)
             {
@@ -3437,6 +3448,13 @@ class PropaleLigne  extends CommonObjectLine
         $sql.= " , date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
         $sql.= " , date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
 	    $sql.= " , fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		
+		// Multicurrency
+		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		
         $sql.= " WHERE rowid = ".$this->rowid;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);

From 21db62d6450072846f5e36fd6a8aaeceb6b5ae42 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 22 Jan 2016 22:35:32 +0100
Subject: [PATCH 010/421] FIX multicurrency price always display and update
 line price if rate is update

---
 htdocs/comm/propal.php                    | 31 +++++++++++++----------
 htdocs/comm/propal/class/propal.class.php |  2 +-
 htdocs/core/class/commonobject.class.php  |  7 +++++
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index d83beedc9c5..487d174b2bb 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -2101,21 +2101,24 @@ if ($action == 'create')
 	print '<td class="nowrap" colspan="2">' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
 	print '</tr>';
 	
-	// Multicurrency Amount HT
-	print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
-	print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
-	print '</tr>';
+	if (!empty($conf->multicurrency->enabled))
+	{
+		// Multicurrency Amount HT
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';
+		
+		// Multicurrency Amount VAT
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';
+		
+		// Multicurrency Amount TTC
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';	
+	}
 	
-	// Multicurrency Amount VAT
-	print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
-	print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
-	print '</tr>';
-	
-	// Multicurrency Amount TTC
-	print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
-	print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
-	print '</tr>';
-
 	// Statut
 	print '<tr><td height="10">' . $langs->trans('Status') . '</td><td align="left" colspan="2">' . $object->getLibStatut(4) . '</td></tr>';
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index fe0c85fce04..cef54968cb7 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -792,7 +792,7 @@ class Propal extends CommonObject
 		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
 		if (empty($this->fk_multicurrency))
 		{
-			$this->multicurrency_code = '';
+			$this->multicurrency_code = $conf->currency;
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
 		}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3e04f98574d..60897072432 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1471,6 +1471,13 @@ abstract class CommonObject
     		if ($this->db->query($sql))
     		{
     			$this->multicurrency_tx = $rate;
+				
+				// Update line price
+				if (!empty($this->lines))
+				{
+					foreach ($this->lines as &$line) $this->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit);
+				}
+				
     			return 1;
     		}
     		else

From e86ebd6799a37276f7bbe0d3d10da60987d652f4 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sat, 23 Jan 2016 00:38:17 +0100
Subject: [PATCH 011/421] NEW add multicurency on customer order

---
 htdocs/comm/propal/class/propal.class.php |  1 +
 htdocs/commande/card.php                  | 98 ++++++++++++++++++++++-
 htdocs/commande/class/commande.class.php  | 94 ++++++++++++++++++++--
 htdocs/core/class/commonobject.class.php  |  2 +
 htdocs/core/tpl/originproductline.tpl.php |  1 +
 5 files changed, 189 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index cef54968cb7..26e65e09464 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -789,6 +789,7 @@ class Propal extends CommonObject
         if (empty($this->availability_id)) $this->availability_id=0;
         if (empty($this->demand_reason_id)) $this->demand_reason_id=0;
 
+		// Multicurrency
 		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
 		if (empty($this->fk_multicurrency))
 		{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 9e7f5fae4f8..a362680b840 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -260,7 +260,9 @@ if (empty($reshook))
 			$object->contactid = GETPOST('contactid');
 			$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 			$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
-
+			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+			$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+			
 			// If creation from another object of another module (Example: origin=propal, originid=1)
 			if (! empty($origin) && ! empty($originid))
 			{
@@ -490,7 +492,17 @@ if (empty($reshook))
 		if ($result < 0)
 			dol_print_error($db, $object->error);
 	}
+	
+	// Multicurrency Code
+	else if ($action == 'setmulticurrencycode' && $user->rights->commande->creer) {
+		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
+	}
 
+	// Multicurrency rate
+	else if ($action == 'setmulticurrencyrate' && $user->rights->commande->creer) {
+		$result = $object->setMulticurrencyRate(GETPOST('multicurrency_tx', 'int'));
+	}
+	
 	else if ($action == 'setavailability' && $user->rights->commande->creer) {
 		$result = $object->availability(GETPOST('availability_id'));
 		if ($result < 0)
@@ -1260,7 +1272,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 	$projectid = 0;
 	$remise_absolue = 0;
-		
+	$currency_code = $conf->currency;
+	
 	if (! empty($origin) && ! empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
@@ -1328,6 +1341,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 			$datedelivery = (! empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
 
+			if (!empty($conf->multicurrency->enabled))
+			{
+				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; 
+			}
+
 			$note_private = $object->getDefaultCreateValueFor('note_private', (! empty($objectsrc->note_private) ? $objectsrc->note_private : null));
 			$note_public = $object->getDefaultCreateValueFor('note_public', (! empty($objectsrc->note_public) ? $objectsrc->note_public : null));
 
@@ -1348,6 +1367,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 		$remise_absolue     = 0;
 		$dateorder          = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER)?-1:'';
 		$projectid          = 0;
+		
+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 
 		$note_private = $object->getDefaultCreateValueFor('note_private');
 		$note_public = $object->getDefaultCreateValueFor('note_public');
@@ -1363,6 +1384,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print '<input type="hidden" name="remise_percent" value="' . $soc->remise_percent . '">';
 	print '<input type="hidden" name="origin" value="' . $origin . '">';
 	print '<input type="hidden" name="originid" value="' . $originid . '">';
+	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="' . $currency_tx . '">';
 
 	dol_fiche_head('');
 
@@ -1532,6 +1554,16 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print $form->selectarray('model', $liste, $conf->global->COMMANDE_ADDON_PDF);
 	print "</td></tr>";
 
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		print '<tr>';
+		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+        print '<td colspan="3" class="maxwidthonsmartphone">';
+	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+		print '</td></tr>';
+	}
+
 	// Note public
 	print '<tr>';
 	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
@@ -1603,6 +1635,13 @@ if ($action == 'create' && $user->rights->commande->creer)
 		}
 
 		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc) . "</td></tr>";
+		
+		if (!empty($conf->multicurrency->enabled))
+		{
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";	
+		}
 	}
 	else
 	{
@@ -2145,6 +2184,43 @@ if ($action == 'create' && $user->rights->commande->creer)
 	        print '</td></tr>';
 		}
 
+		// Multicurrency
+		if (! empty($conf->multicurrency->enabled))
+		{
+			// Multicurrency code
+			print '<tr>';
+			print '<td width="25%">';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print fieldLabel('Currency','multicurrency_code');
+			print '</td>';
+			if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
+				print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="5">';
+			if ($action == 'editmulticurrencycode') {
+				$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+			} else {
+				$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+			}
+			print '</td></tr>';
+		
+			// Multicurrency rate
+			print '<tr>';
+			print '<td width="25%">';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print fieldLabel('Rate','multicurrency_tx');
+			print '</td>';
+			if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
+				print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="5">';
+			if ($action == 'editmulticurrencyrate') {
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+			} else {
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+			}
+			print '</td></tr>';
+		}
 		// Other attributes
 		$cols = 3;
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
@@ -2207,6 +2283,24 @@ if ($action == 'create' && $user->rights->commande->creer)
 		// Total TTC
 		print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td>' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 
+		if (!empty($conf->multicurrency->enabled))
+		{
+			// Multicurrency Amount HT
+			print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+			print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+			print '</tr>';
+			
+			// Multicurrency Amount VAT
+			print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+			print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+			print '</tr>';
+			
+			// Multicurrency Amount TTC
+			print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+			print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+			print '</tr>';	
+		}
+
 		// Statut
 		print '<tr><td>' . $langs->trans('Status') . '</td><td>' . $object->getLibStatut(4) . '</td></tr>';
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index b1e4651eace..080db4aa64f 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -33,6 +33,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
 require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php";
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
+dol_include_once('/multicurrency/class/multicurrency.class.php');
 
 /**
  *  Class to manage customers orders
@@ -143,6 +144,14 @@ class Commande extends CommonOrder
     var $nbtodo;
     var $nbtodolate;
 
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_tx;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
+	
     /**
      * ERR Not enough stock
      */
@@ -692,7 +701,17 @@ class Commande extends CommonOrder
 
         // Clean parameters
         $this->brouillon = 1;		// set command as draft
-
+		
+		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = $conf->currency;
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
+		
         dol_syslog(get_class($this)."::create user=".$user->id);
 
         // Check parameters
@@ -738,6 +757,9 @@ class Commande extends CommonOrder
         $sql.= ", remise_absolue, remise_percent";
         $sql.= ", fk_incoterms, location_incoterms";
         $sql.= ", entity";
+        $sql.= ", fk_multicurrency";
+        $sql.= ", multicurrency_code";
+        $sql.= ", multicurrency_tx";
         $sql.= ")";
         $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
         $sql.= ", ".($this->fk_project>0?$this->fk_project:"null");
@@ -763,6 +785,9 @@ class Commande extends CommonOrder
         $sql.= ", ".(int) $this->fk_incoterms;
         $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
         $sql.= ", ".$conf->entity;
+		$sql.= ", ".(int) $this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".(double) $this->multicurrency_tx;
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -1254,13 +1279,18 @@ class Commande extends CommonOrder
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
             
-            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
             $total_localtax1 = $tabprice[9];
             $total_localtax2 = $tabprice[10];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+			
             // Rang to use
             $rangtouse = $rang;
             if ($rangtouse == -1)
@@ -1318,6 +1348,14 @@ class Commande extends CommonOrder
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
+			// Multicurrency
+			$this->line->fk_multicurrency			= $this->fk_multicurrency;
+			$this->line->multicurrency_code			= $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= price2num($pu_ht * $this->multicurrency_tx);
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
             // TODO Ne plus utiliser
             $this->line->price=$price;
             $this->line->remise=$remise;
@@ -1464,6 +1502,7 @@ class Commande extends CommonOrder
         $sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
         $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
         $sql.= ', c.fk_incoterms, c.location_incoterms';
+		$sql.= ", c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc";
         $sql.= ", i.libelle as libelle_incoterms";
         $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
         $sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
@@ -1537,6 +1576,14 @@ class Commande extends CommonOrder
 				$this->location_incoterms = $obj->location_incoterms;
 				$this->libelle_incoterms = $obj->libelle_incoterms;
 
+				// Multicurrency
+				$this->fk_multicurrency 		= $obj->fk_multicurrency;
+				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->multicurrency_tx 		= $obj->multicurrency_tx;
+				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				
                 $this->extraparams			= (array) json_decode($obj->extraparams, true);
 
                 $this->lines				= array();
@@ -1666,6 +1713,7 @@ class Commande extends CommonOrder
         $sql.= ' l.localtax1_tx, l.localtax2_tx, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
         $sql.= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
 	    $sql.= ' l.fk_unit,';
+		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
         $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
@@ -1728,6 +1776,14 @@ class Commande extends CommonOrder
                 $line->date_start       = $this->db->jdate($objp->date_start);
                 $line->date_end         = $this->db->jdate($objp->date_end);
 
+				// Multicurrency
+				$line->fk_multicurrency 		= $objp->fk_multicurrency;
+				$line->multicurrency_code 		= $objp->multicurrency_code;
+				$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+				$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+				$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+				$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+			
                 $this->lines[$i] = $line;
 
                 $i++;
@@ -2478,13 +2534,18 @@ class Commande extends CommonOrder
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
             
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type);
+            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
             $total_localtax1 = $tabprice[9];
             $total_localtax2 = $tabprice[10];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+			
             // Anciens indicateurs: $price, $subprice, $remise (a ne plus utiliser)
             $price = $pu;
             $subprice = $pu;
@@ -2540,6 +2601,12 @@ class Commande extends CommonOrder
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
+			// Multicurrency
+			$this->line->multicurrency_subprice		= price2num($subprice * $this->multicurrency_tx);
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			
             // TODO deprecated
             $this->line->price=$price;
             $this->line->remise=$remise;
@@ -3222,6 +3289,7 @@ class Commande extends CommonOrder
         $sql.= ' l.total_ht, l.total_tva, l.total_ttc, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.localtax1_tx, l.localtax2_tx,';
         $sql.= ' l.date_start, l.date_end,';
 	    $sql.= ' l.fk_unit,';
+		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
         $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, ';
         $sql.= ' p.description as product_desc, p.stock as stock_reel,';
         $sql.= ' p.entity';
@@ -3272,7 +3340,15 @@ class Commande extends CommonOrder
 				$this->lines[$i]->marge_tx			= $marginInfos[1];
 				$this->lines[$i]->marque_tx			= $marginInfos[2];
 	            $this->lines[$i]->fk_unit			= $obj->fk_unit;
-
+				
+				// Multicurrency
+				$line->fk_multicurrency 		= $obj->fk_multicurrency;
+				$line->multicurrency_code 		= $obj->multicurrency_code;
+				$line->multicurrency_subprice 	= $obj->multicurrency_subprice;
+				$line->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$line->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$line->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				
                 $i++;
             }
 
@@ -3608,7 +3684,9 @@ class OrderLine extends CommonOrderLine
         $sql.= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
         $sql.= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
         $sql.= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end,';
-	    $sql.= ' fk_unit)';
+	    $sql.= ' fk_unit';
+		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql.= ')';
         $sql.= " VALUES (".$this->fk_commande.",";
         $sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").",";
         $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
@@ -3639,6 +3717,12 @@ class OrderLine extends CommonOrderLine
         $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
         $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").',';
 	    $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql.= ", ".$this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".$this->multicurrency_subprice;
+		$sql.= ", ".$this->multicurrency_total_ht;
+		$sql.= ", ".$this->multicurrency_total_tva;
+		$sql.= ", ".$this->multicurrency_total_ttc;
         $sql.= ')';
 
         dol_syslog(get_class($this)."::insert", LOG_DEBUG);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 60897072432..baa4fa8f8bb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3382,6 +3382,7 @@ abstract class CommonObject
         print '<td>'.$langs->trans('Description').'</td>';
         print '<td align="right">'.$langs->trans('VAT').'</td>';
         print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
+		if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
         print '<td align="right">'.$langs->trans('Qty').'</td>';
 	    if($conf->global->PRODUCT_USE_UNITS)
 	    {
@@ -3512,6 +3513,7 @@ abstract class CommonObject
 
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['price'] = price($line->subprice);
+		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
         $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
 	    if($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $line->getLabelOfUnit('long');
         $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 7919668ae53..78006316f63 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -23,6 +23,7 @@
 	<td><?php echo $this->tpl['description']; ?></td>
 	<td align="right"><?php echo $this->tpl['vat_rate']; ?></td>
 	<td align="right"><?php echo $this->tpl['price']; ?></td>
+	<?php if (!empty($conf->multicurrency->enabled)) { ?><td align="right"><?php echo $this->tpl['multicurrency_price']; ?></td><?php } ?>
 	<td align="right"><?php echo $this->tpl['qty']; ?></td>
     <?php
     if($conf->global->PRODUCT_USE_UNITS) echo '<td align="left">'.$langs->trans($this->tpl['unit']).'</td>';

From 373225272b42992845cc1d5c679ed4d3cf1998fe Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sat, 23 Jan 2016 16:01:55 +0100
Subject: [PATCH 012/421] FIX reorder the display of currency and rate on
 propal/order FIX update line on propal/order NEW add mulitcurrency on
 customer invoice

---
 htdocs/comm/propal.php                        |  77 ++++++------
 htdocs/commande/card.php                      |  75 ++++++------
 htdocs/commande/class/commande.class.php      |  21 ++--
 htdocs/compta/facture.php                     | 110 +++++++++++++++++-
 htdocs/compta/facture/class/facture.class.php | 104 +++++++++++++++--
 .../commande/doc/pdf_einstein.modules.php     |  28 +++--
 .../modules/facture/doc/pdf_crabe.modules.php |  30 +++--
 7 files changed, 327 insertions(+), 118 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 487d174b2bb..c8b775f40e2 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1927,6 +1927,44 @@ if ($action == 'create')
 	}
 	print '</td></tr>';
 
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		// Multicurrency code
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Currency','multicurrency_code');
+		print '</td>';
+		if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencycode') {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+		} else {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+		}
+		print '</td></tr>';
+	
+		// Multicurrency rate
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Rate','multicurrency_tx');
+		print '</td>';
+		if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencyrate') {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+		} else {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+		}
+		print '</td></tr>';
+	}
+
 	// Project
 	if (! empty($conf->projet->enabled))
 	{
@@ -2018,45 +2056,6 @@ if ($action == 'create')
         print '</td></tr>';
 	}
 
-	// Multicurrency
-	if (! empty($conf->multicurrency->enabled))
-	{
-		// Multicurrency code
-		print '<tr>';
-		print '<td width="25%">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print fieldLabel('Currency','multicurrency_code');
-		print '</td>';
-		if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="5">';
-		if ($action == 'editmulticurrencycode') {
-			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
-		} else {
-			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
-		}
-		print '</td></tr>';
-	
-		// Multicurrency rate
-		print '<tr>';
-		print '<td width="25%">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print fieldLabel('Rate','multicurrency_tx');
-		print '</td>';
-		if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="5">';
-		if ($action == 'editmulticurrencyrate') {
-			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
-		} else {
-			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
-		}
-		print '</td></tr>';
-	}
-	
-
 	// Other attributes
 	$cols = 5;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index a362680b840..180914c7c38 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2090,6 +2090,44 @@ if ($action == 'create' && $user->rights->commande->creer)
 		}
 		print '</td></tr>';
 
+		// Multicurrency
+		if (! empty($conf->multicurrency->enabled))
+		{
+			// Multicurrency code
+			print '<tr>';
+			print '<td width="25%">';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print fieldLabel('Currency','multicurrency_code');
+			print '</td>';
+			if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
+				print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="5">';
+			if ($action == 'editmulticurrencycode') {
+				$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+			} else {
+				$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+			}
+			print '</td></tr>';
+		
+			// Multicurrency rate
+			print '<tr>';
+			print '<td width="25%">';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print fieldLabel('Rate','multicurrency_tx');
+			print '</td>';
+			if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
+				print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="5">';
+			if ($action == 'editmulticurrencyrate') {
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+			} else {
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+			}
+			print '</td></tr>';
+		}
+
 		// Availability
 		print '<tr><td height="10">';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -2184,43 +2222,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 	        print '</td></tr>';
 		}
 
-		// Multicurrency
-		if (! empty($conf->multicurrency->enabled))
-		{
-			// Multicurrency code
-			print '<tr>';
-			print '<td width="25%">';
-			print '<table class="nobordernopadding" width="100%"><tr><td>';
-			print fieldLabel('Currency','multicurrency_code');
-			print '</td>';
-			if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
-				print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
-			print '</tr></table>';
-			print '</td><td colspan="5">';
-			if ($action == 'editmulticurrencycode') {
-				$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
-			} else {
-				$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
-			}
-			print '</td></tr>';
-		
-			// Multicurrency rate
-			print '<tr>';
-			print '<td width="25%">';
-			print '<table class="nobordernopadding" width="100%"><tr><td>';
-			print fieldLabel('Rate','multicurrency_tx');
-			print '</td>';
-			if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
-				print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
-			print '</tr></table>';
-			print '</td><td colspan="5">';
-			if ($action == 'editmulticurrencyrate') {
-				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
-			} else {
-				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
-			}
-			print '</td></tr>';
-		}
 		// Other attributes
 		$cols = 3;
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 080db4aa64f..bc5a0767aff 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3289,7 +3289,7 @@ class Commande extends CommonOrder
         $sql.= ' l.total_ht, l.total_tva, l.total_ttc, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.localtax1_tx, l.localtax2_tx,';
         $sql.= ' l.date_start, l.date_end,';
 	    $sql.= ' l.fk_unit,';
-		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
+		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
         $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, ';
         $sql.= ' p.description as product_desc, p.stock as stock_reel,';
         $sql.= ' p.entity';
@@ -3342,12 +3342,12 @@ class Commande extends CommonOrder
 	            $this->lines[$i]->fk_unit			= $obj->fk_unit;
 				
 				// Multicurrency
-				$line->fk_multicurrency 		= $obj->fk_multicurrency;
-				$line->multicurrency_code 		= $obj->multicurrency_code;
-				$line->multicurrency_subprice 	= $obj->multicurrency_subprice;
-				$line->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
-				$line->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
-				$line->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				$this->lines[$i]->fk_multicurrency 			= $obj->fk_multicurrency;
+				$this->lines[$i]->multicurrency_code 		= $obj->multicurrency_code;
+				$this->lines[$i]->multicurrency_subprice 	= $obj->multicurrency_subprice;
+				$this->lines[$i]->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->lines[$i]->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 				
                 $i++;
             }
@@ -3850,6 +3850,13 @@ class OrderLine extends CommonOrderLine
 		$sql.= " , fk_parent_line=".(! empty($this->fk_parent_line)?$this->fk_parent_line:"null");
 		if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
 		$sql.= " , fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		
+		// Multicurrency
+		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		
 		$sql.= " WHERE rowid = ".$this->rowid;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index c933482f98e..8ee26c3f102 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -271,6 +271,16 @@ if (empty($reshook))
 			dol_print_error($db, $object->error);
 	}
 
+	// Multicurrency Code
+	else if ($action == 'setmulticurrencycode' && $user->rights->facture->creer) {
+		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
+	}
+
+	// Multicurrency rate
+	else if ($action == 'setmulticurrencyrate' && $user->rights->facture->creer) {
+		$result = $object->setMulticurrencyRate(GETPOST('multicurrency_tx', 'int'));
+	}
+	
 	else if ($action == 'setinvoicedate' && $user->rights->facture->creer)
 	{
 		$object->fetch($id);
@@ -699,7 +709,9 @@ if (empty($reshook))
 				$object->remise_percent		= $_POST['remise_percent'];
 				$object->fk_incoterms 		= GETPOST('incoterm_id', 'int');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
-
+				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				
 				// Proprietes particulieres a facture de remplacement
 				$object->fk_facture_source = $_POST['fac_replacement'];
 				$object->type = Facture::TYPE_REPLACEMENT;
@@ -746,7 +758,9 @@ if (empty($reshook))
 				$object->remise_percent		= $_POST['remise_percent'];
 				$object->fk_incoterms 		= GETPOST('incoterm_id', 'int');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
-
+				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				
 				// Proprietes particulieres a facture avoir
 				$object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : '';
 				$object->type = Facture::TYPE_CREDIT_NOTE;
@@ -831,7 +845,9 @@ if (empty($reshook))
 				$object->ref_client     = $_POST['ref_client'];
 				$object->ref_int     	= $_POST['ref_int'];
 				$object->modelpdf       = $_POST['model'];
-
+				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				
 				// Source facture
 				$object->fac_rec = GETPOST('fac_rec');
 
@@ -876,6 +892,8 @@ if (empty($reshook))
 				$object->remise_percent		= $_POST['remise_percent'];
 				$object->fk_incoterms 		= GETPOST('incoterm_id', 'int');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
+				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
 
 				if (GETPOST('type') == Facture::TYPE_SITUATION)
 				{
@@ -1855,6 +1873,8 @@ if ($action == 'create')
 	if ($socid > 0)
 		$res = $soc->fetch($socid);
 
+	$currency_code = $conf->currency;
+	
 	// Load objectsrc
 	$remise_absolue = 0;
 
@@ -1923,6 +1943,12 @@ if ($action == 'create')
 			$remise_absolue 	= (! empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(! empty($soc->remise_absolue)?$soc->remise_absolue:0));
 			$dateinvoice		= (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice);
 
+			if (!empty($conf->multicurrency->enabled))
+			{
+				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; 
+			}
+			
 			// Replicate extrafields
 			$objectsrc->fetch_optionals($originid);
 			$object->array_options = $objectsrc->array_options;
@@ -1936,6 +1962,8 @@ if ($action == 'create')
 		$remise_percent 	= $soc->remise_percent;
 		$remise_absolue 	= 0;
 		$dateinvoice		= (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice);		// Do not set 0 here (0 for a date is 1970)
+		
+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
 	$absolute_discount = $soc->getAvailableDiscounts();
@@ -1958,7 +1986,8 @@ if ($action == 'create')
 	print '<input name="ref_int" type="hidden" value="' . $ref_int . '">';
 	print '<input type="hidden" name="origin" value="' . $origin . '">';
 	print '<input type="hidden" name="originid" value="' . $originid . '">';
-
+	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="' . $currency_tx . '">';
+	
 	dol_fiche_head('');
 
 	print '<table class="border" width="100%">';
@@ -2337,6 +2366,16 @@ if ($action == 'create')
 	print $form->selectarray('model', $liste, $conf->global->FACTURE_ADDON_PDF);
 	print "</td></tr>";
 
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		print '<tr>';
+		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+        print '<td colspan="3" class="maxwidthonsmartphone">';
+	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+		print '</td></tr>';
+	}
+	
 	// Public note
 	print '<tr>';
 	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
@@ -2419,6 +2458,13 @@ if ($action == 'create')
 			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax2) . "</td></tr>";
 		}
 		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc) . "</td></tr>";
+		
+		if (!empty($conf->multicurrency->enabled))
+		{
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";	
+		}
 	}
 	else
 	{
@@ -3384,6 +3430,44 @@ else if ($id > 0 || ! empty($ref))
 	}
 	print '</td></tr>';
 
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		// Multicurrency code
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Currency','multicurrency_code');
+		print '</td>';
+		if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencycode') {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+		} else {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+		}
+		print '</td></tr>';
+	
+		// Multicurrency rate
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Rate','multicurrency_tx');
+		print '</td>';
+		if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencyrate') {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+		} else {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+		}
+		print '</td></tr>';
+	}
+
 	// Bank Account
 	print '<tr><td class="nowrap">';
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
@@ -3498,6 +3582,24 @@ else if ($id > 0 || ! empty($ref))
 	// Total with tax
 	print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td colspan="3" class="nowrap">' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 
+	if (!empty($conf->multicurrency->enabled))
+	{
+		// Multicurrency Amount HT
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';
+		
+		// Multicurrency Amount VAT
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';
+		
+		// Multicurrency Amount TTC
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';	
+	}
+
 	// Statut
 	print '<tr><td>' . $langs->trans('Status') . '</td>';
 	print '<td colspan="3">' . ($object->getLibStatut(4, $totalpaye)) . '</td></tr>';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 91221118f2a..4042af717c2 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php";
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
-
+dol_include_once('/multicurrency/class/multicurrency.class.php');
 
 /**
  *	Class to manage invoices
@@ -107,6 +107,14 @@ class Facture extends CommonInvoice
 	var $specimen;
 
 	var $fac_rec;
+	
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_tx;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
 
 	/**
 	 * @var int Situation cycle reference number
@@ -230,6 +238,16 @@ class Facture extends CommonInvoice
 		if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
 		$this->brouillon = 1;
 
+		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = $conf->currency;
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
+		
 		dol_syslog(get_class($this)."::create user=".$user->id);
 
 		// Check parameters
@@ -301,6 +319,9 @@ class Facture extends CommonInvoice
 		$sql.= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
 		$sql.= ", situation_cycle_ref, situation_counter, situation_final";
 		$sql.= ", fk_incoterms, location_incoterms";
+        $sql.= ", fk_multicurrency";
+        $sql.= ", multicurrency_code";
+        $sql.= ", multicurrency_tx";
 		$sql.= ")";
 		$sql.= " VALUES (";
 		$sql.= "'(PROV)'";
@@ -328,6 +349,9 @@ class Facture extends CommonInvoice
 		$sql.= ", ".($this->situation_final?$this->situation_final:0);
 		$sql.= ", ".(int) $this->fk_incoterms;
         $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", ".(int) $this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".(double) $this->multicurrency_tx;
 		$sql.=")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -973,6 +997,7 @@ class Facture extends CommonInvoice
 		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet, f.extraparams';
 		$sql.= ', f.situation_cycle_ref, f.situation_counter, f.situation_final';
 		$sql.= ', f.fk_account';
+		$sql.= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
         $sql.= ', f.fk_incoterms, f.location_incoterms';
@@ -1045,6 +1070,14 @@ class Facture extends CommonInvoice
 				$this->location_incoterms = $obj->location_incoterms;
 				$this->libelle_incoterms = $obj->libelle_incoterms;
 
+				// Multicurrency
+				$this->fk_multicurrency 		= $obj->fk_multicurrency;
+				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->multicurrency_tx 		= $obj->multicurrency_tx;
+				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				
 				if ($this->type == self::TYPE_SITUATION && $fetch_situation)
 				{
 					$this->fetchPreviousNextSituationInvoice();
@@ -1104,6 +1137,7 @@ class Facture extends CommonInvoice
 		$sql.= ' l.date_start as date_start, l.date_end as date_end,';
 		$sql.= ' l.info_bits, l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc, l.fk_code_ventilation, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,';
 		$sql.= ' l.fk_unit,';
+		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
 		$sql.= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as l';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
@@ -1163,7 +1197,15 @@ class Facture extends CommonInvoice
 				$line->situation_percent= $objp->situation_percent;
 				$line->fk_prev_id       = $objp->fk_prev_id;
 				$line->fk_unit	        = $objp->fk_unit;
-
+				
+				// Multicurrency
+				$line->fk_multicurrency 		= $objp->fk_multicurrency;
+				$line->multicurrency_code 		= $objp->multicurrency_code;
+				$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+				$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+				$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+				$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+				
 				$this->lines[$i] = $line;
 
 				$i++;
@@ -2255,7 +2297,7 @@ class Facture extends CommonInvoice
 			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
 			$txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
 
-			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, $situation_percent);
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, $situation_percent, $this->multicurrency_tx);
 
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
@@ -2264,6 +2306,11 @@ class Facture extends CommonInvoice
 			$total_localtax2 = $tabprice[10];
 			$pu_ht = $tabprice[3];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+			
 			// Rank to use
 			$rangtouse = $rang;
 			if ($rangtouse == -1)
@@ -2313,7 +2360,15 @@ class Facture extends CommonInvoice
 			// infos marge
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
-
+			
+			// Multicurrency
+			$this->line->fk_multicurrency			= $this->fk_multicurrency;
+			$this->line->multicurrency_code			= $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= price2num($this->line->subprice * $this->multicurrency_tx);
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			
 			if (is_array($array_options) && count($array_options)>0) {
 				$this->line->array_options=$array_options;
 			}
@@ -2424,7 +2479,7 @@ class Facture extends CommonInvoice
 			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
 			$txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
 					
-			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, $situation_percent);
+			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, $situation_percent, $this->multicurrency_tx);
 
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
@@ -2435,6 +2490,11 @@ class Facture extends CommonInvoice
 			$pu_tva = $tabprice[4];
 			$pu_ttc = $tabprice[5];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+			
 			// Old properties: $price, $remise (deprecated)
 			$price = $pu;
 			$remise = 0;
@@ -2491,6 +2551,12 @@ class Facture extends CommonInvoice
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
+			// Multicurrency
+			$this->line->multicurrency_subprice		= price2num($this->line->subprice * $this->multicurrency_tx);
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			
 			if (is_array($array_options) && count($array_options)>0) {
 				$this->line->array_options=$array_options;
 			}
@@ -3591,6 +3657,7 @@ class Facture extends CommonInvoice
 		$sql.= ' l.total_ht, l.total_tva, l.total_ttc, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,';
 		$sql.= ' l.date_start, l.date_end,';
 		$sql.= ' l.fk_unit,';
+		$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
 		$sql.= ' p.ref as product_ref, p.fk_product_type, p.label as product_label,';
 		$sql.= ' p.description as product_desc,';
         $sql.= ' p.entity';
@@ -3643,7 +3710,15 @@ class Facture extends CommonInvoice
 				$this->lines[$i]->marge_tx			= $marginInfos[1];
 				$this->lines[$i]->marque_tx			= $marginInfos[2];
 				$this->lines[$i]->fk_unit			= $obj->fk_unit;
-
+				
+				// Multicurrency
+				$this->lines[$i]->fk_multicurrency 			= $obj->fk_multicurrency;
+				$this->lines[$i]->multicurrency_code 		= $obj->multicurrency_code;
+				$this->lines[$i]->multicurrency_subprice 	= $obj->multicurrency_subprice;
+				$this->lines[$i]->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->lines[$i]->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				
 				$i++;
 			}
 			$this->db->free($resql);
@@ -4079,7 +4154,9 @@ class FactureLigne extends CommonInvoiceLine
 		$sql.= ' rang, special_code, fk_product_fournisseur_price, buy_price_ht,';
 		$sql.= ' info_bits, total_ht, total_tva, total_ttc, total_localtax1, total_localtax2,';
 		$sql.= ' situation_percent, fk_prev_id,';
-		$sql.= ' fk_unit)';
+		$sql.= ' fk_unit';
+		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql.= ')';
 		$sql.= " VALUES (".$this->fk_facture.",";
 		$sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").",";
 		$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
@@ -4111,6 +4188,12 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ", " . $this->situation_percent;
 		$sql .= ", " . $this->fk_prev_id;
 		$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql.= ", ".$this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".$this->multicurrency_subprice;
+		$sql.= ", ".$this->multicurrency_total_ht;
+		$sql.= ", ".$this->multicurrency_total_tva;
+		$sql.= ", ".$this->multicurrency_total_ttc;
 		$sql.= ')';
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
@@ -4284,6 +4367,13 @@ class FactureLigne extends CommonInvoiceLine
 		if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
 		$sql .= ", situation_percent=" . $this->situation_percent;
 		$sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		
+		// Multicurrency
+		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		
 		$sql.= " WHERE rowid = ".$this->rowid;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 593e4616fd0..cb9f7571858 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -449,8 +449,9 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					$tvaligne=$object->lines[$i]->total_tva;
-
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+					else $tvaligne=$object->lines[$i]->total_tva;
+					
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
 					$localtax1_rate=$object->lines[$i]->localtax1_tx;
@@ -501,11 +502,11 @@ class pdf_einstein extends ModelePDFCommandes
 						$pdf->setPage($pagenb);
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$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);
 						$pagenb++;
@@ -517,11 +518,11 @@ class pdf_einstein extends ModelePDFCommandes
 					{
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$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);
 						// New page
@@ -535,12 +536,12 @@ 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);
+					$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
 				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+					$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;
 				}
 
@@ -827,8 +828,9 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
+		$total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248,248,248);
@@ -1006,8 +1008,9 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetFillColor(224,224,224);
 				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
+				$total_ttc = ($conf->multicurrency->enabled && $object->multiccurency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
@@ -1060,7 +1063,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
 	{
 		global $conf;
 
@@ -1068,6 +1071,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$hidebottom=0;
 		if ($hidetop) $hidetop=-1;
 
+		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
@@ -1076,7 +1080,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index e967f6781ea..7df6b8c07cd 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -540,9 +540,11 @@ class pdf_crabe extends ModelePDFFactures
 					$prev_progress = $object->lines[$i]->get_prev_progress();
 					if ($prev_progress > 0) // Compute progress from previous situation
 					{
-						$tvaligne = $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						else $tvaligne = $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 					} else {
-						$tvaligne = $object->lines[$i]->total_tva;
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+						else $tvaligne=$object->lines[$i]->total_tva;
 					}
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
@@ -596,11 +598,11 @@ class pdf_crabe extends ModelePDFFactures
 						$pdf->setPage($pagenb);
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$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);
 						$pagenb++;
@@ -612,11 +614,11 @@ class pdf_crabe extends ModelePDFFactures
 					{
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$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);
 						// New page
@@ -630,12 +632,12 @@ class pdf_crabe extends ModelePDFFactures
 				// Show square
 				if ($pagenb == 1)
 				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+					$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
 				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+					$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;
 				}
 
@@ -1017,8 +1019,10 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetFillColor(255,255,255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		
+		$total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248,248,248);
@@ -1211,8 +1215,9 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetFillColor(224,224,224);
 				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
+				$total_ttc = ($conf->multicurrency->enabled && $object->multiccurency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
@@ -1285,7 +1290,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
 	{
 		global $conf;
 
@@ -1293,6 +1298,7 @@ class pdf_crabe extends ModelePDFFactures
 		$hidebottom=0;
 		if ($hidetop) $hidetop=-1;
 
+		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
@@ -1301,7 +1307,7 @@ class pdf_crabe extends ModelePDFFactures
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 

From 93766992994b115984175fdbed0a43104d2b5a8e Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sat, 23 Jan 2016 16:16:15 +0100
Subject: [PATCH 013/421] FIX travis missing comment for new param

---
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 1 +
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index cb9f7571858..3ea6fd63ef0 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1061,6 +1061,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
 	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 7df6b8c07cd..8eee3e5a471 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1288,6 +1288,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
 	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')

From 963d0c396bc31e4e046f15c04a88cf53bbc0e03a Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sat, 23 Jan 2016 21:36:07 +0100
Subject: [PATCH 014/421] FIX change rate on order/invoice do not update lines
 NEW if we change the currency on already existing propal/order/invoice the
 current rate is update too then update lines

---
 htdocs/core/class/commonobject.class.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index baa4fa8f8bb..b305beffe26 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1434,6 +1434,10 @@ abstract class CommonObject
     		if ($this->db->query($sql))
     		{
     			$this->multicurrency_code = $code;
+				
+				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
+				if ($rate) $this->setMulticurrencyRate($rate);
+				
     			return 1;
     		}
     		else
@@ -1475,7 +1479,24 @@ abstract class CommonObject
 				// Update line price
 				if (!empty($this->lines))
 				{
-					foreach ($this->lines as &$line) $this->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit);
+					foreach ($this->lines as &$line) 
+					{
+						switch ($this->element) {
+							case 'propal':
+								$this->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit);
+								break;
+							case 'commande':
+								$this->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end, $line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->fk_unit);
+								break;
+							case 'facture':
+								$this->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $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, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+								break;
+							default:
+								dol_syslog(get_class($this).'::setMulticurrencyRate no updateline defined', LOG_DEBUG);
+								break;
+						}
+						
+					}
 				}
 				
     			return 1;

From b2b787f1ff12dc893ef5f57cf00b73e03ccf5674 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Mon, 25 Jan 2016 21:33:14 +0100
Subject: [PATCH 015/421] FIX Travis

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

diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 91eb8e21a7c..2a58876cdd7 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -275,7 +275,7 @@ class Link extends CommonObject
     /**
      *  Return nb of links
      *
-     *  @param  DoliDb  $dblinks    Database handler
+     *  @param  DoliDb  $db    Database handler
      *  @param  string  $objecttype type of the associated object in dolibarr
      *  @param  int     $objectid   id of the associated object in dolibarr
      *  @return int                 Nb of links, -1 if error

From 4baff7898dc44f923195a194966941a5f65ba794 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 26 Jan 2016 22:18:31 +0100
Subject: [PATCH 016/421] FIX insert FactureLigne FIX phpunit PriceTest with
 new values returned for multicurrency module NEW add test in PriceTest FIX
 FactureTest properties not defined

---
 htdocs/compta/facture/class/facture.class.php | 16 +++++----
 htdocs/core/lib/price.lib.php                 | 14 ++++----
 test/phpunit/FactureTest.php                  |  2 +-
 test/phpunit/PricesTest.php                   | 34 ++++++++++++-------
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4042af717c2..24a1f89eeb9 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4112,7 +4112,11 @@ class FactureLigne extends CommonInvoiceLine
 		if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
-
+		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
+		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
+		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
+		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+		
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring) 
 		{
@@ -4188,12 +4192,12 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ", " . $this->situation_percent;
 		$sql .= ", " . $this->fk_prev_id;
 		$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql.= ", ".$this->fk_multicurrency;
+		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".$this->multicurrency_subprice;
-		$sql.= ", ".$this->multicurrency_total_ht;
-		$sql.= ", ".$this->multicurrency_total_tva;
-		$sql.= ", ".$this->multicurrency_total_ttc;
+		$sql.= ", ".price2num($this->multicurrency_subprice);
+		$sql.= ", ".price2num($this->multicurrency_total_ht);
+		$sql.= ", ".price2num($this->multicurrency_total_tva);
+		$sql.= ", ".price2num($this->multicurrency_total_ttc);
 		$sql.= ')';
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 5d497ade778..4d7803474d8 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -250,11 +250,6 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
 	}
 
-	// Multicurrency
-	$result[16] = price2num($result[0] * $multicurrency_tx, 'MT');
-	$result[17] = price2num($result[1] * $multicurrency_tx, 'MT');
-	$result[18] = price2num($result[2] * $multicurrency_tx, 'MT');
-
 	// if there's some localtax without vat, we calculate localtaxes (we will add them at end)
 
     //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
@@ -331,9 +326,14 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
 		}
 	}
-
+	
+	// Multicurrency
+	$result[16] = price2num($result[0] * $multicurrency_tx, 'MT');
+	$result[17] = price2num($result[1] * $multicurrency_tx, 'MT');
+	$result[18] = price2num($result[2] * $multicurrency_tx, 'MT');
+	
 	// initialize result array
-	//for ($i=0; $i <= 15; $i++) $result[$i] = (float) $result[$i];
+	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
 
 	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
 
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index d2ad97454bf..142a5284989 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -217,7 +217,7 @@ class FactureTest extends PHPUnit_Framework_TestCase
         $newlocalobject=new Facture($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final')), array());    // Actual, Expected
+        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva','multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx')), array());    // Actual, Expected
 
         return $localobject;
     }
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 5e0169f9b36..aee698c1a6e 100755
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -151,9 +151,17 @@ class PricesTest extends PHPUnit_Framework_TestCase
 		$result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0);
         print __METHOD__." result1=".join(', ',$result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0),$result1,'Test1 FR');
-
+        $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0, 1.24, 0.12, 1.36),$result1,'Test1 FR');
 
+		// qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value)
+		$mysoc->country_code='FR';
+		$mysoc->country_id=1;
+		$result1=calcul_price_total(2, 8.56, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205);
+        print __METHOD__." result1=".join(', ',$result1)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        $this->assertEquals(array(17.12, 1.71, 18.83, 8.56, 0.856, 9.416, 17.12, 1.71, 18.83, 0, 0, 0, 0, 0, 0, 0, 18.7, 1.87, 20.56),$result1,'Test1 FR');
+		
+		
         /*
 		 *  Country Spain
 		 */
@@ -166,7 +174,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
 		$result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
         print __METHOD__." result2=".join(', ',$result2)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test1 ES');
+        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110),$result2,'Test1 ES');
 
         // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (other method autodetect)
 		$mysoc->country_code='ES';
@@ -176,7 +184,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
 		$result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
         print __METHOD__." result2=".join(', ',$result2)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test2 ES');
+        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110),$result2,'Test2 ES');
 
         // --------------------------------------------------------
 
@@ -188,7 +196,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
         $result2=calcul_price_total(10, 10, 0, 10, 1.4, 0, 0, 'HT', 0, 0);
 		print __METHOD__." result2=".join(', ',$result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test3 ES');
+        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4),$result2,'Test3 ES');
 
         // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect)
 		$mysoc->country_code='ES';
@@ -198,7 +206,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
 		print __METHOD__." result2=".join(', ',$result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test4 ES');
+        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4),$result2,'Test4 ES');
 
         // --------------------------------------------------------
 
@@ -209,7 +217,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
 		$mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1);
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test5 ES for service');
+        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91),$result2,'Test5 ES for service');
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a service and not a product
 		$mysoc->country_code='ES';
@@ -219,7 +227,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
 		print __METHOD__." result2=".join(', ',$result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test6 ES for product');
+		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110),$result2,'Test6 ES for product');
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a product and not a service
 		$mysoc->country_code='ES';
@@ -229,7 +237,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1);
 		print __METHOD__." result2=".join(', ',$result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test6 ES for service');
+		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91),$result2,'Test6 ES for service');
 
 		// --------------------------------------------------------
 
@@ -241,7 +249,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
         $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0);
 		print __METHOD__." result2=".join(', ',$result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test7 ES for product');
+		$this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0, -100, -10, -110),$result2,'Test7 ES for product');
 
         // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect), we provide a service and not a product
 		$mysoc->country_code='ES';
@@ -250,7 +258,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
 		$mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1);
 		print __METHOD__." result2=".join(', ',$result2)."\n";
-		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test8 ES for service');
+		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19, -100, -10, -91),$result2,'Test8 ES for service');
 
 
         /*
@@ -267,7 +275,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
 		$result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
         print __METHOD__." result3=".join(', ',$result3)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test9 CI');
+        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85),$result3,'Test9 CI');
 
         // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (other method autodetect)
 		$mysoc->country_code='CI';
@@ -277,7 +285,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
 		$result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
         print __METHOD__." result3=".join(', ',$result3)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test10 CI');
+        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85),$result3,'Test10 CI');
 
         return true;
     }

From 1baf25de3c279f3b2663238d7aecd0fc355cab07 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 27 Jan 2016 12:04:00 +0100
Subject: [PATCH 017/421] FIX ISSUE #4506 : make working the
 PROPAL_CLONE_ON_CREATE_PAGE hidden constant

---
 htdocs/comm/propal.php                    | 3 ++-
 htdocs/comm/propal/class/propal.class.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 08106bc2151..a637e4a87fa 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -293,7 +293,8 @@ if (empty($reshook))
 					$object->note = GETPOST('note');
 					$object->statut = 0;
 
-					$id = $object->create_from($user);
+					// the create is done below and further more the existing create_from function is quite hilarating
+					//$id = $object->create_from($user);
 				} else {
 					setEventMessage($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_propal')), 'errors');
 				}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 372ac5d5a61..c7e4724d027 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -946,6 +946,7 @@ class Propal extends CommonObject
      */
     function create_from($user)
     {
+    	// i love this function because $this->products is not used in create function...
         $this->products=$this->lines;
 
         return $this->create($user);

From d79478e66d25364f89b587e5bd2cf933ceb5b3cc Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 30 Jan 2016 09:43:02 +0100
Subject: [PATCH 018/421] Add hook on contacttpl

The goal is to display additionnal feature a the bottom of the contact page like display contact adress and print stamp directly
Another way is to show on a google maps the travel to do between us and the multiple thirdpartie present
---
 htdocs/core/tpl/contacts.tpl.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 638d54a62ef..e6037637d35 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012      Regis Houssin       <regis.houssin@capnetworks.com>
  * Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015	   Charlie BENKE 	<charlie@patas-monkey.com>
+ * Copyright (C) 2015-2016 Charlie BENKE 	<charlie@patas-monkey.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
@@ -228,4 +228,13 @@ $userstatic=new User($db);
 <?php } } ?>
 
 </div>
+<!-- TEMPLATE CONTACTS HOOK BEGIN HERE -->
+<?php
+	if (is_object($hookmanager))
+	{
+		$hookmanager->initHooks(array('contacttpl'));
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action);
+	}
+?>
 <!-- END PHP TEMPLATE CONTACTS -->

From 32b6f207549b7e221abb5c465b2955602017be97 Mon Sep 17 00:00:00 2001
From: Bahfir Abbes <bafbes@gmail.com>
Date: Sat, 30 Jan 2016 17:13:58 +0100
Subject: [PATCH 019/421] Update smtps.class.php

Set mail reply-to field to sender
---
 htdocs/core/class/smtps.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index dd2726d2306..8b8e9e4905c 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1159,7 +1159,7 @@ class SMTPs
 		$_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
 		if ( $this->getErrorsTo() )
 		$_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
-
+		$_header .= "Reply-To: ".$this->getFrom('addr') ."\r\n";
 
 		$_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)'                   . "\r\n"
 		.  'Mime-Version: 1.0'                            . "\r\n";

From 324c1123e0c847d75d928c3894e70acd3d3fdf70 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 30 Jan 2016 17:21:42 +0100
Subject: [PATCH 020/421] Update contacts.tpl.php

if permission modules right are not in french
---
 htdocs/core/tpl/contacts.tpl.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index e6037637d35..4908d162f8b 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -27,15 +27,22 @@ 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; }
+if ($module == 'propal')		{ $permission=$user->rights->propale->creer; }
+elseif ($module == 'fichinter')		{ $permission=$user->rights->ficheinter->creer; }
 elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; }
 elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->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 == 'project_task')		{ $permission=$user->rights->projet->creer; }
-elseif (! isset($permission))			{ $permission=$user->rights->$module->creer; } // If already defined by caller page
+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 == '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))
+{
+	$permission=$user->rights->$module->write; 
+}
 
 $formcompany= new FormCompany($db);
 $companystatic=new Societe($db);

From 2f40233e014574b7a35aafb05ceb7ed8aa2ca441 Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Sun, 31 Jan 2016 10:10:30 +0100
Subject: [PATCH 021/421] fix : handle case of non existing third party field
 in object in fecth_thirdparty function

---
 htdocs/core/class/commonobject.class.php | 34 +++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 005f4684322..f0b0568d2f7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1001,26 +1001,30 @@ abstract class CommonObject
     {
         global $conf;
 
-        if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) return 0;
+        if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
+            return 0;
 
-	    require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+        require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 
-	    $idtofetch=isset($this->socid)?$this->socid:(isset($this->fk_soc)?$this->fk_soc:$this->fk_thirdparty);
-		if ($force_thirdparty_id) $idtofetch=$force_thirdparty_id;
+        $idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
+        if ($force_thirdparty_id)
+            $idtofetch = $force_thirdparty_id;
 
-        $thirdparty = new Societe($this->db);
-        $result=$thirdparty->fetch($idtofetch);
-        $this->client = $thirdparty;  // deprecated
-        $this->thirdparty = $thirdparty;
+        if ($idtofetch) {
+            $thirdparty = new Societe($this->db);
+            $result = $thirdparty->fetch($idtofetch);
+            $this->client = $thirdparty;  // deprecated
+            $this->thirdparty = $thirdparty;
 
-        // Use first price level if level not defined for third party
-        if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->thirdparty->price_level))
-        {
-            $this->client->price_level=1; // deprecated
-            $this->thirdparty->price_level=1;
-        }
+            // Use first price level if level not defined for third party
+            if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->thirdparty->price_level)) {
+                $this->client->price_level = 1; // deprecated
+                $this->thirdparty->price_level = 1;
+            }
 
-        return $result;
+            return $result;
+        } else
+            return -1;
     }
 
 

From e22664b8cfce36e9d173e57448190ce5f734d33e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 3 Feb 2016 01:00:10 +0100
Subject: [PATCH 022/421] FIX #4528

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

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index e7630756127..12470310ae4 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -587,9 +587,11 @@ function listOfSessions()
                 if(! @is_dir($fullpath) && is_readable($fullpath))
                 {
                     $sessValues = file_get_contents($fullpath);	// get raw session data
-
+                    // Example of possible value
+                    //$sessValues = 'newtoken|s:32:"1239f7a0c4b899200fe9ca5ea394f307";dol_loginmesg|s:0:"";newtoken|s:32:"1236457104f7ae0f328c2928973f3cb5";dol_loginmesg|s:0:"";token|s:32:"123615ad8d650c5cc4199b9a1a76783f";dol_login|s:5:"admin";dol_authmode|s:8:"dolibarr";dol_tz|s:1:"1";dol_tz_string|s:13:"Europe/Berlin";dol_dst|i:0;dol_dst_observed|s:1:"1";dol_dst_first|s:0:"";dol_dst_second|s:0:"";dol_screenwidth|s:4:"1920";dol_screenheight|s:3:"971";dol_company|s:12:"MyBigCompany";dol_entity|i:1;mainmenu|s:4:"home";leftmenuopened|s:10:"admintools";idmenu|s:0:"";leftmenu|s:10:"admintools";';
+                    
                     if (preg_match('/dol_login/i',$sessValues) && // limit to dolibarr session
-                    preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i',$sessValues) && // limit to current entity
+                    (preg_match('/dol_entity\|i:'.$conf->entity.';/i',$sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i',$sessValues)) && // limit to current entity
                     preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i',$sessValues)) // limit to company name
                     {
                         $tmp=explode('_', $file);

From d65ee2252934aca902450108777f1c3415f60329 Mon Sep 17 00:00:00 2001
From: abcnet-lu <abosserelle.pub+github-abcnet-lu@gmail.com>
Date: Wed, 3 Feb 2016 09:27:48 +0100
Subject: [PATCH 023/421] [Close] [#4555] Update label of intermediary VAT rate
 for Luxembourg (fix inverted labels)

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

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 5903243666d..5c0d3792ed3 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -149,8 +149,8 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (12
 
 -- LUXEMBOURG (id country=140)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1401, 140, '17','0','VAT standard rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1402, 140, '14','0','VAT reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1403, 140,  '8','0','VAT intermediary rate', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1402, 140, '14','0','VAT intermediary rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1403, 140,  '8','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1404, 140,  '3','0','VAT super-reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1405, 140,  '0','0','VAT Rate 0', 1);
 

From 6260c1ae9e259f25d14cfc109ad4e6eed3184e37 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Wed, 3 Feb 2016 11:33:13 +0100
Subject: [PATCH 024/421] FIX: Check stock of batch on shippment

---
 htdocs/expedition/card.php                   |  3 ++-
 htdocs/expedition/class/expedition.class.php | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 3bf17f76a4f..c7d91a28ce5 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2013       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
  * Copyright (C) 2014		Francis Appels			<francis.appels@yahoo.com>
+ * Copyright (C) 2016		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
@@ -237,7 +238,7 @@ if (empty($reshook))
 						$ret=$object->addline_batch($batch_line[$i]);
 						if ($ret < 0)
 						{
-							$mesg='<div class="error">'.$object->error.'</div>';
+							$mesg='<div class="error">'.$object->errorsToString().'</div>';
 							$error++;
 						}
 					}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index cb77607261b..7dcf66d28ec 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2014-2015  Francis Appels          <francis.appels@yahoo.com>
+ * Copyright (C) 2016		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
@@ -857,6 +858,7 @@ class Expedition extends CommonObject
 	 */
 	function addline_batch($dbatch)
 	{
+		global $conf,$langs;
 		$num = count($this->lines);
 		if ($dbatch['qty']>0)
 		{
@@ -882,7 +884,17 @@ class Expedition extends CommonObject
 
 					if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
 					{
-						// TODO
+						require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+						$prod_batch = new Productbatch($this->db);
+						$prod_batch->fetch($value['id_batch']);
+
+						if ($prod_batch->qty < $linebatch->dluo_qty)
+						{
+							$this->errors[] = $langs->trans('ErrorStockIsNotEnough');
+							dol_syslog(get_class($this)."::addline_batch error=Product ".$prod_batch->batch.": ".$this->errorsToString(), LOG_ERR);
+							$this->db->rollback();
+							return -1;
+						}
 					}
 					
 					//var_dump($linebatch);
@@ -895,6 +907,7 @@ class Expedition extends CommonObject
 
 			//var_dump($line);
 			$this->lines[$num] = $line;
+			return 1;
 		}
 	}
 

From d430676e51284609fb8fb97c4d734af4ce1221a9 Mon Sep 17 00:00:00 2001
From: abcnet-lu <abosserelle.pub+github-abcnet-lu@gmail.com>
Date: Wed, 3 Feb 2016 12:14:26 +0100
Subject: [PATCH 025/421] [Close] [#4558] Add districts and cantons for
 Luxembourg

---
 htdocs/install/mysql/data/llx_10_c_regions.sql   |  7 ++++++-
 .../install/mysql/data/llx_20_c_departements.sql | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index e736f7d993d..c3bed3ae3c6 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -284,4 +284,9 @@ INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) v
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5206, '', 0, 'Tarija', 1);
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5207, '', 0, 'Santa Cruz', 1);
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5208, '', 0, 'El Beni', 1);
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5209, '', 0, 'Pando', 1);
\ No newline at end of file
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5209, '', 0, 'Pando', 1);
+
+-- Regions (districts) Luxembourg (id country=140)
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 140, 14001, '', 0, 'Diekirch', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 140, 14002, '', 0, 'Grevenmacher', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 140, 14003, '', 0, 'Luxembourg', 1);
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 765f96f1da7..c1338fe5d1f 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -1223,4 +1223,18 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('109', 5209, '', 0, '', 'Madre de Dios', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('110', 5209, '', 0, '', 'Manuripi', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('111', 5209, '', 0, '', 'Nicolás Suárez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('112', 5209, '', 0, '', 'General Federico Román', 1);
\ No newline at end of file
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('112', 5209, '', 0, '', 'General Federico Román', 1);
+
+-- Cantons Luxembourg (id country=140)
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0001', 14001, '', 0, '', 'Clervaux', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0002', 14001, '', 0, '', 'Diekirch', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0003', 14001, '', 0, '', 'Redange', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0004', 14001, '', 0, '', 'Vianden', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0005', 14001, '', 0, '', 'Wiltz', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0006', 14002, '', 0, '', 'Echternach', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0007', 14002, '', 0, '', 'Grevenmacher', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0008', 14002, '', 0, '', 'Remich', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0009', 14003, '', 0, '', 'Capellen', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0010', 14003, '', 0, '', 'Esch-sur-Alzette', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0011', 14003, '', 0, '', 'Luxembourg', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU0012', 14003, '', 0, '', 'Mersch', 1);

From 5f7cb75518168d679657b110eec382c26f529b54 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 3 Feb 2016 19:52:09 +0100
Subject: [PATCH 026/421] Fix #4556 desiredstock and seuil_stock_alerte cleared
 on modify product card

removed inputs from update form also removed from update action
---
 htdocs/product/card.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index dbadd69cdcb..e6b48974d0b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -321,8 +321,11 @@ if (empty($reshook))
                 $object->status                 = GETPOST('statut');
                 $object->status_buy             = GETPOST('statut_buy');
                 $object->status_batch	        = GETPOST('status_batch');
+                // removed from update view
+                /*
                 $object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
                 $object->desiredstock           = GETPOST('desiredstock');
+                */
                 $object->duration_value         = GETPOST('duration_value');
                 $object->duration_unit          = GETPOST('duration_unit');
                 $object->canvas                 = GETPOST('canvas');

From 75c48883649603c04ef29b1d1941d296e73ead3b Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Wed, 3 Feb 2016 22:49:43 +0100
Subject: [PATCH 027/421] NEW feature hidden extrafields

---
 htdocs/core/actions_extrafields.inc.php       |  2 ++
 htdocs/core/class/commonobject.class.php      |  5 ++--
 htdocs/core/class/extrafields.class.php       | 29 +++++++++++++------
 htdocs/core/tpl/admin_extrafields_add.tpl.php |  2 ++
 .../core/tpl/admin_extrafields_edit.tpl.php   |  3 ++
 .../core/tpl/admin_extrafields_view.tpl.php   |  2 ++
 htdocs/core/tpl/extrafields_view.tpl.php      |  3 +-
 .../install/mysql/migration/3.9.0-4.0.0.sql   |  2 +-
 .../install/mysql/tables/llx_extrafields.sql  |  1 +
 htdocs/langs/en_US/admin.lang                 |  1 +
 10 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index b866c322158..b91cc49374c 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -162,6 +162,7 @@ if ($action == 'add')
                 	(GETPOST('alwayseditable')?1:0),
                 	(GETPOST('perms')?GETPOST('perms'):''),
                 	(GETPOST('list')?1:0)
+					,(GETPOST('ishidden')?1:0)
                 );
     			if ($result > 0)
     			{
@@ -312,6 +313,7 @@ if ($action == 'update')
     				(GETPOST('alwayseditable')?1:0),
     				(GETPOST('perms')?GETPOST('perms'):''),
                 	(GETPOST('list')?1:0)
+					,(GETPOST('ishidden')?1:0)
     			);
     			if ($result > 0)
     			{
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 005f4684322..d90932d1738 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4085,6 +4085,7 @@ abstract class CommonObject
 				else
 				{
 					$csstyle='';
+					$class=(!empty($extrafields->attribute_hidden[$key]) ? 'class="hideobject" ' : '');
 					if (is_array($params) && count($params)>0) {
 						if (array_key_exists('style',$params)) {
 							$csstyle=$params['style'];
@@ -4092,12 +4093,12 @@ abstract class CommonObject
 					}
 					if ( !empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)
 					{
-						$out .= '<tr '.$csstyle.'>';
+						$out .= '<tr '.$class.$csstyle.'>';
 						$colspan='0';
 					}
 					else
 					{
-						$out .= '<tr '.$csstyle.'>';
+						$out .= '<tr '.$class.$csstyle.'>';
 					}
 					// Convert date into timestamp format
 					if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index ee5f1465e3f..828483db3c7 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -61,6 +61,8 @@ class ExtraFields
 	var $error;
 	var $errno;
 
+	var $attribute_hidden;
+	
 	public static $type2label=array(
 	'varchar'=>'String',
 	'text'=>'TextLong',
@@ -98,6 +100,7 @@ class ExtraFields
 		$this->attribute_required = array();
 		$this->attribute_perms = array();
 		$this->attribute_list = array();
+		$this->attribute_hidden = array();
 	}
 
 	/**
@@ -116,9 +119,10 @@ class ExtraFields
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Into list view by default
+	 *  @param	int		$ishidden			Is hidden extrafield
 	 *  @return int      					<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0, $perms='', $list=0)
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0, $perms='', $list=0, $ishidden=0)
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -135,7 +139,7 @@ class ExtraFields
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable, $perms, $list);
+			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $ishidden);
 			$err2=$this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
@@ -243,9 +247,10 @@ class ExtraFields
 	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
 	 *  @param	string			$perms			Permission to check
 	 *  @param	int				$list			Into list view by default
+	 *  @param	int				$ishidden		Is hidden extrafield
 	 *  @return	int								<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=0)
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=0, $ishidden=0)
 	{
 		global $conf;
 
@@ -271,7 +276,7 @@ class ExtraFields
 				$params='';
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms, list)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms, list, ishidden)";
 			$sql.= " VALUES('".$attrname."',";
 			$sql.= " '".$this->db->escape($label)."',";
 			$sql.= " '".$type."',";
@@ -285,6 +290,7 @@ class ExtraFields
 			$sql.= " '".$alwayseditable."',";
 			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
 			$sql.= " ".$list;
+			$sql.= ", ".$ishidden;
 			$sql.=')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
@@ -389,9 +395,10 @@ class ExtraFields
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Into list view by default
+	 *  @param	int		$ishidden			Is hidden extrafield
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0, $perms='',$list='')
+	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0, $perms='',$list='',$ishidden=0)
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
@@ -432,7 +439,7 @@ class ExtraFields
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list);
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$ishidden);
 				}
 				if ($result > 0)
 				{
@@ -483,12 +490,13 @@ class ExtraFields
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Into list view by default
+	 *  @param	int		$ishidden			Is hidden extrafield
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0)
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$ishidden=0)
 	{
 		global $conf;
-		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list);
+		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$ishidden);
 
 		// Clean parameters
 		if ($elementtype == 'thirdparty') $elementtype='societe';
@@ -526,6 +534,7 @@ class ExtraFields
 			$sql.= " alwayseditable,";
 			$sql.= " param,";
 			$sql.= " list";
+			$sql.= ", ishidden";
 			$sql.= ") VALUES (";
 			$sql.= "'".$attrname."',";
 			$sql.= " ".$conf->entity.",";
@@ -540,6 +549,7 @@ class ExtraFields
 			$sql.= " '".$alwayseditable."',";
 			$sql.= " '".$param."',";
 			$sql.= " ".$list;
+			$sql.= ", ".$ishidden;
 			$sql.= ")";
 			dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
 			$resql2=$this->db->query($sql);
@@ -585,7 +595,7 @@ class ExtraFields
 		// For avoid conflicts with external modules
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,list";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,list,ishidden";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
@@ -616,6 +626,7 @@ class ExtraFields
 					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
 					$this->attribute_perms[$tab->name]=$tab->perms;
 					$this->attribute_list[$tab->name]=$tab->list;
+					$this->attribute_hidden[$tab->name]=$tab->ishidden;
 				}
 			}
 		}
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 174da1ae409..6273ea93940 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -118,6 +118,8 @@
 <tr><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required" <?php echo (GETPOST('required')?' checked':''); ?>></td></tr>
 <!-- Always editable -->
 <tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable" <?php echo (GETPOST('alwayseditable')?' checked':''); ?>></td></tr>
+<!-- Is visible or not -->
+<tr><td><?php echo $langs->trans("IsHidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden" <?php echo (GETPOST('ishidden') ?' checked':''); ?>></td></tr>
 <?php if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { ?>
 <!-- By default visible into list -->
 <tr><td><?php echo $langs->trans("ByDefaultInList"); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 5551d848b5f..71b81ecee0f 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -60,6 +60,7 @@ $alwayseditable=$extrafields->attribute_alwayseditable[$attrname];
 $param=$extrafields->attribute_param[$attrname];
 $perms=$extrafields->attribute_perms[$attrname];
 $list=$extrafields->attribute_list[$attrname];
+$ishidden=$extrafields->attribute_hidden[$attrname];
 
 if((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_array($param))
 {
@@ -117,6 +118,8 @@ if(($type == 'select') || ($type == 'sellist') || ($type == 'checkbox') || ($typ
 <tr><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required" <?php echo ($required?' checked':''); ?>></td></tr>
 <!-- Always editable -->
 <tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable" <?php echo ($alwayseditable?' checked':''); ?>></td></tr>
+<!-- Is visible or not -->
+<tr><td><?php echo $langs->trans("IsHidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden" <?php echo ($ishidden ?' checked':''); ?>></td></tr>
 <!-- By default visible into list -->
 <?php if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { ?>
 <tr><td><?php echo $langs->trans("ByDefaultInList"); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index a5890e36ea2..adb04bbc540 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -44,6 +44,7 @@ print '<td align="right">'.$langs->trans("Size").'</td>';
 print '<td align="center">'.$langs->trans("Unique").'</td>';
 print '<td align="center">'.$langs->trans("Required").'</td>';
 print '<td align="center">'.$langs->trans("AlwaysEditable").'</td>';
+print '<td align="center">'.$langs->trans("IsHidden").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
@@ -60,6 +61,7 @@ foreach($extrafields->attribute_type as $key => $value)
     print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
     print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
     print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";
+	print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";
     print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
     print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
     print "</tr>";
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 8b38cbc5520..9789922e6dc 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -45,7 +45,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 		}
 		else
 		{
-			print '<tr><td>';
+			if (!empty($extrafields->attribute_hidden[$key])) print '<tr class="hideobject"><td>';
+			else print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td';
 			//var_dump($action);exit;
 			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 9ac450b90f8..e10746958aa 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -76,7 +76,7 @@ ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pa
 
 ALTER TABLE llx_website_page ADD CONSTRAINT fk_website_page_website FOREIGN KEY (fk_website) REFERENCES llx_website (rowid);
 
-
+ALTER TABLE llx_extrafields ADD COLUMN ishidden integer DEFAULT 0;
 
  
  
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 9ccbdf60bff..062f20b5c9f 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -34,4 +34,5 @@ create table llx_extrafields
 	alwayseditable  integer DEFAULT 0,							-- 1 if field can be edited whatever is element status
 	param			text,										-- extra parameters to define possible values of field
 	list			integer DEFAULT 0							-- list of values for field that are combo lists
+	,ishidden		integer DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 55eb22f0aee..cc596bae7e8 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1641,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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

From 7b456d23f0dd35ed3c66730f660f6880c2f36a1f Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Wed, 3 Feb 2016 22:53:15 +0100
Subject: [PATCH 028/421] FIX if we add extrafield on socpeople we got sql
 error on the list of contact

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index c916710e087..b319072dc68 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -218,7 +218,7 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contact_extrafields as ef on (p.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (p.rowid = ef.fk_object)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cs ON p.rowid = cs.fk_socpeople"; // We need this table joined to the select in order to filter by categ

From 0c05342934d37dbb031ed6c996bbf0e67a9bbb2d Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Wed, 3 Feb 2016 22:54:48 +0100
Subject: [PATCH 029/421] FIX infinite loop

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

diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index d64cd23e98d..57dd6336a43 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -83,6 +83,7 @@ class FormPropal
                     {
                         $obj = $this->db->fetch_object($resql);
                         $listofstatus[$obj->id]=array('id'=>$obj->id,'code'=>$obj->code,'label'=>$obj->label);
+                        $i++;
                     }
                 }
             }

From 490f3eaf82f5e6fc25d335f1e89d73ff87d26cb6 Mon Sep 17 00:00:00 2001
From: abcnet-lu <abosserelle.pub+github-abcnet-lu@gmail.com>
Date: Thu, 4 Feb 2016 14:41:26 +0100
Subject: [PATCH 030/421] [#4566] Add legal forms for Luxembourg

---
 htdocs/install/mysql/data/llx_c_forme_juridique.sql | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index 52d488d3706..550190a89c5 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -278,3 +278,13 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154,
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', 'Sociedad anónima', 1);
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', 'Sociedad en comandita por acciones', 1);
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', 'Sociedad cooperativa', 1);
+
+-- Luxembourg
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (140, '14001', 'Entreprise individuelle', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (140, '14002', 'Société en nom collectif (SENC)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (140, '14003', 'Société en commandite simple (SECS)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (140, '14004', 'Société en commandite par actions (SECA)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (140, '14005', 'Société à responsabilité limitée (SARL)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (140, '14006', 'Société anonyme (SA)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (140, '14007', 'Société coopérative (SC)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (140, '14008', 'Société européenne (SE)', 1);

From f87bfffdd96b1f203fed705c479fdb46d8f927d9 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 4 Feb 2016 16:12:00 +0100
Subject: [PATCH 031/421] add edition feacture on product element

---
 .../core/modules/product/modules_product.php  | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 htdocs/core/modules/product/modules_product.php

diff --git a/htdocs/core/modules/product/modules_product.php b/htdocs/core/modules/product/modules_product.php
new file mode 100644
index 00000000000..afe07e39503
--- /dev/null
+++ b/htdocs/core/modules/product/modules_product.php
@@ -0,0 +1,52 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+
+/**
+ *	\class      ModeleProduct
+ *	\brief      Parent class for product models of doc generators
+ */
+abstract class ModeleProduct extends CommonDocGenerator
+{
+    var $error='';
+
+    /**
+     *  Return list of active generation modules
+     *
+	 * 	@param	DoliDB		$db					Database handler
+     *  @param	integer		$maxfilenamelength  Max length of value to show
+     * 	@return	array							List of templates
+     */
+    static function liste_modeles($db,$maxfilenamelength=0)
+    {
+        global $conf;
+
+        $type='product';
+        $liste=array();
+
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $liste=getListOfModels($db,$type,$maxfilenamelength);
+
+        return $liste;
+    }
+}

From db0c8740b9321742a092727c1c6c6ca1d644183e Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 4 Feb 2016 16:17:45 +0100
Subject: [PATCH 032/421] add administration feature of products docs

---
 htdocs/product/admin/product.php | 226 ++++++++++++++++++++++++++++++-
 1 file changed, 224 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 57f6577f789..15b113ffffb 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2011-2012 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2016		Charlie Benke		 <charlie@patas-monkey.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
@@ -42,6 +43,9 @@ if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->e
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
+$type = GETPOST('type','alpha');
+$label = GETPOST('label','alpha');
+$scandir = GETPOST('scandir','alpha');
 
 // Pricing Rules
 $select_pricing_rules=array(
@@ -98,12 +102,13 @@ if ($action == 'setModuleOptions')
 	if (! $error)
     {
         $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	//setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
         $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
+	// message yet present at the bottom if($action)
+	//setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -171,6 +176,86 @@ if ($action == 'other')
 	$value = GETPOST('activate_usesearchtoselectproduct','alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_USE_SEARCH_TO_SELECT", $value,'chaine',0,'',$conf->entity);
 }
+
+if ($action == 'specimen') // For products
+{
+	$modele= GETPOST('module','alpha');
+
+	$inter = new Fichinter($db);
+	$inter->initAsSpecimen();
+
+	// 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/product/doc/pdf_".$modele.".modules.php",0);
+		if (file_exists($file))
+		{
+			$filefound=1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($inter,$langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=products&file=SPECIMEN.pdf");
+			return;
+		}
+		else
+		{
+			setEventMessage($obj->error,'errors');
+			dol_syslog($obj->error, LOG_ERR);
+		}
+	}
+	else
+	{
+		setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+// Activate a model
+if ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+}
+
+if ($action == 'del')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		if ($conf->global->PRODUCT_ADDON_PDF == "$value") dolibarr_del_const($db, 'PRODUCT_ADDON_PDF',$conf->entity);
+	}
+}
+
+// Set default model
+if ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "PRODUCT_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->PRODUCT_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+
 if ($action == 'set')
 {
 	$const = "PRODUCT_SPECIAL_".strtoupper(GETPOST('spe','alpha'));
@@ -314,6 +399,143 @@ foreach ($dirproduct as $dirroot)
 }
 print '</table>';
 
+
+print '<br>';
+print_titre($langs->trans("ModelModulesProduct"));
+
+// Load array def with activated templates
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = 'product'";
+$sql.= " AND entity = ".$conf->entity;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td width="140">'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
+print '<td align="center" width="60">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+$var=true;
+foreach ($dirproduct as $dirroot)
+{
+	$dir = dol_buildpath($dirroot.'core/modules/product/doc/',0);
+	$handle=@opendir($dir);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle))!==false)
+		{
+			if (preg_match('/\.modules\.php$/i',$file))
+			{
+				$name = substr($file, 4, dol_strlen($file) -16);
+				$classname = substr($file, 0, dol_strlen($file) -12);
+
+			    try {
+        			dol_include_once($dirroot.'core/modules/product/doc/'.$file);
+    			}
+    			catch(Exception $e)
+    			{
+    			    dol_syslog($e->getMessage(), LOG_ERR);
+    			}
+
+    			$module = new $classname($db);
+
+				$modulequalified=1;
+				if (! empty($module->version)) {
+					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+				}
+
+				if ($modulequalified)
+				{
+					$var = !$var;
+					print '<tr '.$bc[$var].'><td width="100">';
+					print $module->name;
+					print "</td><td>\n";
+					if (method_exists($module,'info')) print $module->info($langs);
+					else print $module->description;
+					print '</td>';
+
+					// Activate / Disable
+					if (in_array($name, $def))
+					{
+						print "<td align=\"center\">\n";
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">';
+						print img_picto($langs->trans("Enabled"),'switch_on');
+						print '</a>';
+						print "</td>";
+					}
+					else
+					{
+						if (versioncompare($module->phpmin,versionphparray()) > 0)
+						{
+							print "<td align=\"center\">\n";
+							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
+							print "</td>";
+						}
+						else
+						{
+							print "<td align=\"center\">\n";
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+							print "</td>";
+						}
+					}
+
+					// Info
+					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+					$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+					if ($module->type == 'pdf')
+					{
+						$htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
+					}
+					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
+
+					print '<td align="center" class="nowrap">';
+					print $form->textwithpicto('',$htmltooltip,1,0);
+					print '</td>';
+
+					// Preview
+					print '<td align="center" class="nowrap">';
+					if ($module->type == 'pdf')
+					{
+						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+					}
+					else
+					{
+						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
+					}
+					print $linkspec;
+					print '</td>';
+
+					print "</tr>\n";
+				}
+			}
+		}
+		closedir($handle);
+	}
+}
+print '</table>';
+
 /*
  * Other conf
  */

From 0517435797c72fc338e8a3acf46dc05ba94c450f Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 4 Feb 2016 16:21:27 +0100
Subject: [PATCH 033/421] add product document generation

---
 htdocs/product/card.php | 50 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d65c7fe1f35..bdfdf986d17 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2014-2015	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2016		Charlie Benke		 <charlie@patas-monkey.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
@@ -44,6 +45,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.php';
+
 if (! empty($conf->propal->enabled))     require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->facture->enabled))    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (! empty($conf->commande->enabled))   require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -125,7 +128,33 @@ if (empty($reshook))
     	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
     	exit;
     }
+	/*
+	 * Build doc
+	 */
+	else if ($action == 'builddoc' && $user->rights->produit->creer)
+	{
 
+		// Save last template used to generate document
+		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang='';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+		if (! empty($newlang))
+		{
+			$outputlangs = new Translate("",$conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		$result=product_create($db, $object, GETPOST('model','alpha'), $outputlangs);
+		if ($result <= 0)
+		{
+			dol_print_error($db,$result);
+			exit;
+		}
+	}
+	
     // Barcode type
     if ($action ==	'setfk_barcode_type' && $createbarcode)
     {
@@ -1649,7 +1678,28 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->
 {
     print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestionclone,'yes','action-clone',250,600);
 }
+print '<div class="fichecenter"><div class="fichehalfleft">';
+print '<a name="builddoc"></a>'; // ancre
 
+/*
+ * Documents generes
+ */
+$filedir=$conf->product->dir_output.'/product/'.$object->id;
+
+$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+$genallowed=$user->rights->produit->creer;
+$delallowed=$user->rights->produit->supprimer;
+
+$var=true;
+
+$somethingshown=$formfile->show_documents('product',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang);
+
+print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+print '</div></div></div>';
+
+print '<br><br>';
 
 
 /* ************************************************************************** */

From 1e9ea4f2ac181fe9a357692d65516057f8db42cc Mon Sep 17 00:00:00 2001
From: abcnet-lu <abosserelle.pub+github-abcnet-lu@gmail.com>
Date: Thu, 4 Feb 2016 16:40:49 +0100
Subject: [PATCH 034/421] [#4568] Add professional IDs for Luxembourg

---
 htdocs/langs/de_DE/companies.lang | 6 ++++++
 htdocs/langs/en_US/companies.lang | 6 ++++++
 htdocs/langs/fr_FR/companies.lang | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index caca577779f..7efd00d61ff 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Niederlassungsgenehmigung)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index d9a85c72175..7c64149b5bf 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Id. prof. 3 (SRVC TAX)
 ProfId4IN=Id. prof. 4
 ProfId5IN=Id. prof. 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Autorisation d'établissement)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id. prof. 1 (R.C.)
 ProfId2MA=Id. prof. 2 (Patente)
 ProfId3MA=Id. prof. 3 (I.F.)

From 87c5854382640069f4895e4b3253b968b6f22c00 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 4 Feb 2016 16:58:19 +0100
Subject: [PATCH 035/421] just change for rerun travis cheking

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

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 4908d162f8b..de3d79a790d 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2012      Regis Houssin       <regis.houssin@capnetworks.com>
- * Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2012      Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015-2016 Charlie BENKE 	<charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify

From a65660712267f780dc47d812fe5e3e4679263c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 4 Feb 2016 17:12:58 +0100
Subject: [PATCH 036/421] Update CMailFile.class.php

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index b3da46ff366..9f6f0995ded 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -375,7 +375,7 @@ class CMailFile
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
 		{
-            dol_include_once('/core/class/hookmanager.class.php');
+            require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
             $hookmanager = new HookManager($db);
             $hookmanager->initHooks(array(
                 'maildao'

From 69e0f1ebc3405af903067c49a32582ec7b741265 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 Feb 2016 17:55:30 +0100
Subject: [PATCH 037/421] Add log to help debug

---
 htdocs/main.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 25176c6bc93..39fd1a8eb1a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1501,7 +1501,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 /**
  *  Show left menu bar
  *
- *  @param  array	$menu_array_before 	       	Table of menu entries to show before entries of menu handler
+ *  @param  array	$menu_array_before 	       	Table of menu entries to show before entries of menu handler. This param is deprectaed and must be provided to ''.
  *  @param  string	$helppagename    	       	Name of wiki page for help ('' by default).
  * 				     		                   	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
  * 									         		       For other external page: http://server/url
@@ -1519,6 +1519,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
     $searchform='';
     $bookmarks='';
 
+    if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING); 
+        
     if (empty($conf->dol_hide_leftmenu))
     {
 	    // Instantiate hooks of thirdparty module

From 70e051a1bf01c953e6e474f85719376e5a8aee1b Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 4 Feb 2016 18:05:35 +0100
Subject: [PATCH 038/421] Add goods customers boxes

---
 htdocs/core/boxes/box_bonsclients.php | 168 ++++++++++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 htdocs/core/boxes/box_bonsclients.php

diff --git a/htdocs/core/boxes/box_bonsclients.php b/htdocs/core/boxes/box_bonsclients.php
new file mode 100644
index 00000000000..0f650e6775c
--- /dev/null
+++ b/htdocs/core/boxes/box_bonsclients.php
@@ -0,0 +1,168 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2016      Charlie Benke        <charlie@patas-monkey.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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/core/boxes/box_clients.php
+ *	\ingroup    societes
+ *	\brief      Module de generation de l'affichage de la box clients
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
+
+
+/**
+ * Class to manage the box to show last thirdparties
+ */
+class box_bonsclients extends ModeleBoxes
+{
+	var $boxcode="goodcustomers";
+	var $boximg="object_company";
+	var $boxlabel="BoxGoodCustomers";
+	var $depends = array("societe");
+
+	var $db;
+	var $enabled = 1;
+
+	var $info_box_head = array();
+	var $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB	$db      	Database handler
+     *  @param	string	$param		More parameters
+	 */
+	function __construct($db,$param='')
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		// disable box for such cases
+		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
+	}
+
+	/**
+     *  Load data for box to show them later
+     *
+     *  @param	int		$max        Maximum number of records to load
+     *  @return	void
+	 */
+	function loadBox($max=5)
+	{
+		global $user, $langs, $db, $conf;
+		$langs->load("boxes");
+
+		$this->max=$max;
+
+        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+        $thirdpartystatic=new Societe($db);
+
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers",$max));
+
+		if ($user->rights->societe->lire)
+		{
+			
+			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
+			$sql.= " count(*) as nbfact, sum(if (f.paye=1,1,0)) as nbfactpaye";
+			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
+			$sql.= ' WHERE s.entity IN ('.getEntity('societe', 1).')';
+			$sql.= ' AND s.rowid = f.fk_soc';
+			$sql.= " GROUP BY s.rowid, s.nom, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms, s.status";
+			$sql.= $db->order("nbfact","DESC");
+			$sql.= $db->plimit($max,0);
+
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+
+				$line = 0;
+				while ($line < $num)
+				{
+					$objp = $db->fetch_object($result);
+					$datem=$db->jdate($objp->tms);
+					$thirdpartystatic->id = $objp->rowid;
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$nbfact = $objp->nbfact;
+					$nbimpaye = $objp->nbfact - $objp->nbfactpaye;
+
+					$this->info_box_contents[$line][] = array(
+					    'td' => 'align="left"',
+					    'text' => $thirdpartystatic->getNomUrl(1),
+					    'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+					    'td' => 'align="right"',
+					    'text' => dol_print_date($datem, "day")
+					);
+
+					$this->info_box_contents[$line][] = array(
+					    'td' => 'align="right"',
+					    'text' => $nbfact.( $nbimpaye != 0 ? ' ('.$nbimpaye.')':'')
+					);
+					
+					$this->info_box_contents[$line][] = array(
+					    'td' => 'align="right" width="18"',
+					    'text' => $thirdpartystatic->LibStatut($objp->status,3)
+					);
+
+					$line++;
+				}
+
+				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+
+				$db->free($result);
+			}
+			else {
+				$this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+    	        										'maxlength'=>500,
+	            										'text' => ($db->error().' sql='.$sql));
+			}
+		}
+		else {
+			$this->info_box_contents[0][0] = array('align' => 'left',
+				'text' => $langs->trans("ReadPermissionNotAllowed"));
+		}
+
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *	@return	void
+	 */
+	function showBox($head = null, $contents = null)
+	{
+		parent::showBox($this->info_box_head, $this->info_box_contents);
+	}
+}
+

From 5498b1cd5a9362b61e0950c5006db874af235d5b Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 4 Feb 2016 18:06:43 +0100
Subject: [PATCH 039/421] Update modSociete.class.php

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

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 41fd00e5463..b8032cca13e 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -131,7 +131,9 @@ class modSociete extends DolibarrModules
         $this->boxes[$r][1] = "box_activity.php";
         $this->boxes[$r][2] = '(WarningUsingThisBoxSlowDown)';
         $r++;
-
+        $this->boxes[$r][1] = "box_bonsclients.php";
+        $this->boxes[$r][2] = '(WarningUsingThisBoxSlowDown)';
+        $r++;
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'societe';

From 9c896b18699834f331dbccb1bf404b042e8e41b1 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 4 Feb 2016 18:10:28 +0100
Subject: [PATCH 040/421] translations too

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

diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 796c058e3b5..6afc6d7b7b2 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers= %s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Add a box to your dashboard...
\ No newline at end of file
+ChooseBoxToAdd=Add a box to your dashboard...

From 7e3a7876885b791392b3441041e2f5fed7e6fb07 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 4 Feb 2016 19:03:25 +0100
Subject: [PATCH 041/421] FIX phpcs

---
 htdocs/core/actions_extrafields.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index b91cc49374c..f31e2c184d8 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -161,8 +161,8 @@ if ($action == 'add')
                 	$params,
                 	(GETPOST('alwayseditable')?1:0),
                 	(GETPOST('perms')?GETPOST('perms'):''),
-                	(GETPOST('list')?1:0)
-					,(GETPOST('ishidden')?1:0)
+                	(GETPOST('list')?1:0),
+					(GETPOST('ishidden')?1:0)
                 );
     			if ($result > 0)
     			{
@@ -312,8 +312,8 @@ if ($action == 'update')
     				$params,
     				(GETPOST('alwayseditable')?1:0),
     				(GETPOST('perms')?GETPOST('perms'):''),
-                	(GETPOST('list')?1:0)
-					,(GETPOST('ishidden')?1:0)
+                	(GETPOST('list')?1:0),
+					(GETPOST('ishidden')?1:0)
     			);
     			if ($result > 0)
     			{

From 32c0b2a9b14bdb11d39388d2ee7221282bf840b8 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 4 Feb 2016 21:05:19 +0100
Subject: [PATCH 042/421] NEW add html id/class to locate value in the DOM html

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d90932d1738..d1153a73eda 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4110,7 +4110,8 @@ abstract class CommonObject
 						$label = '<span'.($mode != 'view' ? ' class="fieldrequired"':'').'>'.$label.'</span>';
 
 					$out .= '<td>'.$langs->trans($label).'</td>';
-					$out .='<td'.($colspan?' colspan="'.$colspan.'"':'').'>';
+					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
+					$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';
 
 					switch($mode) {
 					case "view":
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 9789922e6dc..f4b817b583d 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -68,7 +68,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
 
 			print '</tr></table>';
-			print '<td colspan="'.$cols.'">';
+			$html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : '';
+			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.'" colspan="'.$cols.'">';
 
 			// Convert date into timestamp format
 			if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) {

From a8e480e392fd8b26300d1568aab5a3f4af5478ff Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 4 Feb 2016 23:15:06 +0100
Subject: [PATCH 043/421] FIX #3509 payment ref for suppliers

---
 htdocs/admin/supplier_payment.php             | 220 ++++++++++++++++++
 htdocs/core/lib/fourn.lib.php                 |   5 +
 .../mod_supplier_payment_brodator.php         | 140 +++++++++++
 .../mod_supplier_payment_bronan.php           | 150 ++++++++++++
 .../modules_supplier_payment.php              | 101 ++++++++
 htdocs/fourn/class/paiementfourn.class.php    | 120 +++++++++-
 .../install/mysql/migration/3.8.0-3.9.0.sql   |   3 +
 .../mysql/tables/llx_paiementfourn.sql        |   2 +
 8 files changed, 737 insertions(+), 4 deletions(-)
 create mode 100644 htdocs/admin/supplier_payment.php
 create mode 100644 htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
 create mode 100644 htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
 create mode 100644 htdocs/core/modules/supplier_payment/modules_supplier_payment.php

diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
new file mode 100644
index 00000000000..41737f7a9d5
--- /dev/null
+++ b/htdocs/admin/supplier_payment.php
@@ -0,0 +1,220 @@
+<?php
+/* Copyright (C) 2015  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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/admin/payment.php
+ *		\ingroup    facture
+ *		\brief      Page to setup invoices payments
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+
+$langs->load("admin");
+$langs->load("errors");
+$langs->load('other');
+$langs->load('bills');
+
+if (! $user->admin) accessforbidden();
+
+$action = GETPOST('action','alpha');
+$value = GETPOST('value','alpha');
+$label = GETPOST('label','alpha');
+$scandir = GETPOST('scandir','alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'updateMask')
+{
+    $maskconstsupplierpayment=GETPOST('maskconstsupplierpayment','alpha');
+    $masksupplierpayment=GETPOST('masksupplierpayment','alpha');
+    if ($maskconstsupplierpayment) $res = dolibarr_set_const($db,$maskconstsupplierpayment,$masksupplierpayment,'chaine',0,'',$conf->entity);
+
+    if (! $res > 0) $error++;
+
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
+}
+
+    if ($action == 'setmod')
+{
+    dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON",$value,'chaine',0,'',$conf->entity);
+}
+
+/*
+ * View
+ */
+
+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+
+llxHeader("",$langs->trans("SupplierPaymentSetup"),'EN:Supplier_Payment_Configuration|FR:Configuration_module_paiement_fournisseur');
+
+$form=new Form($db);
+
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("SupplierPaymentSetup"),$linkback,'title_setup');
+
+print "<br />";
+
+$head = supplierorder_admin_prepare_head();
+dol_fiche_head($head, 'supplierpayment', $langs->trans("SupplierPayment"), 0, 'invoice');
+
+/*
+ *  Numbering module
+ */
+
+print load_fiche_titre($langs->trans("SupplierPaymentsNumberingModule"));
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+print '</tr>'."\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+    $dir = dol_buildpath($reldir."core/modules/supplier_payment/");
+    if (is_dir($dir))
+    {
+        $handle = opendir($dir);
+        if (is_resource($handle))
+        {
+            $var=true;
+
+            while (($file = readdir($handle))!==false)
+            {
+                if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
+                {
+                    $filebis = $file;
+                    $classname = preg_replace('/\.php$/','',$file);
+                    // For compatibility
+                    if (! is_file($dir.$filebis))
+                    {
+                        $filebis = $file."/".$file.".modules.php";
+                        $classname = "mod_supplier_payment_".$file;
+                    }
+                    // Check if there is a filter on country
+                    preg_match('/\-(.*)_(.*)$/',$classname,$reg);
+                    if (! empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
+
+                    $classname = preg_replace('/\-.*$/','',$classname);
+                    if (! class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/',$filebis) || preg_match('/mod_/',$classname)) && substr($filebis, dol_strlen($filebis)-3, 3) == 'php')
+                    {
+                        // Charging the numbering class
+                        require_once $dir.$filebis;
+
+                        $module = new $classname($db);
+
+                        // Show modules according to features level
+                        if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+                        if ($module->isEnabled())
+                        {
+                            $var = !$var;
+                            print '<tr '.$bc[$var].'><td width="100">';
+                            echo preg_replace('/\-.*$/','',preg_replace('/mod_supplier_payment_/','',preg_replace('/\.php$/','',$file)));
+                            print "</td><td>\n";
+
+                            print $module->info();
+
+                            print '</td>';
+
+                            // Show example of numbering module
+                            print '<td class="nowrap">';
+                            $tmp=$module->getExample();
+                            if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+                            elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+                            else print $tmp;
+                            print '</td>'."\n";
+
+                            print '<td align="center">';
+                            //print "> ".$conf->global->SUPPLIER_PAYMENT_ADDON." - ".$file;
+                            if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file)
+                            {
+                                print img_picto($langs->trans("Activated"),'switch_on');
+                            }
+                            else
+                            {
+                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/','',$file).'&scandir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+                            }
+                            print '</td>';
+
+                            $payment=new PaiementFourn($db);
+                            $payment->initAsSpecimen();
+
+                            // Example
+                            $htmltooltip='';
+                            $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+                            $nextval=$module->getNextValue($mysoc,$payment);
+                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                                    $htmltooltip.=$langs->trans("NextValue").': ';
+                                if ($nextval) {
+                                    if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                        $nextval = $langs->trans($nextval);
+                                    $htmltooltip.=$nextval.'<br>';
+                                } else {
+                                    $htmltooltip.=$langs->trans($module->error).'<br>';
+                                }
+                            }
+
+                            print '<td align="center">';
+                            print $form->textwithpicto('',$htmltooltip,1,0);
+
+                            if ($conf->global->PAYMENT_ADDON.'.php' == $file)  // If module is the one used, we show existing errors
+                            {
+                                if (! empty($module->error)) dol_htmloutput_mesg($module->error,'','error',1);
+                            }
+
+                            print '</td>';
+
+                            print "</tr>\n";
+
+                        }
+                    }
+                }
+            }
+            closedir($handle);
+        }
+    }
+}
+
+print '</table>';
+
+dol_fiche_end();
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index fdeece84d52..19d6429cc6e 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -178,6 +178,11 @@ function supplierorder_admin_prepare_head()
 	$head[$h][1] = $langs->trans("SuppliersInvoice");
 	$head[$h][2] = 'invoice';
 	$h++;
+	
+	$head[$h][0] = DOL_URL_ROOT."/admin/supplier_payment.php";
+	$head[$h][1] = $langs->trans("SuppliersPayment");
+	$head[$h][2] = 'supplierpayment';
+	$h++;
 
 	complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin');
 
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
new file mode 100644
index 00000000000..fb06c028aed
--- /dev/null
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -0,0 +1,140 @@
+<?php
+/* Copyright (C) 2015      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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ * \file       htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+ * \ingroup    supplier_payment
+ * \brief      File containing class for numbering module Brodator
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_payment/modules_supplier_payment.php';
+
+
+/**
+ *	Class to manage customer payment numbering rules Ant
+ */
+class mod_supplier_payment_brodator extends ModeleNumRefPayments
+{
+	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $error = '';
+	var $nom = 'Brodator';
+
+
+    /**
+     *  Renvoi la description du modele de numerotation
+     *
+     *  @return     string      Texte descripif
+     */
+	function info()
+    {
+    	global $conf,$langs;
+
+		$langs->load("bills");
+
+		$form = new Form($this->db);
+
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte.= '<input type="hidden" name="action" value="updateMask">';
+		$texte.= '<input type="hidden" name="maskconstsupplierpayment" value="SUPPLIER_PAYMENT_BRODATOR_MASK">';
+		$texte.= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
+		$tooltip.=$langs->trans("GenericMaskCodes2");
+		$tooltip.=$langs->trans("GenericMaskCodes3");
+		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
+		$tooltip.=$langs->trans("GenericMaskCodes5");
+
+		// Parametrage du prefix
+		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masksupplierpayment" value="'.$conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK.'">',$tooltip,1,1).'</td>';
+
+		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+
+		$texte.= '</tr>';
+
+		$texte.= '</table>';
+		$texte.= '</form>';
+
+		return $texte;
+    }
+
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+     	global $conf,$langs,$mysoc;
+
+    	$old_code_client=$mysoc->code_client;
+    	$mysoc->code_client='CCCCCCCCCC';
+     	$numExample = $this->getNextValue($mysoc,'');
+		$mysoc->code_client=$old_code_client;
+
+		if (! $numExample)
+		{
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+    }
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param	Societe		$objsoc     Object thirdparty
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+    function getNextValue($objsoc,$object)
+    {
+		global $db,$conf;
+
+		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+
+		// We get cursor rule
+		$mask=$conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK;
+
+		if (! $mask)
+		{
+			$this->error='NotConfigured';
+			return 0;
+		}
+
+		$numFinal=get_next_value($db,$mask,'paiementfourn','ref','',$objsoc,$object->datepaye);
+
+		return  $numFinal;
+	}
+
+
+	/**
+	 *  Return next free value
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 * 	@param	string		$objforref	Object for number to search
+	 *  @return string      			Next free value
+     */
+    function commande_get_num($objsoc,$objforref)
+    {
+        return $this->getNextValue($objsoc,$objforref);
+    }
+
+}
+
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
new file mode 100644
index 00000000000..e7146e2e1fd
--- /dev/null
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -0,0 +1,150 @@
+<?php
+/* Copyright (C) 2015      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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ * \file       htdocs/core/modules/payment/mod_payment_bronan.php
+ * \ingroup    supplier_payment
+ * \brief      File containing class for numbering module Bronan
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_payment/modules_supplier_payment.php';
+
+/**
+ *	Class to manage customer payment numbering rules Cicada
+ */
+class mod_supplier_payment_bronan extends ModeleNumRefPayments
+{
+	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $prefix='SPAY';
+	var $error='';
+	var $nom='Bronan';
+
+
+    /**
+     *  Return description of numbering module
+     *
+     *  @return     string      Text with description
+     */
+    function info()
+    {
+    	global $langs;
+      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+    }
+
+
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**
+	 *  Test si les numeros deje en vigueur dans la base ne provoquent pas de
+	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *  @return     boolean     false si conflit, true si ok
+	 */
+	function canBeActivated()
+	{
+		global $conf,$langs,$db;
+
+		$payyymm=''; $max='';
+
+		$posindice=9;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
+		$sql.= " WHERE ref LIKE '".$this->prefix."____-%'";
+		$sql.= " AND entity = ".$conf->entity;
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$row = $db->fetch_row($resql);
+			if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
+		}
+		if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
+		{
+			$langs->load("errors");
+			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param	Societe		$objsoc     Object thirdparty
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+	function getNextValue($objsoc,$object)
+	{
+		global $db,$conf;
+
+		// D'abord on recupere la valeur max
+		$posindice=10;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
+		$sql.= " WHERE ref like '".$this->prefix."____-%'";
+		$sql.= " AND entity = ".$conf->entity;
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max=0;
+		}
+		else
+		{
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			return -1;
+		}
+
+		//$date=time();
+		$date=$object->datepaye;
+		$yymm = strftime("%y%m",$date);
+
+    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else $num = sprintf("%04s",$max+1);
+
+		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
+
+
+	/**
+	 *  Return next free value
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 * 	@param	string		$objforref	Object for number to search
+	 *  @return string      			Next free value
+	 */
+	function payment_get_num($objsoc,$objforref)
+	{
+		return $this->getNextValue($objsoc,$objforref);
+	}
+
+}
diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
new file mode 100644
index 00000000000..c9023a9fc65
--- /dev/null
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -0,0 +1,101 @@
+<?php
+/* Copyright (C) 2015      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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *  \class      ModeleNumRefPayments
+ *  \brief      Payment numbering references mother class
+ */
+
+abstract class ModeleNumRefPayments
+{
+	var $error='';
+
+	/**
+	 *	Return if a module can be used or not
+	 *
+	 *	@return		boolean     true if module can be used
+	 */
+	function isEnabled()
+	{
+		return true;
+	}
+
+	/**
+	 *	Return the default description of numbering module
+	 *
+	 *	@return     string      Texte descripif
+	 */
+	function info()
+	{
+		global $langs;
+		$langs->load("bills");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *	Return numbering example
+	 *
+	 *	@return     string      Example
+	 */
+	function getExample()
+	{
+		global $langs;
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
+
+	/**
+	 *  Test if the existing numbers in the database do not cause conflicts that would prevent this numbering run.
+	 *
+	 *	@return     boolean     false si conflit, true si ok
+	 */
+	function canBeActivated()
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns the next value
+	 *
+	 *	@param	Societe		$objsoc     Object thirdparty
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return	string      Valeur
+	 */
+	function getNextValue($objsoc,$object)
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *	Returns the module numbering version
+	 *
+	 *	@return     string      Value
+	 */
+	function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
+		return $langs->trans("NotAvailable");
+	}
+}
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index bfdfea41fe4..bb84f8ca917 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -74,7 +74,7 @@ class PaiementFourn extends Paiement
 	{
 	    $error=0;
 	    
-		$sql = 'SELECT p.rowid, p.datep as dp, p.amount, p.statut, p.fk_bank,';
+		$sql = 'SELECT p.rowid, p.ref, p.entity, p.datep as dp, p.amount, p.statut, p.fk_bank,';
 		$sql.= ' c.code as paiement_code, c.libelle as paiement_type,';
 		$sql.= ' p.num_paiement, p.note, b.fk_account';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiementfourn as p';
@@ -95,7 +95,8 @@ class PaiementFourn extends Paiement
 			{
 				$obj = $this->db->fetch_object($resql);
 				$this->id             = $obj->rowid;
-				$this->ref            = $obj->rowid;
+				$this->ref            = $obj->ref;
+				$this->entity         = $obj->entity;
 				$this->date           = $this->db->jdate($obj->dp);
 				$this->numero         = $obj->num_paiement;
 				$this->bank_account   = $obj->fk_account;
@@ -149,11 +150,12 @@ class PaiementFourn extends Paiement
 
 		if ($this->total <> 0) // On accepte les montants negatifs
 		{
+			$ref = $this->getNextNumRef('');
 			$now=dol_now();
 
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn (';
-			$sql.= 'datec, datep, amount, fk_paiement, num_paiement, note, fk_user_author, fk_bank)';
-			$sql.= " VALUES ('".$this->db->idate($now)."',";
+			$sql.= 'ref, entity, datec, datep, amount, fk_paiement, num_paiement, note, fk_user_author, fk_bank)';
+			$sql.= " VALUES ('".$this->db->escape($ref)."', ".$conf->entity.", '".$this->db->idate($now)."',";
 			$sql.= " '".$this->db->idate($this->datepaye)."', '".$this->total."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.", 0)";
 
 			dol_syslog("PaiementFourn::create", LOG_DEBUG);
@@ -513,4 +515,114 @@ class PaiementFourn extends Paiement
 		if ($withpicto != 2) $result.=$link.$text.$linkend;
 		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.
+	 *
+	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
+	 *  @return	void
+	 */
+	function initAsSpecimen($option='')
+	{
+		global $user,$langs,$conf;
+
+		$now=dol_now();
+		$arraynow=dol_getdate($now);
+		$nownotime=dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
+
+		// Initialize parameters
+		$this->id=0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen=1;
+		$this->facid = 1;
+		$this->datepaye = $nownotime;
+	}
+	
+	/**
+	 *      Return next reference of supplier invoice not already used (or last reference)
+	 *      according to numbering module defined into constant SUPPLIER_PAYMENT_ADDON
+	 *
+	 *      @param	   Societe		$soc		object company
+	 *      @param     string		$mode		'next' for next value or 'last' for last value
+	 *      @return    string					free ref or last ref
+	 */
+	function getNextNumRef($soc,$mode='next')
+	{
+		global $conf, $db, $langs;
+		$langs->load("bills");
+
+		// Clean parameters (if not defined or using deprecated value)
+		if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) $conf->global->SUPPLIER_PAYMENT_ADDON='mod_supplier_payment_bronan';
+		else if ($conf->global->SUPPLIER_PAYMENT_ADDON=='brodator') $conf->global->SUPPLIER_PAYMENT_ADDON='mod_supplier_payment_brodator';
+		else if ($conf->global->SUPPLIER_PAYMENT_ADDON=='bronan') $conf->global->SUPPLIER_PAYMENT_ADDON='mod_supplier_payment_bronan';
+
+		if (! empty($conf->global->SUPPLIER_PAYMENT_ADDON))
+		{
+			$mybool=false;
+
+			$file = $conf->global->SUPPLIER_PAYMENT_ADDON.".php";
+			$classname = $conf->global->SUPPLIER_PAYMENT_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+			foreach ($dirmodels as $reldir) {
+
+				$dir = dol_buildpath($reldir."core/modules/supplier_payment/");
+
+				// Load file with numbering class (if found)
+				if (is_file($dir.$file) && is_readable($dir.$file))
+				{
+					$mybool |= include_once $dir . $file;
+				}
+			}
+
+			// For compatibility
+			if (! $mybool)
+			{
+				$file = $conf->global->SUPPLIER_PAYMENT_ADDON.".php";
+				$classname = "mod_supplier_payment_".$conf->global->SUPPLIER_PAYMENT_ADDON;
+				$classname = preg_replace('/\-.*$/','',$classname);
+				// Include file with class
+				foreach ($conf->file->dol_document_root as $dirroot)
+				{
+					$dir = $dirroot."/core/modules/supplier_payment/";
+
+					// Load file with numbering class (if found)
+					if (is_file($dir.$file) && is_readable($dir.$file)) {
+						$mybool |= include_once $dir . $file;
+					}
+				}
+			}
+
+			if (! $mybool)
+			{
+				dol_print_error('',"Failed to include file ".$file);
+				return '';
+			}
+
+			$obj = new $classname();
+			$numref = "";
+			$numref = $obj->getNextValue($soc,$this);
+
+			/**
+			 * $numref can be empty in case we ask for the last value because if there is no invoice created with the
+			 * set up mask.
+			 */
+			if ($mode != 'last' && !$numref) {
+				dol_print_error($db,"SupplierPayment::getNextNumRef ".$obj->error);
+				return "";
+			}
+
+			return $numref;
+		}
+		else
+		{
+			$langs->load("errors");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+			return "";
+		}
+	}
 }
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 7c372a5c394..24fd141a217 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -583,3 +583,6 @@ ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN doc_ref varchar(300) NOT NU
 
 ALTER TABLE llx_holiday ADD COLUMN tms timestamp;
 ALTER TABLE llx_holiday ADD COLUMN entity integer DEFAULT 1 NOT NULL;
+
+ALTER TABLE llx_paiementfourn ADD COLUMN ref varchar(30) AFTER rowid;
+ALTER TABLE llx_paiementfourn ADD COLUMN entity integer AFTER ref;
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 701899d5a2f..cbcc93d9b0f 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -20,6 +20,8 @@
 create table llx_paiementfourn
 (
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
+  ref				varchar(30),
+  entity			integer DEFAULT 1,
   tms               timestamp,
   datec             datetime,          -- date de creation de l'enregistrement
   datep             datetime,          -- date de paiement

From 0ae8a3398d5b0158ae97a80ba7e1e84e65fa5f9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 Feb 2016 10:56:45 +0100
Subject: [PATCH 044/421] Fix sql error when extrafields on contact

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index c916710e087..b319072dc68 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -218,7 +218,7 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contact_extrafields as ef on (p.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (p.rowid = ef.fk_object)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cs ON p.rowid = cs.fk_socpeople"; // We need this table joined to the select in order to filter by categ

From e1da95871a02c9f39cc987de6097691517bea2ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 Feb 2016 12:23:16 +0100
Subject: [PATCH 045/421] Fix bad name

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

diff --git a/htdocs/core/js/select2_locale.js.php b/htdocs/core/js/select2_locale.js.php
index 2600182dfa1..660b41820df 100644
--- a/htdocs/core/js/select2_locale.js.php
+++ b/htdocs/core/js/select2_locale.js.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file       htdocs/core/js/timepicker.js.php
+ * \file       htdocs/core/js/select2_locale.js.php
  * \brief      File that include javascript functions for timepicker
  */
 

From 713050bd57e618f71debed9a81a0d70fe9665274 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 Feb 2016 12:46:41 +0100
Subject: [PATCH 046/421] Fix style on payment page

---
 htdocs/fourn/facture/paiement.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index c4b2e4c01f6..253b55b4659 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -283,10 +283,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             print '<input type="hidden" name="socid" value="'.$obj->socid.'">';
             print '<input type="hidden" name="societe" value="'.$obj->name.'">';
 
+            dol_fiche_head('');
+            
             print '<table class="border" width="100%">';
 
-            print '<tr class="liste_titre"><td colspan="3">'.$langs->trans('Payment').'</td>';
-            print '<tr><td>'.$langs->trans('Company').'</td><td colspan="2">';
+            print '<tr><td class="fieldrequired">'.$langs->trans('Company').'</td><td colspan="2">';
             $supplierstatic->id=$obj->socid;
             $supplierstatic->name=$obj->name;
             print $supplierstatic->getNomUrl(1,'supplier');
@@ -312,7 +313,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 print '<tr><td colspan="2">&nbsp;</td></tr>';
             }
             print '</table>';
-
+            dol_fiche_end();
 
 			$parameters=array('facid'=>$facid, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
 			$reshook=$hookmanager->executeHooks('paymentsupplierinvoices',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -339,7 +340,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                {
 	                    $i = 0;
 	                    print '<br>';
-	                    print $langs->trans('Invoices').'<br>';
 
 						if(!empty($conf->global->FAC_AUTO_FILLJS)){
 							//Add js for AutoFill
@@ -351,15 +351,15 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print '	});'."\n";
 							print '	</script>'."\n";
 						}
-						print '<table class="noborder" width="100%">';
+						print '<table class="liste" width="100%">';
 	                    print '<tr class="liste_titre">';
-	                    print '<td>'.$langs->trans('Ref').'</td>';
+	                    print '<td>'.$langs->trans('Invoice').'</td>';
 	                    print '<td>'.$langs->trans('RefSupplier').'</td>';
 	                    print '<td align="center">'.$langs->trans('Date').'</td>';
 	                    print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
 	                    print '<td align="right">'.$langs->trans('AlreadyPaid').'</td>';
 	                    print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
-	                    print '<td align="center">'.$langs->trans('Amount').'</td>';
+	                    print '<td align="center">'.$langs->trans('PaymentAmount').'</td>';
 	                    print '</tr>';
 
 	                    $var=True;
@@ -425,7 +425,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	        if ($action != 'add_paiement')
 	        {
 				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
-				print '<br><input type="submit" class="button" value="'.$langs->trans('Save').'"></div>';
+				print '<br><input type="submit" class="button" value="'.$langs->trans('ToMakePayment').'"></div>';
 	        }
 
             // Form to confirm payment

From ede4453164c2432d1145626a8c5a4cf9335d07e2 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Fri, 5 Feb 2016 12:59:32 +0100
Subject: [PATCH 047/421] Fix: Avoid errors when batch stock is negative

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index c7d91a28ce5..ea82a63732a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -882,7 +882,7 @@ if ($action == 'create')
 							if ($defaultqty<=0) {
 								$defaultqty=0;
 							} else {
-								$defaultqty -= min($defaultqty,$substock);
+								$defaultqty -= ($substock > 0 ? min($defaultqty,$substock) : 0);
 							}
 							$subj++;
 						}

From 36c7697b63ef561f261853327fd0ef98aa49562f Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Fri, 5 Feb 2016 13:43:06 +0100
Subject: [PATCH 048/421] FIX: retrieve correct pu_ttc (set by printObjectLine
 function) like in 3.7

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

diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index d61831cfec2..7d570531213 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -124,7 +124,7 @@ $coldisplay=-1; // We remove first td
 	if ($inputalsopricewithtax)
 	{
 		$coldisplay++;
-		print '<td align="right"><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
+		print '<td align="right"><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="'.(isset($pu_ttc)?price($pu_ttc,0,'',0):'').'"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '></td>';
 	}

From f0aef885893cd217904eddb63c7a907e76abed4b Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Fri, 5 Feb 2016 13:49:19 +0100
Subject: [PATCH 049/421] better fix

---
 htdocs/core/class/commonobject.class.php | 4 +++-
 htdocs/core/tpl/objectline_edit.tpl.php  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1cf042e9d13..a78a1cfea49 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3051,6 +3051,8 @@ abstract class CommonObject
 				$text.= ' - '.(! empty($line->label)?$line->label:$label);
 				$description.=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description));	// Description is what to show on popup. We shown nothing if already into desc.
 			}
+			
+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
@@ -3074,7 +3076,7 @@ abstract class CommonObject
 			if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("Label").'"';
 			else $placeholder=' title="'.$langs->trans("Label").'"';
 
-			$pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 7d570531213..d61831cfec2 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -124,7 +124,7 @@ $coldisplay=-1; // We remove first td
 	if ($inputalsopricewithtax)
 	{
 		$coldisplay++;
-		print '<td align="right"><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="'.(isset($pu_ttc)?price($pu_ttc,0,'',0):'').'"';
+		print '<td align="right"><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '></td>';
 	}

From bf7181a0640df531b033c507e501bb206392733f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 Feb 2016 18:37:01 +0100
Subject: [PATCH 050/421] All messages separated with , into errorsToString

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c281d9bebbd..019be7fcc09 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -381,7 +381,7 @@ abstract class CommonObject
      */
     function errorsToString()
     {
-    	return $this->error.(is_array($this->errors)?(($this->error!=''?' ':'').join(',',$this->errors)):'');
+    	return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ',$this->errors)):'');
     }
 
     /**

From 7a6c7f10a6c14bcd93003a0e7ee29277d9d65535 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Fri, 5 Feb 2016 19:14:40 +0100
Subject: [PATCH 051/421] FIX: add missing global def for ttc column

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 99e497046e0..704bc097db7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2540,7 +2540,7 @@ abstract class CommonObject
 	 */
 	function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)
 	{
-		global $conf,$langs,$user,$object,$hookmanager;
+		global $conf,$langs,$user,$object,$hookmanager,$inputalsopricewithtax;
 
 		print '<tr class="liste_titre nodrag nodrop">';
 

From 0cee4b016bb682c52a4925e97591dff4dfebbf9b Mon Sep 17 00:00:00 2001
From: Sof <virtualsof@yahoo.fr>
Date: Fri, 5 Feb 2016 19:46:01 +0100
Subject: [PATCH 052/421] FIX : Typo

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

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 7038c745364..ba083cc1527 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -714,12 +714,12 @@ if ($resql)
 		print '<td align="right">'.(price2num($object->pmp)?price(price2num($object->pmp*$obj->reel,'MT')):'').'</td>';
         // Sell price
 		print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($object->price,'MU'),1);
+        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price,'MU'),1);
         else print $langs->trans("Variable");
         print '</td>';
         // Value sell
         print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($object->price*$obj->reel,'MT'),1).'</td>';
+        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price*$obj->reel,'MT'),1).'</td>';
         else print $langs->trans("Variable");
 		print '</tr>'; ;
 		$total += $obj->reel;
@@ -782,12 +782,12 @@ print '<td class="liste_total" align="right">';
 print $totalvalue?price(price2num($totalvalue,'MT'),1):'&nbsp;';
 print '</td>';
 print '<td class="liste_total" align="right">';
-if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total,1):'&nbsp;');
+if (empty($conf->global->PRODUIT_MULTIPRICES)) print ($total?price($totalvaluesell/$total,1):'&nbsp;');
 else print $langs->trans("Variable");
 print '</td>';
 // Value to sell
 print '<td class="liste_total" align="right">';
-if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($totalvaluesell,'MT'),1);
+if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($totalvaluesell,'MT'),1);
 else print $langs->trans("Variable");
 print '</td>';
 print "</tr>";

From fd7a05490d429ac032574f4e1d64b00b55528908 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 Feb 2016 20:06:07 +0100
Subject: [PATCH 053/421] DiscountOffered text was too long

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php           | 2 +-
 htdocs/core/modules/propale/doc/pdf_azur.modules.php            | 2 +-
 .../core/modules/supplier_proposal/doc/pdf_aurore.modules.php   | 2 +-
 htdocs/langs/en_US/bills.lang                                   | 1 +
 htdocs/langs/fr_FR/bills.lang                                   | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 7a4621cc396..796e225b268 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1253,7 +1253,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetFillColor(255,255,255);
 
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOffered"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 8266efe74a5..22bfcb6e6d8 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1184,7 +1184,7 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->SetFillColor(255,255,255);
 
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOffered"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle, 0, $outputlangs), $useborder, 'R', 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 4a14998d0c4..cc7123bba7e 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -1051,7 +1051,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$pdf->SetFillColor(255,255,255);
 
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOffered"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle, 0, $outputlangs), $useborder, 'R', 1);
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 20f6fe0619c..392050c6cd5 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -196,6 +196,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 86019a751ab..ccd0160bf09 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -199,6 +199,7 @@ Rest=Créance
 AmountExpected=Montant réclamé
 ExcessReceived=Trop perçu
 EscompteOffered=Escompte (règlement avant échéance)
+EscompteOfferedShort=Escompte
 SendBillRef=Envoi de la facture %s
 SendReminderBillRef=Relance de la facture %s (rappel)
 StandingOrders=Prélèvements

From eb48e84b34217167d18d84534d2c3d353b148d17 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 5 Feb 2016 23:37:04 +0100
Subject: [PATCH 054/421] name of boxe file changed

---
 .../core/boxes/{box_bonsclients.php => box_goodcustomers.php}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename htdocs/core/boxes/{box_bonsclients.php => box_goodcustomers.php} (99%)

diff --git a/htdocs/core/boxes/box_bonsclients.php b/htdocs/core/boxes/box_goodcustomers.php
similarity index 99%
rename from htdocs/core/boxes/box_bonsclients.php
rename to htdocs/core/boxes/box_goodcustomers.php
index 0f650e6775c..734d1885824 100644
--- a/htdocs/core/boxes/box_bonsclients.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -31,7 +31,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 /**
  * Class to manage the box to show last thirdparties
  */
-class box_bonsclients extends ModeleBoxes
+class box_goodcustomers extends ModeleBoxes
 {
 	var $boxcode="goodcustomers";
 	var $boximg="object_company";

From e2afe5460e1fb6210b7ae6bad8a566da88d00aa1 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 5 Feb 2016 23:37:31 +0100
Subject: [PATCH 055/421] Update modSociete.class.php

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

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index b8032cca13e..f0d04d30990 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -131,7 +131,7 @@ class modSociete extends DolibarrModules
         $this->boxes[$r][1] = "box_activity.php";
         $this->boxes[$r][2] = '(WarningUsingThisBoxSlowDown)';
         $r++;
-        $this->boxes[$r][1] = "box_bonsclients.php";
+        $this->boxes[$r][1] = "box_goodcustomers.php";
         $this->boxes[$r][2] = '(WarningUsingThisBoxSlowDown)';
         $r++;
 		// Permissions

From 59c9d8527509cb2141118d9ac509a60826d48951 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 5 Feb 2016 23:38:04 +0100
Subject: [PATCH 056/421] Update boxes.lang

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

diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 6afc6d7b7b2..57bfc174ec5 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -61,7 +61,7 @@ BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers= %s Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.

From 9c74af63af3a56f1bad38fa6e351991679178bd2 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 6 Feb 2016 12:06:05 +0100
Subject: [PATCH 057/421] Dictionnary for label sticker and card format

---
 htdocs/admin/dict.php                         |  13 +-
 htdocs/core/lib/format_cards.lib.php          | 135 +++---------------
 .../modules/member/doc/pdf_standard.class.php |  11 +-
 .../doc/pdf_standardlabel.class.php           |  11 +-
 .../printsheet/doc/pdf_tcpdflabel.class.php   |  11 +-
 .../install/mysql/migration/3.9.0-4.0.0.sql   |  33 +++++
 .../mysql/tables/llx_c_format_cards.sql       |  39 +++++
 7 files changed, 134 insertions(+), 119 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_c_format_cards.sql

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 17033845f8c..18c112f987f 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -77,7 +77,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,0,25,0,26);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,25,0,26);
 
 // Name of SQL tables of dictionaries
 $tabname=array();
@@ -110,6 +110,7 @@ $tabname[26]= MAIN_DB_PREFIX."c_units";
 $tabname[27]= MAIN_DB_PREFIX."c_stcomm";
 $tabname[28]= MAIN_DB_PREFIX."c_holiday_types";
 $tabname[29]= MAIN_DB_PREFIX."c_lead_status";
+$tabname[30]= MAIN_DB_PREFIX."c_format_cards";
 
 // Dictionary labels
 $tablib=array();
@@ -142,6 +143,7 @@ $tablib[26]= "DictionaryUnits";
 $tablib[27]= "DictionaryProspectStatus";
 $tablib[28]= "DictionaryHolidayTypes";
 $tablib[29]= "DictionaryOpportunityStatus";
+$tablib[30]= "DictionaryFormatCards";
 
 // Requests to extract data
 $tabsql=array();
@@ -174,6 +176,7 @@ $tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".M
 $tabsql[27]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
 $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newByMonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
 $tabsql[29]= "SELECT rowid   as rowid, code, label, percent, position, active FROM ".MAIN_DB_PREFIX."c_lead_status";
+$tabsql[30]= "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards";
 
 // Criteria to sort dictionaries
 $tabsqlsort=array();
@@ -206,6 +209,7 @@ $tabsqlsort[26]="code ASC";
 $tabsqlsort[27]="code ASC";
 $tabsqlsort[28]="country ASC, code ASC";
 $tabsqlsort[29]="position ASC";
+$tabsqlsort[30]="code ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
@@ -238,6 +242,7 @@ $tabfield[26]= "code,label,short_label";
 $tabfield[27]= "code,libelle";
 $tabfield[28]= "code,label,affect,delay,newByMonth,country_id,country";
 $tabfield[29]= "code,label,percent,position";
+$tabfield[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
@@ -270,6 +275,7 @@ $tabfieldvalue[26]= "code,label,short_label";
 $tabfieldvalue[27]= "code,libelle";
 $tabfieldvalue[28]= "code,label,affect,delay,newByMonth,country";
 $tabfieldvalue[29]= "code,label,percent,position";
+$tabfieldvalue[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
@@ -302,6 +308,7 @@ $tabfieldinsert[26]= "code,label,short_label";
 $tabfieldinsert[27]= "code,libelle";
 $tabfieldinsert[28]= "code,label,affect,delay,newByMonth,fk_country";
 $tabfieldinsert[29]= "code,label,percent,position";
+$tabfieldinsert[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 
 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on
@@ -336,6 +343,7 @@ $tabrowid[26]= "";
 $tabrowid[27]= "id";
 $tabrowid[28]= "";
 $tabrowid[29]= "";
+$tabrowid[30]= "";
 
 // Condition to show dictionary in setup page
 $tabcond=array();
@@ -368,6 +376,7 @@ $tabcond[26]= ! empty($conf->product->enabled);
 $tabcond[27]= ! empty($conf->societe->enabled);
 $tabcond[28]= ! empty($conf->holiday->enabled);
 $tabcond[29]= ! empty($conf->projet->enabled);
+$tabcond[30]= ! empty($conf->label->enabled);
 
 // List of help for fields
 $tabhelp=array();
@@ -400,6 +409,7 @@ $tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"),'delay'=>$langs->trans("MinimumNoticePeriod"), 'newByMonth'=>$langs->trans("NbAddedAutomatically"));
 $tabhelp[29] = array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[30] = array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck=array();
@@ -432,6 +442,7 @@ $tabfieldcheck[26] = array();
 $tabfieldcheck[27] = array();
 $tabfieldcheck[28] = array();
 $tabfieldcheck[29] = array();
+$tabfieldcheck[30] = array();
 
 // Complete all arrays with entries found into modules
 complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index b0b865c89f4..f86468aeb9f 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2007      Patrick Raguin <patrick.raguin@gmail.com>
+ * Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.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
@@ -31,118 +31,29 @@ global $_Avery_Labels;
 // To get into inch, just /25.4
 // Size of pages available on: http://www.worldlabel.com/Pages/pageaverylabels.htm
 // _PosX = marginLeft+(_COUNTX*(width+SpaceX));
-$_Avery_Labels = array (
-			      '5160'=>array('name'=>'Avery-5160, WL-875WX',
-					    'paper-size'=>'letter',
-					    'metric'=>'mm',
-					    'marginLeft'=>5.58165,	// 0.21975 inch
-					    'marginTop'=>12.7,		// 0.5 inch
-					    'NX'=>3,
-					    'NY'=>10,
-					    'SpaceX'=>3.556,	// 0.14 inch
-					    'SpaceY'=>0,
-					    'width'=>65.8749,	// 2.59350 inch
-					    'height'=>25.4,		// 1 inch
-					    'font-size'=>7),
-			      '5161'=>array('name'=>'Avery-5161, WL-75WX',
-					    'paper-size'=>'letter',
-					    'metric'=>'mm',
-					    'marginLeft'=>4.445,	// 0.175 inch
-					    'marginTop'=>12.7,
-					    'NX'=>2,
-					    'NY'=>10,
-					    'SpaceX'=>3.968,	// 0.15625 inch
-					    'SpaceY'=>0,
-					    'width'=>101.6,		// 4 inch
-					    'height'=>25.4,		// 1 inch
-					    'font-size'=>7),
-			      '5162'=>array('name'=>'Avery-5162, WL-100WX',
-					    'paper-size'=>'letter',
-					    'metric'=>'mm',
-					    'marginLeft'=>3.8735,	// 0.1525 inch
-					    'marginTop'=>22.352,	// 0.88 inch
-					    'NX'=>2,
-					    'NY'=>7,
-					    'SpaceX'=>4.954,	// 0.195 inch
-					    'SpaceY'=>0,
-					    'width'=>101.6,		// 4 inch
-					    'height'=>33.781,	// 1.33 inch
-					    'font-size'=>8),
-			      '5163'=>array('name'=>'Avery-5163, WL-125WX',
-					    'paper-size'=>'letter',
-					    'metric'=>'mm',
-					    'marginLeft'=>4.572,	// 0.18 inch
-					    'marginTop'=>12.7,	// 0.5 inch
-					    'NX'=>2,
-					    'NY'=>5,
-					    'SpaceX'=>3.556,	// 0.14 inch
-					    'SpaceY'=>0,
-					    'width'=>101.6,		// 4 inch
-					    'height'=>50.8,		// 2 inch
-					    'font-size'=>10),
-			     /* Bugged '5164'=>array('name'=>'5164 (Letter)',
-					    'paper-size'=>'letter',
-					    'metric'=>'in',
-					    'marginLeft'=>0.148,
-					    'marginTop'=>0.5,
-					    'NX'=>2,
-					    'NY'=>3,
-					    'SpaceX'=>0.2031,
-					    'SpaceY'=>0,
-					    'width'=>4.0,
-					    'height'=>3.33,
-					    'font-size'=>12), */
-			      '8600'=>array('name'=>'Avery-8600',
-					    'paper-size'=>'letter',
-					    'metric'=>'mm',
-					    'marginLeft'=>7.1,
-					    'marginTop'=>19,
-					    'NX'=>3,
-					    'NY'=>10,
-					    'SpaceX'=>9.5,
-					    'SpaceY'=>3.1,
-					    'width'=>66.6,
-					    'height'=>25.4,
-					    'font-size'=>7),
-			      'L7163'=>array('name'=>'Avery-L7163',
-					     'paper-size'=>'A4',
-					     'metric'=>'mm',
-					     'marginLeft'=>5,
-					     'marginTop'=>15,
-					     'NX'=>2,
-					     'NY'=>7,
-					     'SpaceX'=>2.5,
-					     'SpaceY'=>0,
-					     'width'=>99.1,
-					     'height'=>38.1,
-					     'font-size'=>8),
-					// 85.0 x 54.0 mm
-			      'AVERYC32010'=>array('name'=>'Avery-C32010',
-					     'paper-size'=>'A4',
-					     'metric'=>'mm',
-					     'marginLeft'=>15,
-					     'marginTop'=>13,
-					     'NX'=>2,
-					     'NY'=>5,
-					     'SpaceX'=>10,
-					     'SpaceY'=>0,
-					     'width'=>85,
-					     'height'=>54,
-					     'font-size'=>10),
-					'CARD'=>array('name'=>'Dolibarr Business cards',
-					    'paper-size'=>'A4',
-					    'metric'=>'mm',
-					    'marginLeft'=>15,
-					    'marginTop'=>15,
-					    'NX'=>2,
-					    'NY'=>5,
-					    'SpaceX'=>0,
-					    'SpaceY'=>0,
-					    'width'=>85,
-					    'height'=>54,
-					    'font-size'=>10)
-		);
 
+$sql = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards WHERE active=1 ORDER BY code ASC";
+$resql = $db->query($sql);
+while ($row = $db->fetch_array($resql)) {
+    $_Avery_Labels[$row['code']]['name']=$row['name'];
+    $_Avery_Labels[$row['code']]['paper-size']=$row['paper_size'];
+    $_Avery_Labels[$row['code']]['orientation']=$row['orientation'];
+    $_Avery_Labels[$row['code']]['metric']=$row['metric'];
+    $_Avery_Labels[$row['code']]['marginLeft']=$row['leftmargin'];
+    $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
+    $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
+    $_Avery_Labels[$row['code']]['NX']=$row['nx'];
+    $_Avery_Labels[$row['code']]['NY']=$row['ny'];
+    $_Avery_Labels[$row['code']]['SpaceX']=$row['spacex'];
+    $_Avery_Labels[$row['code']]['SpaceY']=$row['spacey'];
+    $_Avery_Labels[$row['code']]['width']=$row['width'];
+    $_Avery_Labels[$row['code']]['height']=$row['height'];
+    $_Avery_Labels[$row['code']]['font-size']=$row['font_size'];
+    $_Avery_Labels[$row['code']]['custom_x']=$row['custom_x'];
+    $_Avery_Labels[$row['code']]['custom_y']=$row['custom_y'];
+}
+
+// we add characteristics to the name
 foreach($_Avery_Labels as $key => $val)
 {
 	$_Avery_Labels[$key]['name'].=' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index a768cfefc53..7d369d34b7c 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -247,7 +247,14 @@ class pdf_standard extends CommonStickerGenerator
 		$this->Tformat = $_Avery_Labels[$this->code];
 		if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
-		$this->format = $this->Tformat['paper-size'];
+        // standard format or custom
+        if ($this->Tformat['paper-size']!='custom') {
+            $this->format = $this->Tformat['paper-size'];
+        } else {
+            //custom
+            $resolution= array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+            $this->format = $resolution;
+        }
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -284,7 +291,7 @@ class pdf_standard extends CommonStickerGenerator
 			}
 		}
 
-		$pdf=pdf_getInstance($this->format,$this->Tformat['metric']);
+		$pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
 
 		if (class_exists('TCPDF'))
 		{
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index 0bfb2d849c5..09dfe2efe5e 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -241,7 +241,14 @@ class pdf_standardlabel extends CommonStickerGenerator
 		$this->Tformat = $_Avery_Labels[$this->code];
 		if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
-		$this->format = $this->Tformat['paper-size'];
+        // standard format or custom
+        if ($this->Tformat['paper-size']!='custom') {
+            $this->format = $this->Tformat['paper-size'];
+        } else {
+            //custom
+            $resolution= array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+            $this->format = $resolution;
+        }
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -268,7 +275,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 			}
 		}
 
-		$pdf=pdf_getInstance($this->format,$this->Tformat['metric']);
+		$pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
 
 		if (class_exists('TCPDF'))
 		{
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index dd70c608f07..2089cf6e0b9 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -282,7 +282,14 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		$this->Tformat = $_Avery_Labels[$this->code];
 		if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
-		$this->format = $this->Tformat['paper-size'];
+        // standard format or custom
+        if ($this->Tformat['paper-size']!='custom') {
+            $this->format = $this->Tformat['paper-size'];
+        } else {
+            //custom
+            $resolution= array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+            $this->format = $resolution;
+        }
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -309,7 +316,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			}
 		}
 
-		$pdf=pdf_getInstance($this->format,$this->Tformat['metric']);
+		$pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
 
 		if (class_exists('TCPDF'))
 		{
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 9ac450b90f8..e43345afc60 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -76,6 +76,39 @@ ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pa
 
 ALTER TABLE llx_website_page ADD CONSTRAINT fk_website_page_website FOREIGN KEY (fk_website) REFERENCES llx_website (rowid);
 
+CREATE TABLE llx_c_format_cards
+(
+  rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  code varchar(50) NOT NULL,
+  name varchar(50) NOT NULL,
+  paper_size varchar(20) NOT NULL,
+  orientation varchar(1) NOT NULL,
+  metric varchar(5) NOT NULL,
+  leftmargin double(24,8) NOT NULL,
+  topmargin double(24,8) NOT NULL,
+  nx integer NOT NULL,
+  ny integer NOT NULL,
+  spacex double(24,8) NOT NULL,
+  spacey double(24,8) NOT NULL,
+  width double(24,8) NOT NULL,
+  height double(24,8) NOT NULL,
+  font_size integer NOT NULL,
+  custom_x double(24,8) NOT NULL,
+  custom_y double(24,8) NOT NULL,
+  active integer NOT NULL
+) ENGINE=InnoDB;
+
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (1, '5160', 'Avery-5160, WL-875WX', 'letter', 'P', 'mm', 5.58165000, 12.70000000, 3, 10, 3.55600000, 0.00000000, 65.87490000, 25.40000000, 7, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (2, '5161', 'Avery-5161, WL-75WX', 'letter', 'P', 'mm', 4.44500000, 12.70000000, 2, 10, 3.96800000, 0.00000000, 101.60000000, 25.40000000, 7, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (3, '5162', 'Avery-5162, WL-100WX', 'letter', 'P', 'mm', 3.87350000, 22.35200000, 2, 7, 4.95400000, 0.00000000, 101.60000000, 33.78100000, 8, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (4, '5163', 'Avery-5163, WL-125WX', 'letter', 'P', 'mm', 4.57200000, 12.70000000, 2, 5, 3.55600000, 0.00000000, 101.60000000, 50.80000000, 10, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (5, '5164', '5164 (Letter)', 'letter', 'P', 'in', 0.14800000, 0.50000000, 2, 3, 0.20310000, 0.00000000, 4.00000000, 3.33000000, 12, 0.00000000, 0.00000000, 0);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (6, '8600', 'Avery-8600', 'letter', 'P', 'mm', 7.10000000, 19.00000000, 3, 10, 9.50000000, 3.10000000, 66.60000000, 25.40000000, 7, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (7, '99012', 'DYMO 99012 89*36mm', 'custom', 'L', 'mm', 1.00000000, 1.00000000, 1, 1, 0.00000000, 0.00000000, 36.00000000, 89.00000000, 10, 36.00000000, 89.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (8, '99014', 'DYMO 99014 101*54mm', 'custom', 'L', 'mm', 1.00000000, 1.00000000, 1, 1, 0.00000000, 0.00000000, 54.00000000, 101.00000000, 10, 54.00000000, 101.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (9, 'AVERYC32010', 'Avery-C32010', 'A4', 'P', 'mm', 15.00000000, 13.00000000, 2, 5, 10.00000000, 0.00000000, 85.00000000, 54.00000000, 10, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (10, 'CARD', 'Dolibarr Business cards', 'A4', 'P', 'mm', 15.00000000, 15.00000000, 2, 5, 0.00000000, 0.00000000, 85.00000000, 54.00000000, 10, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (11, 'L7163', 'Avery-L7163', 'A4', 'P', 'mm', 5.00000000, 15.00000000, 2, 7, 2.50000000, 0.00000000, 99.10000000, 38.10000000, 8, 0.00000000, 0.00000000, 1);
 
 
  
diff --git a/htdocs/install/mysql/tables/llx_c_format_cards.sql b/htdocs/install/mysql/tables/llx_c_format_cards.sql
new file mode 100644
index 00000000000..b58170c0d48
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_format_cards.sql
@@ -0,0 +1,39 @@
+-- ========================================================================
+-- Copyright (C) 2016 Frederic 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/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_c_format_cards
+(
+  rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  code varchar(50) NOT NULL,
+  name varchar(50) NOT NULL,
+  paper_size varchar(20) NOT NULL,
+  orientation varchar(1) NOT NULL,
+  metric varchar(5) NOT NULL,
+  leftmargin double(24,8) NOT NULL,
+  topmargin double(24,8) NOT NULL,
+  nx integer NOT NULL,
+  ny integer NOT NULL,
+  spacex double(24,8) NOT NULL,
+  spacey double(24,8) NOT NULL,
+  width double(24,8) NOT NULL,
+  height double(24,8) NOT NULL,
+  font_size integer NOT NULL,
+  custom_x double(24,8) NOT NULL,
+  custom_y double(24,8) NOT NULL,
+  active integer NOT NULL
+) ENGINE=InnoDB;

From e079021de3c454f5ed53e79e542f0c01b3038425 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 6 Feb 2016 12:16:12 +0100
Subject: [PATCH 058/421] data

---
 .../install/mysql/data/llx_c_format_cards.sql | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 htdocs/install/mysql/data/llx_c_format_cards.sql

diff --git a/htdocs/install/mysql/data/llx_c_format_cards.sql b/htdocs/install/mysql/data/llx_c_format_cards.sql
new file mode 100644
index 00000000000..b235fdccc5b
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_format_cards.sql
@@ -0,0 +1,34 @@
+-- ========================================================================
+-- Copyright (C) 2016 Frederic 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/>.
+--
+-- ========================================================================
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (1, '5160', 'Avery-5160, WL-875WX', 'letter', 'P', 'mm', 5.58165000, 12.70000000, 3, 10, 3.55600000, 0.00000000, 65.87490000, 25.40000000, 7, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (2, '5161', 'Avery-5161, WL-75WX', 'letter', 'P', 'mm', 4.44500000, 12.70000000, 2, 10, 3.96800000, 0.00000000, 101.60000000, 25.40000000, 7, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (3, '5162', 'Avery-5162, WL-100WX', 'letter', 'P', 'mm', 3.87350000, 22.35200000, 2, 7, 4.95400000, 0.00000000, 101.60000000, 33.78100000, 8, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (4, '5163', 'Avery-5163, WL-125WX', 'letter', 'P', 'mm', 4.57200000, 12.70000000, 2, 5, 3.55600000, 0.00000000, 101.60000000, 50.80000000, 10, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (5, '5164', '5164 (Letter)', 'letter', 'P', 'in', 0.14800000, 0.50000000, 2, 3, 0.20310000, 0.00000000, 4.00000000, 3.33000000, 12, 0.00000000, 0.00000000, 0);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (6, '8600', 'Avery-8600', 'letter', 'P', 'mm', 7.10000000, 19.00000000, 3, 10, 9.50000000, 3.10000000, 66.60000000, 25.40000000, 7, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (7, '99012', 'DYMO 99012 89*36mm', 'custom', 'L', 'mm', 1.00000000, 1.00000000, 1, 1, 0.00000000, 0.00000000, 36.00000000, 89.00000000, 10, 36.00000000, 89.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (8, '99014', 'DYMO 99014 101*54mm', 'custom', 'L', 'mm', 1.00000000, 1.00000000, 1, 1, 0.00000000, 0.00000000, 54.00000000, 101.00000000, 10, 54.00000000, 101.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (9, 'AVERYC32010', 'Avery-C32010', 'A4', 'P', 'mm', 15.00000000, 13.00000000, 2, 5, 10.00000000, 0.00000000, 85.00000000, 54.00000000, 10, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (10, 'CARD', 'Dolibarr Business cards', 'A4', 'P', 'mm', 15.00000000, 15.00000000, 2, 5, 0.00000000, 0.00000000, 85.00000000, 54.00000000, 10, 0.00000000, 0.00000000, 1);
+INSERT INTO llx_c_format_cards (rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active) VALUES (11, 'L7163', 'Avery-L7163', 'A4', 'P', 'mm', 5.00000000, 15.00000000, 2, 7, 2.50000000, 0.00000000, 99.10000000, 38.10000000, 8, 0.00000000, 0.00000000, 1);

From 2e1011ca0c384485177a602fa9b8338661a9241b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 12:26:12 +0100
Subject: [PATCH 059/421] Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to
 disable a feature that seems useless.

---
 htdocs/core/tpl/admin_extrafields_add.tpl.php   | 6 ++++--
 htdocs/core/tpl/admin_extrafields_edit.tpl.php  | 6 +++++-
 htdocs/core/tpl/admin_extrafields_view.tpl.php  | 5 ++---
 htdocs/install/mysql/tables/llx_extrafields.sql | 4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 6273ea93940..2b485f69fb9 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -117,9 +117,11 @@
 <!-- Required -->
 <tr><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required" <?php echo (GETPOST('required')?' checked':''); ?>></td></tr>
 <!-- Always editable -->
-<tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable" <?php echo (GETPOST('alwayseditable')?' checked':''); ?>></td></tr>
+<tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable" <?php echo ((GETPOST('alwayseditable') || ! GETPOST('button'))?' checked':''); ?>></td></tr>
 <!-- Is visible or not -->
-<tr><td><?php echo $langs->trans("IsHidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden" <?php echo (GETPOST('ishidden') ?' checked':''); ?>></td></tr>
+<?php if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) { ?>
+<tr><td><?php echo $langs->trans("Hidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden" <?php echo (GETPOST('ishidden') ?' checked' : ''); ?>></td></tr>
+<?php } ?>
 <?php if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { ?>
 <!-- By default visible into list -->
 <tr><td><?php echo $langs->trans("ByDefaultInList"); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 71b81ecee0f..b79fa539d2e 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -119,7 +119,11 @@ if(($type == 'select') || ($type == 'sellist') || ($type == 'checkbox') || ($typ
 <!-- Always editable -->
 <tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable" <?php echo ($alwayseditable?' checked':''); ?>></td></tr>
 <!-- Is visible or not -->
-<tr><td><?php echo $langs->trans("IsHidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden" <?php echo ($ishidden ?' checked':''); ?>></td></tr>
+<?php if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) { ?>
+<tr><td><?php echo $langs->trans("Hidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden" <?php echo ($ishidden ?' checked':''); ?>></td></tr>
+<?php } else { 
+	print '<input id="ishidden" type="hidden" name="ishidden" value="'.($ishidden?1:0).'">';
+}?>
 <!-- By default visible into list -->
 <?php if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { ?>
 <tr><td><?php echo $langs->trans("ByDefaultInList"); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index adb04bbc540..6acc81f009f 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -44,7 +44,7 @@ print '<td align="right">'.$langs->trans("Size").'</td>';
 print '<td align="center">'.$langs->trans("Unique").'</td>';
 print '<td align="center">'.$langs->trans("Required").'</td>';
 print '<td align="center">'.$langs->trans("AlwaysEditable").'</td>';
-print '<td align="center">'.$langs->trans("IsHidden").'</td>';
+if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.$langs->trans("Hidden").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
@@ -61,11 +61,10 @@ foreach($extrafields->attribute_type as $key => $value)
     print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
     print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
     print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";
-	print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";
+	if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";	// Add hidden option on not working feature. Why hide if user can't see it.
     print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
     print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
     print "</tr>";
-    //      $i++;
 }
 
 print "</table>";
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 062f20b5c9f..b7a7288980b 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -33,6 +33,6 @@ create table llx_extrafields
 	pos             integer DEFAULT 0,
 	alwayseditable  integer DEFAULT 0,							-- 1 if field can be edited whatever is element status
 	param			text,										-- extra parameters to define possible values of field
-	list			integer DEFAULT 0							-- list of values for field that are combo lists
-	,ishidden		integer DEFAULT 0
+	list			integer DEFAULT 0,							-- list of values for field that are combo lists
+	ishidden		integer DEFAULT 0							-- ??? example of use case ???
 )ENGINE=innodb;

From 8f8c63e9c8d370e8a7bb19ec7df31ea2cd8accb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 12:37:48 +0100
Subject: [PATCH 060/421] FIX Delete triggers must be before delete (reverse
 order compared to create)

---
 .../compta/paiement/class/paiement.class.php  | 64 +++++++++----------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 4fa9c5b9575..d01600a7125 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -291,12 +291,12 @@ class Paiement extends CommonObject
 
 
 	/**
-	 *      Supprime un paiement ainsi que les lignes qu'il a genere dans comptes
-	 *      Si le paiement porte sur un ecriture compte qui est rapprochee, on refuse
-	 *      Si le paiement porte sur au moins une facture a "payee", on refuse
+	 *  Delete a payment and generated links into account
+	 *  - Si le paiement porte sur un ecriture compte qui est rapprochee, on refuse
+	 *  - Si le paiement porte sur au moins une facture a "payee", on refuse
 	 *
-	 *      @param	int		$notrigger		No trigger
-	 *      @return int     				<0 si ko, >0 si ok
+	 *  @param	int		$notrigger		No trigger
+	 *  @return int     				<0 si ko, >0 si ok
 	 */
 	function delete($notrigger=0)
 	{
@@ -326,21 +326,43 @@ class Paiement extends CommonObject
 			return -2;
 		}
 
-		$accline = new AccountLine($this->db);
-
 		// Delete bank urls. If payment is on a conciliated line, return error.
-		if ($bank_line_id)
+		if ($bank_line_id > 0)
 		{
+			$accline = new AccountLine($this->db);
+
 			$result=$accline->fetch($bank_line_id);
 			if ($result == 0) $accline->rowid=$bank_line_id;    // If not found, we set artificially rowid to allow delete of llx_bank_url
 
-            $result=$accline->delete_urls($user);
+            // Delete bank account url lines linked to payment
+			$result=$accline->delete_urls($user);
             if ($result < 0)
             {
                 $this->error=$accline->error;
 				$this->db->rollback();
 				return -3;
             }
+
+            // Delete bank account lines linked to payment
+			$result=$accline->delete($user);
+			if ($result < 0)
+			{
+				$this->error=$accline->error;
+				$this->db->rollback();
+				return -4;
+			}
+		}
+
+		if (! $notrigger)
+		{
+			// Call triggers
+			$result=$this->call_trigger('PAYMENT_CUSTOMER_DELETE', $user);
+			if ($result < 0)
+			{
+			    $this->db->rollback();
+			    return -1;
+			 }
+		    // End call triggers
 		}
 
 		// Delete payment (into paiement_facture and paiement)
@@ -361,30 +383,6 @@ class Paiement extends CommonObject
 				return -3;
 			}
 
-			// Supprimer l'ecriture bancaire si paiement lie a ecriture
-			if ($bank_line_id)
-			{
-				$result=$accline->delete($user);
-				if ($result < 0)
-				{
-					$this->error=$accline->error;
-					$this->db->rollback();
-					return -4;
-				}
-			}
-
-			if (! $notrigger)
-			{
-				// Appel des triggers
-				$result=$this->call_trigger('PAYMENT_CUSTOMER_DELETE', $user);
-				if ($result < 0)
-				{
-				    $this->db->rollback();
-				    return -1;
-				 }
-			    // Fin appel triggers
-			}
-
 			$this->db->commit();
 			return 1;
 		}

From 3828fe70261c43e26fb3729e442901af79c9d456 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 15:06:37 +0100
Subject: [PATCH 061/421] FIX Bad filter on opportunities

---
 build/debian/README.howto                   | 13 +++++++++++++
 htdocs/core/class/html.formprojet.class.php |  9 +++++----
 htdocs/langs/en_US/projects.lang            |  3 +++
 htdocs/projet/list.php                      |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 01f19e28ccf..5a8b7b742a2 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -137,6 +137,19 @@ With only message
 tag 729538 +pending
 
 
+To remove status of a bug without "moreinfo" (bug can be processed)
+
+or replay to email 999999@bugs.debian.org + submitter of bug
+With a message starting with: 
+
+Control: tag -1 -moreinfo
+Thanks. Fixed into git.
+
+or replay to email control@bugs.debian.org
+With only message 
+tag 729538 -moreinfo
+
+
 
 ##### Testing a package into unstable env
 
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 4f65d5327d1..7ccb382a4a3 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -535,14 +535,14 @@ class FormProjets
 	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
 	 *
 	 *    @param   string      $htmlname           HTML name
-	 *    @param   int         $preselected        Preselected
+	 *    @param   string      $preselected        Preselected (int or 'all' or 'none')
 	 *    @param   int         $showempty          Add an empty line
 	 *    @param   int         $useshortlabel      Use short label
 	 *    @param   int         $showallnone        Add choice "All" and "None"
 	 *    @param   int         $showpercent        Show default probability for status
 	 *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	function selectOpportunityStatus($htmlname, $preselected=0, $showempty=1, $useshortlabel=0, $showallnone=0, $showpercent=0)
+	function selectOpportunityStatus($htmlname, $preselected='-1', $showempty=1, $useshortlabel=0, $showallnone=0, $showpercent=0)
 	{
 		global $conf, $langs;
 
@@ -560,8 +560,9 @@ class FormProjets
 			{
 				$sellist = '<select class="flat oppstatus" id="'.$htmlname.'" name="'.$htmlname.'">';
 				if ($showempty) $sellist.= '<option value="-1"></option>';
-				if ($showallnone) $sellist.= '<option value="all">--'.$langs->trans("Alls").'--</option>';
-				if ($showallnone) $sellist.= '<option value="none">--'.$langs->trans("None").'--</option>';
+				if ($showallnone) $sellist.= '<option value="all"'.($preselected == 'all'?' selected="selected"':'').'>--'.$langs->trans("OnlyOpportunitiesShort").'--</option>';
+				if ($showallnone) $sellist.= '<option value="openedopp"'.($preselected == 'openedopp'?' selected="selected"':'').'>--'.$langs->trans("OpenedOpportunitiesShort").'--</option>';
+				if ($showallnone) $sellist.= '<option value="none"'.($preselected == 'none'?' selected="selected"':'').'>--'.$langs->trans("NotAnOpportunityShort").'--</option>';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 1300963c2a8..5a27777d993 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -183,6 +183,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 7eea03111ee..6153d3b81ce 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -269,6 +269,7 @@ if ($search_opp_status)
 {
     if (is_numeric($search_opp_status) && $search_opp_status > 0) $sql .= " AND p.fk_opp_status = ".$db->escape($search_opp_status);
     if ($search_opp_status == 'all') $sql .= " AND p.fk_opp_status IS NOT NULL";
+    if ($search_opp_status == 'openedopp') $sql .= " AND p.fk_opp_status IS NOT NULL AND p.fk_opp_status NOT IN (SELECT rowid FROM ".MAIN_DB_PREFIX."c_lead_status WHERE code IN ('WIN','LOST'))";
     if ($search_opp_status == 'none') $sql .= " AND p.fk_opp_status IS NULL";
 }
 if ($search_public!='') $sql .= " AND p.public = ".$db->escape($search_public);

From 806d3642d8cd2b732cbde46781eca5f55105887a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 15:06:37 +0100
Subject: [PATCH 062/421] FIX Bad filter on opportunities

Conflicts:
	htdocs/core/class/html.formprojet.class.php
---
 build/debian/README.howto                   | 13 +++++++++++++
 htdocs/core/class/html.formprojet.class.php |  9 +++++----
 htdocs/langs/en_US/projects.lang            |  3 +++
 htdocs/projet/list.php                      |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 28f5ed6e2b1..859c571e7c5 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -136,6 +136,19 @@ With only message
 tag 729538 +pending
 
 
+To remove status of a bug without "moreinfo" (bug can be processed)
+
+or replay to email 999999@bugs.debian.org + submitter of bug
+With a message starting with: 
+
+Control: tag -1 -moreinfo
+Thanks. Fixed into git.
+
+or replay to email control@bugs.debian.org
+With only message 
+tag 729538 -moreinfo
+
+
 
 ##### Testing a package into unstable env
 
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 498604d9307..977b792568b 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -535,13 +535,13 @@ class FormProjets
 	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
 	 *
 	 *    @param   string      $htmlname           HTML name
-	 *    @param   int         $preselected        Preselected
+	 *    @param   string      $preselected        Preselected (int or 'all' or 'none')
 	 *    @param   int         $showempty          Add an empty line
 	 *    @param   int         $useshortlabel      Use short label
 	 *    @param   int         $showallnone        Add choice "All" and "None"
 	 *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	function selectOpportunityStatus($htmlname, $preselected=0, $showempty=1, $useshortlabel=0, $showallnone=0)
+	function selectOpportunityStatus($htmlname, $preselected='-1', $showempty=1, $useshortlabel=0, $showallnone=0)
 	{
 		global $conf, $langs;
 
@@ -559,8 +559,9 @@ class FormProjets
 			{
 				$sellist = '<select class="flat oppstatus" name="'.$htmlname.'">';
 				if ($showempty) $sellist.= '<option value="-1"></option>';
-				if ($showallnone) $sellist.= '<option value="all">--'.$langs->trans("Alls").'--</option>';
-				if ($showallnone) $sellist.= '<option value="none">--'.$langs->trans("None").'--</option>';
+				if ($showallnone) $sellist.= '<option value="all"'.($preselected == 'all'?' selected="selected"':'').'>--'.$langs->trans("OnlyOpportunitiesShort").'--</option>';
+				if ($showallnone) $sellist.= '<option value="openedopp"'.($preselected == 'openedopp'?' selected="selected"':'').'>--'.$langs->trans("OpenedOpportunitiesShort").'--</option>';
+				if ($showallnone) $sellist.= '<option value="none"'.($preselected == 'none'?' selected="selected"':'').'>--'.$langs->trans("NotAnOpportunityShort").'--</option>';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 830219f8aeb..6fa62f96905 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -179,6 +179,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability (depending on status of opportunity)
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index b5fb7e31666..9ae3513fa8a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -267,6 +267,7 @@ if ($search_opp_status)
 {
     if (is_numeric($search_opp_status) && $search_opp_status > 0) $sql .= " AND p.fk_opp_status = ".$db->escape($search_opp_status);
     if ($search_opp_status == 'all') $sql .= " AND p.fk_opp_status IS NOT NULL";
+    if ($search_opp_status == 'openedopp') $sql .= " AND p.fk_opp_status IS NOT NULL AND p.fk_opp_status NOT IN (SELECT rowid FROM ".MAIN_DB_PREFIX."c_lead_status WHERE code IN ('WIN','LOST'))";
     if ($search_opp_status == 'none') $sql .= " AND p.fk_opp_status IS NULL";
 }
 if ($search_public!='') $sql .= " AND p.public = ".$db->escape($search_public);

From 58f728eae5b6441c37cae96aec0b368976e5b0d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 15:11:45 +0100
Subject: [PATCH 063/421] Prepare 3.9rc

---
 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 b9a7819413f..84cb17669da 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','3.9.0-beta');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.9.0-rc');
 
 if (! defined('EURO')) define('EURO',chr(128));
 

From ebd9a97bab3fb2699badd354e607082d47c54793 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 15:48:38 +0100
Subject: [PATCH 064/421] Prepare 3.9

---
 build/debian/dolibarr.desktop                 |  1 +
 build/debian/install.forced.php.install       |  2 +-
 build/makepack-dolibarr.pl                    | 52 ++++++++++++-------
 htdocs/custom/README.md                       |  2 +-
 .../jquery/plugins/select2/release.sh         |  0
 5 files changed, 37 insertions(+), 20 deletions(-)
 mode change 100644 => 100755 htdocs/includes/jquery/plugins/select2/release.sh

diff --git a/build/debian/dolibarr.desktop b/build/debian/dolibarr.desktop
index f4b471edf13..dd59be792d2 100644
--- a/build/debian/dolibarr.desktop
+++ b/build/debian/dolibarr.desktop
@@ -22,5 +22,6 @@ Type=Application
 Categories=Office
 StartupNotify=true
 InitialPreference=5
+Keywords=erp,crm,billing,customer,supplier,stock,agenda,project,order,shipment
 #NoDisplay=true
 #OnlyShowIn=GNOME
diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install
index 099aab0675a..57ab33464bc 100644
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -26,7 +26,7 @@ $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
-// If we enable/disable libraries declaration during install, we must also check they are 
+// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are 
 // - not removed from package (see rm in rules file),
 // - declared into dependencies (see Depends in control file)
 //$force_dolibarr_lib_TCPDF_PATH='';
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index ac5529d7d8f..a641cf2e69c 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -523,25 +523,26 @@ if ($nboftargetok) {
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`;		# Keep this removal in case we embed libraries
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
         #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
    	    
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.txt`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/.gitattributes`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/license.md`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PDF`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/PHPExcel/Shared/PCLZip`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
@@ -549,6 +550,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}
@@ -837,17 +839,28 @@ if ($nboftargetok) {
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
 			# Removed duplicate license files
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/php-iban/LICENSE`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/ColReorder/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/ColVis/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/FixedColumns/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/Responsive/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/license.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/select2/LICENSE`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mike42/escpos-php/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt`;
+			
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING`;
 			# Removed files we don't need
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
 			
 			# Rename upstream changelog to match debian rules
 			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
@@ -909,8 +922,11 @@ if ($nboftargetok) {
 			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_api_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_card.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_list.php`;
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_script.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
 			$ret=`$cmd`;
@@ -1156,7 +1172,7 @@ if ($nboftargetok) {
 				print "$command\n";	
 				my $ret=`$command 2>&1`;
 
-				$command="rsync -s $OPTIONUPDATEDIST -e 'ssh' \"$file\" \"".$destFolder."\"";
+				$command="rsync -s -e 'ssh' \"$file\" \"".$destFolder."\"";
 				print "$command\n";	
 				my $ret=`$command 2>&1`;
 				print "$ret\n";
diff --git a/htdocs/custom/README.md b/htdocs/custom/README.md
index e46934902cb..5f15148f685 100644
--- a/htdocs/custom/README.md
+++ b/htdocs/custom/README.md
@@ -9,7 +9,7 @@ of the module.
 
 For example on Linux OS: Get the module from the command 
 mkdir ~/git; cd ~/git
-git clone https://git.doliforge.org/p/newmodule/newmodule.git
+git clone https://git.framasoft.org/p/newmodule/newmodule.git
 Then create the symbolic link
 ln -fs ~/git/newmodule/htdocs /path_to_dolibarr/htdocs/custom/newmodule 
 
diff --git a/htdocs/includes/jquery/plugins/select2/release.sh b/htdocs/includes/jquery/plugins/select2/release.sh
old mode 100644
new mode 100755

From c6fe8e54793feb2f7c1c215295313cb23dac4fcf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 17:13:24 +0100
Subject: [PATCH 065/421] Fix first install on debian.

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

diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index ac6f444f45e..ed0736ee9dc 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -77,7 +77,7 @@ $conffiletoshow = "htdocs/conf/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";
 
 
-if (! defined('DONOTLOADCONF') && file_exists($conffile))
+if (! defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8)    // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
 {
     $result=include_once $conffile;	// Load conf file
     if ($result)

From 4c859999e8f4209c155f7539ceceb368f36ea57c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 17:19:57 +0100
Subject: [PATCH 066/421] Fix first install on debian.

---
 build/debian/patches/use-etc-dolibarr-conf.patch | 4 ++--
 htdocs/install/inc.php                           | 3 ++-
 htdocs/support/inc.php                           | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/debian/patches/use-etc-dolibarr-conf.patch b/build/debian/patches/use-etc-dolibarr-conf.patch
index f911ad18af0..3bca20ee66f 100644
--- a/build/debian/patches/use-etc-dolibarr-conf.patch
+++ b/build/debian/patches/use-etc-dolibarr-conf.patch
@@ -34,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined
 --- a/htdocs/support/inc.php
 +++ b/htdocs/support/inc.php
 @@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
@@ -47,4 +47,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index ed0736ee9dc..c5ebc33c56e 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -77,7 +77,8 @@ $conffiletoshow = "htdocs/conf/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";
 
 
-if (! defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8)    // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
+// Load conf file if it is already defined
+if (! defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
 {
     $result=include_once $conffile;	// Load conf file
     if ($result)
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index c5f74469faa..36566b0d3f5 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -62,7 +62,8 @@ $conffiletoshow = "htdocs/conf/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";
 
 
-if (! defined('DONOTLOADCONF') && file_exists($conffile))
+// Load conf file if it is already defined
+if (! defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
 {
 	$result=include_once $conffile;	// Load conf file
 	if ($result)

From 77c059f7e60aa85f36d6bbd974daef589f93d75c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 17:24:54 +0100
Subject: [PATCH 067/421] We must remove flash binary part

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

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index a641cf2e69c..a057489ad04 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -527,7 +527,8 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
         #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
    	    
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extensions/TableTools/swf`;	# Source of this flash is not available
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	    # Source of this flash is not available
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;

From adb66eddf1c0cbc6783a59df138b433bfefa1e53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Feb 2016 17:45:02 +0100
Subject: [PATCH 068/421] Fix generation of rpm packages

---
 ChangeLog                        |  2 +-
 build/makepack-dolibarr.pl       | 13 ++++++++-----
 build/rpm/dolibarr-forrpm.patch  |  4 ++--
 build/rpm/dolibarr_fedora.spec   |  2 ++
 build/rpm/dolibarr_generic.spec  |  2 ++
 build/rpm/dolibarr_mandriva.spec |  2 ++
 build/rpm/dolibarr_opensuse.spec |  2 ++
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a17879fcbdd..13346d43763 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,7 @@ Upgrading to any other version or any other database system is abolutely require
 make a Dolibarr upgrade.
 
 
-***** ChangeLog for 3.9 compared to 3.8.* *****
+***** ChangeLog for 3.9.0 compared to 3.8.* *****
 For users:
 NEW: A new and more modern look for "eldy" theme.
 NEW: Introduce a new theme called "Material Design". 
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index a057489ad04..42091d0cda4 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -354,15 +354,18 @@ if ($nboftargetok) {
 		chdir("$SOURCE");
 		
 		# Test that the ChangeLog is ok
-		$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$BUILD" "$SOURCE/ChangeLog" 2>&1`;
+		$TMPBUILDTOCHECKCHANGELOG=$BUILD;
+		$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc//;
+		print "Check if ChangeLog is ok for version $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG\n";
+		$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG" "$SOURCE/ChangeLog" 2>&1`;
 		if (! $ret)
 		{
-			print "Error: The ChangeLogFile was not updated. Run the following command first:\n";
-			if (! $BUILD)
+			print "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\n";
+			if (! $BUILD || $BUILD eq '0-rc')	# For a major version
 			{
-				print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+				print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
 			}
-			else
+			else			# For a maintenance release
 			{
 				print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
 			}
diff --git a/build/rpm/dolibarr-forrpm.patch b/build/rpm/dolibarr-forrpm.patch
index 41f27e3b791..6c484345be9 100644
--- a/build/rpm/dolibarr-forrpm.patch
+++ b/build/rpm/dolibarr-forrpm.patch
@@ -25,7 +25,7 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined
 diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 --- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
 +++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
@@ -39,4 +39,4 @@ diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 7189b7b6dc2..0cd72f99cdd 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -183,6 +183,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
@@ -200,6 +201,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 0e28ff594ea..043088bf5d6 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -263,6 +263,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
@@ -280,6 +281,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 639ec2b52dd..3f439bb4a9a 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -180,6 +180,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
@@ -197,6 +198,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 23f42adaa0a..cc21d7083b3 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -191,6 +191,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
@@ -208,6 +209,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user

From 426f6541e67d17a4b05efd585ded2a90e00e180a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 01:05:53 +0100
Subject: [PATCH 069/421] Fix: can publish on foundation ref storage

---
 build/makepack-dolibarr.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 42091d0cda4..c719c56ec25 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -1154,8 +1154,10 @@ if ($nboftargetok) {
 	    		}
 	    		else
 	    		{
-	    			$destFolder="$NEWPUBLISH";
-		    		print "Publish file ".$file." to $NEWPUBLISH\n";
+	    			$filenameonly=$file;
+	    			$filenameonly =~ s{.*/}{};      # removes path  
+	    			$destFolder="$NEWPUBLISH/$filenameonly";
+		    		print "Publish file ".$file." to $NEWPUBLISH/".$filenameonly."\n";
 	    		}
 
 				# mkdir	   

From 38e5b773ced391b90419cc3b5d5a72742a8cae6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 01:11:12 +0100
Subject: [PATCH 070/421] Fix: can publish on foundation ref storage

---
 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 c719c56ec25..1d6542eafc9 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -1155,7 +1155,7 @@ if ($nboftargetok) {
 	    		else
 	    		{
 	    			$filenameonly=$file;
-	    			$filenameonly =~ s{.*/}{};      # removes path  
+	    			$filenameonly =~ s/.*\/([^\/]+\/[^\/]+)$/$1/;      # removes path  
 	    			$destFolder="$NEWPUBLISH/$filenameonly";
 		    		print "Publish file ".$file." to $NEWPUBLISH/".$filenameonly."\n";
 	    		}

From 8a8aaf618de388cff0f74cf3cce1872ed5b66e19 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 02:22:10 +0100
Subject: [PATCH 071/421] Fix: select to add box was lost

---
 htdocs/core/class/html.formother.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index c89844a91db..474c07f4b0a 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -977,15 +977,19 @@ class FormOther
 
         $confuserzone='MAIN_BOXES_'.$areacode;
 
+        // $boxactivated will be array of boxes enabled into global setup
+        // $boxidactivatedforuser will be array of boxes choosed by user
+        
         $selectboxlist=$boxlist='';
         $boxactivated=InfoBox::listBoxes($db,'activated',$areacode,(empty($user->conf->$confuserzone)?null:$user));	// Search boxes of common+user (or common only if user has no specific setup)
+        //var_dump($boxactivated);
         
         $boxidactivatedforuser=array();
         foreach($boxactivated as $box)
         {
         	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user
         }
-
+        
         $arrayboxtoactivatelabel=array();
         if (! empty($user->conf->$confuserzone))
         {
@@ -1174,7 +1178,7 @@ class FormOther
             $boxlist.= "</table>";
         }
 
-        return array('selectboxlist'=>$nbboxactivated?$selectboxlist:'', 'boxactivated'=>$boxactivated, 'boxlist'=>$boxlist);
+        return array('selectboxlist'=>count($boxactivated)?$selectboxlist:'', 'boxactivated'=>$boxactivated, 'boxlist'=>$boxlist);
     }
 
 

From 84f4f2d40f93e79d381463c1348d76987c6b7a21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 02:55:56 +0100
Subject: [PATCH 072/421] FIX The search on user/group was not using new code.
 Fiels used for search was not visible.

---
 htdocs/core/search.php      | 15 +++++++++++++--
 htdocs/user/group/index.php | 20 +++++++++++++++++++-
 htdocs/user/home.php        | 22 +++++++---------------
 3 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/search.php b/htdocs/core/search.php
index ccb8838e42f..05b03064096 100644
--- a/htdocs/core/search.php
+++ b/htdocs/core/search.php
@@ -126,8 +126,19 @@ if (GETPOST('search_project') != '')
 }
 if (GETPOST('search_task') != '')
 {
-	header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php?mode=search&search_all='.urlencode(GETPOST('search_task')));
-	exit;
+    header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php?mode=search&search_all='.urlencode(GETPOST('search_task')));
+    exit;
+}
+
+if (GETPOST('search_user') != '')
+{
+    header("Location: ".DOL_URL_ROOT.'/user/index.php?mode=search&sall='.urlencode(GETPOST('search_user')));
+    exit;
+}
+if (GETPOST('search_group') != '')
+{
+    header("Location: ".DOL_URL_ROOT.'/user/group/index.php?mode=search&sall='.urlencode(GETPOST('search_group')));
+    exit;
 }
 
 
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index f515c8307e7..af46fd39d21 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -49,6 +49,12 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield="g.nom";
 if (! $sortorder) $sortorder="ASC";
 
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+    'g.nom'=>"Group",
+    'g.note'=>"Note"
+);
+
 
 /*
  * View
@@ -85,7 +91,19 @@ if ($resql)
 
     $param="&search_group=".urlencode($search_group)."&amp;sall=".urlencode($sall);
     if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
-    print '<table class="noborder" width="100%">';
+    
+    if ($sall)
+    {
+        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+        print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
+    }
+    
+    $moreforfilter='';
+    
+	//$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+	//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+    
+    print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Group"),$_SERVER["PHP_SELF"],"g.nom",$param,"","",$sortfield,$sortorder);
     //multicompany
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 22b6d54adda..e9d9fb6c489 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -63,31 +63,23 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Search User
 $var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/user/index.php">';
+print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAUser").'</td></tr>';
+print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Ref").':</td><td><input class="flat" type="text" name="search_user" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td></tr>';
-print "</table><br>\n";
-print '</form>';
+print $langs->trans("User").':</td><td><input class="flat" type="text" name="search_user" size="18"></td><td'.($canreadperms?' rowspan="2"':'').'><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
 
 // Search Group
 if ($canreadperms)
 {
 	$var=false;
-	print '<form method="post" action="'.DOL_URL_ROOT.'/user/group/index.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover" width="100%">';
-	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAGroup").'</td></tr>';
 	print '<tr '.$bc[$var].'><td>';
-	print $langs->trans("Ref").':</td><td><input class="flat" type="text" name="search_group" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td></tr>';
-	print "</table><br>\n";
-	print '</form>';
+	print $langs->trans("Group").':</td><td><input class="flat" type="text" name="search_group" size="18"></td></tr>';
 }
 
+print "</table><br>\n";
+print '</form>';
 
 //print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';

From 9d427d224811ca9d93a6692c02047ffdcfcc5530 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 7 Feb 2016 07:41:53 +0100
Subject: [PATCH 073/421] Fixed: Missing link in eldy menu to init accountancy

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

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e72ec0d23c3..0497b50308f 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -555,6 +555,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 						{
 							$langs->load("products");
 							$newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=modulesadmintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
+
+							if (! empty($conf->accounting->enabled))
+							{
+								$langs->load("accountancy");
+								$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=home&amp;leftmenu=modulesadmintools", $langs->trans("InitAccountancy"), 1, $user->admin);
+							}
 						}
 					}
 				}

From eaca582cb5364257dfa2403954071891004a22e5 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 7 Feb 2016 08:47:02 +0100
Subject: [PATCH 074/421] Fixed: Problem of merging - Review page init
 accountancy again

---
 htdocs/accountancy/admin/productaccount.php | 93 ++++++++++-----------
 htdocs/langs/en_US/accountancy.lang         | 18 +++-
 2 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 8f3e178b525..bb1ab366427 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -1,6 +1,6 @@
-<?PHP
+<?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014 	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014 	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Ari Elbaz (elarifr)	<github@accedinfo.com>
@@ -20,13 +20,14 @@
  */
 
 /**
- * \file htdocs/accountancy/admin/productaccount.php
+ * \file 	htdocs/accountancy/admin/productaccount.php
  * \ingroup Accounting Expert
- * \brief Onglet de gestion de parametrages des ventilations
+ * \brief 	To define accounting account on product / service
  */
 require '../../main.inc.php';
 
 // Class
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@@ -40,7 +41,11 @@ $langs->load("compta");
 $langs->load("main");
 $langs->load("accountancy");
 
-// search & action GETPOST
+// Security check
+if (!$user->admin) accessforbidden();
+if (empty($conf->accounting->enabled)) accessforbidden();
+ 
+// Search & action GETPOST
 $action = GETPOST('action');
 $codeventil_buy = GETPOST('codeventil_buy', 'array');
 $codeventil_sell = GETPOST('codeventil_sell', 'array');
@@ -76,8 +81,8 @@ if (! $sortfield)
 	$sortfield = "p.ref";
 if (! $sortorder)
 	$sortorder = "ASC";
-	
-	// sales or purchase
+
+// Sales or Purchase mode ?
 if ($action == 'update') {
 	if (! empty($btn_changetype)) {
 		$error = 0;
@@ -129,9 +134,9 @@ if ($action == 'update') {
 					
 					dol_syslog("/accountancy/admin/productaccount.php sql=" . $sql, LOG_DEBUG);
 					if ($db->query($sql)) {
-						$msg .= '<div><font color="green">' . $langs->trans("Product") . ' ' . $productid . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
+						$msg .= '<div><font color="green">' . $langs->trans("Product") . ' ' . $productid . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . length_accountg($accounting->account_number) . '</font></div>';
 					} else {
-						$msg .= '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Product") . ' ' . $productid . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $accounting->account_number . '<br/> <pre>' . $sql . '</pre></font></div>';
+						$msg .= '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Product") . ' ' . $productid . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . length_accountg($accounting->account_number) . '<br/> <pre>' . $sql . '</pre></font></div>';
 					}
 				}
 				
@@ -144,13 +149,6 @@ if ($action == 'update') {
 	}
 }
 
-// Security check
-if ($user->societe_id > 0)
-	accessforbidden();
-	// TODO after adding menu
-	// if (! $user->rights->accounting->ventilation->dispatch)
-	// accessforbidden();
-
 $form = new FormVentilation($db);
 
 // Defaut AccountingAccount RowId Product / Service
@@ -176,12 +174,11 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_desc = '';
 }
 
-// debug move header to top
-llxHeader('', $langs->trans("Accounts"));
-
 /*
  * View
  */
+ 
+llxHeader('', $langs->trans("Accounts"));
 
 print '<script type="text/javascript">
 			$(function () {
@@ -206,7 +203,7 @@ $sql .= " WHERE (";
 
 $pcgver = $conf->global->CHARTOFACCOUNTS;
 
-IF ($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '') {
+if ($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '') {
 	$sql .= " p.accountancy_code_buy ='' OR p.accountancy_code_buy IS NULL";
 	$sql .= " OR (p.accountancy_code_buy  IS NOT NULL AND p.accountancy_code_buy  != '' AND p.accountancy_code_buy  NOT IN
 	(SELECT aa.account_number FROM " . MAIN_DB_PREFIX . "accounting_account as aa , " . MAIN_DB_PREFIX . "accounting_system as asy  WHERE fk_pcg_version = asy.pcg_version AND asy.rowid = " . $pcgver . "))";
@@ -237,29 +234,29 @@ $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
-	
-	/*
-	 * View
-	 */
-	print_barre_liste($langs->trans("ProductAccountingAccountSelect"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
-	
+
+	print load_fiche_titre($langs->trans("InitAccountancy"),'','title_setup');
+	print '<br>';
+	print $langs->trans("InitAccountancyDesc").'<br>';
+	print '<br>';
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="update">';
 	
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td>' . $langs->trans('OptionMode') . '</td><td>' . $langs->trans('Description') . '</td>';
+	print '<td>' . $langs->trans('Options') . '</td><td>' . $langs->trans('Description') . '</td>';
 	print "</tr>\n";
-	print '<tr ' . $bc[false] . '><td width="200"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL"' . ($accounting_product_mode != 'ACCOUNTANCY_BUY' ? ' checked' : '') . '> ' . $langs->trans('Accountancy_code_sell') . '</td>';
-	print '<td colspan="2">' . nl2br($langs->trans('OptionModeProductSell'));
+	print '<tr ' . $bc[false] . '><td width="25%"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL"' . ($accounting_product_mode != 'ACCOUNTANCY_BUY' ? ' checked' : '') . '> ' . $langs->trans('OptionModeProductSell') . '</td>';
+	print '<td colspan="2">' . nl2br($langs->trans('OptionModeProductSellDesc'));
 	print "</td></tr>\n";
-	print '<tr ' . $bc[true] . '><td width="200"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY"' . ($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '') . '> ' . $langs->trans('Accountancy_code_buy') . '</td>';
-	print '<td colspan="2">' . nl2br($langs->trans('OptionModeProductBuy')) . "</td></tr>\n";
+	print '<tr ' . $bc[true] . '><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY"' . ($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '') . '> ' . $langs->trans('OptionModeProductBuy') . '</td>';
+	print '<td colspan="2">' . nl2br($langs->trans('OptionModeProductBuyDesc')) . "</td></tr>\n";
 	
 	print "</table>\n";
 	
-	print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="changetype"></div>';
+	print '<br /><div align="right"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="changetype"></div>';
 	
 	print "<br>\n";
 	
@@ -267,33 +264,29 @@ if ($result) {
 		print $msg;
 	}
 	
-	// print '<td align="left"><b>' . $langs->trans("DescProductAccountingAccount") . '</b></td>&nbsp;';
-	// print_liste_field_titre($langs->trans("RowId"), $_SERVER["PHP_SELF"], "p.rowid", "", $param, '', $sortfield, $sortorder);
-	print '&nbsp;&nbsp;';
-	
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
+	/*
 	if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 		print '<th align="left">' . $langs->trans("Accountancy_code_buy") . '</td>';
-		print '<th align="left">' . $langs->trans("Accountancy_code_buy_suggest") . '</td>';
 	} else {
 		print '<th align="left">' . $langs->trans("Accountancy_code_sell") . '</td>';
-		print '<th align="left">' . $langs->trans("Accountancy_code_sell_suggest") . '</td>';
 	}
-	// print_liste_field_titre('');
-	print_liste_field_titre($langs->trans("Ventilate") . '<br><label id="select-all">' . $langs->trans('All') . '</label> / <label id="unselect-all">' . $langs->trans('None') . '</label>');
+	*/
+	print_liste_field_titre($langs->trans("AccountAccounting"));
+	print_liste_field_titre($langs->trans("Modify") . '<br><label id="select-all">' . $langs->trans('All') . '</label> / <label id="unselect-all">' . $langs->trans('None') . '</label>','','','','','align="center"');
 	print '</tr>';
 	
 	print '<tr class="liste_titre">';
-	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_ref" value="' . $search_ref . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_ref" value="' . $search_ref . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="30" name="search_desc" value="' . $search_desc . '"></td>';
 	
-	print '<td class="liste_titre" colspan="2">&nbsp;</td>';
-	print '<td align="right" class="liste_titre">';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td align="center" class="liste_titre">';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
 	print '&nbsp;';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
@@ -346,13 +339,12 @@ if ($result) {
 		// TODO ADJUST DESCRIPTION SIZE
 		// print '<td align="left">' . $obj->description . '</td>';
 		// TODO: we shoul set a user defined value to adjust user square / wide screen size
-		$trunclengh = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
+		$trunclengh = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 64;
 		print '<td style="' . $code_sell_p_l_differ . '">' . nl2br(dol_trunc($obj->description, $trunclengh)) . '</td>';
 		
-		// acountingaccount buy
-		
+		// Accounting account
 		if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-			print '<td align="left">' . $obj->accountancy_code_buy . '</td>';
+			// print '<td align="left">' . $obj->accountancy_code_buy . '</td>';
 			// TODO: replace by select
 			// print '<td align="left">' . $compta_prodbuy . '</td>';
 			// TODO: we shoul set a user defined value to adjust user square / wide screen size
@@ -361,9 +353,8 @@ if ($result) {
 			print $form->select_account($compta_prodbuy_id, 'codeventil_' . $product_static->id, 1);
 			print '</td>';
 		} else {
-			
-			// acountingaccount sel
-			print '<td align="left">' . $obj->accountancy_code_sell . '</td>';
+			// Accounting account sell
+			// print '<td align="left">' . $obj->accountancy_code_sell . '</td>';
 			// TODO: replace by select
 			// TODO: we shoul set a user defined value to adjust user square / wide screen size
 			// $trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
@@ -380,7 +371,7 @@ if ($result) {
 		$i ++;
 	}
 	print '</table>';
-	print '<br><div align="center"><input type="submit" class="butAction" name="changeaccount" value="' . $langs->trans("Change_Account") . '"></div>';
+	print '<br><div align="right"><input type="submit" class="butAction" name="changeaccount" value="' . $langs->trans("Validate") . '"></div>';
 	print '</form>';
 	
 	$db->free($result);
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 1103cbeb739..9f3941a42ec 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -105,6 +105,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -153,6 +154,8 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,8 +166,15 @@ Fieldname=Name of Field
 Headername=Name in header
 Type=Type of fields
 Param=Additionnal parameters
-EnabledProduct=In Product
-EnabledTiers=In Tiers
-EnabledVat=In Vat
+EnabledProduct=In product
+EnabledTiers=In third party
+EnabledVat=In VAT
 
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
\ No newline at end of file
+## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductBuy=Mode purchases
+OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
+OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
\ No newline at end of file

From c71bb9d67c356d3d280084f819c95bfab397b25f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 12:33:40 +0100
Subject: [PATCH 075/421] Fix filter on contract not visible

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

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index e8c722dcab3..040a623fe98 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -172,7 +172,7 @@ if ($resql)
     if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall);
+        print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
     
     // If the user can view prospects other than his'

From 28c89dc3e38bd418ada9f4bbc8e0b2d317fde27f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 13:10:36 +0100
Subject: [PATCH 076/421] Prepare the ground to have a full editable homearea
 page

---
 htdocs/core/class/html.formother.class.php |  57 ++++----
 htdocs/index.php                           | 150 ++++++++++++---------
 2 files changed, 111 insertions(+), 96 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 474c07f4b0a..fc8ee1c30d0 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -960,16 +960,15 @@ class FormOther
 
 
 
-
     /**
-     * 	Show a HTML Tab with boxes of a particular area including personalized choices of user.
+     * 	Get array with HTML tabs with boxes of a particular area including personalized choices of user.
      *  Class 'Form' must be known.
      *
      * 	@param	   User         $user		 Object User
      * 	@param	   String       $areacode    Code of area for pages (0=value for Home page)
      * 	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlist'=>)
      */
-    static function printBoxesArea($user,$areacode)
+    static function getBoxesArea($user,$areacode)
     {
         global $conf,$langs,$db;
 
@@ -980,9 +979,8 @@ class FormOther
         // $boxactivated will be array of boxes enabled into global setup
         // $boxidactivatedforuser will be array of boxes choosed by user
         
-        $selectboxlist=$boxlist='';
+        $selectboxlist='';
         $boxactivated=InfoBox::listBoxes($db,'activated',$areacode,(empty($user->conf->$confuserzone)?null:$user));	// Search boxes of common+user (or common only if user has no specific setup)
-        //var_dump($boxactivated);
         
         $boxidactivatedforuser=array();
         foreach($boxactivated as $box)
@@ -990,6 +988,7 @@ class FormOther
         	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user
         }
         
+        // Define selectboxlist
         $arrayboxtoactivatelabel=array();
         if (! empty($user->conf->$confuserzone))
         {
@@ -1092,8 +1091,8 @@ class FormOther
 	        $selectboxlist.='</script>'."\n";
         }
 
+        // Define boxlista and boxlistb
         $nbboxactivated=count($boxidactivatedforuser);
-        //print load_fiche_titre(($nbboxactivated?$langs->trans("OtherInformationsBoxes"):''),$selectboxlist,'','','otherboxes');
 
         if ($nbboxactivated)
         {
@@ -1102,13 +1101,13 @@ class FormOther
 
         	$emptybox=new ModeleBoxes($db);
 
-            $boxlist.='<table width="100%" class="notopnoleftnoright">';
-            $boxlist.='<tr><td class="notopnoleftnoright">'."\n";
+            //$boxlist.='<table width="100%" class="notopnoleftnoright">';
+            //$boxlist.='<tr><td class="notopnoleftnoright">'."\n";
 
-            $boxlist.='<div class="fichehalfleft">';
+            //$boxlist.='<div class="fichehalfleft">';
 
-            $boxlist.="\n<!-- Box left container -->\n";
-            $boxlist.='<div id="left" class="connectedSortable">'."\n";
+            $boxlista.="\n<!-- Box left container -->\n";
+            $boxlista.='<div id="left" class="connectedSortable">'."\n";
 
             // Define $box_max_lines
             $box_max_lines=5;
@@ -1124,9 +1123,9 @@ class FormOther
                     $ii++;
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
-                    // Affichage boite key
+                    // Show box
                     $box->loadBox($box_max_lines);
-                    $boxlist.= $box->outputBox();
+                    $boxlista.= $box->outputBox();
                 }
             }
 
@@ -1135,15 +1134,15 @@ class FormOther
             	$emptybox->box_id='A';
             	$emptybox->info_box_head=array();
             	$emptybox->info_box_contents=array();
-            	$boxlist.= $emptybox->outputBox(array(),array());
+            	$boxlista.= $emptybox->outputBox(array(),array());
             }
-            $boxlist.= "</div>\n";
-            $boxlist.= "<!-- End box left container -->\n";
+            $boxlista.= "</div>\n";
+            $boxlista.= "<!-- End box left container -->\n";
 
-            $boxlist.= '</div><div class="fichehalfright"><div class="ficheaddleft">';
+            //$boxlist.= '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-            $boxlist.= "\n<!-- Box right container -->\n";
-            $boxlist.= '<div id="right" class="connectedSortable">'."\n";
+            $boxlistb.= "\n<!-- Box right container -->\n";
+            $boxlistb.= '<div id="right" class="connectedSortable">'."\n";
 
             $ii=0;
             foreach ($boxactivated as $key => $box)
@@ -1155,9 +1154,9 @@ class FormOther
                     $ii++;
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
-                    // Affichage boite key
+                    // Show box
                     $box->loadBox($box_max_lines);
-                    $boxlist.= $box->outputBox();
+                    $boxlistb.= $box->outputBox();
                 }
             }
 
@@ -1166,19 +1165,19 @@ class FormOther
             	$emptybox->box_id='B';
             	$emptybox->info_box_head=array();
             	$emptybox->info_box_contents=array();
-            	$boxlist.= $emptybox->outputBox(array(),array());
+            	$boxlistb.= $emptybox->outputBox(array(),array());
             }
-            $boxlist.= "</div>\n";
-            $boxlist.= "<!-- End box right container -->\n";
+            $boxlistb.= "</div>\n";
+            $boxlistb.= "<!-- End box right container -->\n";
 
-            $boxlist.= '</div></div>';
-            $boxlist.= "\n";
+            //$boxlist.= '</div></div>';
+            //$boxlist.= "\n";
 
-            $boxlist.= "</td></tr>";
-            $boxlist.= "</table>";
+            //$boxlist.= "</td></tr>";
+            //$boxlist.= "</table>";
         }
 
-        return array('selectboxlist'=>count($boxactivated)?$selectboxlist:'', 'boxactivated'=>$boxactivated, 'boxlist'=>$boxlist);
+        return array('selectboxlist'=>count($boxactivated)?$selectboxlist:'', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
     }
 
 
diff --git a/htdocs/index.php b/htdocs/index.php
index d876b718ce8..3e2fa24eed0 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -73,7 +73,7 @@ if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$langs->trans("HomeAr
 llxHeader('',$title);
 
 
-$resultboxes=FormOther::printBoxesArea($user,"0");
+$resultboxes=FormOther::getBoxesArea($user,"0");
 
 
 print load_fiche_titre($langs->trans("HomeArea"),$resultboxes['selectboxlist'],'title_home');
@@ -107,38 +107,41 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 /*
  * Informations area
  */
-
-print '<table summary="Login info" class="noborder" width="100%">';
-print '<tr class="liste_titre"><th class="liste_titre" colspan="2">'.$langs->trans("Informations").'</th></tr>';
-print '<tr '.$bc[false].'>';
-print '<td class="nowrap">'.$langs->trans("User").'</td><td>'.$user->getNomUrl(0).'</td></tr>';
-print '<tr '.$bc[true].'>';
-print '<td class="nowrap">'.$langs->trans("PreviousConnexion").'</td><td>';
-if ($user->datepreviouslogin) print dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
-else print $langs->trans("Unknown");
-print '</td>';
-print "</tr>\n";
-print "</table>\n";
-
+$boxinfo='';
+$boxinfo.= '<div class="box">';
+$boxinfo.= '<table summary="'.dol_escape_htmltag($langs->trans("LoginInformation")).'" class="noborder boxtable" width="100%">';
+$boxinfo.= '<tr class="liste_titre"><th class="liste_titre" colspan="2">'.$langs->trans("Informations").'</th></tr>';
+$boxinfo.= '<tr '.$bc[false].'>';
+$boxinfo.= '<td class="nowrap">'.$langs->trans("User").'</td><td>'.$user->getNomUrl(0).'</td></tr>';
+$boxinfo.= '<tr '.$bc[true].'>';
+$boxinfo.= '<td class="nowrap">'.$langs->trans("PreviousConnexion").'</td><td>';
+if ($user->datepreviouslogin) $boxinfo.= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
+else $boxinfo.= $langs->trans("Unknown");
+$boxinfo.= '</td>';
+$boxinfo.= "</tr>\n";
+$boxinfo.= "</table>\n";
+$boxinfo.= '</div>';
+print $boxinfo;
 
 /*
  * Dashboard Dolibarr states (statistics)
  * Hidden for external users
  */
+$boxstat='';
+
 $langs->load("commercial");
 $langs->load("bills");
 $langs->load("orders");
 $langs->load("contracts");
 
-//print memory_get_usage();
 if (empty($user->societe_id))
 {
-    print '<br>';
-    print '<table  summary="'.$langs->trans("DolibarrStateBoard").'" class="noborder" width="100%">';
-    print '<tr class="liste_titre">';
-    print '<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
-    print '</tr>';
-    print '<tr class="impair"><td class="tdboxstats nohover">';
+    $boxstat.='<div class="box">';
+    $boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
+    $boxstat.='<tr class="liste_titre">';
+    $boxstat.='<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
+    $boxstat.='</tr>';
+    $boxstat.='<tr class="impair"><td class="tdboxstats nohover">';
 
     $var=true;
 
@@ -292,19 +295,21 @@ if (empty($user->societe_id))
 	            $var=!$var;
 	            if (!empty($langfile[$key])) $langs->load($langfile[$key]);
 	            $text=$langs->trans($titres[$key]);
-	            print '<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
-	            print '<div class="boxstats">';
-	            print '<span class="boxstatstext">'.img_object("",$icons[$key]).' '.$text.'</span><br>';
-	            print '<span class="boxstatsindicator">'.$board->nb[$val].'</span>';
-	            print '</div>';
-	            print '</a>';
+	            $boxstat.='<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
+	            $boxstat.='<div class="boxstats">';
+	            $boxstat.='<span class="boxstatstext">'.img_object("",$icons[$key]).' '.$text.'</span><br>';
+	            $boxstat.='<span class="boxstatsindicator">'.$board->nb[$val].'</span>';
+	            $boxstat.='</div>';
+	            $boxstat.='</a>';
 	        }
 	    }
     }
 
-    print '</td></tr>';
-    print '</table>';
+    $boxstat.='</td></tr>';
+    $boxstat.='</table>';
+    $boxstat.='</div>';
 }
+print $boxstat;
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
@@ -317,21 +322,18 @@ $showweather=empty($conf->global->MAIN_DISABLE_METEO)?1:0;
 //Array that contains all WorkboardResponse classes to process them
 $dashboardlines=array();
 
-print '<table class="noborder" width="100%">'."\n";
-print '<tr class="liste_titre">';
-print '<th class="liste_titre" colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
-print '<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
-print '<th class="liste_titre" align="right">'.$form->textwithpicto($langs->trans("Late"),$langs->trans("LateDesc")).'</th>';
-print '<th class="liste_titre">&nbsp;</th>';
+$boxwork='';
+$boxwork.='<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable" width="100%">'."\n";
+$boxwork.='<tr class="liste_titre">';
+$boxwork.='<th class="liste_titre" colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
+$boxwork.='<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
+$boxwork.='<th class="liste_titre" align="right">'.$form->textwithpicto($langs->trans("Late"),$langs->trans("LateDesc")).'</th>';
+$boxwork.='<th class="liste_titre">&nbsp;</th>';
 //print '<th class="liste_titre" width="20">&nbsp;</th>';
-if ($showweather) print '<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
-print '</tr>'."\n";
+if ($showweather) $boxwork.='<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
+$boxwork.='</tr>'."\n";
 
-
-//
 // Do not include sections without management permission
-//
-
 require DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
 // Number of actions to do (late)
@@ -357,7 +359,6 @@ if (! empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS)
 {
     include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
     $board=new Task($db);
-
     $dashboardlines[] = $board->load_board($user);
 }
 
@@ -367,7 +368,6 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
     include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
     $board=new Propal($db);
 	$dashboardlines[] = $board->load_board($user,"opened");
-
 	// Number of commercial proposals CLOSED signed (billed)
 	$dashboardlines[] = $board->load_board($user,"signed");
 }
@@ -377,7 +377,6 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
     $board=new Commande($db);
-
 	$dashboardlines[] = $board->load_board($user);
 }
 
@@ -386,7 +385,6 @@ if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->comma
 {
     include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
     $board=new CommandeFournisseur($db);
-
 	$dashboardlines[] = $board->load_board($user);
 }
 
@@ -396,7 +394,6 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
     include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
     $board=new Contrat($db);
     $dashboardlines[] = $board->load_board($user,"inactives");
-
 	// Number of active services (expired)
     $dashboardlines[] = $board->load_board($user,"expired");
 }
@@ -445,7 +442,6 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->appr
 {
     include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board=new ExpenseReport($db);
-
 	$dashboardlines[] = $board->load_board($user,'toapprove');
 }
 
@@ -454,7 +450,6 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->to_p
 {
     include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board=new ExpenseReport($db);
-
 	$dashboardlines[] = $board->load_board($user,'topay');
 }
 
@@ -483,55 +478,76 @@ foreach($valid_dashboardlines as $board)
 foreach($valid_dashboardlines as $board)
 {
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="16">'.$board->img.'</td><td>'.$board->label.'</td>';
-    print '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
-    print '<td align="right">';
+    $boxwork.= '<tr '.$bc[$var].'><td width="16">'.$board->img.'</td><td>'.$board->label.'</td>';
+    $boxwork.= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
+    $boxwork.= '<td align="right">';
     //if ($board->nbtodolate > 0)
     //{
         $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days");
-        print '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.$board->url.'"><span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
-        print $board->nbtodolate;
-        print '</span></a>';
+        $boxwork.= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.$board->url.'"><span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
+        $boxwork.= $board->nbtodolate;
+        $boxwork.= '</span></a>';
     //}
-    print '</td>';
-    print '<td align="left">';
-    if ($board->nbtodolate > 0) print img_picto($langs->trans("NActionsLate",$board->nbtodolate).' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')',"warning");
-    else print '&nbsp;';
-    print '</td>';
+    $boxwork.='</td>';
+    $boxwork.='<td align="left">';
+    if ($board->nbtodolate > 0) $boxwork.=img_picto($langs->trans("NActionsLate",$board->nbtodolate).' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')',"warning");
+    else $boxwork.='&nbsp;';
+    $boxwork.='</td>';
     /*print '<td class="nowrap" align="right">';
     print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
     print '</td>';*/
     
     if ($showweather)
     {
-        print '<td class="nohover hideonsmartphone" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
+        $boxwork.='<td class="nohover hideonsmartphone" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
         $text='';
         if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
         $options='height="64px"';
         if ($rowspan <= 2) $options='height="24"';  // Weather logo is smaller if dashboard has few elements
         else if ($rowspan <= 3) $options='height="48"';  // Weather logo is smaller if dashboard has few elements
-        print showWeather($totallate,$text,$options);
-        print '</td>';
+        $boxwork.=showWeather($totallate,$text,$options);
+        $boxwork.='</td>';
         $showweather=0;
     }
-    print '</tr>';
-    print "\n";
+    $boxwork.='</tr>';
+    $boxwork.="\n";
 }
 
+$boxwork.='</table>';   // End table array of working board
 
-print '</table>';   // End table array
+print $boxwork;
 
+print '</div></div></div><div class="clearboth"></div>';
+
+print '<div class="fichecenter fichecenterbis">';
 
-print '</div></div></div><div class="clearboth"></div><div class="fichecenter fichecenterbis">';
 
 /*
  * Show boxes
  */
 
-print $resultboxes['boxlist'];
+$boxlist.='<table width="100%" class="notopnoleftnoright">';
+$boxlist.='<tr><td class="notopnoleftnoright">'."\n";
+
+$boxlist.='<div class="fichehalfleft">';
+
+$boxlist.=$resultboxes['boxlista'];
+
+$boxlist.= '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+$boxlist.=$resultboxes['boxlistb'];
+
+$boxlist.= '</div></div>';
+$boxlist.= "\n";
+
+$boxlist.= "</td></tr>";
+$boxlist.= "</table>";
+
+print $boxlist;
 
 print '</div>';
 
+
 /*
  * Show security warnings
  */

From c1a6a2880b9e674379289f8262f0b022f08690f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 14:22:52 +0100
Subject: [PATCH 077/421] Debug numbering module for customer payment

---
 htdocs/admin/payment.php  |  8 ++++++--
 htdocs/compta/facture.php | 20 ++++++++++++++------
 htdocs/index.php          | 26 +++++++++++++++-----------
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 07113231bcc..fa99e2c202b 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -39,6 +39,8 @@ $label = GETPOST('label','alpha');
 $scandir = GETPOST('scandir','alpha');
 $type='invoice';
 
+if (empty($conf->global->PAYMENT_ADDON)) $conf->global->PAYMENT_ADDON = 'mod_payment_cicada.php';
+
 
 /*
  * Actions
@@ -62,11 +64,13 @@ if ($action == 'updateMask')
     }
 }
 
-    if ($action == 'setmod')
+if ($action == 'setmod')
 {
     dolibarr_set_const($db, "PAYMENT_ADDON",$value,'chaine',0,'',$conf->entity);
 }
 
+
+
 /*
  * View
  */
@@ -88,7 +92,7 @@ dol_fiche_head($head, 'payment', $langs->trans("Invoices"), 0, 'invoice');
  *  Numbering module
  */
 
-print load_fiche_titre($langs->trans("PaymentsNumberingModule"));
+print load_fiche_titre($langs->trans("PaymentsNumberingModule"), '', '');
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index b3f3bd25c17..c8bc79c1928 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1827,6 +1827,7 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 $formmargin = new FormMargin($db);
+$paymentstatic=new Paiement($db);
 $bankaccountstatic = new Account($db);
 if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
@@ -3125,6 +3126,7 @@ else if ($id > 0 || ! empty($ref))
 	// List of payments already done
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">' . ($object->type == Facture::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')) . '</td>';
+	print '<td class="liste_titre">' . $langs->trans('Date') . '</td>';
 	print '<td class="liste_titre">' . $langs->trans('Type') . '</td>';
 	if (! empty($conf->banque->enabled))
 		print '<td class="liste_titre" align="right">' . $langs->trans('BankAccount') . '</td>';
@@ -3135,10 +3137,10 @@ else if ($id > 0 || ! empty($ref))
 	$var = true;
 
 	// Payments already done (from payment on this invoice)
-	$sql = 'SELECT p.datep as dp, p.num_paiement, p.rowid, p.fk_bank,';
+	$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
 	$sql .= ' c.code as payment_code, c.libelle as payment_label,';
 	$sql .= ' pf.amount,';
-	$sql .= ' ba.rowid as baid, ba.ref, ba.label';
+	$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label';
 	$sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_paiement as c, ' . MAIN_DB_PREFIX . 'paiement_facture as pf, ' . MAIN_DB_PREFIX . 'paiement as p';
 	$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
 	$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
@@ -3160,15 +3162,21 @@ else if ($id > 0 || ! empty($ref))
 				$objp = $db->fetch_object($result);
 				$var = ! $var;
 				print '<tr ' . $bc [$var] . '><td>';
-				print '<a href="' . DOL_URL_ROOT . '/compta/paiement/card.php?id=' . $objp->rowid . '">' . img_object($langs->trans('ShowPayment'), 'payment') . ' ';
-				print dol_print_date($db->jdate($objp->dp), 'day') . '</a></td>';
+				$paymentstatic->id=$objp->rowid;
+				$paymentstatic->datepaye=$db->jdate($objp->dp);
+				$paymentstatic->ref=$objp->ref;
+				$paymentstatic->num_paiement=$objp->num_paiement;
+				$paymentstatic->payment_code=$objp->payment_code;
+				print $paymentstatic->getNomUrl(1);
+				print '</td>';
+				print '<td>'.dol_print_date($db->jdate($objp->dp), 'day') . '</td>';
 				$label = ($langs->trans("PaymentType" . $objp->payment_code) != ("PaymentType" . $objp->payment_code)) ? $langs->trans("PaymentType" . $objp->payment_code) : $objp->payment_label;
 				print '<td>' . $label . ' ' . $objp->num_paiement . '</td>';
 				if (! empty($conf->banque->enabled))
 				{
 					$bankaccountstatic->id = $objp->baid;
-					$bankaccountstatic->ref = $objp->ref;
-					$bankaccountstatic->label = $objp->ref;
+					$bankaccountstatic->ref = $objp->baref;
+					$bankaccountstatic->label = $objp->baref;
 					print '<td align="right">';
 					if ($bankaccountstatic->id)
 						print $bankaccountstatic->getNomUrl(1, 'transactions');
diff --git a/htdocs/index.php b/htdocs/index.php
index 3e2fa24eed0..0bb3b41ffb2 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -121,7 +121,8 @@ $boxinfo.= '</td>';
 $boxinfo.= "</tr>\n";
 $boxinfo.= "</table>\n";
 $boxinfo.= '</div>';
-print $boxinfo;
+//print $boxinfo;
+
 
 /*
  * Dashboard Dolibarr states (statistics)
@@ -309,7 +310,7 @@ if (empty($user->societe_id))
     $boxstat.='</table>';
     $boxstat.='</div>';
 }
-print $boxstat;
+//print $boxstat;
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
@@ -323,6 +324,7 @@ $showweather=empty($conf->global->MAIN_DISABLE_METEO)?1:0;
 $dashboardlines=array();
 
 $boxwork='';
+$boxwork.='<div class="box">';
 $boxwork.='<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable" width="100%">'."\n";
 $boxwork.='<tr class="liste_titre">';
 $boxwork.='<th class="liste_titre" colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
@@ -514,8 +516,9 @@ foreach($valid_dashboardlines as $board)
 }
 
 $boxwork.='</table>';   // End table array of working board
+$boxwork.='</div>';
 
-print $boxwork;
+//print $boxwork;
 
 print '</div></div></div><div class="clearboth"></div>';
 
@@ -531,10 +534,13 @@ $boxlist.='<tr><td class="notopnoleftnoright">'."\n";
 
 $boxlist.='<div class="fichehalfleft">';
 
+$boxlist.=$boxinfo;
+$boxlist.=$boxstat;
 $boxlist.=$resultboxes['boxlista'];
 
 $boxlist.= '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
+$boxlist.=$boxwork;
 $boxlist.=$resultboxes['boxlistb'];
 
 $boxlist.= '</div></div>';
@@ -592,8 +598,7 @@ $db->close();
 
 /**
  *  Show weather logo. Logo to show depends on $totallate and values for
- *  $conf->global->MAIN_METEO_OFFSET
- *  $conf->global->MAIN_METEO_GAP
+ *  $conf->global->MAIN_METEO_LEVELx
  *
  *  @param      int     $totallate      Nb of element late
  *  @param      string  $text           Text to show on logo
@@ -606,13 +611,12 @@ function showWeather($totallate,$text,$options)
 
     $out='';
     $offset=0;
-    $cursor=10; // By default
-    //if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
-    //if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
+    $factor=10; // By default
+    
     $level0=$offset;           if (! empty($conf->global->MAIN_METEO_LEVEL0)) $level0=$conf->global->MAIN_METEO_LEVEL0;
-    $level1=$offset+1*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
-    $level2=$offset+2*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
-    $level3=$offset+3*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
+    $level1=$offset+1*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
+    $level2=$offset+2*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
+    $level3=$offset+3*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
 
     if ($totallate <= $level0) $out.=img_picto_common($text,'weather/weather-clear.png',$options);
     if ($totallate > $level0 && $totallate <= $level1) $out.=img_picto_common($text,'weather/weather-few-clouds.png',$options);

From efc2eeea8398d8c621f313e5ee70ac98138495ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 14:41:06 +0100
Subject: [PATCH 078/421] Uniformize code for filters on payments

---
 htdocs/compta/paiement/list.php   | 40 ++++++++++-----
 htdocs/fourn/facture/paiement.php | 81 ++++++++++++++++---------------
 2 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 8cda05bec45..8ad94817699 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -56,6 +56,7 @@ $search_paymenttype=GETPOST("search_paymenttype");
 $search_amount=GETPOST("search_amount",'alpha');    // alpha because we must be able to search on "< x"
 $search_company=GETPOST("search_company",'alpha');
 $search_payment_num=GETPOST('search_payment_num','alpha');
+
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
@@ -67,6 +68,15 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="p.rowid";
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('paymentlist'));
+$extrafields = new ExtraFields($db);
+
+
+/*
+ * Actions
+ */
+
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
 	$search_ref="";
@@ -80,10 +90,6 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
     $month='';
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('paymentlist'));
-$extrafields = new ExtraFields($db);
-
 
 
 /*
@@ -167,11 +173,11 @@ else
     {
         $sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
     }
-    if ($search_ref)       		    $sql .=natural_search('p.ref', $search_ref);
+    if ($search_ref)       		    $sql .= natural_search('p.ref', $search_ref);
     if ($search_account > 0)      	$sql .=" AND b.fk_account=".$search_account;
     if ($search_paymenttype != "")  $sql .=" AND c.code='".$db->escape($search_paymenttype)."'";
-    if ($search_payment_num != '')  $sql .=" AND p.num_paiement = '".$db->escape($search_payment_num)."'";
-    if ($search_amount)      		$sql .=" AND p.amount='".$db->escape(price2num($search_amount))."'";
+    if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
+    if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1); 
     if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
 	// Add where from hooks
 	$parameters=array();
@@ -199,10 +205,12 @@ if ($resql)
 
     $paramlist='';
     $paramlist.=(GETPOST("orphelins")?"&orphelins=1":"");
-    $paramlist.=($search_ref?"&search_ref=".$search_ref:"");
-    $paramlist.=($search_company?"&search_company=".$search_company:"");
-    $paramlist.=($search_amount?"&search_amount=".$search_amount:"");
-
+    $paramlist.=($search_ref?"&search_ref=".urlencode($search_ref):"");
+    $paramlist.=($search_company?"&search_company=".urlencode($search_company):"");
+    $paramlist.=($search_amount?"&search_amount=".urlencode($search_amount):"");
+    $paramlist.=($search_payment_num?"&search_payment_num=".urlencode($search_payment_num):"");
+    if ($optioncss != '') $paramlist.='&optioncss='.urlencode($optioncss);
+    
     print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num, $nbtotalofrecords,'title_accountancy.png');
 
     print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
@@ -273,9 +281,10 @@ if ($resql)
         print $paymentstatic->getNomUrl(1);
         print '</td>';
 
+        // Date
         print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day').'</td>';
 
-        // Company
+        // Thirdparty
         print '<td>';
         if ($objp->socid)
         {
@@ -286,7 +295,12 @@ if ($resql)
         else print '&nbsp;';
         print '</td>';
 
-        print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td><td>'.$objp->num_paiement.'</td>';
+        // Type
+        print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
+        
+        // Payment number
+        print '<td>'.$objp->num_paiement.'</td>';
+        
         print '<td>';
         if ($objp->bid)
         {
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index c4b2e4c01f6..36f3fc2ffb3 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -46,6 +46,13 @@ $facid=GETPOST('facid','int');
 $socid=GETPOST('socid','int');
 $accountid	= GETPOST('accountid');
 
+$search_ref=GETPOST("search_ref","int");
+$search_account=GETPOST("search_account","int");
+$search_paymenttype=GETPOST("search_paymenttype");
+$search_amount=GETPOST("search_amount",'alpha');    // alpha because we must be able to search on "< x"
+$search_company=GETPOST("search_company",'alpha');
+$search_payment_num=GETPOST('search_payment_num','alpha');
+
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -69,6 +76,7 @@ if ($user->societe_id > 0)
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('paymentsupplier'));
+$extrafields = new ExtraFields($db);
 
 
 
@@ -76,6 +84,19 @@ $hookmanager->initHooks(array('paymentsupplier'));
  * Actions
  */
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search_ref="";
+    $search_account="";
+    $search_amount="";
+    $search_paymenttype="";
+    $search_payment_num="";
+    $search_company="";
+    $day='';
+    $year='';
+    $month='';
+}
+
 $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');
@@ -460,21 +481,6 @@ if (empty($action))
     if (! $sortorder) $sortorder='DESC';
     if (! $sortfield) $sortfield='p.datep';
 
-    $search_ref=GETPOST('search_ref');
-    $search_account=GETPOST('search_account');
-    $search_paymenttype=GETPOST('search_paymenttype');
-    $search_amount=GETPOST('search_amount');
-    $search_company=GETPOST('search_company');
-
-	if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
-	{
-		$search_ref="";
-		$search_account="";
-		$search_paymenttype="";
-		$search_amount="";
-		$search_company="";
-	}
-
     $sql = 'SELECT p.rowid as pid, p.datep as dp, p.amount as pamount, p.num_paiement,';
     $sql.= ' s.rowid as socid, s.nom as name,';
     $sql.= ' c.code as paiement_type, c.libelle as paiement_libelle,';
@@ -496,26 +502,12 @@ if (empty($action))
         $sql .= ' AND f.fk_soc = '.$socid;
     }
     // Search criteria
-    if (! empty($search_ref))
-    {
-        $sql .= ' AND p.rowid='.$db->escape($search_ref);
-    }
-    if (! empty($search_account) && $search_account > 0)
-    {
-        $sql .= ' AND b.fk_account='.$db->escape($search_account);
-    }
-    if (! empty($search_paymenttype))
-    {
-        $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
-    }
-    if (! empty($search_amount))
-    {
-        $sql .= " AND p.amount='".price2num($search_amount)."'";
-    }
-    if (! empty($search_company))
-    {
-        $sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
-    }
+    if ($search_ref)       		    $sql .= natural_search('p.rowid', $search_ref);
+    if ($search_account > 0)      	$sql .=" AND b.fk_account=".$search_account;
+    if ($search_paymenttype != "")  $sql .=" AND c.code='".$db->escape($search_paymenttype)."'";
+    if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
+    if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
+    if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
     $sql.= " GROUP BY p.rowid, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, c.code, c.libelle, ba.rowid, ba.label";
     if (!$user->rights->societe->client->voir) $sql .= ", sc.fk_soc, sc.fk_user";
     $sql.= $db->order($sortfield,$sortorder);
@@ -529,10 +521,11 @@ if (empty($action))
         $var=True;
 
         $paramlist='';
-        $paramlist.=(! empty($search_ref)?"&search_ref=".$search_ref:"");
-        $paramlist.=(! empty($search_company)?"&search_company=".$search_company:"");
-        $paramlist.=(! empty($search_amount)?"&search_amount='".$search_amount:"");
-        if ($optioncss != '') $paramlist.='&optioncss='.$optioncss;
+        $paramlist.=($search_ref?"&search_ref=".urlencode($search_ref):"");
+        $paramlist.=($search_company?"&search_company=".urlencode($search_company):"");
+        $paramlist.=($search_amount?"&search_amount=".urlencode($search_amount):"");
+        $paramlist.=($search_payment_num?"&search_payment_num=".urlencode($search_payment_num):"");
+        if ($optioncss != '') $paramlist.='&optioncss='.urlencode($optioncss);
 
         print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num);
 
@@ -544,6 +537,7 @@ if (empty($action))
         print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','',$paramlist,'align="center"',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('ThirdParty'),$_SERVER["PHP_SELF"],'s.nom','',$paramlist,'',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'c.libelle','',$paramlist,'',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"p.num_paiement","",$paramlist,"",$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$paramlist,'',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$paramlist,'align="right"',$sortfield,$sortorder);
         //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$paramlist,'',$sortfield,$sortorder);
@@ -562,6 +556,9 @@ if (empty($action))
         print '<td>';
         $form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1);
         print '</td>';
+        print '<td align="left">';
+        print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.$search_payment_num.'">';
+        print '</td>';
         print '<td>';
         $form->select_comptes($search_account,'search_account',0,'',1);
         print '</td>';
@@ -585,15 +582,19 @@ if (empty($action))
             // Date
             print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 
+            // Thirdparty
             print '<td>';
             if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->name,32).'</a>';
             else print '&nbsp;';
             print '</td>';
 
+            // Type
             $payment_type = $langs->trans("PaymentType".$objp->paiement_type)!=("PaymentType".$objp->paiement_type)?$langs->trans("PaymentType".$objp->paiement_type):$objp->paiement_libelle;
-
             print '<td>'.$payment_type.' '.dol_trunc($objp->num_paiement,32)."</td>\n";
 
+            // Payment number
+            print '<td>'.$objp->num_paiement.'</td>';
+            
             print '<td>';
             if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.dol_trunc($objp->label,24).'</a>';
             else print '&nbsp;';

From 3a5846ea7facf271060e0e3c4253175836a64350 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 14:45:49 +0100
Subject: [PATCH 079/421] Fix bad link to bank account

---
 htdocs/accountancy/journal/bankjournal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 4ca8b152202..3f62dfbe40e 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -122,7 +122,7 @@ $paymentsalstatic = new PaymentSalary($db);
 // Get code of finance journal
 $bank_code_journal = new Account($db);
 $result = $bank_code_journal->fetch($id_bank_account);
-$journal = $bank_code_journal->accountancy_journal;
+$journal = $bank_code_journal->ref;
 
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
@@ -524,7 +524,7 @@ else {
 	
 	llxHeader('', $langs->trans("FinanceJournal"));
 	
-	$nom = $langs->trans("FinanceJournal") . ' - ' . $journal;
+	$nom = $langs->trans("FinanceJournal") . ' - ' . $bank_code_journal->getNomUrl(1);
 	$builddate = time();
 	$description = $langs->trans("DescFinanceJournal") . '<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);

From 9da0164d90252ae26238f6b83812637a2f05a0d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 15:50:48 +0100
Subject: [PATCH 080/421] Uniformize code for lists

---
 dev/skeletons/skeleton_list.php               |  6 ++---
 htdocs/accountancy/bookkeeping/listbyyear.php |  9 ++++---
 htdocs/accountancy/customer/lines.php         |  8 +++---
 htdocs/accountancy/supplier/lines.php         |  8 +++---
 htdocs/adherents/cotisations.php              | 10 +++++---
 htdocs/adherents/list.php                     | 12 ++++-----
 htdocs/adherents/type.php                     | 16 ------------
 htdocs/commande/list.php                      |  8 +++---
 htdocs/commande/orderstoinvoice.php           | 10 ++++----
 htdocs/compta/bank/account.php                |  8 +++---
 htdocs/compta/bank/search.php                 | 15 +++++------
 htdocs/compta/deplacement/list.php            |  8 +++---
 htdocs/compta/facture/list.php                |  8 +++---
 htdocs/compta/facture/mergepdftool.php        | 14 +++--------
 htdocs/compta/paiement/cheque/list.php        |  8 +++---
 htdocs/compta/paiement/list.php               |  7 +++---
 htdocs/compta/prelevement/list.php            | 15 ++++++-----
 htdocs/compta/salaries/index.php              |  9 ++++---
 htdocs/compta/sociales/index.php              |  9 ++++---
 htdocs/compta/tva/reglement.php               |  9 ++++---
 htdocs/contrat/list.php                       | 11 ++++----
 htdocs/contrat/services.php                   |  8 +++---
 htdocs/core/class/html.form.class.php         | 19 ++++++++++++++
 htdocs/don/list.php                           | 11 +++++---
 htdocs/expedition/list.php                    |  8 +++---
 htdocs/expensereport/list.php                 |  8 +++---
 htdocs/fichinter/list.php                     |  8 +++---
 htdocs/fourn/commande/list.php                |  8 +++---
 htdocs/fourn/commande/orderstoinvoice.php     |  6 +++--
 htdocs/fourn/facture/impayees.php             | 10 +++++---
 htdocs/fourn/facture/list.php                 |  7 +++---
 htdocs/fourn/facture/paiement.php             |  9 ++++---
 htdocs/holiday/list.php                       |  6 ++---
 htdocs/loan/calc.php                          | 25 ++++++++++++-------
 htdocs/opensurvey/list.php                    |  4 +--
 .../product/canvas/product/tpl/list.tpl.php   | 12 ++++-----
 .../product/canvas/service/tpl/list.tpl.php   | 12 ++++-----
 htdocs/product/list.php                       |  8 +++---
 htdocs/product/price.php                      |  9 +++----
 htdocs/product/reassort.php                   |  8 +++---
 htdocs/product/reassortlot.php                |  8 +++---
 htdocs/product/stock/list.php                 |  8 +++---
 htdocs/product/stock/replenish.php            | 10 ++++----
 htdocs/projet/list.php                        |  8 +++---
 htdocs/projet/tasks/list.php                  |  4 +--
 htdocs/societe/consumption.php                |  4 +--
 htdocs/societe/list.php                       | 12 ++++-----
 htdocs/societe/price.php                      |  3 ++-
 htdocs/user/hierarchy.php                     |  5 ++--
 htdocs/user/index.php                         |  8 +++---
 50 files changed, 256 insertions(+), 208 deletions(-)

diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index 834e0b07e2f..80e3e38f438 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -352,9 +352,9 @@ if ($resql)
     }*/
     // Action column
 	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 	print '</tr>'."\n";
         
     
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index d04edae3bf2..e9751e0f12e 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -208,9 +208,10 @@ print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit
 print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, "", $sortfield, $sortorder);
-print '<th class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '"></td>';
+print '<td class="liste_titre" align="right">';
+print '</td>';
 print "</tr>\n";
+
 print '<tr class="liste_titre">';
 
 print '<td class="liste_titre">';
@@ -258,7 +259,9 @@ print '<td class="liste_titre">';
 print '<input type="text" size=3 class="flat" name="search_code_journal" value="' . $search_code_journal . '"/>';
 print '</td>';
 
-print '<td class="liste_titre">';
+print '<td class="liste_titre" align="right">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 0d5dbc35668..7b4d597fc12 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -246,9 +246,11 @@ if ($result) {
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
 	print '<td class="liste_titre" colspan="2">&nbsp;</td>';
-	print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
-	print "</td></tr>\n";
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
 	
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 6736c6a30d6..788eaa32e88 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -220,9 +220,11 @@ if ($result) {
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
 	print '<td class="liste_titre" colspan="2">&nbsp;</td>';
-	print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
-	print "</td></tr>\n";
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
 	
 	$facturefournisseur_static = new FactureFournisseur($db);
 	$product_static = new Product($db);
diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index cc8e39d32ca..7ff98ceb503 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -196,11 +196,13 @@ if ($result)
 
 	print '<td align="right" class="liste_titre">';
 	print '<input class="flat" type="text" name="search_amount" value="'.$search_amount.'" size="4">';
-	print '</td><td align="right" class="liste_titre" width="60px">';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print ' ';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print '</td>';
+	
+    // Action column
+    print '<td class="liste_titre" colspan="2" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';  
 
 	print "</tr>\n";
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index dc7266603ca..b19c6b2e35d 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -240,7 +240,7 @@ if ($resql)
 
     print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("EndSubscription"),$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans(""),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
 	print "</tr>\n";
 
 	// Line for filters fields
@@ -272,11 +272,11 @@ if ($resql)
     // Status
     print '<td class="liste_titre">&nbsp;</td>';
 
-	print '<td align="right" colspan="2" class="liste_titre">';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '&nbsp; ';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
+    // Action column
+    print '<td class="liste_titre" colspan="2" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';    
 
 	print "</tr>\n";
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index e2fc32f3bcb..f46b6d0268c 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -210,22 +210,6 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 	{
 		dol_print_error($db);
 	}
-
-	//dol_fiche_end();
-
-	/*
-	 * Hotbar
-	 */
-	print '<div class="tabsAction">';
-
-	// New type
-	if ($user->rights->adherent->configurer)
-	{
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=create">'.$langs->trans("NewType").'</a></div>';
-	}
-
-	print "</div>";
-
 }
 
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 8e5e73fd6fc..5a112e60861 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -378,9 +378,11 @@ if ($resql)
 	print '<td align="center">';
 	print $form->selectyesno('billed', $billed, 1, 0, 1);
 	print '</td>';
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print "</td></tr>\n";
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
 
 	$var=true;
 	$total=0;
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 79f18ad26ab..aeafb1ee67b 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -604,10 +604,11 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		//REF
 		print '<input class="flat" size="10" type="text" name="sref" value="'.$sref.'">';
 		print '</td>';
-		//print '<td class="liste_titre">';
+
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="10" name="sref_client" value="'.$sref_client.'">';
-
+        print '</td>';
+        
 		//DATE ORDER
 		print '<td class="liste_titre" align="center">';
 		print $period;
@@ -619,15 +620,14 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		print '</td>';
 
 		//SEARCH BUTTON
-		print '</td><td align="right" class="liste_titre">';
+		print '<td align="right" class="liste_titre">';
 		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 
 		//ALL/NONE
-		print '<td class="liste_titre" align="center">';
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
 		print '</td>';
 
-		print '</td></tr>';
+		print '</tr>';
 		print '</form>';
 
 		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index d6f8652d31c..0973ece78d3 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -555,10 +555,10 @@ if ($id > 0 || ! empty($ref))
 	print '<td align="right"><input type="text" class="flat" name="req_debit" value="'.$req_debit.'" size="4"></td>';
 	print '<td align="right"><input type="text" class="flat" name="req_credit" value="'.$req_credit.'" size="4"></td>';
 	print '<td align="center">&nbsp;</td>';
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 	print "</tr>\n";
 
 
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index 81a1a493892..f5231a87ef8 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -178,7 +178,9 @@ if ($resql)
 
 	print '<form method="post" action="search.php" name="search_form">'."\n";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
-
+	print '<input type="hidden" name="action" value="search">';
+	if (! empty($_REQUEST['bid'])) print '<input type="hidden" name="bid" value="'.$_REQUEST["bid"].'">';
+	
 	$moreforfilter = '';
 	
 	$moreforfilter.='<div class="divsearchfield">';
@@ -227,12 +229,11 @@ if ($resql)
 	print '<td class="liste_titre" align="right">';
 	print '<input type="text" class="flat" name="credit" size="4" value="'.$credit.'">';
 	print '</td>';
-	print '<td class="liste_titre" align="right">';
-	print '<input type="hidden" name="action" value="search">';
-	if (! empty($_REQUEST['bid'])) print '<input type="hidden" name="bid" value="'.$_REQUEST["bid"].'">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print "</td></tr>\n";
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
 
     // Loop on each record
     $total_debit=0;
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index a5684891ca8..497de98fa72 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -164,9 +164,11 @@ if ($resql)
     print '<td class="liste_titre" align="right">';
     // print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
     print '</td>';
-    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print "</td></tr>\n";
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+    print "</tr>\n";
 
     $var=true;
     while ($i < min($num,$limit))
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a680886827a..1c32462b884 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -783,9 +783,11 @@ if ($resql)
 	$liststatus=array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
 	print $form->selectarray('search_status', $liststatus, $search_status, 1);
     print '</td>';
-    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print "</td></tr>\n";
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+    print "</tr>\n";
 
     if ($num > 0)
     {
diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php
index cff600d3a57..19c1d083018 100644
--- a/htdocs/compta/facture/mergepdftool.php
+++ b/htdocs/compta/facture/mergepdftool.php
@@ -814,17 +814,7 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Rest"),$_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye,am","",$param,'align="right"',$sortfield,$sortorder);
-
-	$searchpitco='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	$searchpitco.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Reset"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	if (empty($mode))
-	{
-		print_liste_field_titre($searchpitco,$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
-	}
-	else
-	{
-		print_liste_field_titre($searchpitco,$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
-	}
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
 	print "</tr>\n";
 
 	// Lignes des champs de filtre
@@ -858,6 +848,8 @@ if ($resql)
 	print $form->selectarray('filtre', $liststatus, $filter, 1);
 	print '</td>';
 	print '<td class="liste_titre" align="center">';
+	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+	print $searchpitco;
 	if (empty($mode))
 	{
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 5e404a76242..2b3a7153793 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -151,9 +151,11 @@ if ($resql)
 	print '<td class="liste_titre" align="right">';
 	print '<input class="flat" type="text" size="6" name="search_amount" value="'.$search_amount.'">';
 	print '</td>';
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print "</td></tr>\n";
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+    print "</tr>\n";
 
     if ($num > 0)
     {
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 8ad94817699..33576328786 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -257,9 +257,10 @@ if ($resql)
     print '</td>';
     print '<td align="right">';
     print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
-	print '</td><td align="right">';
-    print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
     print '</td>';
     if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
     {
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index d0c6792a785..e7cef1a50ad 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -114,6 +114,7 @@ if ($result)
     print_barre_liste($langs->trans("WithdrawalsLines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
 
     print"\n<!-- debut table -->\n";
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
     print '<table class="liste" width="100%">';
 
     print '<tr class="liste_titre">';
@@ -126,8 +127,7 @@ if ($result)
     print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","","",'align="right"');
     print_liste_field_titre('');
 	print "</tr>\n";
-
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
+	
     print '<tr class="liste_titre">';
     print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'. dol_escape_htmltag($search_line).'" size="6"></td>';
     print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. dol_escape_htmltag($search_bon).'" size="8"></td>';
@@ -137,10 +137,10 @@ if ($result)
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
-    print '</form>';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+    print '</tr>';
 
     $var=True;
 
@@ -185,6 +185,9 @@ if ($result)
         $i++;
     }
     print "</table>";
+    
+    print '</form>';
+    
     $db->free($result);
 }
 else
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 52f1938a857..18554f30de8 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -167,9 +167,12 @@ if ($result)
 	print '</td>';
 	// Amount
 	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print "</td></tr>\n";
+
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
 
     while ($i < min($num,$limit))
     {
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 63c156609c8..2dbb3fd22d7 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -193,9 +193,12 @@ if ($resql)
 		print '<td class="liste_titre">&nbsp;</td>';
 		// Status
 		print '<td class="liste_titre">&nbsp;</td>';
-		print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-		print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-		print "</td></tr>\n";
+
+        print '<td class="liste_titre" align="right">';
+        $searchpitco=$form->showFilterAndCheckAddButtons(0);
+        print $searchpitco;
+        print '</td>';
+		print "</tr>\n";
 
 		while ($i < min($num,$limit))
 		{
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 91140bb97ca..3dee569b0ff 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -162,9 +162,12 @@ if ($result)
 	$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
 	print '</td>';
 	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print "</td></tr>\n";
+
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
 
 	while ($i < min($num,$limit))
     {
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 040a623fe98..f9e7351ed87 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -254,11 +254,12 @@ if ($resql)
     print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
     print '</td>';
     print '<td class="liste_titre">&nbsp;</td>';
-    //print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre" colspan="5"></td>';
-    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print "</td></tr>\n";
+    print '<td class="liste_titre" colspan="5" align="right"></td>';
+    print '<td>';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+    print "</tr>\n";
 
     $var=true;
     while ($i < min($num,$limit))
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index b7b257ca07a..2f1c3697058 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -238,9 +238,11 @@ if ($resql)
 	);
 	print $form->selectarray('search_status',$arrayofstatus,(strstr($search_status, ',')?-1:$search_status),1);
 	print '</td>';
-    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print "</td></tr>\n";
+	print '<td class="liste_titre" align="right">';
+	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+	print $searchpitco;
+	print '</td>';
+    print "</tr>\n";
 
 	$contractstatic=new Contrat($db);
 	$productstatic=new Product($db);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e60883c7149..aac6d0714f2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5676,5 +5676,24 @@ class Form
         return $out;
     }
 
+    /**
+     *	Return HTML to show the search and clear seach button
+     *
+     *  @param	int  	$addcheckuncheckall    Add the check all uncheck al button
+     *  @return	string                          
+     */
+    function showFilterAndCheckAddButtons($addcheckuncheckall=0)
+    {   
+        global $langs;
+        
+        $out='';
+        $out.='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+        if ($addcheckuncheckall)
+        {
+            
+        }
+        $out.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+        return $out;
+    }
 }
 
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 83e1db184a5..372e60b5f96 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -111,7 +111,7 @@ if (trim($search_name) != '')
 {
     $sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
 }
-if ($search_amount) $sql.=" AND d.amount='".$db->escape(price2num(trim($search_amount)))."'";
+if ($search_amount) $sql.= natural_search(array('d.amount'), price2num(trim($search_amount)), 1);
 
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
@@ -188,9 +188,12 @@ if ($resql)
         print '</td>';
     }
     print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print "</td></tr>\n";
+
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
 
 	$var=True;
 	while ($i < min($num,$limit))
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 4d1764ad0cf..c8dd6445ae2 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -189,12 +189,10 @@ if ($resql)
 	print '<td align="right">';
 	print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusSendingDraftShort'),'1'=>$langs->trans('StatusSendingValidatedShort'),'2'=>$langs->trans('StatusSendingProcessedShort')),$viewstatut,1);
 	print '</td>';
-	// Search
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
     print '</td>';
-
 	print "</tr>\n";
 
 	$var=True;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index efa6572dd10..b7f5be64455 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -265,10 +265,10 @@ if ($resql)
 	select_expensereport_statut($search_status,'search_status',1,1);
 	print '</td>';
 
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 
 	print "</tr>\n";
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 74edaf72099..cf40a285996 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -196,9 +196,11 @@ if ($result)
 	$liststatus=$interventionstatic->statuts_short;
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1);
 	print '</td>';
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print "</td></tr>\n";
+	print '<td class="liste_titre" align="right">';
+	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+	print $searchpitco;
+	print '</td>';
+    print "</tr>\n";
 
 	$companystatic=new Societe($db);
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index a3e0d8c9c33..3f4aee09bcd 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -269,9 +269,11 @@ if ($resql)
 	print '<td align="center">';
 	print $form->selectyesno('billed', $billed, 1, 0, 1);
 	print '</td>';
-	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print "</td></tr>\n";
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
 
 	$var=true;
 
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index d0502ed927a..3f75bca3a35 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -500,7 +500,8 @@ if (($action != 'create' && $action != 'add') && !$error) {
 		// print '<td class="liste_titre">';
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
-
+        print '</td>';
+        
 		// DATE ORDER
 		print '<td class="liste_titre" align="center">';
 		print $period;
@@ -512,8 +513,9 @@ if (($action != 'create' && $action != 'add') && !$error) {
 		print '</td>';
 
 		// SEARCH BUTTON
-		print '</td><td align="right" class="liste_titre">';
+		print '<td align="right" class="liste_titre">';
 		print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '"  value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+		print '</td>';
 
 		// ALL/NONE
 		print '<td class="liste_titre" align="center">';
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index ccb6671ba3a..a5ea3b88286 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -214,10 +214,12 @@ if ($user->rights->fournisseur->facture->lire)
 		print '<input class="flat" type="text" size="8" name="search_amount_no_tax" value="'.$search_amount_no_tax.'">';
 		print '</td><td class="liste_titre" align="right">';
 		print '<input class="flat" type="text" size="8" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
-		print '</td><td class="liste_titre" colspan="2" align="right">';
-		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-		print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-		print "</td></tr>\n";
+		print '</td>';
+        print '<td class="liste_titre" align="right">';
+        $searchpitco=$form->showFilterAndCheckAddButtons(0);
+        print $searchpitco;
+        print '</td>';
+		print "</tr>\n";
 
 		if ($num > 0)
 		{
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 6731c70d328..3c238a2f6f8 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -332,10 +332,11 @@ if ($resql)
 	print '</td><td class="liste_titre" align="right">';
 	$liststatus=array('0'=>$langs->trans("Draft"),'1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
 	print $form->selectarray('filtre', $liststatus, $search_status, 1);
-	print '</td><td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 	print "</tr>\n";
 
 	$facturestatic=new FactureFournisseur($db);
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 36f3fc2ffb3..3753001cf23 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -564,10 +564,11 @@ if (empty($action))
         print '</td>';
         print '<td align="right">';
         print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
-        print '</td><td align="right">';
-		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-        print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-		print '</td>';
+        print '</td>';
+        print '<td class="liste_titre" align="right">';
+        $searchpitco=$form->showFilterAndCheckAddButtons(0);
+        print $searchpitco;
+        print '</td>';
         print "</tr>\n";
 
         while ($i < min($num,$limit))
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index a92945ce502..3e74c7e14f5 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -368,9 +368,9 @@ $holiday->selectStatutCP($search_statut);
 print '</td>';
 
 // ACTION
-print '<td align="right">';
-print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+print '<td class="liste_titre" align="right">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php
index e73b5e0f255..681d0721f0a 100644
--- a/htdocs/loan/calc.php
+++ b/htdocs/loan/calc.php
@@ -115,6 +115,8 @@ if (! empty($errors)) {
     $form_complete   = false;
 }
 
+
+
 /*
  *	View
  */
@@ -125,31 +127,34 @@ print load_fiche_titre($langs->trans("LoanCalc"));
 print $langs->trans('LoanCalcDesc');
 
 print '<form method="GET" name="information" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="form_complete" value="1">';
-print '<table cellpadding="2" cellspacing="0" border="0" width="100%">';
+print '<input type="hidden" name="form_complete" value="1"><br>';
+
+dol_fiche_head('');
+
+print '<table class="noborder centpercent">';
 //print '<tr>';
 //print '<td align="right"><img src="/images/clear.gif" width="225" height="1" border="0" alt=""></td>';
 //print '<td align="smalltext" width="100%"><img src="/images/clear.gif" width="250" height="1" border="0" alt=""></td>';
 //print '</tr>';
-print '<tr bgcolor="#cccccc">';
+print '<tr>';
 print '<td align="center" colspan="2"><b>'.$langs->trans('PurchaseFinanceInfo').'</b></td>';
 print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
 print '<td align="right">'.$langs->trans('SalePriceOfAsset').':</td>';
 print '<td><input type="text" size="10" name="sale_price" value="'.$sale_price.'"> '.$langs->trans("Currency".$conf->currency).'</td>';print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
 print '<td align="right">'.$langs->trans('PercentageDown').':</td>';
 print '<td><input type="text" size="5" name="down_percent" value="'.$down_percent.'">%</td>';
 print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
 print '<td align="right">'.$langs->trans('LengthOfMortgage').':</td>';
 print '<td><input type="text" size="3" name="year_term" value="'.$year_term.'">years</td>';
 print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
 print '<td align="right">'.$langs->trans('AnnualInterestRate').':</td>';
 print '<td><input type="text" size="5" name="annual_interest_percent" value="'.$annual_interest_percent.'">%</td>';
 print '</tr>';
-print '<tr bgcolor="#eeeeee">';
+print '<tr>';
 print '<td align="right">'.$langs->trans('ExplainCalculations').':</td>';
 
 if (! empty($show_progress))
@@ -164,7 +169,9 @@ else
 print '</tr>';
 print '</table>';
 
-print '<br><center><input class="button" type="submit" value="'.$langs->trans("Calculate").'"> &nbsp; &nbsp; ';
+dol_fiche_end();
+
+print '<center><input class="button" type="submit" value="'.$langs->trans("Calculate").'"> &nbsp; &nbsp; ';
 print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
 
 // If the form has already been calculated, the $down_payment
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index d152364929d..b440b5ee43e 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -108,8 +108,8 @@ print '<td></td>';
 $arraystatus=array(''=>'&nbsp;','expired'=>$langs->trans("Expired"),'opened'=>$langs->trans("Opened"));
 print '<td align="center">'. $form->selectarray('status', $arraystatus, $status).'</td>';
 print '<td class="liste_titre" align="right">';
-print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
 print '</td>';
 print '</tr>'."\n";
 
diff --git a/htdocs/product/canvas/product/tpl/list.tpl.php b/htdocs/product/canvas/product/tpl/list.tpl.php
index c5e372cfad0..e57fd5adfab 100644
--- a/htdocs/product/canvas/product/tpl/list.tpl.php
+++ b/htdocs/product/canvas/product/tpl/list.tpl.php
@@ -69,12 +69,12 @@
  		if ($searchfield['enabled']) {
  			if ($searchfield['search'])	{ ?>
   				<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
-	<?php } else if ($key == $num) { ?>
-  			<td class="liste_titre" align="right">
-  				<input type="image" class="liste_titre" name="button_search" src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/search.png" alt="<?php echo $langs->trans('Search'); ?>">
-  				<input type="image" class="liste_titre" name="button_removefilter" src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/searchclear.png" alt="<?php echo $langs->trans('RemoveFilter'); ?>">
-  			</td>
-  	<?php } else { ?>
+	<?php } else if ($key == $num) { 
+        print '<td class="liste_titre" align="right">';
+        $searchpitco=$form->showFilterAndCheckAddButtons(0);
+        print $searchpitco;
+        print '</td>';
+	} else { ?>
   			<td class="liste_titre">&nbsp;</td>
  	<?php } } } ?>
 </tr>
diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php
index fe860c1bf73..4fc875e15bf 100644
--- a/htdocs/product/canvas/service/tpl/list.tpl.php
+++ b/htdocs/product/canvas/service/tpl/list.tpl.php
@@ -69,12 +69,12 @@
  		if ($searchfield['enabled']) {
  			if ($searchfield['search'])	{ ?>
   				<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
-	<?php } else if ($key == $num) { ?>
-  			<td class="liste_titre" align="right">
-  				<input type="image" class="liste_titre" name="button_search" src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/search.png" alt="<?php echo $langs->trans('Search'); ?>">
-  				<input type="image" class="liste_titre" name="button_removefilter" src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/searchclear.png" alt="<?php echo $langs->trans('RemoveFilter'); ?>">
-  			</td>
-  	<?php } else { ?>
+	<?php } else if ($key == $num) { 	
+        print '<td class="liste_titre" align="right">';
+        $searchpitco=$form->showFilterAndCheckAddButtons(0);
+        print $searchpitco;
+        print '</td>';
+ 			} else { ?>
   			<td class="liste_titre">&nbsp;</td>
  	<?php } } } ?>
 </tr>
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 6451f8bdde5..088f7e73c66 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -548,10 +548,10 @@ else
 	            print $form->selectarray('tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')),$tobuy,1);
 	            print '</td>';
     		}
-    		print '<td class="liste_titre nowrap" align="right">';
-    		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    		print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    		print '</td>';
+            print '<td class="liste_titre" align="right">';
+            $searchpitco=$form->showFilterAndCheckAddButtons(0);
+            print $searchpitco;
+            print '</td>';
 
     		print '</tr>';
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 1f635a96262..b8c9222fab6 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1459,11 +1459,10 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
     		print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
     		print '<td colspan="8">&nbsp;</td>';
     		// Print the search button
-    		print '<td class="liste_titre" align="right">';
-    		print '<input class="liste_titre" name="button_search" type="image" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-    		print ' ';
-    		print '<input class="liste_titre" name="button_removefilter" type="image" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/searchclear.png" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
-    		print '</td>';
+            print '<td class="liste_titre" align="right">';
+            $searchpitco=$form->showFilterAndCheckAddButtons(0);
+            print $searchpitco;
+            print '</td>';
     		print '</tr>';
 		}
 		
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index b8a52024dfc..27f85cd90ab 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -279,10 +279,10 @@ if ($resql)
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" alt="'.$langs->trans("Search").'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" alt="'.$langs->trans("RemoveFilter").'">';
-	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 	print '</tr>';
 
 	$product_static=new Product($db);
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 87d6d4e46eb..3b77f9c5ba7 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -292,10 +292,10 @@ if ($resql)
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" alt="'.$langs->trans("Search").'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" alt="'.$langs->trans("RemoveFilter").'">';
-	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 	print '</tr>';
 
 	$product_static=new Product($db);
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 6d487de21e3..bebfc87b528 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -153,10 +153,10 @@ if ($result)
 	print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
 	print '</td>';
 
-	print '<td class="liste_titre nowrap" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 
 	print '</tr>';
 
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 94629a3e821..d29ee366bb0 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -468,11 +468,11 @@ print '<td class="liste_titre">&nbsp;</td>'.
 	'<td class="liste_titre" align="right">&nbsp;</td>'.
 	'<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&nbsp;<input type="checkbox" id="salert" name="salert" ' . (!empty($alertchecked)?$alertchecked:'') . '></td>'.
 	'<td class="liste_titre" align="right">&nbsp;</td>'.
-	'<td class="liste_titre">&nbsp;</td>'.
-	'<td class="liste_titre" align="right">'.
-	'<input class="liste_titre" name="button_search" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">'.
-	'<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">'.
-	'</td>';
+	'<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 print '</tr>';
 
 $prod = new Product($db);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 6153d3b81ce..75dca94540b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -516,10 +516,10 @@ if ($resql)
         print '</td>';
     }
     // Action column
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 
     print '</tr>'."\n";
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index e140ee2f672..98bbff88483 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -504,8 +504,8 @@ if ($resql)
     }
     // Action column
     print '<td class="liste_titre" align="right">';
-    print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
     print '</td>';
     print '</tr>';
     
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 0c5e6646889..4f1f9fb05d6 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -348,8 +348,8 @@ print '<td class="liste_titre" align="left">';
 print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
 print '</td>';
 print '<td class="liste_titre" align="right">';
-print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("resetFilters")).'" title="'.dol_escape_htmltag($langs->trans("resetFilters")).'">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index d8e22b3974d..7cfc07918fd 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -718,7 +718,8 @@ if ($resql)
     
     // Type (customer/prospect/supplier)
     print '<td class="liste_titre maxwidthonsmartphone" align="middle">';
-	print '<select class="flat" name="search_type">';
+	if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
+    print '<select class="flat" name="search_type">';
 	print '<option value="-1"'.($search_type==''?' selected':'').'>&nbsp;</option>';
 	if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
 	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type=='2,3'?' selected':'').'>'.$langs->trans('Prospect').'</option>';
@@ -803,11 +804,10 @@ if ($resql)
         print '</td>';
     }
     // Action column
-	print '<td class="liste_titre" align="right">';
-	if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 
 	print "</tr>\n";
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 589c102c8a3..7ac093ca7dd 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -509,7 +509,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
             print '<td colspan="8">&nbsp;</td>';
             // Print the search button
             print '<td class="liste_titre" align="right">';
-            print '<input class="liste_titre" name="button_search" type="image" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+            $searchpitco=$form->showFilterAndCheckAddButtons(0);
+            print $searchpitco;
             print '</td>';
             print '</tr>';
             
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 8ac96a336f4..66d725b3204 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -152,8 +152,9 @@ print '<td>&nbsp;</td>';
 print '<td align="right">';
 print $form->selectarray('search_statut', array('-1'=>'','1'=>$langs->trans('Enabled')),$search_statut);
 print '</td>';
-print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+print '<td class="liste_titre" align="right">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index d0ac0aaa66d..f0fa04327cd 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -395,10 +395,10 @@ if ($result)
         print '</td>';
     }
     // Action column
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
 	
     print "</tr>\n";
 

From b68047428a73a0e11065d6a5534f25559533c8bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 16:02:30 +0100
Subject: [PATCH 081/421] Fix filter on cron

---
 htdocs/cron/class/cronjob.class.php |  3 ++-
 htdocs/cron/list.php                | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 9ef47c30ea7..5a3be50c738 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -395,7 +395,8 @@ class Cronjob extends CommonObject
     	$sql.= " t.test";
     	$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
     	$sql.= " WHERE 1 = 1";
-    	if ($status >= 0) $sql.= " AND t.status = ".(empty($status)?'0':'1');
+    	if ($status >= 0 && $status < 2) $sql.= " AND t.status = ".(empty($status)?'0':'1');
+    	if ($status == 2) $sql.= " AND t.status = 2";
     	//Manage filter
     	if (is_array($filter) && count($filter)>0) {
     		foreach($filter as $key => $value) {
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 49f5878d436..a42feafc437 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012      Nicolas Villa aka Boyquotes http://informetic.fr
- * Copyright (C) 2013      Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.srouceforge.net>
+ * Copyright (C) 2013      Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * 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
@@ -35,11 +35,6 @@ $langs->load("bills");
 
 if (!$user->rights->cron->read) accessforbidden();
 
-
-/*
- * Actions
- */
-
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $id=GETPOST('id','int');
@@ -57,7 +52,7 @@ if (empty($sortorder)) $sortorder="DESC";
 if (empty($sortfield)) $sortfield="t.status";
 if (empty($arch)) $arch = 0;
 if ($page == -1) {
-	$page = 0 ;
+    $page = 0 ;
 }
 
 $limit = $conf->global->MAIN_SIZE_LISTE_LIMIT;
@@ -65,6 +60,11 @@ $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
+
+/*
+ * Actions
+ */
+
 // Do we click on purge search criteria ?
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
@@ -79,8 +79,8 @@ if (!empty($search_label))
 }
 
 // Delete jobs
-if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete){
-
+if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete)
+{
 	//Delete cron task
 	$object = new Cronjob($db);
 	$object->id=$id;
@@ -92,8 +92,8 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->del
 }
 
 // Execute jobs
-if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute){
-
+if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute)
+{
 	$object = new Cronjob($db);
 	$job = $object->fetch($id);
 

From baa6172ead70cb11dba7ce37b7ab3acee8ca2a64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 16:13:33 +0100
Subject: [PATCH 082/421] Fix look for first incoterm combo

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index aac6d0714f2..ca4d9550bcb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -645,11 +645,11 @@ class Form
      *  @param	string	$page       			Defined the form action
      *  @param  string	$htmlname       		Name of html select object
      *  @param  string	$htmloption     		Options html on select object
-     * 	@param	int		$forcecombo				Force to use combo box
+     * 	@param	int		$forcecombo				Force to use standard combo box (no ajax use)
      *  @param	array	$events					Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
      *  @return string           				HTML string with select and input
      */
-    function select_incoterms($selected='', $location_incoterms='', $page='',$htmlname='incoterm_id',$htmloption='', $forcecombo=0, $events=array())
+    function select_incoterms($selected='', $location_incoterms='', $page='', $htmlname='incoterm_id', $htmloption='', $forcecombo=1, $events=array())
     {
         global $conf,$langs;
 
@@ -667,7 +667,7 @@ class Form
         $resql=$this->db->query($sql);
         if ($resql)
         {
-        	if (!$forcecombo)
+        	if ($conf->use_javascript_ajax && ! $forcecombo)
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname, $events);
@@ -680,8 +680,8 @@ class Form
 	            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			}
 
-            $out.= '<select id="'.$htmlname.'" class="flat selectincoterm" name="'.$htmlname.'" '.$htmloption.'>';
-			$out.= '<option value=""></option>';
+            $out.= '<select id="'.$htmlname.'" class="flat selectincoterm noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';
+			$out.= '<option value="0">&nbsp;</option>';
             $num = $this->db->num_rows($resql);
             $i = 0;
             if ($num)

From 786f16de0204cfc975becb3165e1e6545200c608 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 16:20:07 +0100
Subject: [PATCH 083/421] Add comment

---
 htdocs/core/class/commondocgenerator.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 5804ab4cf9f..b8aa683097f 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -134,9 +134,8 @@ abstract class CommonDocGenerator
             'mycompany_idprof6'=>$mysoc->idprof6,
         	'mycompany_vatnumber'=>$mysoc->tva_intra,
 			'mycompany_object'=>$mysoc->object,
-        	// Only private not exists for "mysoc"
             'mycompany_note_private'=>$mysoc->note_private,
-
+            //'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
         );
     }
 

From 81aae30253ff494a4f38624238845fc632f28564 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 19:55:41 +0100
Subject: [PATCH 084/421] NEW Add a checkbox to select/unselect all lines on
 page that support mass actions (like invoice list page)

---
 htdocs/compta/facture/list.php         |  4 ++--
 htdocs/compta/facture/mergepdftool.php | 10 +-------
 htdocs/core/class/html.form.class.php  | 33 ++++++++++++++++++++------
 htdocs/theme/eldy/style.css.php        |  8 +++++--
 htdocs/theme/md/style.css.php          |  5 ++++
 5 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 1c32462b884..1b81c3cda50 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -783,8 +783,8 @@ if ($resql)
 	$liststatus=array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
 	print $form->selectarray('search_status', $liststatus, $search_status, 1);
     print '</td>';
-    print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print '<td class="liste_titre" align="center">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(1, 'checkforselect', 1);
     print $searchpitco;
     print '</td>';
     print "</tr>\n";
diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php
index 19c1d083018..27325bdef1d 100644
--- a/htdocs/compta/facture/mergepdftool.php
+++ b/htdocs/compta/facture/mergepdftool.php
@@ -848,16 +848,8 @@ if ($resql)
 	print $form->selectarray('filtre', $liststatus, $filter, 1);
 	print '</td>';
 	print '<td class="liste_titre" align="center">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+	$searchpitco=$form->showFilterAndCheckAddButtons(1, empty($mode)?'checkformerge':'checkforsend');
 	print $searchpitco;
-	if (empty($mode))
-	{
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
-	}
-	else
-	{
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkallsend">'.$langs->trans("All").'</a> / <a href="#" id="checknonesend">'.$langs->trans("None").'</a>';
-	}
 	print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ca4d9550bcb..633ff76117c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -508,7 +508,6 @@ class Form
     	
     	$ret.='<!-- JS CODE TO ENABLE mass action select -->
 		<script type="text/javascript">
-    	jQuery(document).ready(function () {
     		function initCheckForSelect()
     		{
     			atleastoneselected=0;
@@ -526,6 +525,8 @@ class Form
 	  				jQuery(".massaction").hide();
 	  			}
     		}
+    	    
+    	jQuery(document).ready(function () {
     		initCheckForSelect();
     		jQuery(".checkforselect").click(function() {
     			initCheckForSelect();
@@ -5679,20 +5680,38 @@ class Form
     /**
      *	Return HTML to show the search and clear seach button
      *
-     *  @param	int  	$addcheckuncheckall    Add the check all uncheck al button
+     *  @param	int  	$addcheckuncheckall        Add the check all uncheck al button
+     *  @param  string  $cssclass                  CSS class
+     *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
      *  @return	string                          
      */
-    function showFilterAndCheckAddButtons($addcheckuncheckall=0)
+    function showFilterAndCheckAddButtons($addcheckuncheckall=0, $cssclass='checkforaction', $calljsfunction=0)
     {   
-        global $langs;
-        
+        global $conf, $langs;
+
         $out='';
         $out.='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+        $out.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
         if ($addcheckuncheckall)
         {
-            
+            if (! empty($conf->use_javascript_ajax)) $out.='<input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions">';
         }
-        $out.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+        $out.='<script type="text/javascript">
+                $(document).ready(function() {
+                	$("#checkallactions").click(function() {
+                        if($(this).is(\':checked\')){
+                            console.log("We check all");
+                    		$(".'.$cssclass.'").prop(\'checked\', true);
+                        }
+                        else
+                        {
+                            console.log("We uncheck all");
+                    		$(".'.$cssclass.'").prop(\'checked\', false);
+                        }';
+        if ($calljsfunction) $out.='initCheckForSelect();';
+        $out.='         });
+                });
+              </script>';
         return $out;
     }
 }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 30f97b557d4..4f1e049ba65 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -263,7 +263,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-size: <?php print $fontsize ?>px;
     font-family: <?php print $fontlist ?>;
     background: #FFF;
-    color: #111;
+    /* color: #111; */
     border: 1px solid #C0C0C0;
     margin: 0px 0px 0px 0px;
 }
@@ -515,7 +515,11 @@ div.myavailability {
 	padding-top: 4px;
 	padding-bottom: 4px;
 }
-
+.checkallactions {
+	vertical-align: top;
+    margin-top: 6px;	
+    margin-left: 4px;	
+}
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 02896756c64..b60c3c5be06 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -503,6 +503,11 @@ div.myavailability {
 	padding-top: 4px;
 	padding-bottom: 4px;
 }
+.checkallactions {
+	vertical-align: top;
+    margin-top: 6px;	
+    margin-left: 4px;	
+}
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */

From ad63d5c48db1b09cefd123ba6a946e0fdf4b2025 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 22:47:16 +0100
Subject: [PATCH 085/421] NEW Move load module to status experimental

---
 htdocs/core/modules/modComptabilite.class.php | 2 +-
 htdocs/core/modules/modLoan.class.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index 864c0012dec..ca49ab12f7d 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -58,7 +58,7 @@ class modComptabilite extends DolibarrModules
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;
-        $this->picto='';
+        $this->picto='accounting';
 
 		// Config pages
 		$this->config_page_url = array("compta.php");
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index 19d44ca11cc..25f1b7cf2c2 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -51,7 +51,7 @@ class modLoan extends DolibarrModules
 		$this->description = "Loans management";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'development';
+		$this->version = 'experimental';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;

From cfa3b16637a9beed63f7c7d54b2277302bc07f28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 22:47:46 +0100
Subject: [PATCH 086/421] Menu entries for accountancy are shown when menu
 entry is selected and not all the time

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

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index baa73c532f8..e0da649e53b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -940,21 +940,21 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy",$langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
 
 				// Dispatch
-				$newmenu->add("/accountancy/customer/index.php?leftmenu=dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->ventilation->read, '', $mainmenu, 'dispatch_customer');
-					if (empty($leftmenu) || $leftmenu=="dispatch_customer") $newmenu->add("/accountancy/customer/list.php",$langs->trans("ToDispatch"),2,$user->rights->accounting->ventilation->dispatch);
-					if (empty($leftmenu) || $leftmenu=="dispatch_customer") $newmenu->add("/accountancy/customer/lines.php",$langs->trans("Dispatched"),2,$user->rights->accounting->ventilation->read);
+				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->ventilation->read, '', $mainmenu, 'dispatch_customer');
+			    if (preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/list.php?leftmenu=accountancy_dispatch_customer",$langs->trans("ToDispatch"),2,$user->rights->accounting->ventilation->dispatch);
+				if (preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/lines.php?leftmenu=accountancy_dispatch_customer",$langs->trans("Dispatched"),2,$user->rights->accounting->ventilation->read);
 
 				if (! empty($conf->supplier_invoice->enabled))
 				{
-					$newmenu->add("/accountancy/supplier/index.php?leftmenu=dispatch_supplier&amp;mainmenu=accountancy",$langs->trans("SuppliersVentilation"),1,$user->rights->accounting->ventilation->read, '', $mainmenu, 'dispatch_supplier');
-						if (empty($leftmenu) || $leftmenu=="dispatch_supplier") $newmenu->add("/accountancy/supplier/list.php",$langs->trans("ToDispatch"),2,$user->rights->accounting->ventilation->dispatch);
-						if (empty($leftmenu) || $leftmenu=="dispatch_supplier") $newmenu->add("/accountancy/supplier/lines.php",$langs->trans("Dispatched"),2,$user->rights->accounting->ventilation->read);
+					if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy",$langs->trans("SuppliersVentilation"),1,$user->rights->accounting->ventilation->read, '', $mainmenu, 'dispatch_supplier');
+					if (preg_match('/accountancy_dispatch_supplier/',$leftmenu)) $newmenu->add("/accountancy/supplier/list.php?leftmenu=accountancy_dispatch_supplier",$langs->trans("ToDispatch"),2,$user->rights->accounting->ventilation->dispatch);
+					if (preg_match('/accountancy_dispatch_supplier/',$leftmenu)) $newmenu->add("/accountancy/supplier/lines.php?leftmenu=accountancy_dispatch_supplier",$langs->trans("Dispatched"),2,$user->rights->accounting->ventilation->read);
 				}
 
 				// Journals
 				if(! empty($conf->accounting->enabled) && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')
 				{
-					$newmenu->add('',$langs->trans("Journaux"),1,$user->rights->accounting->comptarapport->lire);
+					if (preg_match('/accountancy/',$leftmenu)) $newmenu->add('',$langs->trans("Journaux"),1,$user->rights->accounting->comptarapport->lire);
 
 					$sql = "SELECT rowid, label, accountancy_journal";
 					$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
@@ -972,7 +972,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 						while ($i < $numr)
 						{
 							$objp = $db->fetch_object($resql);
-							$newmenu->add('/accountancy/journal/bankjournal.php?id_account='.$objp->rowid,$langs->trans("Journal").' - '.$objp->label,2,$user->rights->accounting->comptarapport->lire);
+							if (preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/bankjournal.php?left_menu=accountancy_journal&id_account='.$objp->rowid,$langs->trans("Journal").' - '.dol_trunc($objp->label,10),2,$user->rights->accounting->comptarapport->lire);
 							$i++;
 						}
 					}
@@ -980,34 +980,34 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$db->free($resql);
 
 					// Add other journal
-					$newmenu->add("/accountancy/journal/sellsjournal.php?leftmenu=journal",$langs->trans("SellsJournal"),2,$user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/accountancy/journal/purchasesjournal.php?leftmenu=journal",$langs->trans("PurchasesJournal"),2,$user->rights->accounting->comptarapport->lire);
+					if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/journal/sellsjournal.php?leftmenu=accountancy_journal",$langs->trans("SellsJournal"),2,$user->rights->accounting->comptarapport->lire);
+					if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/journal/purchasesjournal.php?leftmenu=accountancy_journal",$langs->trans("PurchasesJournal"),2,$user->rights->accounting->comptarapport->lire);
 				}
 
 				// General Ledger
-				$newmenu->add("/accountancy/bookkeeping/list.php?leftmenu=bookkeeping",$langs->trans("Bookkeeping"),1,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookkeeping');
-				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/listbyyear.php",$langs->trans("ByYear"),2,$user->rights->accounting->mouvements->lire);
-				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balancebymonth.php",$langs->trans("AccountBalanceByMonth"),2,$user->rights->accounting->mouvements->lire);
+				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/list.php?leftmenu=accountancy_bookkeeping",$langs->trans("Bookkeeping"),1,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookkeeping');
+				if (preg_match('/accountancy_bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/listbyyear.php?leftmenu=accountancy_bookkeeping",$langs->trans("ByYear"),2,$user->rights->accounting->mouvements->lire);
+				if (preg_match('/accountancy_bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balancebymonth.php?leftmenu=accountancy_bookkeeping",$langs->trans("AccountBalanceByMonth"),2,$user->rights->accounting->mouvements->lire);
 
 				// Reports
 				$langs->load("compta");
 
-				$newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy",$langs->trans("Reportings"),1,$user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
+				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report&amp;mainmenu=accountancy",$langs->trans("Reportings"),1,$user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
 
-				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/resultat/index.php?leftmenu=report",$langs->trans("ReportInOut"),2,$user->rights->accounting->comptarapport->lire);
-				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report",$langs->trans("ByCompanies"),3,$user->rights->accounting->comptarapport->lire);
-				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/index.php?leftmenu=report",$langs->trans("ReportTurnover"),2,$user->rights->accounting->comptarapport->lire);
-				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/casoc.php?leftmenu=report",$langs->trans("ByCompanies"),3,$user->rights->accounting->comptarapport->lire);
-				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/cabyuser.php?leftmenu=report",$langs->trans("ByUsers"),3,$user->rights->accounting->comptarapport->lire);
-				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
+				if (preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report",$langs->trans("ReportInOut"),2,$user->rights->accounting->comptarapport->lire);
+				if (preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report",$langs->trans("ByCompanies"),3,$user->rights->accounting->comptarapport->lire);
+				if (preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report",$langs->trans("ReportTurnover"),2,$user->rights->accounting->comptarapport->lire);
+				if (preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report",$langs->trans("ByCompanies"),3,$user->rights->accounting->comptarapport->lire);
+				if (preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report",$langs->trans("ByUsers"),3,$user->rights->accounting->comptarapport->lire);
+				if (preg_match('/accountancy_report/',$leftmenu)) $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
 
 				// Admin
 				$langs->load("admin");
-			    $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy", $langs->trans("Fiscalyear"),1,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
-				$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy", $langs->trans("Chartofaccounts"),1,$user->rights->accounting->chartofaccount, '', $mainmenu, 'chartofaccount');
+			    if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Fiscalyear"),1,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
+				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),1,$user->rights->accounting->chartofaccount, '', $mainmenu, 'chartofaccount');
 			}
 
-			// Comptabilite
+			// Accountancy (simple)
 			if (! empty($conf->comptabilite->enabled))
 			{
 				$langs->load("compta");

From 99c59c8c6bbf2c00743a6eaad027cdac7230767c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 23:01:21 +0100
Subject: [PATCH 087/421] Missing translation

---
 htdocs/admin/receiptprinter.php        | 38 +++++++++++++++++---------
 htdocs/langs/en_US/receiptprinter.lang |  2 ++
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 5beaacc8515..87fce1f6087 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2013      Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2013-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -242,10 +242,12 @@ if ($mode == 'config' && $user->admin)
     print '<th></th>';
     print "</tr>\n";
     $ret = $printer->listprinters();
+    $nbofprinters = count($printer->listprinters);
+    
     if ($ret > 0) {
         setEventMessages($printer->error, $printer->errors, 'errors');
     } else {
-        for ($line=0; $line < count($printer->listprinters); $line++) {
+        for ($line=0; $line < $nbofprinters; $line++) {
             $var = !$var;
             print '<tr '.$bc[$var].'>';
             if ($action=='editprinter' && $printer->listprinters[$line]['rowid']==$printerid) {
@@ -282,16 +284,21 @@ if ($mode == 'config' && $user->admin)
         }
     }
 
-    if ($action!='editprinter') {
-        print '<tr class="liste_titre">';
-        print '<th>'.$langs->trans("Name").'</th>';
-        print '<th>'.$langs->trans("Type").'</th>';
-        print '<th>'.$langs->trans("Profile").'</th>';
-        print '<th>'.$langs->trans("Parameters").'</th>';
-        print '<th></th>';
-        print '<th></th>';
-        print '<th></th>';
-        print "</tr>\n";
+    if ($action!='editprinter') 
+    {
+        if ($nbofprinters > 0)
+        {
+            print '<tr class="liste_titre">';
+            print '<th>'.$langs->trans("Name").'</th>';
+            print '<th>'.$langs->trans("Type").'</th>';
+            print '<th>'.$langs->trans("Profile").'</th>';
+            print '<th>'.$langs->trans("Parameters").'</th>';
+            print '<th></th>';
+            print '<th></th>';
+            print '<th></th>';
+            print "</tr>\n";
+        }
+        
         print '<tr>';
         print '<td><input size="50" type="text" name="printername"></td>';
         $ret = $printer->selectTypePrinter();
@@ -307,6 +314,7 @@ if ($mode == 'config' && $user->admin)
     print '</table>';
 
     dol_fiche_end();
+    
     if ($action!='editprinter') {
         print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
     } else {
@@ -315,7 +323,9 @@ if ($mode == 'config' && $user->admin)
     print '</form>';
 
     print '<div><p></div>';
+    
     dol_fiche_head();
+    
     print $langs->trans("ReceiptPrinterTypeDesc")."<br><br>\n";
     print '<table class="noborder" width="100%">'."\n";
     print '<tr '.$bc[1].'><td>'.$langs->trans("CONNECTOR_DUMMY").':</td><td>'.$langs->trans("CONNECTOR_DUMMY_HELP").'</td></tr>';
@@ -325,7 +335,9 @@ if ($mode == 'config' && $user->admin)
     //print '<tr '.$bc[1].'><td>'.$langs->trans("CONNECTOR_JAVA").':</td><td>'.$langs->trans("CONNECTOR_JAVA_HELP").'</td></tr>';
     print '</table>';
     dol_fiche_end();
+
     print '<div><p></div>';
+    
     dol_fiche_head();
     print $langs->trans("ReceiptPrinterProfileDesc")."<br><br>\n";
     print '<table class="noborder" width="100%">'."\n";
@@ -423,13 +435,13 @@ if ($mode == 'template' && $user->admin)
 }
 
 // to remove after test
+$object=new stdClass();
 $object->date_time = '2015-11-02 22:30:25';
 $object->id = 1234;
 $object->customer_firstname  = 'John';
 $object->customer_lastname  = 'Deuf';
 $object->vendor_firstname  = 'Jim';
 $object->vendor_lastname  = 'Big';
-
 $object->barcode = '3700123862396';
 //$printer->sendToPrinter($object, 1, 16);
 //setEventMessages($printer->error, $printer->errors, 'errors');
diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/en_US/receiptprinter.lang
+++ b/htdocs/langs/en_US/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type

From e28765ff69ed076e763ff0c4f992da7bacf91bdc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Feb 2016 23:07:16 +0100
Subject: [PATCH 088/421] Fix: List of employee is by default selected on
 employee = yes

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

diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index f0fa04327cd..c7590bc702f 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -84,7 +84,7 @@ $arrayfields=array(
     'u.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1),
     'u.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1),
     'u.gender'=>array('label'=>$langs->trans("Gender"), 'checked'=>0),
-    'u.employee'=>array('label'=>$langs->trans("Employee"), 'checked'=>0),
+    'u.employee'=>array('label'=>$langs->trans("Employee"), 'checked'=>($mode=='employee'?1:0)),
     'u.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0),
     'u.email'=>array('label'=>$langs->trans("EMail"), 'checked'=>1),
     'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
@@ -123,6 +123,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 // Default search
 if ($search_statut == '') $search_statut='1';
+if ($mode == 'employee') $search_employee=1;
 
 
 
@@ -192,7 +193,6 @@ else
 {
 	$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
 }
-if ($mode == "employee") $sql.= " AND u.employee = 1";
 if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid;
 //if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
 if ($search_supervisor > 0)   $sql.= " AND u.fk_user = ".$search_supervisor;

From c4c7ea2f221199b1566dad96c038d2f197184776 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Feb 2016 02:49:19 +0100
Subject: [PATCH 089/421] FIX Relative discount decimals are not saved

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

diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 6d0d1dedb2a..224004b6735 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -30,6 +30,8 @@ $langs->load("companies");
 $langs->load("orders");
 $langs->load("bills");
 
+$id=GETPOST("id",'int');
+
 $socid = GETPOST('id','int');
 // Security check
 if ($user->societe_id > 0)
@@ -52,9 +54,9 @@ if (GETPOST('cancel') && ! empty($backtopage))
 
 if (GETPOST("action") == 'setremise')
 {
-	$soc = New Societe($db);
-	$soc->fetch($_GET["id"]);
-	$result=$soc->set_remise_client($_POST["remise"],$_POST["note"],$user);
+	$soc = new Societe($db);
+	$soc->fetch($id);
+	$result=$soc->set_remise_client(price2num(GETPOST("remise")),GETPOST("note"),$user);
 
 	if ($result > 0)
 	{

From a15d03a67644e0247a9efa00884a7c7d76c2a85f Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Mon, 8 Feb 2016 10:06:32 +0100
Subject: [PATCH 090/421] fix : Strict Standards: Only variables should be
 passed by reference

---
 htdocs/core/modules/modSociete.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index fb8623695e6..ab48d6807ec 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -297,7 +297,11 @@ class modSociete extends DolibarrModules
         			case 'sellist':
 						$tmp='';
 						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) 
+        				{
+							$stack=array_keys($tmpparam['options']);
+							$tmp=array_shift($stack);
+						}
 						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
 						break;
         		}

From 29910840610a658e5fa8364e523bd039c84b73d0 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 8 Feb 2016 10:50:40 +0100
Subject: [PATCH 091/421] fx accountancy

---
 htdocs/accountancy/journal/purchasesjournal.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 86232bb2029..7d9778f72b8 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -94,6 +94,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0 ";
+$sql .= " AND fd.fk_code_ventilation > 0 ";
 if (! empty($conf->multicompany->enabled)) {
 	$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")";
 }

From 9b10f030bf5eb5143107a7a1ecea51ba4b3d5890 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 8 Feb 2016 12:20:40 +0100
Subject: [PATCH 092/421] Fix: missing signature and uniformize code between
 card and script

---
 htdocs/comm/mailing/card.php       | 15 +++++++++------
 scripts/emailings/mailing-send.php | 25 +++++++++++++------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e1d357b6c3a..dc17c68e387 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2005-2012	Laurent Destailleur		<eldy@uers.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2016	Regis Houssin			<regis.houssin@capnetworks.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
@@ -222,6 +222,8 @@ if (empty($reshook))
 	                    $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+	                    $signature = (!empty($user->signature))?$user->signature:'';
+
 	                    // Array of possible substitutions (See also fie mailing-send.php that should manage same substitutions)
 						$substitutionarray=array(
 								'__ID__' => $obj->source_id,
@@ -234,6 +236,7 @@ if (empty($reshook))
 								'__OTHER3__' => $other3,
 								'__OTHER4__' => $other4,
 								'__OTHER5__' => $other5,
+								'__SIGNATURE__' => $signature,	// Signature is empty when ran from command line or taken from user in parameter)
 								'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
 								'__UNSUBSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>'
 						);
@@ -1093,10 +1096,10 @@ else
 			}
 
 			print '</table>';
-			
+
 			dol_fiche_end();
-			
-			
+
+
 
 			print "\n";
 			print '<form name="edit_mailing" action="card.php" method="post" enctype="multipart/form-data">'."\n";
@@ -1108,7 +1111,7 @@ else
 			print_fiche_titre($langs->trans("EMail"),'','');
 
 			dol_fiche_head();
-			
+
 			print '<table class="border" width="100%">';
 
 			// Subject
@@ -1175,7 +1178,7 @@ else
 			print '</table>';
 
 			dol_fiche_end();
-			
+
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'" name="save">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 9896db73352..1c25d78ba55 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -1,8 +1,9 @@
 #!/usr/bin/php
 <?php
 /*
- * Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2016	Regis Houssin			<regis.houssin@capnetworks.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
@@ -141,15 +142,15 @@ if ($resql)
 						$sendto = str_replace(',',' ',dolGetFirstLastname($obj2->firstname, $obj2->lastname) ." <".$obj2->email.">");
 
 						// Make subtsitutions on topic and body
-						$other=explode(';',$obj2->other);
-						$other1=$other[0];
-						$other2=$other[1];
-						$other3=$other[2];
-						$other4=$other[3];
-						$other5=$other[4];
-						// Array of possible substitutions (See also fie mailing-send.php that should manage same substitutions)
-						$signature = (!empty($user->signature))?$user->signature:''; 
-						
+						$other=explode(';',$obj->other);
+						$tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+	                    $tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+	                    $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+	                    $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+	                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+	                    $signature = (!empty($user->signature))?$user->signature:'';
+
+						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray=array(
 							'__ID__' => $obj->source_id,
 							'__EMAIL__' => $obj->email,
@@ -251,7 +252,7 @@ if ($resql)
 										$error++;
 									}
 								}
-                                
+
                                 if (!empty($conf->global->MAILING_DELAY)) {
                                     sleep($conf->global->MAILING_DELAY);
                                 }

From 0b2560130758506c8bc94e01bbc5138bc92a92d9 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 8 Feb 2016 12:31:40 +0100
Subject: [PATCH 093/421] Fix: wrong object name

---
 htdocs/comm/mailing/card.php       | 2 +-
 scripts/emailings/mailing-send.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index dc17c68e387..3bca65a3ee7 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -222,7 +222,7 @@ if (empty($reshook))
 	                    $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $signature = (!empty($user->signature))?$user->signature:'';
+	                    $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
 
 	                    // Array of possible substitutions (See also fie mailing-send.php that should manage same substitutions)
 						$substitutionarray=array(
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 1c25d78ba55..8baf85ee5fe 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -142,18 +142,18 @@ if ($resql)
 						$sendto = str_replace(',',' ',dolGetFirstLastname($obj2->firstname, $obj2->lastname) ." <".$obj2->email.">");
 
 						// Make subtsitutions on topic and body
-						$other=explode(';',$obj->other);
+						$other=explode(';',$obj2->other);
 						$tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
 	                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $signature = (!empty($user->signature))?$user->signature:'';
+	                    $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
 
 						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray=array(
-							'__ID__' => $obj->source_id,
-							'__EMAIL__' => $obj->email,
+							'__ID__' => $obj2->source_id,
+							'__EMAIL__' => $obj2->email,
 							'__LASTNAME__' => $obj2->lastname,
 							'__FIRSTNAME__' => $obj2->firstname,
 							'__MAILTOEMAIL__' => '<a href="mailto:'.$obj2->email.'">'.$obj2->email.'</a>',

From 19b333f78bda120ad34372a65900080b12ecfd4b Mon Sep 17 00:00:00 2001
From: Sof <virtualsof@yahoo.fr>
Date: Fri, 5 Feb 2016 19:46:01 +0100
Subject: [PATCH 094/421] FIX : Typo

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

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 7038c745364..ba083cc1527 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -714,12 +714,12 @@ if ($resql)
 		print '<td align="right">'.(price2num($object->pmp)?price(price2num($object->pmp*$obj->reel,'MT')):'').'</td>';
         // Sell price
 		print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($object->price,'MU'),1);
+        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price,'MU'),1);
         else print $langs->trans("Variable");
         print '</td>';
         // Value sell
         print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($object->price*$obj->reel,'MT'),1).'</td>';
+        if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price*$obj->reel,'MT'),1).'</td>';
         else print $langs->trans("Variable");
 		print '</tr>'; ;
 		$total += $obj->reel;
@@ -782,12 +782,12 @@ print '<td class="liste_total" align="right">';
 print $totalvalue?price(price2num($totalvalue,'MT'),1):'&nbsp;';
 print '</td>';
 print '<td class="liste_total" align="right">';
-if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total,1):'&nbsp;');
+if (empty($conf->global->PRODUIT_MULTIPRICES)) print ($total?price($totalvaluesell/$total,1):'&nbsp;');
 else print $langs->trans("Variable");
 print '</td>';
 // Value to sell
 print '<td class="liste_total" align="right">';
-if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($totalvaluesell,'MT'),1);
+if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($totalvaluesell,'MT'),1);
 else print $langs->trans("Variable");
 print '</td>';
 print "</tr>";

From c672ad9fed2cff80b4d501ff366db636b0b05a17 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 8 Feb 2016 15:00:49 +0100
Subject: [PATCH 095/421] Update box_goodcustomers.php

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

diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 734d1885824..609eabdbc7a 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -83,7 +83,7 @@ class box_goodcustomers extends ModeleBoxes
 		{
 			
 			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
-			$sql.= " count(*) as nbfact, sum(if (f.paye=1,1,0)) as nbfactpaye";
+			$sql.= " count(*) as nbfact, sum(". $db->if('f.paye=1','1','0').") as nbfactpaye";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
 			$sql.= ' WHERE s.entity IN ('.getEntity('societe', 1).')';
 			$sql.= ' AND s.rowid = f.fk_soc';

From 0b6bd0bc146f3e9646e4a5b05feacc8e84820689 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Feb 2016 15:49:38 +0100
Subject: [PATCH 096/421] More robust error management on barcode module.

---
 htdocs/barcode/codeinit.php      |   2 +-
 htdocs/core/lib/barcode.lib.php  |  17 +--
 htdocs/langs/en_US/admin.lang    |   2 +
 htdocs/product/admin/product.php | 246 ++++++++++++++++---------------
 htdocs/product/card.php          |  66 +++++----
 htdocs/product/document.php      |   1 -
 htdocs/viewimage.php             |   2 +-
 7 files changed, 177 insertions(+), 159 deletions(-)

diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index db662b6d9e4..e421c17a470 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -298,7 +298,7 @@ if ($conf->product->enabled || $conf->product->service)
 	{
 		$disabled=1;
 		$titleno=$langs->trans("NoBarcodeNumberingTemplateDefined");
-		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font><br>';
+		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
 	}
 	if (empty($nbno))
 	{
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 778723c5f3b..eaaa6f349c4 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -63,8 +63,6 @@ else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
  * @param	string	$encoding	Encoding
  * @param	integer	$scale		Scale
  * @param	string	$mode		'png' or 'jpg' ...
- *
- *
  * @return	array	$bars		array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info)
  */
 function barcode_print($code, $encoding="ANY", $scale = 2 ,$mode = "png")
@@ -116,8 +114,7 @@ function barcode_encode($code,$encoding)
     global $genbarcode_loc;
 
     if (
-    ((preg_match("/^ean$/i", $encoding)
-    && ( strlen($code)==12 || strlen($code)==13)))
+    (preg_match("/^ean$/i", $encoding))
 
     || (($encoding) && (preg_match("/^isbn$/i", $encoding))
     && (( strlen($code)==9 || strlen($code)==10) ||
@@ -140,7 +137,7 @@ function barcode_encode($code,$encoding)
     }
     else
     {
-        print "barcode_encode needs an external programm for encodings other then EAN/ISBN<BR>\n";
+        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=\"http://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
         print "<LI>compile and install them\n";
@@ -151,6 +148,7 @@ function barcode_encode($code,$encoding)
         print "<BR>\n";
         return false;
     }
+
     return $bars;
 }
 
@@ -178,7 +176,7 @@ function barcode_gen_ean_sum($ean)
  *
  * @param	string	$ean		Code
  * @param	string	$encoding	Encoding
- * @return	array				array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info)
+ * @return	array				array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info, 'error': error message if error)
  */
 function barcode_encode_ean($ean, $encoding = "EAN-13")
 {
@@ -189,7 +187,7 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
     $ean=trim($ean);
     if (preg_match("/[^0-9]/i",$ean))
     {
-        return array("text"=>"Invalid EAN-Code");
+        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
     }
     $encoding=strtoupper($encoding);
     if ($encoding=="ISBN")
@@ -199,7 +197,7 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
     if (preg_match("/^978/", $ean)) $encoding="ISBN";
     if (strlen($ean)<12 || strlen($ean)>13)
     {
-        return array("text"=>"Invalid $encoding Code (must have 12/13 numbers)");
+        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
     }
 
     $ean=substr($ean,0,12);
@@ -227,7 +225,8 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
     }
 
     return array(
-		"encoding" => $encoding,
+        "error" => '',
+        "encoding" => $encoding,
 		"bars" => $line,
 		"text" => $text
     );
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index cc596bae7e8..5920ad01141 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1711,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
\ No newline at end of file
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 15b113ffffb..4a142e909fe 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -323,7 +323,7 @@ $form=new Form($db);
  */
 $dirproduct=array('/core/modules/product/');
 
-print load_fiche_titre($langs->trans("ProductCodeChecker"));
+print load_fiche_titre($langs->trans("ProductCodeChecker"), '', '');
 
 print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre">'."\n";
@@ -400,9 +400,6 @@ foreach ($dirproduct as $dirroot)
 print '</table>';
 
 
-print '<br>';
-print_titre($langs->trans("ModelModulesProduct"));
-
 // Load array def with activated templates
 $def = array();
 $sql = "SELECT nom";
@@ -414,135 +411,142 @@ if ($resql)
 {
 	$i = 0;
 	$num_rows=$db->num_rows($resql);
-	while ($i < $num_rows)
+	if ($num_rows > 0)
 	{
-		$array = $db->fetch_array($resql);
-		array_push($def, $array[0]);
-		$i++;
+	    print '<br>';
+	    print load_fiche_titre($langs->trans("ModelModulesProduct"), '', '');
+
+    	while ($i < $num_rows)
+    	{
+    		$array = $db->fetch_array($resql);
+    		array_push($def, $array[0]);
+    		$i++;
+    	}
+        
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td width="140">'.$langs->trans("Name").'</td>';
+        print '<td>'.$langs->trans("Description").'</td>';
+        print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
+        print '<td align="center" width="60">'.$langs->trans("ShortInfo").'</td>';
+        print '<td align="center" width="60">'.$langs->trans("Preview").'</td>';
+        print "</tr>\n";
+        
+        $var=true;
+        foreach ($dirproduct as $dirroot)
+        {
+        	$dir = dol_buildpath($dirroot.'core/modules/product/doc/',0);
+        	$handle=@opendir($dir);
+        	if (is_resource($handle))
+        	{
+        		while (($file = readdir($handle))!==false)
+        		{
+        			if (preg_match('/\.modules\.php$/i',$file))
+        			{
+        				$name = substr($file, 4, dol_strlen($file) -16);
+        				$classname = substr($file, 0, dol_strlen($file) -12);
+        
+        			    try {
+                			dol_include_once($dirroot.'core/modules/product/doc/'.$file);
+            			}
+            			catch(Exception $e)
+            			{
+            			    dol_syslog($e->getMessage(), LOG_ERR);
+            			}
+        
+            			$module = new $classname($db);
+        
+        				$modulequalified=1;
+        				if (! empty($module->version)) {
+        					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+        					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+        				}
+        
+        				if ($modulequalified)
+        				{
+        					$var = !$var;
+        					print '<tr '.$bc[$var].'><td width="100">';
+        					print $module->name;
+        					print "</td><td>\n";
+        					if (method_exists($module,'info')) print $module->info($langs);
+        					else print $module->description;
+        					print '</td>';
+        
+        					// Activate / Disable
+        					if (in_array($name, $def))
+        					{
+        						print "<td align=\"center\">\n";
+        						print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">';
+        						print img_picto($langs->trans("Enabled"),'switch_on');
+        						print '</a>';
+        						print "</td>";
+        					}
+        					else
+        					{
+        						if (versioncompare($module->phpmin,versionphparray()) > 0)
+        						{
+        							print "<td align=\"center\">\n";
+        							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
+        							print "</td>";
+        						}
+        						else
+        						{
+        							print "<td align=\"center\">\n";
+        							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+        							print "</td>";
+        						}
+        					}
+        
+        					// Info
+        					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+        					$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+        					if ($module->type == 'pdf')
+        					{
+        						$htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
+        					}
+        					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+        					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
+        
+        					print '<td align="center" class="nowrap">';
+        					print $form->textwithpicto('',$htmltooltip,1,0);
+        					print '</td>';
+        
+        					// Preview
+        					print '<td align="center" class="nowrap">';
+        					if ($module->type == 'pdf')
+        					{
+        						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+        					}
+        					else
+        					{
+        						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
+        					}
+        					print $linkspec;
+        					print '</td>';
+        
+        					print "</tr>\n";
+        				}
+        			}
+        		}
+        		closedir($handle);
+        	}
+        }
+        print '</table>';
 	}
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td width="140">'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="60">'.$langs->trans("ShortInfo").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Preview").'</td>';
-print "</tr>\n";
-
-$var=true;
-foreach ($dirproduct as $dirroot)
-{
-	$dir = dol_buildpath($dirroot.'core/modules/product/doc/',0);
-	$handle=@opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle))!==false)
-		{
-			if (preg_match('/\.modules\.php$/i',$file))
-			{
-				$name = substr($file, 4, dol_strlen($file) -16);
-				$classname = substr($file, 0, dol_strlen($file) -12);
-
-			    try {
-        			dol_include_once($dirroot.'core/modules/product/doc/'.$file);
-    			}
-    			catch(Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
-
-    			$module = new $classname($db);
-
-				$modulequalified=1;
-				if (! empty($module->version)) {
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
-				}
-
-				if ($modulequalified)
-				{
-					$var = !$var;
-					print '<tr '.$bc[$var].'><td width="100">';
-					print $module->name;
-					print "</td><td>\n";
-					if (method_exists($module,'info')) print $module->info($langs);
-					else print $module->description;
-					print '</td>';
-
-					// Activate / Disable
-					if (in_array($name, $def))
-					{
-						print "<td align=\"center\">\n";
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">';
-						print img_picto($langs->trans("Enabled"),'switch_on');
-						print '</a>';
-						print "</td>";
-					}
-					else
-					{
-						if (versioncompare($module->phpmin,versionphparray()) > 0)
-						{
-							print "<td align=\"center\">\n";
-							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
-							print "</td>";
-						}
-						else
-						{
-							print "<td align=\"center\">\n";
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-							print "</td>";
-						}
-					}
-
-					// Info
-					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-					$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-					if ($module->type == 'pdf')
-					{
-						$htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
-					}
-					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
-
-					print '<td align="center" class="nowrap">';
-					print $form->textwithpicto('',$htmltooltip,1,0);
-					print '</td>';
-
-					// Preview
-					print '<td align="center" class="nowrap">';
-					if ($module->type == 'pdf')
-					{
-						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-					}
-					else
-					{
-						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
-					}
-					print $linkspec;
-					print '</td>';
-
-					print "</tr>\n";
-				}
-			}
-		}
-		closedir($handle);
-	}
-}
-print '</table>';
-
+    
+    
 /*
  * Other conf
  */
 
 print "<br>";
 
-print load_fiche_titre($langs->trans("ProductOtherConf"));
+print load_fiche_titre($langs->trans("ProductOtherConf"), '', '');
 
 
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index bdfdf986d17..283d94b97bd 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -36,6 +36,7 @@
  */
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
@@ -80,11 +81,21 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
+$object = new Product($db);
 if ($id > 0 || ! empty($ref))
 {
-	$object = new Product($db);
-	$object->fetch($id, $ref);
+    $result = $object->fetch($id, $ref);
+
+    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+
+    if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+    {
+        if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+        else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+    }
 }
+$modulepart='product';
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas = !empty($object->canvas)?$object->canvas:GETPOST("canvas");
@@ -769,6 +780,7 @@ else $title = $langs->trans('ProductServiceCard');
 llxHeader('', $title, $helpurl);
 
 $form = new Form($db);
+$formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
 if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
 
@@ -1678,28 +1690,6 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->
 {
     print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestionclone,'yes','action-clone',250,600);
 }
-print '<div class="fichecenter"><div class="fichehalfleft">';
-print '<a name="builddoc"></a>'; // ancre
-
-/*
- * Documents generes
- */
-$filedir=$conf->product->dir_output.'/product/'.$object->id;
-
-$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-$genallowed=$user->rights->produit->creer;
-$delallowed=$user->rights->produit->supprimer;
-
-$var=true;
-
-$somethingshown=$formfile->show_documents('product',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang);
-
-print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-print '</div></div></div>';
-
-print '<br><br>';
 
 
 /* ************************************************************************** */
@@ -1872,16 +1862,40 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
         print $html;
         print '</table>';
 		
-		dol_fiche_end();
-
         print '<div class="center">';
         print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
         print '</div>';
 
+        dol_fiche_end();
+
         print '</form>';
     }
 }
 
 
+/*
+ * Documents generes
+ */
+if ($action == '' || $action == 'view')
+{
+    print '<div class="fichecenter"><div class="fichehalfleft">';
+    print '<a name="builddoc"></a>'; // ancre
+
+    $filedir=$upload_dir;
+
+    $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+    $genallowed=$user->rights->produit->creer;
+    $delallowed=$user->rights->produit->supprimer;
+
+    $var=true;
+    
+    $somethingshown=$formfile->show_documents($modulepart,$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang);
+
+    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+    print '</div></div></div>';
+}
+
+
 llxFooter();
 $db->close();
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 8a4c68990c6..177c3bd2f81 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -211,7 +211,6 @@ if ($object->id)
     
     dol_fiche_end();
 
-    $modulepart = 'produit';
     $permission = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index d14ccc6f8d4..949884df6e9 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify

From 7445a0f71cb57e928df702f90219515a541f8aeb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Feb 2016 16:42:34 +0100
Subject: [PATCH 097/421] Clean code for generating sheet of barcode. Can
 choose output filename.

---
 htdocs/adherents/cartes/carte.php             |  2 +-
 htdocs/barcode/printsheet.php                 | 19 +++++---
 htdocs/core/lib/barcode.lib.php               | 15 +++----
 htdocs/core/lib/format_cards.lib.php          | 44 +++++++++++--------
 .../barcode/doc/phpbarcode.modules.php        | 30 +++++++------
 .../barcode/doc/tcpdfbarcode.modules.php      | 24 +++++-----
 .../doc/pdf_standardlabel.class.php           |  4 +-
 .../printsheet/doc/pdf_tcpdflabel.class.php   |  4 +-
 .../modules/printsheet/modules_labels.php     | 11 +++--
 9 files changed, 87 insertions(+), 66 deletions(-)

diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index dc1b6563c53..b5e4efaec16 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -190,7 +190,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
     		{
     			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
     		}
-        	if (! $mesg) $result=members_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs);
+        	if (! $mesg) $result=doc_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs);
         }
 
     	if ($result <= 0)
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index bb3934625b6..01e969fc927 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -145,7 +145,9 @@ if ($action == 'builddoc')
 		// Load barcode class for generating barcode image
 		$classname = "mod".ucfirst($generator);
 		$module = new $classname($db);
-		if ($generator != 'tcpdfbarcode') {
+		if ($generator != 'tcpdfbarcode') 
+		{
+		    // May be phpbarcode
 			$template = 'standardlabel';
 			$is2d = false;
 			if ($module->encodingIsSupported($encoding))
@@ -153,12 +155,12 @@ if ($action == 'builddoc')
 				$barcodeimage=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 				dol_delete_file($barcodeimage);
 				// File is created with full name $barcodeimage = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
-				$result=$module->writeBarCode($code,$encoding,'Y',4);
-
+				$result=$module->writeBarCode($code,$encoding,'Y',4,1);
 				if ($result <= 0 || ! dol_is_file($barcodeimage))
 				{
 					$error++;
 					setEventMessages('Failed to generate image file of barcode for code='.$code.' encoding='.$encoding.' file='.basename($barcodeimage), null, 'errors');
+					setEventMessages($module->error, null, 'errors');
 				}
 			}
 			else
@@ -207,7 +209,7 @@ if ($action == 'builddoc')
 
 			for ($i=0; $i < $numberofsticker; $i++)
 			{
-				$arrayofmembers[]=array(
+				$arrayofrecords[]=array(
 					'textleft'=>$textleft,
 					'textheader'=>$textheader,
 					'textfooter'=>$textfooter,
@@ -226,7 +228,7 @@ if ($action == 'builddoc')
 		// Build and output PDF
 		if ($mode == 'label')
 		{
-			if (! count($arrayofmembers))
+			if (! count($arrayofrecords))
 			{
 				$mesg=$langs->trans("ErrorRecordNotFound");
 			}
@@ -234,7 +236,7 @@ if ($action == 'builddoc')
 			{
 				$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
 			}
-			if (! $mesg) $result=members_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs, $diroutput, $template);
+			if (! $mesg) $result=doc_label_pdf_create($db, $arrayofrecords, $modellabel, $outputlangs, $diroutput, $template, 'tmp_barcode_sheet.pdf');
 		}
 
 		if ($result <= 0)
@@ -283,10 +285,13 @@ print '	<div class="tagtr">';
 print '	<div class="tagtd" style="overflow: hidden; white-space: nowrap; max-width: 300px;">';
 print $langs->trans("DescADHERENT_ETIQUETTE_TYPE").' &nbsp; ';
 print '</div><div class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;">';
-// List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
+// List of possible labels (defined into $_Avery_Labels variable set into core/lib/format_cards.lib.php)
 $arrayoflabels=array();
 foreach(array_keys($_Avery_Labels) as $codecards)
 {
+    $labeltoshow=$_Avery_Labels[$codecards]['name'];
+    //$labeltoshow.=' ('.$_Avery_Labels[$row['code']]['paper-size'].')';
+	$arrayoflabels[$codecards]=$labeltoshow;
 	$arrayoflabels[$codecards]=$_Avery_Labels[$codecards]['name'];
 }
 print $form->selectarray('modellabel',$arrayoflabels,(GETPOST('modellabel')?GETPOST('modellabel'):$conf->global->ADHERENT_ETIQUETTE_TYPE),1,0,0);
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index eaaa6f349c4..6fa6b55151e 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2012 Laurent Destailleur     <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2016 Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2004-2010 Folke Ashberg: Some lines of code were inspired from work
  *                         of Folke Ashberg into PHP-Barcode 0.3pl2, available as GPL
  *                         source code at http://www.ashberg.de/bar.
@@ -59,21 +59,20 @@ else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
 /**
  * Print barcode
  *
- * @param	string	$code		Code
- * @param	string	$encoding	Encoding
- * @param	integer	$scale		Scale
- * @param	string	$mode		'png' or 'jpg' ...
- * @return	array	$bars		array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info)
+ * @param	string	       $code		Code
+ * @param	string	       $encoding	Encoding
+ * @param	integer	       $scale		Scale
+ * @param	string	       $mode		'png' or 'jpg' ...
+ * @return	array|string   $bars		array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info) or string with error message
  */
 function barcode_print($code, $encoding="ANY", $scale = 2 ,$mode = "png")
 {
-    // DOLCHANGE LDR Add log
     dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");
 
     $bars=barcode_encode($code,$encoding);
     if (! $bars || ! empty($bars['error']))
     {
-        // DOLCHANGE LDR Return error message instead of array
+        // Return error message instead of array
         if (empty($bars['error'])) $error='Bad Value '.$code.' for encoding '.$encoding;
         else $error=$bars['error'];
         dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index f86468aeb9f..7e89946d471 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -34,26 +34,34 @@ global $_Avery_Labels;
 
 $sql = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards WHERE active=1 ORDER BY code ASC";
 $resql = $db->query($sql);
-while ($row = $db->fetch_array($resql)) {
-    $_Avery_Labels[$row['code']]['name']=$row['name'];
-    $_Avery_Labels[$row['code']]['paper-size']=$row['paper_size'];
-    $_Avery_Labels[$row['code']]['orientation']=$row['orientation'];
-    $_Avery_Labels[$row['code']]['metric']=$row['metric'];
-    $_Avery_Labels[$row['code']]['marginLeft']=$row['leftmargin'];
-    $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
-    $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
-    $_Avery_Labels[$row['code']]['NX']=$row['nx'];
-    $_Avery_Labels[$row['code']]['NY']=$row['ny'];
-    $_Avery_Labels[$row['code']]['SpaceX']=$row['spacex'];
-    $_Avery_Labels[$row['code']]['SpaceY']=$row['spacey'];
-    $_Avery_Labels[$row['code']]['width']=$row['width'];
-    $_Avery_Labels[$row['code']]['height']=$row['height'];
-    $_Avery_Labels[$row['code']]['font-size']=$row['font_size'];
-    $_Avery_Labels[$row['code']]['custom_x']=$row['custom_x'];
-    $_Avery_Labels[$row['code']]['custom_y']=$row['custom_y'];
+if ($resql)
+{
+    while ($row = $db->fetch_array($resql)) 
+    {
+        $_Avery_Labels[$row['code']]['name']=$row['name'];
+        $_Avery_Labels[$row['code']]['paper-size']=$row['paper_size'];
+        $_Avery_Labels[$row['code']]['orientation']=$row['orientation'];
+        $_Avery_Labels[$row['code']]['metric']=$row['metric'];
+        $_Avery_Labels[$row['code']]['marginLeft']=$row['leftmargin'];
+        $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
+        $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
+        $_Avery_Labels[$row['code']]['NX']=$row['nx'];
+        $_Avery_Labels[$row['code']]['NY']=$row['ny'];
+        $_Avery_Labels[$row['code']]['SpaceX']=$row['spacex'];
+        $_Avery_Labels[$row['code']]['SpaceY']=$row['spacey'];
+        $_Avery_Labels[$row['code']]['width']=$row['width'];
+        $_Avery_Labels[$row['code']]['height']=$row['height'];
+        $_Avery_Labels[$row['code']]['font-size']=$row['font_size'];
+        $_Avery_Labels[$row['code']]['custom_x']=$row['custom_x'];
+        $_Avery_Labels[$row['code']]['custom_y']=$row['custom_y'];
+    }
+}
+else
+{
+    dol_print_error($db);
 }
 
-// we add characteristics to the name
+// We add characteristics to the name
 foreach($_Avery_Labels as $key => $val)
 {
 	$_Avery_Labels[$key]['name'].=' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index 8f76595bf88..d04c6a70c04 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -105,13 +105,14 @@ class modPhpbarcode extends ModeleBarCode
     /**
 	 *	Return an image file on the fly (no need to write on disk)
 	 *
-	 *	@param	string   	$code			Value to encode
-	 *	@param  string	 	$encoding		Mode of encoding
-	 *	@param  string	 	$readable		Code can be read
-	 *	@param	integer		$scale			Scale
-	 *	@return	int							<0 if KO, >0 if OK
+	 *	@param	string   	$code			  Value to encode
+	 *	@param  string	 	$encoding		  Mode of encoding
+	 *	@param  string	 	$readable		  Code can be read
+	 *	@param	integer		$scale			  Scale
+	 *  @param  integer     $nooutputiferror  No output if error 
+	 *	@return	int							  <0 if KO, >0 if OK
      */
-	function buildBarCode($code,$encoding,$readable='Y',$scale=1)
+	function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
 	{
 		global $_GET,$_SERVER;
 		global $conf;
@@ -135,7 +136,7 @@ class modPhpbarcode extends ModeleBarCode
 		if (! is_array($result))
 		{
 			$this->error=$result;
-			print $this->error;
+			if (empty($nooutputiferror)) print $this->error;
 			return -1;
 		}
 
@@ -145,13 +146,14 @@ class modPhpbarcode extends ModeleBarCode
 	/**
 	 *	Save an image file on disk (with no output)
 	 *
-	 *	@param	string   	$code			Value to encode
-	 *	@param	string   	$encoding		Mode of encoding
-	 *	@param  string	 	$readable		Code can be read
-	 *	@param	integer		$scale			Scale
-	 *	@return	int							<0 if KO, >0 if OK
+	 *	@param	string   	$code			  Value to encode
+	 *	@param	string   	$encoding		  Mode of encoding
+	 *	@param  string	 	$readable		  Code can be read
+	 *	@param	integer		$scale			  Scale
+	 *  @param  integer     $nooutputiferror  No output if error 
+	 *	@return	int							  <0 if KO, >0 if OK
 	 */
-	function writeBarCode($code,$encoding,$readable='Y',$scale=1)
+	function writeBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
 	{
 		global $conf,$filebarcode;
 
@@ -161,7 +163,7 @@ class modPhpbarcode extends ModeleBarCode
 
 		$filebarcode=$file;	// global var to be used in barcode_outimage called by barcode_print in buildBarCode
 
-		$result=$this->buildBarCode($code,$encoding,$readable,$scale);
+		$result=$this->buildBarCode($code,$encoding,$readable,$scale,$nooutputiferror);
 
 		return $result;
 	}
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index eb1b801821b..47912c47c20 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -89,12 +89,14 @@ class modTcpdfbarcode extends ModeleBarCode
 	/**
 	 *	Return an image file on the fly (no need to write on disk)
 	 *
-	 *	@param		String	  $code		   Value to encode
-	 *	@param		String	  $encoding	   Mode of encoding
-	 *	@param		String	  $readable	   Code can be read
-	 *	@return		int				<0 if KO, >0 if OK
+	 *	@param	   string	    $code		      Value to encode
+	 *	@param	   string	    $encoding	      Mode of encoding
+	 *	@param	   string	    $readable	      Code can be read
+	 *	@param	   integer		$scale			  Scale (not used with this engine)
+	 *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
+	 *	@return	   int			                  <0 if KO, >0 if OK
 	 */
-	function buildBarCode($code,$encoding,$readable='Y')
+	function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
 	{
 		global $_GET;
 		
@@ -134,12 +136,14 @@ class modTcpdfbarcode extends ModeleBarCode
 	/**
 	 *	Save an image file on disk (with no output)
 	 *
-	 *	@param		String	  $code			Value to encode
-	 *	@param		String	  $encoding		Mode of encoding
-	 *	@param		String	  $readable		Code can be read
-	 *	@return		int				<0 if KO, >0 if OK
+	 *	@param	   string	    $code		      Value to encode
+	 *	@param	   string	    $encoding	      Mode of encoding
+	 *	@param	   string	    $readable	      Code can be read
+	 *	@param	   integer		$scale			  Scale (not used with this engine)
+	 *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
+	 *	@return	   int			                  <0 if KO, >0 if OK
 	 */
-	function writeBarCode($code,$encoding,$readable='Y')
+	function writeBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
 	{
 		global $conf,$_GET;
 
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index 09dfe2efe5e..5fce4c63a51 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -231,9 +231,10 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 *	@param	Translate	$outputlangs		Lang object for output language
 	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *	@param	string		$outputdir			Output directory for pdf file
+	 *  @param  string      $filename           Short file name of PDF output file
 	 *	@return int								1=OK, 0=KO
 	 */
-	function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='')
+	function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='',$filename='tmp_address_sheet.pdf')
 	{
 		global $user,$conf,$langs,$mysoc,$_Avery_Labels;
 
@@ -263,7 +264,6 @@ class pdf_standardlabel extends CommonStickerGenerator
 		$keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name);
 
 		$dir = (empty($outputdir)?$conf->adherent->dir_temp:$outputdir);
-		$filename='tmp_address_sheet.pdf';
 		$file = $dir."/".$filename;
 
 		if (! file_exists($dir))
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index 2089cf6e0b9..4605b81de5e 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -272,9 +272,10 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 	 *	@param	Translate	$outputlangs		Lang object for output language
 	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *	@param	string		$outputdir			Output directory for pdf file
+	 *  @param  string      $filename           Short file name of PDF output file
 	 *	@return int								1=OK, 0=KO
 	 */
-	function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='')
+	function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='',$filename='tmp_address_sheet.pdf')
 	{
 		global $user,$conf,$langs,$mysoc,$_Avery_Labels;
 
@@ -304,7 +305,6 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		$keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name);
 
 		$dir = (empty($outputdir)?$conf->adherent->dir_temp:$outputdir);
-		$filename='tmp_address_sheet.pdf';
 		$file = $dir."/".$filename;
 
 		if (! file_exists($dir))
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index 1b077f8eab5..bac32ec45d2 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -60,7 +60,7 @@ class ModelePDFLabels
 
 
 /**
- *  Create a document onto disk accordign to template module
+ *  Create a document onto disk according to template module.
  *
  *	@param  DoliDB		$db					Database handler
  *	@param  array		$arrayofrecords		Array of records
@@ -68,9 +68,10 @@ class ModelePDFLabels
  *	@param	Translate	$outputlangs		Objet lang a utiliser pour traduction
  *	@param	string		$outputdir			Output directory
  *  @param  string      $template           pdf generenate document class to use default 'standardlabel'
+ *  @param  string      $filename           Short file name of PDF output file
  *	@return int        						<0 if KO, >0 if OK
  */
-function members_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir='', $template='standardlabel')
+function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir='', $template='standardlabel', $filename='tmp_address_sheet.pdf')
 {
 	global $conf,$langs;
 	$langs->load("members");
@@ -109,6 +110,8 @@ function members_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $
 	}
 	else $srctemplatepath=$code;
 
+	dol_syslog("modele=".$modele." outputdir=".$outputdir." template=".$template." code=".$code." srctemplatepath=".$srctemplatepath." filename=".$filename, LOG_DEBUG);
+	
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
 	$dirmodels=array('/');
@@ -141,7 +144,7 @@ function members_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir) > 0)
+		if ($obj->write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir, $filename) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			return 1;
@@ -149,7 +152,7 @@ function members_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $
 		else
 		{
 			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"members_label_pdf_create Error: ".$obj->error);
+			dol_print_error($db,"doc_label_pdf_create Error: ".$obj->error);
 			return -1;
 		}
 	}

From bfcf1e01e8437615ebd0a167f6f19965605f9c4b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Feb 2016 16:51:29 +0100
Subject: [PATCH 098/421] Fix alignement

---
 htdocs/adherents/stats/byproperties.php |  6 +++---
 htdocs/adherents/stats/geo.php          | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index efcd9e8968e..35ee0c6f6db 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -116,9 +116,9 @@ else
 }
 
 // Print array
-print '<table class="noborder" width="100%">';
+print '<table class="liste" width="100%">';
 print '<tr class="liste_titre">';
-print '<td align="center">'.$langs->trans("Nature").'</td>';
+print '<td>'.$langs->trans("Nature").'</td>';
 print '<td align="right">'.$langs->trans("NbOfMembers").'</td>';
 print '<td align="center">'.$langs->trans("LastMemberDate").'</td>';
 print '</tr>';
@@ -133,7 +133,7 @@ foreach ($data as $val)
 	$year = $val['year'];
 	$var=!$var;
 	print '<tr '.$bc[$var].'>';
-	print '<td align="center">'.$memberstatic->getmorphylib($val['label']).'</td>';
+	print '<td>'.$memberstatic->getmorphylib($val['label']).'</td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="center">'.dol_print_date($val['lastdate'],'dayhour').'</td>';
 	print '</tr>';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index b65ea310115..85157dc824d 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -1,4 +1,4 @@
-<?php //ligne 86
+<?php
 /* Copyright (c) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -282,11 +282,11 @@ if (count($arrayjs) && $mode == 'memberbycountry')
 if ($mode)
 {
     // Print array / Affiche le tableau
-    print '<table class="noborder" width="100%">';
+    print '<table class="liste" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td align="center">'.$label.'</td>';
+    print '<td>'.$label.'</td>';
     if ($label2) print '<td align="center">'.$label2.'</td>';
-    print '<td align="center">'.$langs->trans("NbOfMembers").'</td>';
+    print '<td align="right">'.$langs->trans("NbOfMembers").'</td>';
     print '<td align="center">'.$langs->trans("LastMemberDate").'</td>';
     print '</tr>';
 
@@ -297,10 +297,10 @@ if ($mode)
         $year = $val['year'];
         $var=!$var;
         print '<tr '.$bc[$var].'>';
-        print '<td align="center">'.$val['label'].'</td>';
+        print '<td>'.$val['label'].'</td>';
         if ($label2) print '<td align="center">'.$val['label2'].'</td>';
         print '<td align="right">'.$val['nb'].'</td>';
-        print '<td align="right">'.dol_print_date($val['lastdate'],'dayhour').'</td>';
+        print '<td align="center">'.dol_print_date($val['lastdate'],'dayhour').'</td>';
         print '</tr>';
         $oldyear=$year;
     }

From 50eae967bcf5f4830123672e97e600b5f9cc9ed9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Feb 2016 17:48:14 +0100
Subject: [PATCH 099/421] Fix disabled entries were no greyed

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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2c5ac022529..b2ca926fd71 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -263,7 +263,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-size: <?php print $fontsize ?>px;
     font-family: <?php print $fontlist ?>;
     background: #FFF;
-    color: #111;
+    /* color: #111; */
     border: 1px solid #C0C0C0;
     margin: 0px 0px 0px 0px;
 }

From 5dd016c3bc2a12bdb76c8eaffe45756afb90367e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 8 Feb 2016 17:55:29 +0100
Subject: [PATCH 100/421] Update modOauth.class.php

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

diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index 0ccab13e2b5..dc19839011b 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -139,8 +139,8 @@ class modOauth extends DolibarrModules
         $this->remove($options);
 
         $sql = array(
-            "CREATE TABLE IF NOT EXISTS llx_oauth_state (rowid int(11) NOT NULL AUTO_INCREMENT, service varchar(36), state varchar(128), fk_user int(11), fk_adherent int(11), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
-            "CREATE TABLE IF NOT EXISTS llx_oauth_token (rowid int(11) NOT NULL AUTO_INCREMENT, service varchar(36), token text, fk_user int(11), fk_adherent int(11), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
+            "CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."oauth_state (rowid int(11) NOT NULL AUTO_INCREMENT, service varchar(36), state varchar(128), fk_user int(11), fk_adherent int(11), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
+            "CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."oauth_token (rowid int(11) NOT NULL AUTO_INCREMENT, service varchar(36), token text, fk_user int(11), fk_adherent int(11), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
             );
 
         return $this->_init($sql,$options);

From d89daf9cd26cc21fd7de10b865ef770f69337085 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Feb 2016 18:04:42 +0100
Subject: [PATCH 101/421] Work to move the merge pdf tool into the mass action
 combo of lists

---
 htdocs/compta/facture/list.php         | 155 ++++++++++++++++++++++++-
 htdocs/compta/facture/mergepdftool.php |   3 +-
 htdocs/core/class/html.form.class.php  |   4 +-
 htdocs/langs/en_US/main.lang           |   3 +-
 4 files changed, 156 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 1b81c3cda50..af0376fef0e 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -105,6 +105,9 @@ $fieldid = (! empty($ref)?'facnumber':'rowid');
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'facture', $id,'','','fk_soc',$fieldid);
 
+$diroutputpdf=$conf->facture->dir_output . '/unpaid/temp';
+if (! $user->rights->societe->client->voir || $socid) $diroutputpdf.='/private/'.$user->id;	// If user has no permission to see all, output dir is specific to user
+
 $object=new Facture($db);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
@@ -134,13 +137,19 @@ $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 if (empty($reshook))
 {
-	// Mass actions
+	// Mass actions. Controls on number of lines checked
+    $maxformassaction=1000;
 	if (! empty($massaction) && count($toselect) < 1)
 	{
 		$error++;
 		setEventMessages($langs->trans("NoLineChecked"), null, "warnings");
 	}
-
+	if (! $error && count($toselect) > $maxformassaction)
+	{
+	    setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
+	    $error++;
+	}
+	
 	if (! $error && $massaction == 'confirm_presend')
 	{
 		$resaction = '';
@@ -149,7 +158,7 @@ if (empty($reshook))
 		$langs->load("mails");
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		
-		if (!isset($user->email))
+		if (!$error && !isset($user->email))
 		{
 			$error++;
 			setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
@@ -408,6 +417,127 @@ if (empty($reshook))
 		$action='list';
 		$massaction='';
 	}
+
+	if (! $error && $massaction == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_search'))
+	{
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+         
+        $objecttmp=new Facture($db);
+        $listofobjectid=array();
+        $listofobjectthirdparties=array();
+        $listofobjectref=array();
+        foreach($toselect as $toselectid)
+        {
+            $objecttmp=new Facture($db);	// must create new instance because instance is saved into $listofobjectref array for future use
+            $result=$objecttmp->fetch($toselectid);
+            if ($result > 0)
+            {
+                $listoinvoicesid[$toselectid]=$toselectid;
+                $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
+                $listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
+                $listofobjectref[$toselectid]=$objecttmp->ref;
+            }
+        }
+
+        $arrayofinclusion=array();
+        foreach($listofobjectref as $tmppdf) $arrayofinclusion[]=preg_quote($tmppdf.'.pdf','/');
+        $factures = dol_dir_list($conf->facture->dir_output,'all',1,implode('|',$arrayofinclusion),'\.meta$|\.png','date',SORT_DESC,0,true);
+
+        // liste les fichiers
+        $files = array();
+        foreach($listofobjectref as $basename)
+        {
+            foreach($factures as $facture)
+            {
+                if (strstr($facture["name"],$basename))
+                {
+                    $files[] = $conf->facture->dir_output.'/'.$basename.'/'.$facture["name"];
+                    break;
+                }
+            }
+        }
+        
+        // Define output language (Here it is not used because we do only merging existing PDF)
+        $outputlangs = $langs;
+        $newlang='';
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+        if (! empty($newlang))
+        {
+            $outputlangs = new Translate("",$conf);
+            $outputlangs->setDefaultLang($newlang);
+        }
+
+        // Create empty PDF
+        $pdf=pdf_getInstance();
+        if (class_exists('TCPDF'))
+        {
+            $pdf->setPrintHeader(false);
+            $pdf->setPrintFooter(false);
+        }
+        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+
+        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+        // Add all others
+        foreach($files as $file)
+        {
+            // Charge un document PDF depuis un fichier.
+            $pagecount = $pdf->setSourceFile($file);
+            for ($i = 1; $i <= $pagecount; $i++)
+            {
+                $tplidx = $pdf->importPage($i);
+                $s = $pdf->getTemplatesize($tplidx);
+                $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+                $pdf->useTemplate($tplidx);
+            }
+        }
+
+        // Create output dir if not exists
+        dol_mkdir($diroutputpdf);
+
+        // Save merged file
+        $filename=strtolower(dol_sanitizeFileName($langs->transnoentities("Invoices")));
+        if ($filter=='paye:0')
+        {
+            if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+            else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+        }
+        if ($year) $filename.='_'.$year;
+        if ($month) $filename.='_'.$month;
+        if ($pagecount)
+        {
+            $now=dol_now();
+            $file=$diroutputpdf.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
+            $pdf->Output($file,'F');
+            if (! empty($conf->global->MAIN_UMASK))
+                @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $langs->load("exports");
+                setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
+        }
+        else
+        {
+            setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+        }
+	}
+	
+	// Remove file
+	if ($action == 'remove_file')
+	{
+	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	
+	    $langs->load("other");
+	    $upload_dir = $diroutputpdf;
+	    $file = $upload_dir . '/' . GETPOST('file');
+	    $ret=dol_delete_file($file);
+	    if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+	    else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	    $action='';
+	}
+	
 }
 
 // Do we click on purge search criteria ?
@@ -578,7 +708,7 @@ if ($resql)
 	if ($search_paymentmode > 0) $param.='search_paymentmode='.$search_paymentmode;
 	$param.=(! empty($option)?"&amp;option=".$option:"");
 	
-	$massactionbutton=$form->selectMassAction('', $massaction ? array() : array('presend'=>$langs->trans("SendByMail")));
+	$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
     
     $i = 0;
     print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -917,6 +1047,23 @@ if ($resql)
     print "</table>\n";
     print "</form>\n";
     $db->free($resql);
+    
+    if ($massaction == 'builddoc' || $action == 'remove_file')
+    {
+        /*
+         * Show list of available documents
+         */
+        $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+        $urlsource.=str_replace('&amp;','&',$param);
+        
+        $filedir=$diroutputpdf;
+        $genallowed=$user->rights->facture->lire;
+        $delallowed=$user->rights->facture->lire;
+    
+        print '<br>';
+        // We disable multilang because we concat already existing pdf.
+        $formfile->show_documents('unpaid','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$langs->trans("PDFMerge"),'');
+    }    
 }
 else
 {
diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php
index 27325bdef1d..043a45a0861 100644
--- a/htdocs/compta/facture/mergepdftool.php
+++ b/htdocs/compta/facture/mergepdftool.php
@@ -385,7 +385,6 @@ if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_s
 
 		// liste les fichiers
 		$files = array();
-		$factures_bak = $factures ;
 		foreach($_POST['toGenerate'] as $basename)
 		{
 			foreach($factures as $facture)
@@ -458,7 +457,7 @@ if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_s
 		}
 		else
 		{
-			setEventMessages($langs->trans('NoPDFAvailableForChecked'), null, 'errors');
+			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
 	}
 	else
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f7b527b6a59..7ad26f99dd5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -486,7 +486,7 @@ class Form
      * Generate select HTML to choose massaction
      * 
      * @param	string	$selected		Selected value
-     * @param	int		$arrayofaction	array('code'=>'label', ...)
+     * @param	int		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
      * @return	string					Select list
      */
     function selectMassAction($selected, $arrayofaction)
@@ -5813,7 +5813,7 @@ class Form
                             console.log("We uncheck all");
                     		$(".'.$cssclass.'").prop(\'checked\', false);
                         }';
-        if ($calljsfunction) $out.='initCheckForSelect();';
+        if ($calljsfunction) $out.='if (typeof initCheckForSelect == \'function\') { initCheckForSelect(); } else { console.log("No function initCheckForSelect found. Call won\'t done."); }';
         $out.='         });
                 });
               </script>';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 18146dc684d..3e782fdbeaf 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -735,7 +735,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday

From f640bf7c61ec37e146879f420b8e82825a445398 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Feb 2016 11:56:12 +0100
Subject: [PATCH 102/421] Manage the reply-to field into mail libs

---
 htdocs/comm/index.php                     | 82 +++++++++++++++++++++++
 htdocs/compta/facture/list.php            |  5 +-
 htdocs/core/class/CMailFile.class.php     | 18 ++---
 htdocs/core/class/smtps.class.php         | 34 +++++++++-
 htdocs/core/lib/functions.lib.php         | 37 ++++++++--
 htdocs/langs/en_US/main.lang              |  2 +-
 htdocs/langs/en_US/supplier_proposal.lang |  1 +
 htdocs/theme/eldy/style.css.php           |  3 +
 htdocs/theme/md/style.css.php             |  3 +
 9 files changed, 167 insertions(+), 18 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 93f9b243624..727e9904fef 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 if (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 if (! empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (! empty($conf->supplier_proposal->enabled))  require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 if (! empty($conf->commande->enabled))  require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
@@ -66,6 +67,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $companystatic=new Societe($db);
 if (! empty($conf->propal->enabled)) $propalstatic=new Propal($db);
+if (! empty($conf->supplier_proposal->enabled)) $supplierproposalstatic=new SupplierProposal($db);
 if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db);
 if (! empty($conf->fournisseur->enabled)) $supplierorderstatic=new CommandeFournisseur($db);
 
@@ -208,6 +210,86 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 }
 
 
+
+/*
+ * Draft supplier proposals
+ */
+if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+{
+    $langs->load("supplier_proposal");
+
+    $sql = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
+    $sql.= ", s.code_client";
+    $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+    if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE p.fk_statut = 0";
+    $sql.= " AND p.fk_soc = s.rowid";
+    $sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+    if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    if ($socid)	$sql.= " AND s.rowid = ".$socid;
+
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $total = 0;
+        $num = $db->num_rows($resql);
+         
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td colspan="3">'.$langs->trans("SupplierProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
+
+        if ($num > 0)
+        {
+            $i = 0;
+            $var=true;
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                $var=!$var;
+                print '<tr '.$bc[$var].'><td  class="nowrap">';
+                $supplierproposalstatic->id=$obj->rowid;
+                $supplierproposalstatic->ref=$obj->ref;
+                $supplierproposalstatic->total_ht = $obj->total_ht;
+                $supplierproposalstatic->total_tva = $obj->total_tva;
+                $supplierproposalstatic->total_ttc = $obj->total_ttc;
+                print $supplierproposalstatic->getNomUrl(1);
+                print '</td>';
+                print '<td class="nowrap">';
+                $companystatic->id=$obj->socid;
+                $companystatic->name=$obj->name;
+                $companystatic->client=$obj->client;
+                $companystatic->code_client = $obj->code_client;
+                $companystatic->code_fournisseur = $obj->code_fournisseur;
+                $companystatic->canvas=$obj->canvas;
+                print $companystatic->getNomUrl(1,'customer',16);
+                print '</td>';
+                print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
+                $i++;
+                $total += $obj->total_ht;
+            }
+            if ($total>0)
+            {
+                $var=!$var;
+                print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
+            }
+        }
+        else
+        {
+            $var=!$var;
+            print '<tr colspan="3" '.$bc[$var].'><td>'.$langs->trans("NoProposal").'</td></tr>';
+        }
+        print "</table><br>";
+
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+
+
 /*
  * Draft orders
  */
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index af0376fef0e..5068306646b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2012 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2015 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
@@ -712,8 +712,7 @@ if ($resql)
     
     $i = 0;
     print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    
-	print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$massactionbutton,$num,$nbtotalofrecords,'title_accountancy.png');
+	print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$massactionbutton,$num,$nbtotalofrecords,'title_accountancy.png',0,'','',$limit);
 
 	if ($massaction == 'presend')
 	{
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 82d1444ff73..c0e5bb5458a 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -37,10 +37,11 @@
 class CMailFile
 {
 	var $subject;      	// Topic:       Subject of email
-	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>')
+	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
 	                   	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
 	                   	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
 	                   	// Return-Path: Email where to send bounds.
+	var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
 	var $errors_to;		// Errors-To:	Email where to send errors.
 	var $addr_to;
 	var $addr_cc;
@@ -190,6 +191,7 @@ class CMailFile
 			// Define smtp_headers
 			$this->subject = $subject;
 			$this->addr_from = $from;
+			$this->reply_to = $from;         // Set this property after constructor if you want to use another value
 			$this->errors_to = $errors_to;
 			$this->addr_to = $to;
 			$this->addr_cc = $addr_cc;
@@ -256,7 +258,8 @@ class CMailFile
 			$smtps->setTO($this->getValidAddress($to,0,1));
 			$smtps->setFrom($this->getValidAddress($from,0,1));
 			$smtps->setTrackId($trackid);
-
+			$smtps->setReplyTo($this->getValidAddress($from,0,1));   // Set property with this->smtps->setReplyTo after constructor if you want to use another value than the From
+			
 			if (! empty($this->html))
 			{
 				if (!empty($css))
@@ -308,6 +311,7 @@ class CMailFile
 			$this->phpmailer->Subject($this->encodetorfc2822($subject));
 			$this->phpmailer->setTO($this->getValidAddress($to,0,1));
 			$this->phpmailer->SetFrom($this->getValidAddress($from,0,1));
+			$this->phpmailer->SetReplyTo($this->getValidAddress($from,0,1));   // Set property with this->phpmailer->setReplyTo after constructor if you want to use another value than the From
 			// TODO Add trackid into smtp header
 
 			if (! empty($this->html))
@@ -341,12 +345,10 @@ class CMailFile
 				}
 			}
 
-			$smtps->setCC($addr_cc);
-			$smtps->setBCC($addr_bcc);
-			$smtps->setErrorsTo($errors_to);
-			$smtps->setDeliveryReceipt($deliveryreceipt);
-
-			$this->smtps=$smtps;
+			$this->phpmailer->setCC($addr_cc);
+			$this->phpmailer->setBCC($addr_bcc);
+			$this->phpmailer->setErrorsTo($errors_to);
+			$this->phpmailer->setDeliveryReceipt($deliveryreceipt);
 		}
 		else
 		{
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 8b8e9e4905c..cfefa223a7d 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -817,7 +817,36 @@ class SMTPs
 		return $_retValue;
 	}
 
-
+	/**
+	 * Reply-To Address from which mail will be the reply-to
+	 *
+	 * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to
+	 * @return 	void
+	 */
+	function setReplyTo($_strReplyTo)
+	{
+	    if ( $_strReplyTo )
+	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+	}
+	
+	/**
+	 * Retrieves the Address from which mail will be the reply-to
+	 *
+	 * @param  	boolean $_part		To "strip" 'Real name' from address
+	 * @return 	string 				Address from which mail will be the reply-to
+	 */
+	function getReplyTo($_part = true)
+	{
+	    $_retValue = '';
+	
+	    if ( $_part === true )
+	        $_retValue = $this->_msgReplyTo;
+	    else
+	        $_retValue = $this->_msgReplyTo[$_part];
+	
+	    return $_retValue;
+	}
+	
 	/**
 	 * Inserts given addresses into structured format.
 	 * This method takes a list of given addresses, via an array
@@ -1159,7 +1188,8 @@ class SMTPs
 		$_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
 		if ( $this->getErrorsTo() )
 		$_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
-		$_header .= "Reply-To: ".$this->getFrom('addr') ."\r\n";
+		if ( $this->getReplyTo() )
+        $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
 
 		$_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)'                   . "\r\n"
 		.  'Mime-Version: 1.0'                            . "\r\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 17a1a575a97..26f549fab1f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2968,7 +2968,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
  *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
  *  @param	string	$morehtml			More html to show
  *  @param  string  $morecss            More css to the table
- *  @param  int     $limit              Limit ofnumber of lines on each page
+ *  @param  int     $limit              Max number of lines
  *	@return	void
  */
 function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=0)
@@ -3016,7 +3016,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	{
 		if ($totalnboflines)	// If we know total nb of lines
 		{
-			$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 6 : 3);		// nb before and after selected page + ... + first or last
+			$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 6 : 3);		// page nb before and after selected page + ... + first or last
 
 			$nbpages=ceil($totalnboflines/$limit);
 			$cpt=($page-$maxnbofpage);
@@ -3055,7 +3055,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 			$pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><span '.(empty($conf->dol_use_jmobile)?'class="active"':'data-role="button"').'>'.($page+1)."</li>";
 		}
 	}
-	print_fleche_navigation($page,$file,$options,$nextpage,$pagelist,$morehtml);		// output the div and ul for previous/last completed with page numbers into $pagelist
+	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $limit, $totalnboflines);		// output the div and ul for previous/last completed with page numbers into $pagelist
 	print '</td>';
 
 	print '</tr></table>'."\n";
@@ -3071,13 +3071,42 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
  *	@param	integer			$nextpage	    	Do we show a next page button
  *	@param	string			$betweenarrows		HTML content to show between arrows. MUST contains '<li> </li>' tags or '<li><span> </span></li>'.
  *  @param	string			$afterarrows		HTML content to show after arrows. Must NOT contains '<li> </li>' tags.
+ *  @param  string          $limit              Max nb of record to show ('' = unknown = default, '0' = no limit, 'x' = limit)
+ *	@param	int		        $totalnboflines		Total number of records/lines for all pages (if known)
  *	@return	void
  */
-function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='')
+function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit='', $totalnboflines=0)
 {
 	global $conf, $langs;
 
 	print '<div class="pagination"><ul>';
+	if ($limit != '')
+	{
+	    $pagesizechoices='10:10,20:20,30:30,50:50,100:100,250:250,500:500,1000:1000,0:'.$langs->trans("All");
+	    if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
+	    
+        print '<li class="pagination"><select class="flat selectlimit" name="limit">';
+        $tmpchoice=explode(',',$pagesizechoices);
+        $found=false;
+        foreach($tmpchoice as $val)
+        {
+            $selected='';
+            $tmp=explode(':',$val);
+            $key=$tmp[0];
+            $val=$tmp[1];
+            if ($key != '' && $val != '')
+            {
+                if ($key == $limit)
+                {
+                    $selected = ' selected="selected"';
+                    $found = true;
+                }
+                print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";
+            }
+        }
+        print '</select>';
+        print '</li>';	    
+	}
 	if ($page > 0)
 	{
 		if (empty($conf->dol_use_jmobile)) print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 3e782fdbeaf..040f483c3f8 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -310,7 +310,7 @@ UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
-PriceUHT=U.P. (net in currency)
+PriceUHT=U.P. (net)
 PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang
index 99a5753a665..69f765391ff 100644
--- a/htdocs/langs/en_US/supplier_proposal.lang
+++ b/htdocs/langs/en_US/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4f1e049ba65..3d11bbf0508 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -520,6 +520,9 @@ div.myavailability {
     margin-top: 6px;	
     margin-left: 4px;	
 }
+.selectlimit {
+	margin-right: 10px !important;
+}
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index b60c3c5be06..f2ab4e27c43 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -508,6 +508,9 @@ div.myavailability {
     margin-top: 6px;	
     margin-left: 4px;	
 }
+.selectlimit {
+	margin-right: 10px !important;
+}
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */

From 73041b0be50eb148dad1fff2dc15dbe300c0ee61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Feb 2016 14:05:05 +0100
Subject: [PATCH 103/421] Update google_oauthcallback.php

---
 htdocs/core/modules/oauth/google_oauthcallback.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 43232ed92f2..623c131086b 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -45,7 +45,7 @@ $backtourl = GETPOST('backtourl', 'alpha');
 $uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
 //$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
 //$currentUri->setQuery('');
-$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php');
+$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/google_oauthcallback.php');
 
 
 /**

From 51da5ea1f0676ca747f5899efbee305e424906d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Feb 2016 14:07:54 +0100
Subject: [PATCH 104/421] Update printgcp.modules.php

---
 htdocs/core/modules/printing/printgcp.modules.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 7c6e965f778..29e6f0d6941 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -75,7 +75,7 @@ class printing_printgcp extends PrintingDriver
         $credentials = new Credentials(
             $this->google_id,
             $this->google_secret,
-            $urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php'
+            $urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
         );
         $access = ($storage->hasAccessToken('Google')?'HasAccessToken':'NoAccessToken');
         $serviceFactory = new \OAuth\ServiceFactory();
@@ -113,7 +113,7 @@ class printing_printgcp extends PrintingDriver
          
             if ($this->google_id != '' && $this->google_secret != '') {
                 $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
-                $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_ACCESS', 'info'=>$access, 'type'=>'info', 'renew'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'delete'=>($storage->hasAccessToken('Google')?$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'):''));
+                $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_ACCESS', 'info'=>$access, 'type'=>'info', 'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'delete'=>($storage->hasAccessToken('Google')?$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'):''));
                 if ($token_ok) {
                     $refreshtoken = $token->getRefreshToken();
                     $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_REFRESH',   'info'=>((! empty($refreshtoken))?'Yes':'No'), 'type'=>'info');
@@ -122,10 +122,10 @@ class printing_printgcp extends PrintingDriver
                 }
                 /*
                 if ($storage->hasAccessToken('Google')) {
-                    $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
-                    $this->conf[] = array('varname'=>'PRINTGCP_DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
+                    $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
+                    $this->conf[] = array('varname'=>'PRINTGCP_DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
                 } else {
-                    $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
+                    $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
                 }*/
             } else {
                 $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
@@ -200,7 +200,7 @@ class printing_printgcp extends PrintingDriver
         $credentials = new Credentials(
             $this->google_id,
             $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/getgoogleoauthcallback.php'
+            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
         );
         $serviceFactory = new \OAuth\ServiceFactory();
         $apiService = $serviceFactory->createService('Google', $credentials, $storage, array());
@@ -387,7 +387,7 @@ class printing_printgcp extends PrintingDriver
         $credentials = new Credentials(
             $this->google_id,
             $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/getgoogleoauthcallback.php'
+            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
         );
         $serviceFactory = new \OAuth\ServiceFactory();
         $apiService = $serviceFactory->createService('Google', $credentials, $storage, array());

From ffccd43aab0a425e6d9574a07ea66e26c88d40f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Feb 2016 14:08:50 +0100
Subject: [PATCH 105/421] Update oauth.php

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

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 2adf79a6174..c65c78d34ef 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -43,7 +43,7 @@ if (!$user->admin)
 
 $action = GETPOST('action', 'alpha');
 
-// Supported OAUTH (a provider is supported when a file xxx_oauth2callback.php is available into htdocs/core/modules/oauth)
+// Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
 $supportedoauth2array=array('OAUTH_GOOGLE_NAME'=>'google');
 
 // API access parameters OAUTH
@@ -368,4 +368,4 @@ print '</form>';
 
 
 llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();

From c28f977e02af60db6ef16be4d86bdef39d6f7444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Feb 2016 14:12:34 +0100
Subject: [PATCH 106/421] Update printgcp.modules.php

---
 htdocs/core/modules/printing/printgcp.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 29e6f0d6941..5177e108f40 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -113,7 +113,7 @@ class printing_printgcp extends PrintingDriver
          
             if ($this->google_id != '' && $this->google_secret != '') {
                 $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
-                $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_ACCESS', 'info'=>$access, 'type'=>'info', 'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'delete'=>($storage->hasAccessToken('Google')?$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'):''));
+                $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_ACCESS', 'info'=>$access, 'type'=>'info', 'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'delete'=>($storage->hasAccessToken('Google')?$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'):''));
                 if ($token_ok) {
                     $refreshtoken = $token->getRefreshToken();
                     $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_REFRESH',   'info'=>((! empty($refreshtoken))?'Yes':'No'), 'type'=>'info');
@@ -338,7 +338,7 @@ class printing_printgcp extends PrintingDriver
         $credentials = new Credentials(
             $this->google_id,
             $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/getoauthcallback.php?service=google'
+            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php?service=google'
         );
         $serviceFactory = new \OAuth\ServiceFactory();
         $apiService = $serviceFactory->createService('Google', $credentials, $storage, array());

From 223195538a33165bb464ddb30b681117968a9bd1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Feb 2016 14:29:12 +0100
Subject: [PATCH 107/421] Return bad late or not status for order

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 3417419f892..53c914f7a3c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3342,14 +3342,14 @@ class Commande extends CommonOrder
     /**
      * Is the customer order delayed?
      *
-     * @return bool
+     * @return bool     true if late, false if not
      */
     public function hasDelay()
     {
         global $conf;
 
-        if (!($this->statut > Commande::STATUS_DRAFT) && ($this->statut < Commande::STATUS_CLOSED)) {
-            return false;
+        if (! ($this->statut > Commande::STATUS_DRAFT && $this->statut < Commande::STATUS_CLOSED)) {
+            return false;   // Never late if not inside this status range
         }
 
         $now = dol_now();

From 5c1c413c02cdcf2fb568c1f1905e45b739b005b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Feb 2016 15:44:34 +0100
Subject: [PATCH 108/421] Fix warning

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

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 83c67509dcc..bc40cfde976 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -54,7 +54,8 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     curl_setopt($ch, CURLOPT_VERBOSE, 1);
 	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
-	curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));
+	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
+	
 	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
 	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
 

From 7ef0415aca64a95e401918724d70bb1246c6322b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Feb 2016 15:57:24 +0100
Subject: [PATCH 109/421] Small per enhancement

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 41a9d7c78b7..db227ae4cf6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1892,11 +1892,12 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 {
 	global $conf;
 
-	if (empty($stringencoding)) $stringencoding='UTF-8';
-
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
+	
+	if (empty($stringencoding)) $stringencoding='UTF-8';
 	// reduce for small screen
-    if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
+	if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
+
 	// We go always here
 	if ($trunc == 'right')
 	{

From 05d7b14786a4c5d47768df2b8e3185d0b377be11 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 9 Feb 2016 19:11:19 +0100
Subject: [PATCH 110/421] Accoutancy

---
 htdocs/accountancy/bookkeeping/balance.php | 498 +++++++++++++++++++++
 1 file changed, 498 insertions(+)
 create mode 100644 htdocs/accountancy/bookkeeping/balance.php

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
new file mode 100644
index 00000000000..5e36e5f2a77
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -0,0 +1,498 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file htdocs/accountancy/bookkeeping/balance.php
+ * \ingroup Accounting Expert
+ * \brief Balance of book keeping
+ */
+require '../../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+
+// Langs
+$langs->load("accountancy");
+
+$page = GETPOST("page");
+$sortorder = GETPOST("sortorder");
+$sortfield = GETPOST("sortfield");
+$action = GETPOST('action', 'alpha');
+$search_mvt_num = GETPOST('search_mvt_num', 'int');
+$search_doc_type = GETPOST("search_doc_type");
+$search_doc_ref = GETPOST("search_doc_ref");
+$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(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+
+if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt")) {
+	$action = 'delbookkeepingyear';
+}
+if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
+	$action = 'export_csv';
+}
+
+$search_accountancy_code = GETPOST("search_accountancy_code");
+
+$search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
+if ($search_accountancy_code_start == - 1) {
+	$search_accountancy_code_start = '';
+}
+$search_accountancy_code_end = GETPOST('search_accountancy_code_end', 'alpha');
+if ($search_accountancy_code_end == - 1) {
+	$search_accountancy_code_end = '';
+}
+
+$search_accountancy_aux_code = GETPOST("search_accountancy_aux_code");
+
+$search_accountancy_aux_code_start = GETPOST('search_accountancy_aux_code_start', 'alpha');
+if ($search_accountancy_aux_code_start == - 1) {
+	$search_accountancy_aux_code_start = '';
+}
+$search_accountancy_aux_code_end = GETPOST('search_accountancy_aux_code_end', 'alpha');
+if ($search_accountancy_aux_code_end == - 1) {
+	$search_accountancy_aux_code_end = '';
+}
+$search_mvt_label = GETPOST('search_mvt_label', 'alpha');
+$search_direction = GETPOST('search_direction', 'alpha');
+$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+
+$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
+
+$offset = $limit * $page;
+
+$object = new BookKeeping($db);
+
+$formventilation = new FormVentilation($db);
+$formother = new FormOther($db);
+$form = new Form($db);
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_mvt_num = '';
+	$search_doc_type = '';
+	$search_doc_ref = '';
+	$search_doc_date = '';
+	$search_accountancy_code = '';
+	$search_accountancy_code_start = '';
+	$search_accountancy_code_end = '';
+	$search_accountancy_aux_code = '';
+	$search_accountancy_aux_code_start = '';
+	$search_accountancy_aux_code_end = '';
+	$search_mvt_label = '';
+	$search_direction = '';
+	$search_ledger_code = '';
+	$search_date_start = '';
+	$search_date_end = '';
+}
+
+if (empty($search_date_start)) {
+	$search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
+	$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
+}
+if ($sortorder == "")
+	$sortorder = "ASC";
+if ($sortfield == "")
+	$sortfield = "t.rowid";
+
+$options = '';
+$filter = array ();
+if (! empty($search_date_start)) {
+	$filter['t.doc_date>='] = $search_date_start;
+	$options .= '&amp;date_startmonth=' . GETPOST('date_startmonth', 'int') . '&amp;date_startday=' . GETPOST('date_startday', 'int') . '&amp;date_startyear=' . GETPOST('date_startyear', 'int');
+}
+if (! empty($search_date_end)) {
+	$filter['t.doc_date<='] = $search_date_end;
+	$options .= '&amp;date_endmonth=' . GETPOST('date_endmonth', 'int') . '&amp;date_endday=' . GETPOST('date_endday', 'int') . '&amp;date_endyear=' . GETPOST('date_endyear', 'int');
+}
+if (! empty($search_doc_type)) {
+	$filter['t.doc_type'] = $search_doc_type;
+	$options .= '&amp;search_doc_type=' . $search_doc_type;
+}
+if (! empty($search_doc_date)) {
+	$filter['t.doc_date'] = $search_doc_date;
+	$options .= '&amp;doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&amp;doc_dateday=' . GETPOST('doc_dateday', 'int') . '&amp;doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+}
+if (! empty($search_doc_ref)) {
+	$filter['t.doc_ref'] = $search_doc_ref;
+	$options .= '&amp;search_doc_ref=' . $search_doc_ref;
+}
+if (! empty($search_accountancy_code)) {
+	$filter['t.numero_compte'] = $search_accountancy_code;
+	$options .= '&amp;search_accountancy_code=' . $search_accountancy_code;
+}
+if (! empty($search_accountancy_code_start)) {
+	$filter['t.numero_compte>='] = $search_accountancy_code_start;
+	$options .= '&amp;search_accountancy_code_start=' . $search_accountancy_code_start;
+}
+if (! empty($search_accountancy_code_end)) {
+	$filter['t.numero_compte<='] = $search_accountancy_code_end;
+	$options .= '&amp;search_accountancy_code_end=' . $search_accountancy_code_end;
+}
+if (! empty($search_accountancy_aux_code)) {
+	$filter['t.code_tiers'] = $search_accountancy_aux_code;
+	$options .= '&amp;search_accountancy_aux_code=' . $search_accountancy_aux_code;
+}
+if (! empty($search_accountancy_aux_code_start)) {
+	$filter['t.code_tiers>='] = $search_accountancy_aux_code_start;
+	$options .= '&amp;search_accountancy_aux_code_start=' . $search_accountancy_aux_code_start;
+}
+if (! empty($search_accountancy_aux_code_end)) {
+	$filter['t.code_tiers<='] = $search_accountancy_aux_code_end;
+	$options .= '&amp;search_accountancy_aux_code_end=' . $search_accountancy_aux_code_end;
+}
+if (! empty($search_mvt_label)) {
+	$filter['t.label_compte'] = $search_mvt_label;
+	$options .= '&amp;search_mvt_label=' . $search_mvt_label;
+}
+if (! empty($search_direction)) {
+	$filter['t.sens'] = $search_direction;
+	$options .= '&amp;search_direction=' . $search_direction;
+}
+if (! empty($search_ledger_code)) {
+	$filter['t.code_journal'] = $search_ledger_code;
+	$options .= '&amp;search_ledger_code=' . $search_ledger_code;
+}
+if (! empty($search_mvt_num)) {
+	$filter['t.piece_num'] = $search_mvt_num;
+	$options .= '&amp;search_mvt_num=' . $search_mvt_num;
+}
+
+/*
+ * Action
+ */
+if ($action == 'delbookkeeping') {
+	
+	$import_key = GETPOST('importkey', 'alpha');
+	
+	if (! empty($import_key)) {
+		$result = $object->deleteByImportkey($import_key);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+		Header("Location: list.php");
+		exit();
+	}
+} elseif ($action == 'delbookkeepingyearconfirm') {
+	
+	$delyear = GETPOST('delyear', 'int');
+	
+	if (! empty($delyear)) {
+		$result = $object->deleteByYear($delyear);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+		Header("Location: list.php");
+		exit();
+	}
+} elseif ($action == 'delmouvconfirm') {
+	
+	$mvt_num = GETPOST('mvt_num', 'int');
+	
+	if (! empty($mvt_num)) {
+		$result = $object->deleteMvtNum($mvt_num);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+		// if (!empty($options)) {
+		// Header("Location: list.php?".urldecode($options));
+		// } else {
+		Header("Location: list.php");
+		// }
+		exit();
+	}
+} elseif ($action == 'export_csv') {
+	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	$journal = 'bookkepping';
+	
+	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
+	
+	$result = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+	
+	foreach ( $object->lines as $line ) {
+		
+		if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
+			$sep = ";";
+			// Model Cegid Expert Export
+			$date = dol_print_date($line->doc_date, '%d%m%Y');
+			print $date . $sep;
+			print $line->code_journal . $sep;
+			print length_accountg($line->numero_compte) . $sep;
+			print ' ' . $sep;
+			print $line->sens . $sep;
+			print price($line->montant) . $sep;
+			print dol_trunc($line->label_compte, 32) . $sep;
+			print $line->doc_ref . $sep;
+			
+			/*print $line->piece_num . $sep;
+			 print length_accounta($line->code_tiers) . $sep;
+			 print  . $sep;
+			 print price($line->debit) . $sep;
+			 print price($line->credit) . $sep;*/
+			
+			print "\n";
+		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
+			
+			// Std export
+			$date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
+			print $date . $sep;
+			print $line->doc_ref . $sep;
+			print length_accounta($line->numero_compte) . $sep;
+			print length_accountg($line->code_tiers) . $sep;
+			print price($line->debit) . $sep;
+			print price($line->credit) . $sep;
+			
+			/*print $line->piece_num . $sep;
+			 print $line->label_compte . $sep;
+			 print price($line->montant) . $sep;
+			 print $line->sens . $sep;*/
+			print $line->code_journal . $sep;
+			print "\n";
+		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 3) {
+			
+			// Coala export
+			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
+			print $date . $sep;
+			print $line->code_journal . $sep;
+			print length_accounta($line->numero_compte) . $sep;
+			print $line->piece_num . $sep;
+			print $line->doc_ref . $sep;
+			print price($line->debit) . $sep;
+			print price($line->credit) . $sep;
+			print 'E' . $sep;
+			print length_accountg($line->code_tiers) . $sep;
+			print "\n";
+		}
+	}
+} 
+
+else {
+	
+	$title_page = $langs->trans("AccountBalance") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
+	
+	llxHeader('', $title_page);
+	
+	/*
+	 * List
+	 */
+	
+	$nbtotalofrecords = 0;
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+		$nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
+		if ($nbtotalofrecords < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+	
+	$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+	
+	if ($action == 'delmouv') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?mvt_num=' . GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delmouvconfirm', '', 0, 1);
+		print $formconfirm;
+	}
+	if ($action == 'delbookkeepingyear') {
+		
+		$form_question = array ();
+		$delyear = GETPOST('delyear');
+		
+		if (empty($delyear)) {
+			$delyear = dol_print_date(dol_now(), '%Y');
+		}
+		$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+		
+		$form_question['delyear'] = array (
+				'name' => 'delyear',
+				'type' => 'select',
+				'label' => $langs->trans('DelYear'),
+				'values' => $year_array,
+				'default' => $delyear 
+		);
+		
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, 0, 1);
+		print $formconfirm;
+	}
+	
+	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords);
+	
+	/*print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+	 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+	 print '<input type="hidden" name="action" value="delbookkeeping">';
+	 
+	 print $formventilation->select_bookkeeping_importkey('importkey', GETPOST('importkey'));
+	 
+	 print '<div class="inline-block divButAction"><input type="submit" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
+	 
+	 print '</form>';*/
+	
+	print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
+	print '<div class="tabsAction">' . "\n";
+	//print '<div class="inline-block divButAction"><input type="submit"  name="button_delmvt" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
+	//print '<a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a>';
+	// print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=export_csv">' . $langs->trans("Export") . '</a>';
+	print '<div class="inline-block divButAction"><input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" /></div>';
+	
+	print '</div>';
+	
+	 print '<div class="liste_titre">';
+	 print $langs->trans('DateStart') . ': ';
+	 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
+	 print $langs->trans('DateEnd') . ': ';
+	 print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+	 print '</div>';
+	 /*
+	 print '<div class="liste_titre">';
+	 print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
+	 print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
+	 print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
+	 print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+	 print '</div>';
+	 print '<div class="liste_titre">';
+	 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+	 print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+	 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+	 print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+	 print '</div>';*/
+	
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	//print_liste_field_titre($langs->trans("NumPiece"), $_SERVER['PHP_SELF'], "t.piece_num", "", $options, "", $sortfield, $sortorder);
+	//print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, "", $sortfield, $sortorder);
+	//print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Numerocompte"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
+	//print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $options, "", $sortfield, $sortorder);
+	//print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "bk_label_compte", "", $options, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
+	// print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, 'align="center"', $sortfield, $sortorder);
+	// print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, 'align="center"', $sortfield, $sortorder);
+	//print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Solde"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+	print "</tr>\n";
+	
+	print '<tr class="liste_titre">';
+	/*print '<td><input type="text" name="search_mvt_num" size="8" value="' . $search_mvt_num . '"></td>';
+	print '<td class="liste_titre">';
+	print $langs->trans('From') . ': ';
+	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
+	print '<br>';
+	print $langs->trans('To') . ': ';
+	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+	// print $form->select_date($search_doc_date, 'doc_date', 0, 0, 1);
+	print '</td>';*/
+	//print '<td><input type="text" name="search_doc_ref" size="8" value="' . $search_doc_ref . '"></td>';
+	print '<td>';
+	// print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
+	print $langs->trans('From');
+	print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
+	// print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
+	print '<br>';
+	print $langs->trans('To');
+	print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+	print '</td>';
+	// print '<td><input type="text" name="search_accountancy_code" size="8" value="' . $search_accountancy_code . '"></td>';
+	/*print '<td>';
+	// print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+	print $langs->trans('From');
+	print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+	// print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+	print '<br>';
+	print $langs->trans('To');
+	print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+	print '</td>';*/
+	// print '<td><input type="text" name="search_accountancy_aux_code" size="8" value="' . $search_accountancy_aux_code . '"></td>';
+	
+	/*print '<td class="liste_titre">';
+	print '<input type="text" size=6 class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
+	print '</td>';*/
+	print '<td>&nbsp;</td>';
+	print '<td>&nbsp;</td>';
+	print '<td>&nbsp;</td>';
+	// print '<td>&nbsp;</td>';
+	// print '<td>&nbsp;</td>';
+	//print '<td  align="right"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
+	print '<td align="right" class="liste_titre">';
+	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+	print '&nbsp;';
+	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
+	print '</td>';
+	
+	print '</tr>';
+	
+	$var = True;
+	
+	$total_debit = 0;
+	$total_credit = 0;
+	
+	foreach ( $object->lines as $line ) {
+		$var = ! $var;
+		
+		$total_debit += $line->debit;
+		$total_credit += $line->credit;
+		
+		print "<tr $bc[$var]>";
+		
+		//print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
+		//print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
+		//print '<td>' . $line->doc_ref . '</td>';
+		print '<td>' . length_accountg($line->numero_compte) . '</td>';
+		//print '<td>' . length_accounta($line->code_tiers) . '</td>';
+		//print '<td>' . $line->label_compte . '</td>';
+		print '<td align="right">' . price($line->debit) . '</td>';
+		print '<td align="right">' . price($line->credit) . '</td>';
+		print '<td align="right">' . price($line->credit-$line->debit) . '</td>';
+		// print '<td align="right">' . price($line->montant) . '</td>';
+		// print '<td align="center">' . $line->sens . '</td>';
+		//print '<td align="right">' . $line->code_journal . '</td>';
+		print '<td align="center">';
+		//print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>';
+		//print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $options . '&page=' . $page . '">' . img_delete() . '</a>';
+		print '</td>';
+		print "</tr>\n";
+	}
+	
+	print '<tr class="liste_total">';
+	print '<td></td>';
+	print '<td  align="right">';
+	print price($total_debit);
+	print '</td>';
+	print '<td  align="right">';
+	print price($total_credit);
+	print '</td>';
+	print '<td align="right">'.price($total_credit-$total_debit).'</td>';
+	print '<td align="right"></td>';
+	print '</tr>';
+	
+	print "</table>";
+	print '</form>';
+	
+	llxFooter();
+}
+
+$db->close();
\ No newline at end of file

From 44e39519b038448bc9498daf9e9636525da17994 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 9 Feb 2016 19:20:03 +0100
Subject: [PATCH 111/421] add accountancy balance

---
 htdocs/accountancy/bookkeeping/balance.php    | 245 +-----------------
 .../accountancy/class/bookkeeping.class.php   |  82 +++++-
 htdocs/core/menus/standard/eldy.lib.php       |   3 +-
 3 files changed, 97 insertions(+), 233 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 5e36e5f2a77..16027a42af4 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com> 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,21 +38,8 @@ $page = GETPOST("page");
 $sortorder = GETPOST("sortorder");
 $sortfield = GETPOST("sortfield");
 $action = GETPOST('action', 'alpha');
-$search_mvt_num = GETPOST('search_mvt_num', 'int');
-$search_doc_type = GETPOST("search_doc_type");
-$search_doc_ref = GETPOST("search_doc_ref");
 $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(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
-$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
-
-if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt")) {
-	$action = 'delbookkeepingyear';
-}
-if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
-	$action = 'export_csv';
-}
-
-$search_accountancy_code = GETPOST("search_accountancy_code");
 
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
@@ -63,19 +50,9 @@ if ($search_accountancy_code_end == - 1) {
 	$search_accountancy_code_end = '';
 }
 
-$search_accountancy_aux_code = GETPOST("search_accountancy_aux_code");
-
-$search_accountancy_aux_code_start = GETPOST('search_accountancy_aux_code_start', 'alpha');
-if ($search_accountancy_aux_code_start == - 1) {
-	$search_accountancy_aux_code_start = '';
+if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
+	$action = 'export_csv';
 }
-$search_accountancy_aux_code_end = GETPOST('search_accountancy_aux_code_end', 'alpha');
-if ($search_accountancy_aux_code_end == - 1) {
-	$search_accountancy_aux_code_end = '';
-}
-$search_mvt_label = GETPOST('search_mvt_label', 'alpha');
-$search_direction = GETPOST('search_direction', 'alpha');
-$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 
 $limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 
@@ -89,19 +66,8 @@ $form = new Form($db);
 
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
-	$search_mvt_num = '';
-	$search_doc_type = '';
-	$search_doc_ref = '';
-	$search_doc_date = '';
-	$search_accountancy_code = '';
 	$search_accountancy_code_start = '';
 	$search_accountancy_code_end = '';
-	$search_accountancy_aux_code = '';
-	$search_accountancy_aux_code_start = '';
-	$search_accountancy_aux_code_end = '';
-	$search_mvt_label = '';
-	$search_direction = '';
-	$search_ledger_code = '';
 	$search_date_start = '';
 	$search_date_end = '';
 }
@@ -125,22 +91,6 @@ if (! empty($search_date_end)) {
 	$filter['t.doc_date<='] = $search_date_end;
 	$options .= '&amp;date_endmonth=' . GETPOST('date_endmonth', 'int') . '&amp;date_endday=' . GETPOST('date_endday', 'int') . '&amp;date_endyear=' . GETPOST('date_endyear', 'int');
 }
-if (! empty($search_doc_type)) {
-	$filter['t.doc_type'] = $search_doc_type;
-	$options .= '&amp;search_doc_type=' . $search_doc_type;
-}
-if (! empty($search_doc_date)) {
-	$filter['t.doc_date'] = $search_doc_date;
-	$options .= '&amp;doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&amp;doc_dateday=' . GETPOST('doc_dateday', 'int') . '&amp;doc_dateyear=' . GETPOST('doc_dateyear', 'int');
-}
-if (! empty($search_doc_ref)) {
-	$filter['t.doc_ref'] = $search_doc_ref;
-	$options .= '&amp;search_doc_ref=' . $search_doc_ref;
-}
-if (! empty($search_accountancy_code)) {
-	$filter['t.numero_compte'] = $search_accountancy_code;
-	$options .= '&amp;search_accountancy_code=' . $search_accountancy_code;
-}
 if (! empty($search_accountancy_code_start)) {
 	$filter['t.numero_compte>='] = $search_accountancy_code_start;
 	$options .= '&amp;search_accountancy_code_start=' . $search_accountancy_code_start;
@@ -149,85 +99,17 @@ if (! empty($search_accountancy_code_end)) {
 	$filter['t.numero_compte<='] = $search_accountancy_code_end;
 	$options .= '&amp;search_accountancy_code_end=' . $search_accountancy_code_end;
 }
-if (! empty($search_accountancy_aux_code)) {
-	$filter['t.code_tiers'] = $search_accountancy_aux_code;
-	$options .= '&amp;search_accountancy_aux_code=' . $search_accountancy_aux_code;
-}
-if (! empty($search_accountancy_aux_code_start)) {
-	$filter['t.code_tiers>='] = $search_accountancy_aux_code_start;
-	$options .= '&amp;search_accountancy_aux_code_start=' . $search_accountancy_aux_code_start;
-}
-if (! empty($search_accountancy_aux_code_end)) {
-	$filter['t.code_tiers<='] = $search_accountancy_aux_code_end;
-	$options .= '&amp;search_accountancy_aux_code_end=' . $search_accountancy_aux_code_end;
-}
-if (! empty($search_mvt_label)) {
-	$filter['t.label_compte'] = $search_mvt_label;
-	$options .= '&amp;search_mvt_label=' . $search_mvt_label;
-}
-if (! empty($search_direction)) {
-	$filter['t.sens'] = $search_direction;
-	$options .= '&amp;search_direction=' . $search_direction;
-}
-if (! empty($search_ledger_code)) {
-	$filter['t.code_journal'] = $search_ledger_code;
-	$options .= '&amp;search_ledger_code=' . $search_ledger_code;
-}
-if (! empty($search_mvt_num)) {
-	$filter['t.piece_num'] = $search_mvt_num;
-	$options .= '&amp;search_mvt_num=' . $search_mvt_num;
-}
 
 /*
  * Action
  */
-if ($action == 'delbookkeeping') {
-	
-	$import_key = GETPOST('importkey', 'alpha');
-	
-	if (! empty($import_key)) {
-		$result = $object->deleteByImportkey($import_key);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		Header("Location: list.php");
-		exit();
-	}
-} elseif ($action == 'delbookkeepingyearconfirm') {
-	
-	$delyear = GETPOST('delyear', 'int');
-	
-	if (! empty($delyear)) {
-		$result = $object->deleteByYear($delyear);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		Header("Location: list.php");
-		exit();
-	}
-} elseif ($action == 'delmouvconfirm') {
-	
-	$mvt_num = GETPOST('mvt_num', 'int');
-	
-	if (! empty($mvt_num)) {
-		$result = $object->deleteMvtNum($mvt_num);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		// if (!empty($options)) {
-		// Header("Location: list.php?".urldecode($options));
-		// } else {
-		Header("Location: list.php");
-		// }
-		exit();
-	}
-} elseif ($action == 'export_csv') {
+if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = 'bookkepping';
 	
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 	
-	$result = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
+	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -312,131 +194,43 @@ else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 	
-	if ($action == 'delmouv') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?mvt_num=' . GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delmouvconfirm', '', 0, 1);
-		print $formconfirm;
-	}
-	if ($action == 'delbookkeepingyear') {
-		
-		$form_question = array ();
-		$delyear = GETPOST('delyear');
-		
-		if (empty($delyear)) {
-			$delyear = dol_print_date(dol_now(), '%Y');
-		}
-		$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-		
-		$form_question['delyear'] = array (
-				'name' => 'delyear',
-				'type' => 'select',
-				'label' => $langs->trans('DelYear'),
-				'values' => $year_array,
-				'default' => $delyear 
-		);
-		
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, 0, 1);
-		print $formconfirm;
-	}
-	
 	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords);
 	
-	/*print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-	 print '<input type="hidden" name="action" value="delbookkeeping">';
-	 
-	 print $formventilation->select_bookkeeping_importkey('importkey', GETPOST('importkey'));
-	 
-	 print '<div class="inline-block divButAction"><input type="submit" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
-	 
-	 print '</form>';*/
-	
 	print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 	print '<div class="tabsAction">' . "\n";
-	//print '<div class="inline-block divButAction"><input type="submit"  name="button_delmvt" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
-	//print '<a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a>';
-	// print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=export_csv">' . $langs->trans("Export") . '</a>';
 	print '<div class="inline-block divButAction"><input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" /></div>';
 	
 	print '</div>';
 	
-	 print '<div class="liste_titre">';
-	 print $langs->trans('DateStart') . ': ';
-	 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
-	 print $langs->trans('DateEnd') . ': ';
-	 print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
-	 print '</div>';
-	 /*
-	 print '<div class="liste_titre">';
-	 print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
-	 print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
-	 print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
-	 print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
-	 print '</div>';
-	 print '<div class="liste_titre">';
-	 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-	 print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-	 print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
-	 print '</div>';*/
+	print '<div class="liste_titre">';
+	print $langs->trans('DateStart') . ': ';
+	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
+	print $langs->trans('DateEnd') . ': ';
+	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+	print '</div>';
 	
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	//print_liste_field_titre($langs->trans("NumPiece"), $_SERVER['PHP_SELF'], "t.piece_num", "", $options, "", $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, "", $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Numerocompte"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $options, "", $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "bk_label_compte", "", $options, "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-	// print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, 'align="center"', $sortfield, $sortorder);
-	// print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, 'align="center"', $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Solde"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
 	print "</tr>\n";
 	
 	print '<tr class="liste_titre">';
-	/*print '<td><input type="text" name="search_mvt_num" size="8" value="' . $search_mvt_num . '"></td>';
-	print '<td class="liste_titre">';
-	print $langs->trans('From') . ': ';
-	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
-	print '<br>';
-	print $langs->trans('To') . ': ';
-	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
-	// print $form->select_date($search_doc_date, 'doc_date', 0, 0, 1);
-	print '</td>';*/
-	//print '<td><input type="text" name="search_doc_ref" size="8" value="' . $search_doc_ref . '"></td>';
 	print '<td>';
-	// print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
 	print $langs->trans('From');
 	print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
-	// print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
 	print '<br>';
 	print $langs->trans('To');
 	print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
 	print '</td>';
-	// print '<td><input type="text" name="search_accountancy_code" size="8" value="' . $search_accountancy_code . '"></td>';
-	/*print '<td>';
-	// print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-	print $langs->trans('From');
-	print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	// print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-	print '<br>';
-	print $langs->trans('To');
-	print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
-	print '</td>';*/
-	// print '<td><input type="text" name="search_accountancy_aux_code" size="8" value="' . $search_accountancy_aux_code . '"></td>';
 	
-	/*print '<td class="liste_titre">';
-	print '<input type="text" size=6 class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
-	print '</td>';*/
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
-	// print '<td>&nbsp;</td>';
-	// print '<td>&nbsp;</td>';
-	//print '<td  align="right"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
+	
 	print '<td align="right" class="liste_titre">';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
 	print '&nbsp;';
@@ -458,21 +252,11 @@ else {
 		
 		print "<tr $bc[$var]>";
 		
-		//print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
-		//print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-		//print '<td>' . $line->doc_ref . '</td>';
 		print '<td>' . length_accountg($line->numero_compte) . '</td>';
-		//print '<td>' . length_accounta($line->code_tiers) . '</td>';
-		//print '<td>' . $line->label_compte . '</td>';
 		print '<td align="right">' . price($line->debit) . '</td>';
 		print '<td align="right">' . price($line->credit) . '</td>';
-		print '<td align="right">' . price($line->credit-$line->debit) . '</td>';
-		// print '<td align="right">' . price($line->montant) . '</td>';
-		// print '<td align="center">' . $line->sens . '</td>';
-		//print '<td align="right">' . $line->code_journal . '</td>';
+		print '<td align="right">' . price($line->credit - $line->debit) . '</td>';
 		print '<td align="center">';
-		//print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>';
-		//print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $options . '&page=' . $page . '">' . img_delete() . '</a>';
 		print '</td>';
 		print "</tr>\n";
 	}
@@ -485,7 +269,7 @@ else {
 	print '<td  align="right">';
 	print price($total_credit);
 	print '</td>';
-	print '<td align="right">'.price($total_credit-$total_debit).'</td>';
+	print '<td align="right">' . price($total_credit - $total_debit) . '</td>';
 	print '<td align="right"></td>';
 	print '</tr>';
 	
@@ -494,5 +278,4 @@ else {
 	
 	llxFooter();
 }
-
 $db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index dbca9aeddd9..0015dfbf9e9 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015-*2016 Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -642,6 +642,86 @@ class BookKeeping extends CommonObject
 		}
 	}
 	
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int $limit offset limit
+	 * @param int $offset offset limit
+	 * @param array $filter filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
+		dol_syslog(__METHOD__, LOG_DEBUG);
+	
+		$sql = 'SELECT';
+		$sql .= " t.numero_compte,";
+		$sql .= " SUM(t.debit) as debit,";
+		$sql .= " SUM(t.credit) as credit";
+		
+	
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+	
+		// Manage filter
+		$sqlwhere = array ();
+		if (count($filter) > 0) {
+			foreach ( $filter as $key => $value ) {
+				if ($key == 't.doc_date') {
+					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
+				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
+					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
+				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
+					$sqlwhere[] = $key . '=' . $value;
+				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+				} else {
+					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+				}
+			}
+		}
+	
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ' . implode(' ' . $filtermode . ' ', $sqlwhere);
+		}
+	
+		$sql .= ' GROUP BY t.numero_compte';
+	
+		if (! empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (! empty($limit)) {
+			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		}
+		$this->lines = array ();
+	
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+	
+			while ( $obj = $this->db->fetch_object($resql) ) {
+				$line = new BookKeepingLine();
+				
+				$line->numero_compte = $obj->numero_compte;
+				$line->debit = $obj->debit;
+				$line->credit = $obj->credit;
+				$this->lines[] = $line;
+			}
+			$this->db->free($resql);
+	
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+	
+			return - 1;
+		}
+	}
+	
 	/**
 	 * Update object into database
 	 *
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 0497b50308f..23f37e1b676 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -971,7 +971,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/accountancy/bookkeeping/list.php?leftmenu=bookkeeping",$langs->trans("Bookkeeping"),1,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookkeeping');
 				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/listbyyear.php",$langs->trans("ByYear"),2,$user->rights->accounting->mouvements->lire);
 				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balancebymonth.php",$langs->trans("AccountBalanceByMonth"),2,$user->rights->accounting->mouvements->lire);
-
+				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balance.php",$langs->trans("AccountBalance"),1,$user->rights->accounting->mouvements->lire);
+				
 				// Reports
 				$langs->load("compta");
 

From 44019955402ec5f509fdb5d97011389fd1bddfb7 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 9 Feb 2016 19:22:52 +0100
Subject: [PATCH 112/421] Accountancy feature

---
 htdocs/accountancy/bookkeeping/balance.php    | 281 ++++++++++++++++++
 htdocs/accountancy/bookkeeping/listbyyear.php |   4 +-
 .../accountancy/class/bookkeeping.class.php   |  82 ++++-
 htdocs/core/menus/standard/eldy.lib.php       |   1 +
 4 files changed, 365 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/accountancy/bookkeeping/balance.php

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
new file mode 100644
index 00000000000..16027a42af4
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -0,0 +1,281 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file htdocs/accountancy/bookkeeping/balance.php
+ * \ingroup Accounting Expert
+ * \brief Balance of book keeping
+ */
+require '../../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+
+// Langs
+$langs->load("accountancy");
+
+$page = GETPOST("page");
+$sortorder = GETPOST("sortorder");
+$sortfield = GETPOST("sortfield");
+$action = GETPOST('action', '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(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+
+$search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
+if ($search_accountancy_code_start == - 1) {
+	$search_accountancy_code_start = '';
+}
+$search_accountancy_code_end = GETPOST('search_accountancy_code_end', 'alpha');
+if ($search_accountancy_code_end == - 1) {
+	$search_accountancy_code_end = '';
+}
+
+if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
+	$action = 'export_csv';
+}
+
+$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
+
+$offset = $limit * $page;
+
+$object = new BookKeeping($db);
+
+$formventilation = new FormVentilation($db);
+$formother = new FormOther($db);
+$form = new Form($db);
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_accountancy_code_start = '';
+	$search_accountancy_code_end = '';
+	$search_date_start = '';
+	$search_date_end = '';
+}
+
+if (empty($search_date_start)) {
+	$search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
+	$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
+}
+if ($sortorder == "")
+	$sortorder = "ASC";
+if ($sortfield == "")
+	$sortfield = "t.rowid";
+
+$options = '';
+$filter = array ();
+if (! empty($search_date_start)) {
+	$filter['t.doc_date>='] = $search_date_start;
+	$options .= '&amp;date_startmonth=' . GETPOST('date_startmonth', 'int') . '&amp;date_startday=' . GETPOST('date_startday', 'int') . '&amp;date_startyear=' . GETPOST('date_startyear', 'int');
+}
+if (! empty($search_date_end)) {
+	$filter['t.doc_date<='] = $search_date_end;
+	$options .= '&amp;date_endmonth=' . GETPOST('date_endmonth', 'int') . '&amp;date_endday=' . GETPOST('date_endday', 'int') . '&amp;date_endyear=' . GETPOST('date_endyear', 'int');
+}
+if (! empty($search_accountancy_code_start)) {
+	$filter['t.numero_compte>='] = $search_accountancy_code_start;
+	$options .= '&amp;search_accountancy_code_start=' . $search_accountancy_code_start;
+}
+if (! empty($search_accountancy_code_end)) {
+	$filter['t.numero_compte<='] = $search_accountancy_code_end;
+	$options .= '&amp;search_accountancy_code_end=' . $search_accountancy_code_end;
+}
+
+/*
+ * Action
+ */
+if ($action == 'export_csv') {
+	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	$journal = 'bookkepping';
+	
+	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
+	
+	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+	
+	foreach ( $object->lines as $line ) {
+		
+		if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
+			$sep = ";";
+			// Model Cegid Expert Export
+			$date = dol_print_date($line->doc_date, '%d%m%Y');
+			print $date . $sep;
+			print $line->code_journal . $sep;
+			print length_accountg($line->numero_compte) . $sep;
+			print ' ' . $sep;
+			print $line->sens . $sep;
+			print price($line->montant) . $sep;
+			print dol_trunc($line->label_compte, 32) . $sep;
+			print $line->doc_ref . $sep;
+			
+			/*print $line->piece_num . $sep;
+			 print length_accounta($line->code_tiers) . $sep;
+			 print  . $sep;
+			 print price($line->debit) . $sep;
+			 print price($line->credit) . $sep;*/
+			
+			print "\n";
+		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
+			
+			// Std export
+			$date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
+			print $date . $sep;
+			print $line->doc_ref . $sep;
+			print length_accounta($line->numero_compte) . $sep;
+			print length_accountg($line->code_tiers) . $sep;
+			print price($line->debit) . $sep;
+			print price($line->credit) . $sep;
+			
+			/*print $line->piece_num . $sep;
+			 print $line->label_compte . $sep;
+			 print price($line->montant) . $sep;
+			 print $line->sens . $sep;*/
+			print $line->code_journal . $sep;
+			print "\n";
+		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 3) {
+			
+			// Coala export
+			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
+			print $date . $sep;
+			print $line->code_journal . $sep;
+			print length_accounta($line->numero_compte) . $sep;
+			print $line->piece_num . $sep;
+			print $line->doc_ref . $sep;
+			print price($line->debit) . $sep;
+			print price($line->credit) . $sep;
+			print 'E' . $sep;
+			print length_accountg($line->code_tiers) . $sep;
+			print "\n";
+		}
+	}
+} 
+
+else {
+	
+	$title_page = $langs->trans("AccountBalance") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
+	
+	llxHeader('', $title_page);
+	
+	/*
+	 * List
+	 */
+	
+	$nbtotalofrecords = 0;
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+		$nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
+		if ($nbtotalofrecords < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+	
+	$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+	
+	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords);
+	
+	print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
+	print '<div class="tabsAction">' . "\n";
+	print '<div class="inline-block divButAction"><input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" /></div>';
+	
+	print '</div>';
+	
+	print '<div class="liste_titre">';
+	print $langs->trans('DateStart') . ': ';
+	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
+	print $langs->trans('DateEnd') . ': ';
+	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+	print '</div>';
+	
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Numerocompte"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Solde"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+	print "</tr>\n";
+	
+	print '<tr class="liste_titre">';
+	print '<td>';
+	print $langs->trans('From');
+	print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
+	print '<br>';
+	print $langs->trans('To');
+	print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+	print '</td>';
+	
+	print '<td>&nbsp;</td>';
+	print '<td>&nbsp;</td>';
+	print '<td>&nbsp;</td>';
+	
+	print '<td align="right" class="liste_titre">';
+	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+	print '&nbsp;';
+	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
+	print '</td>';
+	
+	print '</tr>';
+	
+	$var = True;
+	
+	$total_debit = 0;
+	$total_credit = 0;
+	
+	foreach ( $object->lines as $line ) {
+		$var = ! $var;
+		
+		$total_debit += $line->debit;
+		$total_credit += $line->credit;
+		
+		print "<tr $bc[$var]>";
+		
+		print '<td>' . length_accountg($line->numero_compte) . '</td>';
+		print '<td align="right">' . price($line->debit) . '</td>';
+		print '<td align="right">' . price($line->credit) . '</td>';
+		print '<td align="right">' . price($line->credit - $line->debit) . '</td>';
+		print '<td align="center">';
+		print '</td>';
+		print "</tr>\n";
+	}
+	
+	print '<tr class="liste_total">';
+	print '<td></td>';
+	print '<td  align="right">';
+	print price($total_debit);
+	print '</td>';
+	print '<td  align="right">';
+	print price($total_credit);
+	print '</td>';
+	print '<td align="right">' . price($total_credit - $total_debit) . '</td>';
+	print '<td align="right"></td>';
+	print '</tr>';
+	
+	print "</table>";
+	print '</form>';
+	
+	llxFooter();
+}
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index e9751e0f12e..3ec0a704407 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -208,8 +208,8 @@ print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit
 print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, "", $sortfield, $sortorder);
-print '<td class="liste_titre" align="right">';
-print '</td>';
+print '<th class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '"></td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index dbca9aeddd9..0015dfbf9e9 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015-*2016 Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -642,6 +642,86 @@ class BookKeeping extends CommonObject
 		}
 	}
 	
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int $limit offset limit
+	 * @param int $offset offset limit
+	 * @param array $filter filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
+		dol_syslog(__METHOD__, LOG_DEBUG);
+	
+		$sql = 'SELECT';
+		$sql .= " t.numero_compte,";
+		$sql .= " SUM(t.debit) as debit,";
+		$sql .= " SUM(t.credit) as credit";
+		
+	
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+	
+		// Manage filter
+		$sqlwhere = array ();
+		if (count($filter) > 0) {
+			foreach ( $filter as $key => $value ) {
+				if ($key == 't.doc_date') {
+					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
+				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
+					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
+				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
+					$sqlwhere[] = $key . '=' . $value;
+				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+				} else {
+					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+				}
+			}
+		}
+	
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ' . implode(' ' . $filtermode . ' ', $sqlwhere);
+		}
+	
+		$sql .= ' GROUP BY t.numero_compte';
+	
+		if (! empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (! empty($limit)) {
+			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		}
+		$this->lines = array ();
+	
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+	
+			while ( $obj = $this->db->fetch_object($resql) ) {
+				$line = new BookKeepingLine();
+				
+				$line->numero_compte = $obj->numero_compte;
+				$line->debit = $obj->debit;
+				$line->credit = $obj->credit;
+				$this->lines[] = $line;
+			}
+			$this->db->free($resql);
+	
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+	
+			return - 1;
+		}
+	}
+	
 	/**
 	 * Update object into database
 	 *
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e0da649e53b..65b35014376 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -986,6 +986,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				// General Ledger
 				if (preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/list.php?leftmenu=accountancy_bookkeeping",$langs->trans("Bookkeeping"),1,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookkeeping');
+				if (preg_match('/accountancy_bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balance.php?leftmenu=accountancy_bookkeeping",$langs->trans("AccountBalance"),2,$user->rights->accounting->mouvements->lire);
 				if (preg_match('/accountancy_bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/listbyyear.php?leftmenu=accountancy_bookkeeping",$langs->trans("ByYear"),2,$user->rights->accounting->mouvements->lire);
 				if (preg_match('/accountancy_bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balancebymonth.php?leftmenu=accountancy_bookkeeping",$langs->trans("AccountBalanceByMonth"),2,$user->rights->accounting->mouvements->lire);
 

From ef7e245432d431712015a3c60c24df387e3265f6 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 9 Feb 2016 19:23:17 +0100
Subject: [PATCH 113/421] g

---
 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 23f37e1b676..4e6a219c055 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -969,9 +969,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				// General Ledger
 				$newmenu->add("/accountancy/bookkeeping/list.php?leftmenu=bookkeeping",$langs->trans("Bookkeeping"),1,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookkeeping');
+				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balance.php",$langs->trans("AccountBalance"),1,$user->rights->accounting->mouvements->lire);
 				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/listbyyear.php",$langs->trans("ByYear"),2,$user->rights->accounting->mouvements->lire);
 				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balancebymonth.php",$langs->trans("AccountBalanceByMonth"),2,$user->rights->accounting->mouvements->lire);
-				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balance.php",$langs->trans("AccountBalance"),1,$user->rights->accounting->mouvements->lire);
 				
 				// Reports
 				$langs->load("compta");

From 1306a606a8ac7ea379ece9ecf62302dd0032d3c1 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 9 Feb 2016 20:01:43 +0100
Subject: [PATCH 114/421] NEW : Margins module - Check/update buying price on
 invoice lines

---
 htdocs/margin/checkMargins.php    | 254 ++++++++++++++++++++++++++++++
 htdocs/margin/lib/margins.lib.php |   9 ++
 2 files changed, 263 insertions(+)
 create mode 100644 htdocs/margin/checkMargins.php

diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
new file mode 100644
index 00000000000..ac53d079298
--- /dev/null
+++ b/htdocs/margin/checkMargins.php
@@ -0,0 +1,254 @@
+<?php
+/* Copyright (C) 2012-2013	Christophe Battarel	<christophe.battarel@altairis.fr>
+ * Copyright (C) 2014		Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2016       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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/margin/checkMargins.php
+ * \ingroup margin
+ * \brief Check margins
+ */
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.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 . '/margin/lib/margins.lib.php';
+
+$langs->load("companies");
+$langs->load("bills");
+$langs->load("products");
+$langs->load("margins");
+
+// Security check
+
+if ($user->rights->margins->creer) {
+	$agentid = $user->id;
+} else {
+	accessforbidden();
+}
+
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+if (! $sortorder)
+	$sortorder = "DESC";
+if (! $sortfield) {
+	$sortfield = 'f.rowid';
+}
+$page = GETPOST("page", 'int');
+if ($page == - 1) {
+	$page = 0;
+}
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Both test are required to be compatible with all browsers
+if (GETPOST("button_search_x") || GETPOST("button_search")) {
+	$action = 'search';
+} elseif (GETPOST("button_updatemagins_x") || GETPOST("button_updatemagins")) {
+	$action = 'update';
+}
+
+if ($action == 'update') {
+	$datapost = $_POST;
+	
+	foreach ( $datapost as $key => $value ) {
+		if (strpos($key, 'buyingprice_') !== false) {
+			$tmp_array = explode('_', $key);
+			if (count($tmp_array) > 0) {
+				$invoicedet_id = $tmp_array[1];
+				if (! empty($invoicedet_id)) {
+					$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facturedet';
+					$sql .= ' SET buy_price_ht=\'' . price2num($value) . '\'';
+					$sql .= ' WHERE rowid=' . $invoicedet_id;
+					$result = $db->query($sql);
+					if (!$result) {
+						setEventMessages($db->lasterror, null, 'errors');
+					}
+				}
+			}
+		}
+	}
+}
+
+$startdate = $enddate = '';
+
+$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int'));
+$enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear', 'int'));
+
+if (! empty($startdate)) {
+	$options .= '&amp;startdatemonth=' . GETPOST('startdatemonth', 'int') . '&amp;startdateday=' . GETPOST('startdateday', 'int') . '&amp;startdateyear=' . GETPOST('startdateyear', 'int');
+}
+if (! empty($enddate)) {
+	$options .= '&amp;enddatemonth=' . GETPOST('enddatemonth', 'int') . '&amp;enddateday=' . GETPOST('enddateday', 'int') . '&amp;enddateyear=' . GETPOST('enddateyear', 'int');
+}
+
+/*
+ * View
+ */
+
+$userstatic = new User($db);
+$companystatic = new Societe($db);
+$invoicestatic = new Facture($db);
+$productstatic = new Product($db);
+
+$form = new Form($db);
+
+$title = $langs->trans("CheckMargins");
+
+llxHeader('', $title);
+
+// print_fiche_titre($text);
+
+// Show tabs
+$head = marges_prepare_head($user);
+$picto = 'margin';
+dol_fiche_head($head, 'checkMargins', $title, 0, $picto);
+
+print '<form method="post" name="sel" action="' . $_SERVER['PHP_SELF'] . '">';
+print '<table class="border" width="100%">';
+
+// Start date
+print '<td>' . $langs->trans('StartDate') . ' (' . $langs->trans("DateValidation") . ')</td>';
+print '<td width="20%">';
+$form->select_date($startdate, 'startdate', '', '', 1, "sel", 1, 1);
+print '</td>';
+print '<td width="20%">' . $langs->trans('EndDate') . ' (' . $langs->trans("DateValidation") . ')</td>';
+print '<td width="20%">';
+$form->select_date($enddate, 'enddate', '', '', 1, "sel", 1, 1);
+print '</td>';
+print '<td style="text-align: center;">';
+print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Launch')) . '" name="button_search" />';
+print '</td></tr>';
+print "</table>";
+
+$sql = "SELECT";
+$sql .= " f.facnumber, f.rowid as invoiceid, d.rowid as invoicedetid, d.buy_price_ht, d.total_ht, d.subprice, d.label, d.description , d.qty";
+$sql .= " ,d.fk_product";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f ";
+$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as d  ON d.fk_facture = f.rowid";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON d.fk_product = p.rowid";
+$sql .= " WHERE f.fk_statut > 0";
+$sql .= " AND f.entity = " . getEntity('facture', 1);
+if (! empty($startdate))
+	$sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
+if (! empty($enddate))
+	$sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
+$sql .= " AND d.buy_price_ht IS NOT NULL";
+$sql .= $db->order($sortfield, $sortorder);
+
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	
+	dol_syslog(__FILE__, LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result) {
+		$nbtotalofrecords = $db->num_rows($result);
+	} else {
+		setEventMessages($db->lasterror, null, 'errors');
+	}
+}
+
+$sql .= $db->plimit($conf->liste_limit + 1, $offset);
+
+dol_syslog(__FILE__, LOG_DEBUG);
+$result = $db->query($sql);
+if ($result) {
+	$num = $db->num_rows($result);
+	
+	print '<br>';
+	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
+	
+	print "<table class=\"noborder\" width=\"100%\">";
+	
+	print '<tr class="liste_titre">';
+	
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "f.ref", "", $options, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "", "", $options, 'width=20%', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("UnitPriceHT"), $_SERVER["PHP_SELF"], "d.subprice", "", $options, 'align="right"', $sortfield, $sortorder);
+	if ($conf->global->MARGIN_TYPE == "1") {
+		print_liste_field_titre($langs->trans("BuyingPrice"), $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $options, 'align="right"', $sortfield, $sortorder);
+	} else {
+		print_liste_field_titre($langs->trans("CostPrice"), $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $options, 'align="right"', $sortfield, $sortorder);
+	}
+	print_liste_field_titre($langs->trans("Qty"), $_SERVER["PHP_SELF"], "d.qty", "", $options, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("AmountTTC"), $_SERVER["PHP_SELF"], "d.total_ht", "", $options, 'align="right"', $sortfield, $sortorder);
+	
+	print "</tr>\n";
+	
+	if ($num > 0) {
+		$var = true;
+		
+		while ( $objp = $db->fetch_object($result) ) {
+			$var = ! $var;
+			
+			print "<tr " . $bc[$var] . ">";
+			print '<td>';
+			$result_inner = $invoicestatic->fetch($objp->invoiceid);
+			if ($result_inner < 0) {
+				setEventMessages($invoicestatic->error, null, 'errors');
+			} else {
+				print $invoicestatic->getNomUrl(1);
+			}
+			print '</td>';
+			print '<td>';
+			if (! empty($objp->fk_product)) {
+				$result_inner = $productstatic->fetch($objp->fk_product);
+				if ($result_inner < 0) {
+					setEventMessages($productstatic->error, null, 'errors');
+				} else {
+					print $productstatic->getNomUrl(1);
+				}
+			} else {
+				print $objp->label;
+				print '&nbsp;';
+				print $objp->description;
+			}
+			print '</td>';
+			print '<td align="right">';
+			print price($objp->subprice);
+			print '</td>';
+			print '<td align="right">';
+			print '<input type="text" name="buyingprice_' . $objp->invoicedetid . '" id="buyingprice_' . $objp->invoicedetid . '" size="6" value="' . price($objp->buy_price_ht) . '" class="flat">';
+			print '</td>';
+			print '<td align="right">';
+			print $objp->qty;
+			print '</td>';
+			print '<td align="right">';
+			print price($objp->total_ht);
+			print '</td>';
+			
+			print "</tr>\n";
+			
+			$i ++;
+		}
+	}
+	print "</table>";
+} else {
+	dol_print_error($db);
+}
+
+print '<div class="tabsAction">' . "\n";
+print '<div class="inline-block divButAction"><input type="submit"  name="button_updatemagins" id="button_updatemagins" class="butAction" value="' . $langs->trans("Update") . '" /></div>';
+print '</div>';
+print '</form>';
+
+$db->free($result);
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index ce100d49390..2a3d0775eaa 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2012      Christophe Battarel <christophe.battarel@altairis.fr>
  * Copyright (C) 2014-2015 Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2016	   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
@@ -87,6 +88,14 @@ function marges_prepare_head()
 	$head[$h][1] = $langs->trans($title);
 	$head[$h][2] = 'agentMargins';
 
+	
+	if ($user->rights->margins->creer) {
+		$h++;
+		$head[$h][0] = DOL_URL_ROOT."/margin/checkMargins.php";
+		$head[$h][1] = $langs->trans('CheckMargins');
+		$head[$h][2] = 'checkMargins';
+	}
+
 	return $head;
 }
 

From 39feb457791b61e7123b5f0aaf51c57b33024a1c Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Wed, 10 Feb 2016 12:15:22 +0100
Subject: [PATCH 115/421] default sort should be from A to Z

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index dc7266603ca..e4260388ac7 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -57,7 +57,7 @@ if ($page == -1) { $page = 0; }
 $offset = $conf->liste_limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) { $sortorder=($filter=='outofdate'?"ASC":"DESC"); }
+if (! $sortorder) { $sortorder=($filter=='outofdate'?"DESC":"ASC"); }
 if (! $sortfield) { $sortfield=($filter=='outofdate'?"d.datefin":"d.lastname"); }
 
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers

From 6dbaba697355c90fd1f1bcb4abc441a1b5a6959b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Feb 2016 17:45:26 +0100
Subject: [PATCH 116/421] Fix: previous and next arrow

---
 htdocs/comm/action/index.php       |  12 ++++++------
 htdocs/core/lib/functions.lib.php  |  12 +++++++-----
 htdocs/theme/eldy/img/next.png     | Bin 157 -> 106 bytes
 htdocs/theme/eldy/img/previous.png | Bin 151 -> 106 bytes
 htdocs/theme/eldy/style.css.php    |   3 +++
 htdocs/theme/md/img/next.png       | Bin 157 -> 106 bytes
 htdocs/theme/md/img/previous.png   | Bin 151 -> 106 bytes
 htdocs/theme/md/style.css.php      |   3 +++
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 913b46a852b..fe7b15c66fe 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -305,28 +305,28 @@ $param.="&maxprint=".$maxprint;
 // Show navigation bar
 if (empty($action) || $action=='show_month')
 {
-    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n";
     $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%b %Y");
     $nav.=" </span>\n";
-    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n";
     $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a>)";
     $picto='calendar';
 }
 if ($action=='show_week')
 {
-    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n";
     $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
     $nav.=" </span>\n";
-    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n";
     $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
     $picto='calendarweek';
 }
 if ($action=='show_day')
 {
-    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n";
     $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"daytextshort");
     $nav.=" </span>\n";
-    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n";
     $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
     $picto='calendarday';
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 73e42b22b33..1ef841a975a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2410,30 +2410,32 @@ function img_error($titlealt = 'default')
  *	Show next logo
  *
  *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
- *	@return string      		Return img tag
+*	@param	string	$options	Add more attribute on img tag (For example 'style="float: right"')
+  *	@return string      		Return img tag
  */
-function img_next($titlealt = 'default')
+function img_next($titlealt = 'default', $options='')
 {
 	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Next');
 
-	return img_picto($titlealt, 'next.png');
+	return img_picto($titlealt, 'next.png', $options);
 }
 
 /**
  *	Show previous logo
  *
  *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
+ *	@param	string	$options	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_previous($titlealt = 'default')
+function img_previous($titlealt = 'default', $options='')
 {
 	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
 
-	return img_picto($titlealt, 'previous.png');
+	return img_picto($titlealt, 'previous.png', $options);
 }
 
 /**
diff --git a/htdocs/theme/eldy/img/next.png b/htdocs/theme/eldy/img/next.png
index a6152079d98ec6f0084658118994377ba5b3f003..f85bb9154bcc470d14f629ddeb7aa803e9ce93c9 100644
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m3_V>OLn;`PC72F0ZV;+(`_IGM
zB4TKCM$PZ0%%dr1RoC=%CdzpTo}H@D)KHMXC&<8X#Z=&2^i`dyK+O!Eu6{1-oD!M<
DiryZ|

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#n3BBRT^Rni_n+Ahk}B|sEM{Qf
z76xHPhFNnYfP(BLp1!W^4;b0GWCVH&GL8U+^gLZ0LpZJ{Cn&IPF*>o3yU=(~$^=L8
xEonR2wH6%y(9_6zD5Z&Orm=>>AH}0Z4D(f4E%e(?mjQJ$c)I$ztaD0e0ss}jD)ayV

diff --git a/htdocs/theme/eldy/img/previous.png b/htdocs/theme/eldy/img/previous.png
index 90b9e8f7bad1f31e92eb47c627138c40735aa649..95934a2b16ee026803e6501c9659085f4b953fea 100644
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m3_V>OLn;`PC5#R<ZkWW@_Mhio
z%T%BA1eGNzY>BGIj$Ry^vsi;%@>B1%IG?KfaNL|>S(w18op(hzftndSUHx3vIVCg!
E0H1>&b^rhX

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#n3BBRT^Rni_n+Ahk}B|sEM{Qf
z76xHPhFNnYfP(BLp1!W^4;b0GWK55j>}duHX?VIghHzX@PEg=|Vf<w=*9*ft?%~C)
q2RVZu`?9ffG;``LId{Of>ncO}9~S+h3k5nrJq(_%elF{r5}E)o_bDR)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b2ca926fd71..14154d01f51 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -418,6 +418,9 @@ th .button {
 .valignmiddle {
 	vertical-align: middle;
 }
+.valignbottom {
+	vertical-align: bottom;
+}
 .centpercent {
 	width: 100%;
 }
diff --git a/htdocs/theme/md/img/next.png b/htdocs/theme/md/img/next.png
index a6152079d98ec6f0084658118994377ba5b3f003..f85bb9154bcc470d14f629ddeb7aa803e9ce93c9 100644
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m3_V>OLn;`PC72F0ZV;+(`_IGM
zB4TKCM$PZ0%%dr1RoC=%CdzpTo}H@D)KHMXC&<8X#Z=&2^i`dyK+O!Eu6{1-oD!M<
DiryZ|

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#n3BBRT^Rni_n+Ahk}B|sEM{Qf
z76xHPhFNnYfP(BLp1!W^4;b0GWCVH&GL8U+^gLZ0LpZJ{Cn&IPF*>o3yU=(~$^=L8
xEonR2wH6%y(9_6zD5Z&Orm=>>AH}0Z4D(f4E%e(?mjQJ$c)I$ztaD0e0ss}jD)ayV

diff --git a/htdocs/theme/md/img/previous.png b/htdocs/theme/md/img/previous.png
index 90b9e8f7bad1f31e92eb47c627138c40735aa649..95934a2b16ee026803e6501c9659085f4b953fea 100644
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m3_V>OLn;`PC5#R<ZkWW@_Mhio
z%T%BA1eGNzY>BGIj$Ry^vsi;%@>B1%IG?KfaNL|>S(w18op(hzftndSUHx3vIVCg!
E0H1>&b^rhX

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#n3BBRT^Rni_n+Ahk}B|sEM{Qf
z76xHPhFNnYfP(BLp1!W^4;b0GWK55j>}duHX?VIghHzX@PEg=|Vf<w=*9*ft?%~C)
q2RVZu`?9ffG;``LId{Of>ncO}9~S+h3k5nrJq(_%elF{r5}E)o_bDR)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9ae58bbb261..fe1e161dfc8 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -414,6 +414,9 @@ th .button {
 .valignmiddle {
 	vertical-align: middle;
 }
+.valignbottom {
+	vertical-align: bottom;
+}
 .centpercent {
 	width: 100%;
 }

From ab2ac26f170a05ed03765683d44950d3f3a714b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Feb 2016 19:27:22 +0100
Subject: [PATCH 117/421] NEW When a field to show into list is selected, the
 form is automatically submited

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7ad26f99dd5..82697c331a2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4995,7 +4995,10 @@ class Form
               else {
                   $(\'.'.$htmlname.'\').val( $(\'.'.$htmlname.'\').val().replace(title, \'\') )
               }
-          });        
+              // Now, we submit page
+              $(this).parents(\'form:first\').submit();
+        });
+                      
         </script>            
             
         ';

From 9b41e11a1ef09094a211d3f007bcd8364b504776 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Feb 2016 19:28:10 +0100
Subject: [PATCH 118/421] NEW Can select dynamicaly number of lines to show on
 page

---
 htdocs/compta/facture/list.php     |  1 +
 htdocs/core/lib/functions.lib.php  | 59 +++++++++++++++++++++---------
 htdocs/public/test/test_arrays.php |  4 +-
 htdocs/societe/list.php            | 32 ++++++++--------
 4 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 5068306646b..38d1ce96f59 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -695,6 +695,7 @@ if ($resql)
     }
 
     $param='&socid='.$socid;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
     if ($month)              $param.='&month='.$month;
     if ($year)               $param.='&year=' .$year;
     if ($search_ref)         $param.='&search_ref=' .$search_ref;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 26f549fab1f..efa80e70554 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2961,25 +2961,26 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
  *	@param	string	$options         	parametres complementaires lien ('' par defaut)
  *	@param	string	$sortfield       	champ de tri ('' par defaut)
  *	@param	string	$sortorder       	ordre de tri ('' par defaut)
- *	@param	string	$center          	chaine du centre ('' par defaut)
+ *	@param	string	$center          	chaine du centre ('' par defaut). We often find here string $massaction comming from $form->selectMassAction() 
  *	@param	int		$num				number of records found by select with limit+1
  *	@param	int		$totalnboflines		Total number of records/lines for all pages (if known)
  *	@param	string	$picto				Icon to use before title (should be a 32x32 transparent png file)
  *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
  *  @param	string	$morehtml			More html to show
  *  @param  string  $morecss            More css to the table
- *  @param  int     $limit              Max number of lines
+ *  @param  int     $limit              Max number of lines (-1 = use default, 0 = no limit, > 0 = limit)
  *	@return	void
  */
-function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=0)
+function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1)
 {
 	global $conf,$langs;
-
+	
+	$savlimit = $limit;
+	
 	if ($picto == 'setup') $picto='title_setup.png';
 	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
-	if ($limit < 1) $limit = $conf->liste_limit;
-	
-	if (($num > $limit) || ($num == -1))
+	if ($limit < 0) $limit = $conf->liste_limit;
+	if ($savlimit >= 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
 	{
 		$nextpage = 1;
 	}
@@ -3012,13 +3013,14 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	if ($sortorder) $options .= "&amp;sortorder=".$sortorder;
 	// Show navigation bar
 	$pagelist = '';
-	if ($page > 0 || $num > $limit)
+	if ($savlimit != 0 && ($page > 0 || $num > $limit))
 	{
 		if ($totalnboflines)	// If we know total nb of lines
 		{
-			$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 6 : 3);		// page nb before and after selected page + ... + first or last
+			$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 4 : 2);		// page nb before and after selected page + ... + first or last
 
-			$nbpages=ceil($totalnboflines/$limit);
+			if ($limit > 0) $nbpages=ceil($totalnboflines/$limit);
+			else $nbpages=1;
 			$cpt=($page-$maxnbofpage);
 			if ($cpt < 0) { $cpt=0; }
 
@@ -3055,7 +3057,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 			$pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><span '.(empty($conf->dol_use_jmobile)?'class="active"':'data-role="button"').'>'.($page+1)."</li>";
 		}
 	}
-	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $limit, $totalnboflines);		// output the div and ul for previous/last completed with page numbers into $pagelist
+	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $savlimit, $totalnboflines);		// output the div and ul for previous/last completed with page numbers into $pagelist
 	print '</td>';
 
 	print '</tr></table>'."\n";
@@ -3071,22 +3073,30 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
  *	@param	integer			$nextpage	    	Do we show a next page button
  *	@param	string			$betweenarrows		HTML content to show between arrows. MUST contains '<li> </li>' tags or '<li><span> </span></li>'.
  *  @param	string			$afterarrows		HTML content to show after arrows. Must NOT contains '<li> </li>' tags.
- *  @param  string          $limit              Max nb of record to show ('' = unknown = default, '0' = no limit, 'x' = limit)
+ *  @param  int             $limit              Max nb of record to show  (-1 = no combo with limit, 0 = no limit, > 0 = limit)
  *	@param	int		        $totalnboflines		Total number of records/lines for all pages (if known)
  *	@return	void
  */
-function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit='', $totalnboflines=0)
+function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0)
 {
 	global $conf, $langs;
 
 	print '<div class="pagination"><ul>';
-	if ($limit != '')
+	if ((int) $limit >= 0)
 	{
-	    $pagesizechoices='10:10,20:20,30:30,50:50,100:100,250:250,500:500,1000:1000,0:'.$langs->trans("All");
+	    $pagesizechoices='10:10,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
+	    //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
+	    //$pagesizechoices.=',2:2';
 	    if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
-	    
-        print '<li class="pagination"><select class="flat selectlimit" name="limit">';
+	     
+        print '<li class="pagination">';
+        print '<select class="flat selectlimit" name="limit">';
         $tmpchoice=explode(',',$pagesizechoices);
+        $tmpkey=$limit.':'.$limit;
+        if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
+        $tmpkey=$conf->liste_limit.':'.$conf->liste_limit;
+        if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
+        asort($tmpchoice, SORT_NUMERIC);
         $found=false;
         foreach($tmpchoice as $val)
         {
@@ -3096,7 +3106,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
             $val=$tmp[1];
             if ($key != '' && $val != '')
             {
-                if ($key == $limit)
+                if ((int) $key == (int) $limit)
                 {
                     $selected = ' selected="selected"';
                     $found = true;
@@ -3105,6 +3115,19 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
             }
         }
         print '</select>';
+        if ($conf->use_javascript_ajax)
+        {
+            print '<!-- JS CODE TO ENABLE select limit to launch submit of page -->
+            		<script type="text/javascript">
+                	jQuery(document).ready(function () {
+            	  		jQuery(".selectlimit").change(function() {
+                            console.log("Change limit. Send submit");
+                            $(this).parents(\'form:first\').submit();
+            	  		});
+                	});
+            		</script>
+                ';
+        }
         print '</li>';	    
 	}
 	if ($page > 0)
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index ac4d9eb3c54..a6e08d02524 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -144,7 +144,8 @@ $nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
 $nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav.='</form>';
 
-print_barre_liste('Title of my list', 3, $_SERVER["PHP_SELF"], '', '', '', 'Text in middle', 20, 5000, '', 0, $nav);
+$limit=10;
+print_barre_liste('Title of my list', 12, $_SERVER["PHP_SELF"], '', '', '', 'Text in middle', 20, 500, '', 0, $nav, '', $limit);
 
 
 $moreforfilter.='<div class="divsearchfield">';
@@ -190,6 +191,7 @@ if (! empty($moreforfilter))
 </tr>
 <tr class="pair"><td><?php echo $productspecimen->getNomUrl(1); ?></td><td align="right">b1</td><td class="tdlineupdown" align="left">c1</td></tr>
 <tr class="impair"><td>a2</td><td align="right">b2</td><td class="tdlineupdown" align="left">c2</td></tr>
+<tr class="pair"><td>a3</td><td align="right">b3</td><td class="tdlineupdown" align="left">c3</td></tr>
 </table>
 <br>
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 7cfc07918fd..dc9ed9dd252 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -149,7 +149,7 @@ $arrayfields=array(
     's.code_compta_fournisseur'=>array('label'=>$langs->trans("SupplierAccountancyCodeShort"), 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
     's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
     's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
-    'state.state_name'=>array('label'=>$langs->trans("State"), 'checked'=>0),
+    'state.nom'=>array('label'=>$langs->trans("State"), 'checked'=>0),
 	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
     'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
     's.siren'=>array('label'=>$langs->trans("ProfId1Short"), 'checked'=>$checkedprofid1),
@@ -427,7 +427,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 }
 
 $sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
+$sql.= $db->plimit($limit+1, $offset);
 
 $resql = $db->query($sql);
 if ($resql)
@@ -435,7 +435,9 @@ if ($resql)
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	if ($sall != '') $param = "&amp;sall=".urlencode($sall);
+	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($sall != '') $param .= "&amp;sall=".urlencode($sall);
  	if ($search_categ != '') $param.='&amp;search_categ='.urlencode($search_categ);
  	if ($search_sale > 0)	$param.='&amp;search_sale='.urlencode($search_sale);
 	if ($search_nom != '') $param.= "&amp;search_nom=".urlencode($search_nom);
@@ -470,14 +472,21 @@ if ($resql)
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
     } 	
     
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies');
-
     // Show delete result message
     if (GETPOST('delsoc'))
     {
 	    setEventMessages($langs->trans("CompanyDeleted",GETPOST('delsoc')), null, 'mesgs');
     }
 
+    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['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_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
+
 	$langs->load("other");
 	$textprofid=array();
 	foreach(array(1,2,3,4,5,6) as $key)
@@ -491,13 +500,6 @@ if ($resql)
 		}
 	}
 
-	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['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.'">';
-	
     if ($search_all)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -560,7 +562,7 @@ if ($resql)
 	if (! empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.state_name']['checked'])) print_liste_field_titre($langs->trans("StateShort"),$_SERVER["PHP_SELF"],"state.state_name","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($langs->trans("StateShort"),$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($langs->trans("Country"),$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
 	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($langs->trans("ThirdPartyType"),$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.siren']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$param,'class="nowrap"',$sortfield,$sortorder);
@@ -653,7 +655,7 @@ if ($resql)
     	print '</td>';
     }
 	// State
-    if (! empty($arrayfields['state.state_name']['checked']))
+    if (! empty($arrayfields['state.nom']['checked']))
     {
         print '<td class="liste_titre">';
     	print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
@@ -872,7 +874,7 @@ if ($resql)
             print "<td>".$obj->zip."</td>\n";
         }        
 	    // State
-	    if (! empty($arrayfields['state.state_name']['checked']))
+	    if (! empty($arrayfields['state.nom']['checked']))
         {
             print "<td>".$obj->state_name."</td>\n";
         }        

From a0cfe9aad873bcf283ad063757d130293c8063af Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Wed, 10 Feb 2016 23:16:38 +0100
Subject: [PATCH 119/421] New add payment with multicurrency module

---
 htdocs/compta/facture/class/facture.class.php |  16 +-
 htdocs/compta/paiement.php                    | 148 ++++++++++++++++--
 .../compta/paiement/class/paiement.class.php  |  93 +++++++++--
 htdocs/core/class/commoninvoice.class.php     |  10 +-
 htdocs/core/class/discount.class.php          |  24 +--
 .../install/mysql/migration/3.9.0-4.0.0.sql   |   9 +-
 htdocs/install/mysql/tables/llx_paiement.sql  |   3 +-
 .../tables/llx_societe_remise_except.sql      |   3 +
 htdocs/langs/en_US/bills.lang                 |   1 +
 .../class/multicurrency.class.php             |  46 +++++-
 10 files changed, 297 insertions(+), 56 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index fe38c17ff0d..78ca830a191 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2802,7 +2802,7 @@ class Facture extends CommonInvoice
 			$field2='fk_paiementfourn';
 		}
 
-		$sql = 'SELECT pf.amount, p.fk_paiement, p.datep, t.code';
+		$sql = 'SELECT pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, t.code';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
 		$sql.= ' WHERE pf.'.$field.' = '.$this->id;
 		$sql.= ' AND pf.'.$field2.' = p.rowid';
@@ -2836,14 +2836,15 @@ class Facture extends CommonInvoice
 	/**
 	 *    	Return amount (with tax) of all credit notes and deposits invoices used by invoice
 	 *
-	 *		@return		int			<0 if KO, Sum of credit notes and deposits amount otherwise
+	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
 	 */
-	function getSumCreditNotesUsed()
+	function getSumCreditNotesUsed($multicurrency=0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getSumCreditNotesUsed($this);
+		$result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
 		if ($result >= 0)
 		{
 			return $result;
@@ -2858,14 +2859,15 @@ class Facture extends CommonInvoice
 	/**
 	 *    	Return amount (with tax) of all deposits invoices used by invoice
 	 *
-	 *		@return		int			<0 if KO, Sum of deposits amount otherwise
+	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+	 *		@return		int						<0 if KO, Sum of deposits amount otherwise
 	 */
-	function getSumDepositsUsed()
+	function getSumDepositsUsed($multicurrency=0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getSumDepositsUsed($this);
+		$result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
 		if ($result >= 0)
 		{
 			return $result;
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 655bed80031..72fd65d686b 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -54,6 +54,9 @@ $amounts=array();
 $amountsresttopay=array();
 $addwarning=0;
 
+$multicurrency_amounts=array();
+$multicurrency_amountsresttopay=array();
+
 // Security check
 $socid=0;
 if ($user->societe_id > 0)
@@ -90,10 +93,11 @@ if (empty($reshook))
 	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 	    $paiement_id = 0;
 	    $totalpayment = 0;
+		$multicurrency_totalpayment = 0;
 	    $atleastonepaymentnotnull = 0;
 
 	    // Generate payment array and check if there is payment higher than invoice and payment date before invoice date
-	    $tmpinvoice=new Facture($db);
+	    $tmpinvoice=new Facture($db); 
 	    foreach ($_POST as $key => $value)
 	    {
 	        if (substr($key,0,7) == 'amount_')
@@ -124,6 +128,34 @@ if (empty($reshook))
 
 	            $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => $_POST[$key]);
 	        }
+			elseif (substr($key,0,21) == 'multicurrency_amount_')
+			{
+				$cursorfacid = substr($key,21);
+	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
+	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
+	            if (! empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+	            $result=$tmpinvoice->fetch($cursorfacid);
+	            if ($result <= 0) dol_print_error($db);
+	            $multicurrency_amountsresttopay[$cursorfacid]=price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement(1));
+	            if ($multicurrency_amounts[$cursorfacid])
+	            {
+		            // Check amount
+		            if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
+		            {
+		                $addwarning=1;
+		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
+		            }
+		            // Check date
+		            if ($datepaye && ($datepaye < $tmpinvoice->date))
+		            {
+		            	$langs->load("errors");
+		                //$error++;
+		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+		            }
+	            }
+
+	            $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => GETPOST($key, 'int'));
+			}
 	    }
 
 	    // Check parameters
@@ -143,7 +175,7 @@ if (empty($reshook))
 	        }
 	    }
 
-	    if (empty($totalpayment) && empty($atleastonepaymentnotnull))
+	    if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
 	    {
 	        setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->trans('PaymentAmount')), null, 'errors');
 	        $error++;
@@ -154,6 +186,13 @@ if (empty($reshook))
 	        setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('Date')), null, 'errors');
 	        $error++;
 	    }
+		
+		// Check if payments in both currency
+		if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
+		{
+			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
+	        $error++;
+		}
 	}
 
 	/*
@@ -187,6 +226,12 @@ if (empty($reshook))
 		    	$newvalue = price2num($value,'MT');
 		    	$amounts[$key] = -$newvalue;
 		    }
+			
+			foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatch
+		    {
+		    	$newvalue = price2num($value,'MT');
+		    	$multicurrency_amounts[$key] = -$newvalue;
+		    }
 	    }
 
 	    if (! empty($conf->banque->enabled))
@@ -203,6 +248,7 @@ if (empty($reshook))
 	    $paiement = new Paiement($db);
 	    $paiement->datepaye     = $datepaye;
 	    $paiement->amounts      = $amounts;   // Array with all payments dispatching
+	    $paiement->multicurrency_amounts = $multicurrency_amounts;   // Array with all payments dispatching
 	    $paiement->paiementid   = dol_getIdFromCode($db,$_POST['paiementcode'],'c_paiement');
 	    $paiement->num_paiement = $_POST['num_paiement'];
 	    $paiement->note         = $_POST['comment'];
@@ -336,6 +382,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							{
 								subJson[n["name"]] = n["value"];
 							});
+							
 							return subJson;
 						}
 						function callForResult(imgId)
@@ -345,8 +392,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 							json["invoice_type"] = $("#invoice_type").val();
 							json["amountPayment"] = $("#amountpayment").attr("value");
-							json["amounts"] = _elemToJson(form.find("input[name*=\"amount_\"]"));
-							json["remains"] = _elemToJson(form.find("input[name*=\"remain_\"]"));
+							json["amounts"] = _elemToJson(form.find("input.amount"));
+							json["remains"] = _elemToJson(form.find("input.remain]"));
 
 							if (imgId != null) {
 								json["imgClicked"] = imgId;
@@ -368,7 +415,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 										}
 										json[key]=json["label"]+" "+json[key];
 										$("#"+key).text(json[key]);
-									} else {
+									} else {console.log(key);
 										form.find("input[name*=\""+key+"\"]").each(function() {
 											$(this).attr("value", json[key]);
 										});
@@ -376,10 +423,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 								}
 							});
 						}
-						$("#payment_form").find("input[name*=\"amount_\"]").change(function() {
+						$("#payment_form").find("input.amount").change(function() {
 							callForResult();
 						});
-						$("#payment_form").find("input[name*=\"amount_\"]").keyup(function() {
+						$("#payment_form").find("input.amount").keyup(function() {
 							callForResult();
 						});
 			';
@@ -470,7 +517,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         /*
          * List of unpaid invoices
          */
-        $sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.type, ';
+        $sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.multicurrency_total_ttc, f.type, ';
         $sql.= ' f.datef as df';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
         $sql.= ' WHERE f.entity = '.$conf->entity;
@@ -501,9 +548,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				$arraytitle=$langs->trans('Invoice');
 				if ($facture->type == 2) $arraytitle=$langs->trans("CreditNotes");
 				$alreadypayedlabel=$langs->trans('Received');
-				if ($facture->type == 2) $alreadypayedlabel=$langs->trans("PaidBack");
+				$multicurrencyalreadypayedlabel=$langs->trans('MulticurrencyReceived');
+				if ($facture->type == 2) { $alreadypayedlabel=$langs->trans("PaidBack"); $multicurrencyalreadypayedlabel=$langs->trans("MulticurrencyPaidBack"); }
 				$remaindertopay=$langs->trans('RemainderToTake');
-				if ($facture->type == 2) $remaindertopay=$langs->trans("RemainderToPayBack");
+				$multicurrencyremaindertopay=$langs->trans('MulticurrencyRemainderToTake');
+				if ($facture->type == 2) { $remaindertopay=$langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay=$langs->trans("MulticurrencyRemainderToPayBack"); }
 
                 $i = 0;
                 //print '<tr><td colspan="3">';
@@ -513,9 +562,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 print '<td>'.$arraytitle.'</td>';
                 print '<td align="center">'.$langs->trans('Date').'</td>';
                 print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
+                if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
                 print '<td align="right">'.$alreadypayedlabel.'</td>';
+                if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$multicurrencyalreadypayedlabel.'</td>';
                 print '<td align="right">'.$remaindertopay.'</td>';
+                if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$multicurrencyremaindertopay.'</td>';
                 print '<td align="right">'.$langs->trans('PaymentAmount').'</td>';
+                if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
                 print '<td align="right">&nbsp;</td>';
                 print "</tr>\n";
 
@@ -537,7 +590,17 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     $deposits=$invoice->getSumDepositsUsed();
                     $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
                     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
-
+					
+					// Multicurrency Price
+					if (!empty($conf->multicurrency->enabled)) 
+					{
+						$multicurrency_payment = $invoice->getSommePaiement(1);
+						$multicurrency_creditnotes=$invoice->getSumCreditNotesUsed(1);
+						$multicurrency_deposits=$invoice->getSumDepositsUsed(1);
+						$multicurrency_alreadypayed=price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits,'MT');
+	                    $multicurrency_remaintopay=price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits,'MT');
+					}
+					
                     print '<tr '.$bc[$var].'>';
 
                     print '<td>';
@@ -549,17 +612,35 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
                     // Price
                     print '<td align="right">'.price($sign * $objp->total_ttc).'</td>';
-
+					
+					// Multicurrency Price
+					if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.price($sign * $objp->multicurrency_total_ttc).'</td>';
+					
                     // Received or paid back
                     print '<td align="right">'.price($sign * $paiement);
                     if ($creditnotes) print '+'.price($creditnotes);
                     if ($deposits) print '+'.price($deposits);
                     print '</td>';
 
+					// Multicurrency Price
+					if (!empty($conf->multicurrency->enabled)) 
+					{
+						print '<td align="right">'.price($sign * $multicurrency_payment);
+		                if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
+		                if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
+		                print '</td>';
+					}
+					
                     // Remain to take or to pay back
                     print '<td align="right">'.price($sign * $remaintopay).'</td>';
                     //$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
 
+                    // Multicurrency Price
+					if (!empty($conf->multicurrency->enabled)) 
+					{
+						print '<td align="right">'.price($sign * $multicurrency_remaintopay).'</td>';
+					}
+                    
                     // Amount
                     print '<td align="right">';
 
@@ -571,8 +652,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     {
 						if(!empty($conf->global->FAC_AUTO_FILLJS))
 							print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
-                        print '<input type=hidden name="'.$nameRemain.'" value="'.$remaintopay.'">';
-                        print '<input type="text" size="8" name="'.$namef.'" value="'.$_POST[$namef].'">';
+                        print '<input type=hidden class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
+                        print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
                     }
                     else
                     {
@@ -581,10 +662,35 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     }
                     print "</td>";
 
+					// Multicurrency Price
+					if (!empty($conf->multicurrency->enabled)) 
+					{
+						print '<td align="right">';
+						
+						// Add remind multicurrency amount
+	                    $namef = 'multicurrency_amount_'.$objp->facid;
+	                    $nameRemain = 'multicurrency_remain_'.$objp->facid;
+	
+	                    if ($action != 'add_paiement')
+	                    {
+							if(!empty($conf->global->FAC_AUTO_FILLJS))
+								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
+	                    {
+	                        print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
+	                        print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
+	                    }
+	                    print "</td>";
+					}
+
                     // Warning
-                    print '<td align="center" width="16">';
+                    print '<td align="center" width="16">'; 
                     //print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
-                    if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id])))
+                    if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
+                    	|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id])))
                     {
                         print ' '.img_warning($langs->trans("PaymentHigherThanReminderToPay"));
                     }
@@ -608,12 +714,16 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     print '<tr class="liste_total">';
                     print '<td colspan="2" align="left">'.$langs->trans('TotalTTC').'</td>';
                     print '<td align="right"><b>'.price($sign * $total_ttc).'</b></td>';
+					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
                     print '<td align="right"><b>'.price($sign * $totalrecu);
                     if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
                     if ($totalrecudeposits) print '+'.price($totalrecudeposits);
                     print '</b></td>';
+					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
                     print '<td align="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits,'MT')).'</b></td>';
+					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
                     print '<td align="right" id="result" style="font-weight: bold;"></td>';
+					if (!empty($conf->multicurrency->enabled)) print '<td align="right" id="multicurrency_result" style="font-weight: bold;"></td>';
                     print '<td align="center">&nbsp;</td>';
                     print "</tr>\n";
                 }
@@ -653,7 +763,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             $preselectedchoice=$addwarning?'no':'yes';
 
             print '<br>';
-            $text=$langs->trans('ConfirmCustomerPayment',$totalpayment,$langs->trans("Currency".$conf->currency));
+            if (!empty($totalpayment)) $text=$langs->trans('ConfirmCustomerPayment',$totalpayment,$langs->trans("Currency".$conf->currency));
+			if (!empty($multicurrency_totalpayment)) 
+			{
+				$text.='<br />'.$langs->trans('ConfirmCustomerPayment',$multicurrency_totalpayment,$langs->trans("paymentInInvoiceCurrency"));
+			}
             if (GETPOST('closepaidinvoices'))
             {
                 $text.='<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index d01600a7125..7b6c7dd2f5b 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -27,6 +27,7 @@
  *	\brief      File of class to manage payments of customers invoices
  */
 require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
 
 
 /**
@@ -51,6 +52,7 @@ class Paiement extends CommonObject
 	var $montant;
 	var $amount;            // Total amount of payment
 	var $amounts=array();   // Array of amounts
+	var $multicurrency_amounts=array();   // Array of amounts
 	var $author;
 	var $paiementid;	// Type de paiement. Stocke dans fk_paiement
 	// de llx_paiement qui est lie aux types de
@@ -148,21 +150,41 @@ class Paiement extends CommonObject
 		global $conf, $langs;
 
 		$error = 0;
-
-        $now=dol_now();
-
+		$way = $this->getWay();  
+		
+		$now=dol_now();
+		
         // Clean parameters
         $totalamount = 0;
+		$totalamount_converted = 0;
         $atleastonepaymentnotnull = 0;
-		foreach ($this->amounts as $key => $value)	// How payment is dispatch
+		
+		if ($way == 'dolibarr')
 		{
+			$amounts = &$this->amounts;
+			$amounts_to_update = &$this->multicurrency_amounts;
+		}
+		else
+		{
+			$amounts = &$this->multicurrency_amounts;
+			$amounts_to_update = &$this->amounts;
+		}
+		
+		foreach ($amounts as $key => $value)	// How payment is dispatch
+		{
+			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value, $way);
+			$totalamount_converted += $value_converted;
+			$amounts_to_update[$key] = price2num($value_converted, 'MT');
+			
 			$newvalue = price2num($value,'MT');
-			$this->amounts[$key] = $newvalue;
+			$amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
 			if (! empty($newvalue)) $atleastonepaymentnotnull++;
 		}
+		
 		$totalamount = price2num($totalamount);
-
+		$totalamount_converted = price2num($totalamount_converted);
+		
 		// Check parameters
         if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
         {
@@ -174,9 +196,20 @@ class Paiement extends CommonObject
 
 		$ref = $this->getNextNumRef('');
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, datec, datep, amount, fk_paiement, num_paiement, note, fk_user_creat)";
-		$sql.= " VALUES (".$conf->entity.", '".$ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$totalamount."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
+		if ($way == 'dolibarr')
+		{
+			$total = $totalamount;
+			$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
+		}
+		else
+		{
+			$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
+			$mtotal = $totalamount;
+		}
 
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, fk_user_creat)";
+		$sql.= " VALUES (".$conf->entity.", '".$ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
+		
 		dol_syslog(get_class($this)."::Create insert paiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -190,9 +223,9 @@ class Paiement extends CommonObject
 				if (is_numeric($amount) && $amount <> 0)
 				{
 					$amount = price2num($amount);
-					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount)';
-					$sql .= ' VALUES ('.$facid.', '. $this->id.', \''.$amount.'\')';
-
+					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount, multicurrency_amount)';
+					$sql .= ' VALUES ('.$facid.', '. $this->id.', \''.$amount.'\', \''.$this->multicurrency_amounts[$key].'\')';
+		
 					dol_syslog(get_class($this).'::Create Amount line '.$key.' insert paiement_facture', LOG_DEBUG);
 					$resql=$this->db->query($sql);
 					if ($resql)
@@ -277,8 +310,9 @@ class Paiement extends CommonObject
 
 		if (! $error)
 		{
-		    $this->amount=$totalamount;
-		    $this->total=$totalamount;    // deprecated
+		    $this->amount=$total;
+		    $this->total=$total;    // deprecated
+		    $this->multicurrency_amount=$mtotal;
 			$this->db->commit();
 			return $this->id;
 		}
@@ -434,9 +468,13 @@ class Paiement extends CommonObject
 
             $acc = new Account($this->db);
             $result=$acc->fetch($this->fk_account);
-
-            $totalamount=$this->amount;
+			
+			$totalamount=$this->amount;
             if (empty($totalamount)) $totalamount=$this->total; // For backward compatibility
+            
+            // if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
+            if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount=$this->multicurrency_amount;
+			
             if ($mode == 'payment_supplier') $totalamount=-$totalamount;
 
             // Insert payment into llx_bank
@@ -858,6 +896,31 @@ class Paiement extends CommonObject
 		}
 	}
 
+	/**
+	 * 	get the right way of payment
+	 * 
+	 * 	@return 	string 	'dolibarr' if standard comportment or paid in dolibarr currency, 'customer' if payment received from multicurrency inputs
+	 */
+	function getWay()
+	{
+		global $conf;
+		
+		$way = 'dolibarr';
+		if (!empty($conf->multicurrency->enabled))
+		{
+			foreach ($this->multicurrency_amounts as $value)
+			{
+				if (!empty($value)) // one value found then payment is in invoice currency
+				{
+					$way = 'customer';
+					break;
+				}
+			}
+		}
+		
+		return $way;
+	}
+	
 	/**
 	 *  Initialise an instance with random values.
 	 *  Used to build previews or test instances.
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 42265846d04..7c68a5ff978 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -91,9 +91,10 @@ abstract class CommonInvoice extends CommonObject
 	/**
 	 * 	Return amount of payments already done
 	 *
-	 *	@return		int		Amount of payment already done, <0 if KO
+	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+	 *	@return		int						Amount of payment already done, <0 if KO
 	 */
-	function getSommePaiement()
+	function getSommePaiement($multicurrency=0)
 	{
 		$table='paiement_facture';
 		$field='fk_facture';
@@ -103,7 +104,7 @@ abstract class CommonInvoice extends CommonObject
 			$field='fk_facturefourn';
 		}
 
-		$sql = 'SELECT sum(amount) as amount';
+		$sql = 'SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$table;
 		$sql.= ' WHERE '.$field.' = '.$this->id;
 
@@ -113,7 +114,8 @@ abstract class CommonInvoice extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$this->db->free($resql);
-			return $obj->amount;
+			if ($multicurrency) return $obj->multicurrency_amount;
+			else return $obj->amount;
 		}
 		else
 		{
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 3542b8eb1a9..e256dbfb649 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -371,12 +371,13 @@ class DiscountAbsolute
     /**
      *  Return amount (with tax) of all credit notes and deposits invoices used by invoice
      *
-     *	@param		Facture		$invoice	Object invoice
-     *	@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
+     *	@param		Facture		$invoice		Object invoice
+	 *	@param		int			$multicurrency	Return multicurrency_amount instead of amount
+     *	@return		int							<0 if KO, Sum of credit notes and deposits amount otherwise
      */
-    function getSumCreditNotesUsed($invoice)
+    function getSumCreditNotesUsed($invoice, $multicurrency=0)
     {
-        $sql = 'SELECT sum(rc.amount_ttc) as amount';
+        $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 as f';
         $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
         $sql.= ' AND f.type = 2';
@@ -386,7 +387,8 @@ class DiscountAbsolute
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            return $obj->amount;
+            if ($multicurrency) return $obj->multicurrency_amount;
+			else return $obj->amount;
         }
         else
         {
@@ -397,12 +399,13 @@ class DiscountAbsolute
     /**
      *  Return amount (with tax) of all deposits invoices used by invoice
      *
-     *	@param		Facture		$invoice	Object invoice
-     *	@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
+     *	@param		Facture		$invoice		Object invoice
+	 *  @param 		int 		$multicurrency 	Return multicurrency_amount instead of amount
+     *	@return		int							<0 if KO, Sum of credit notes and deposits amount otherwise
      */
-    function getSumDepositsUsed($invoice)
+    function getSumDepositsUsed($invoice, $multicurrency=0)
     {
-        $sql = 'SELECT sum(rc.amount_ttc) as amount';
+        $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 as f';
         $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
         $sql.= ' AND f.type = 3';
@@ -412,7 +415,8 @@ class DiscountAbsolute
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            return $obj->amount;
+            if ($multicurrency) return $obj->multicurrency_amount;
+			else return $obj->amount;
         }
         else
         {
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 50e0c4d2e56..680e91a39bb 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -211,4 +211,11 @@ ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
  
- 
\ No newline at end of file
+ALTER TABLE llx_paiement ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0;
+ALTER TABLE llx_paiement_facture ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0;
+ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_ht double(24,8) NOT NULL;
+ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_tva double(24,8) DEFAULT 0 NOT NULL;
+ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_ttc double(24,8) DEFAULT 0 NOT NULL;
+
diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql
index a82d5eb40e8..2a287ac7e89 100644
--- a/htdocs/install/mysql/tables/llx_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_paiement.sql
@@ -26,7 +26,8 @@ create table llx_paiement
   datec            datetime,							-- date de creation
   tms              timestamp,
   datep            datetime,							-- payment date
-  amount           double(24,8) DEFAULT 0,
+  amount           double(24,8) DEFAULT 0,				-- amount paid in Dolibarr currency
+  multicurrency_amount double(24,8) DEFAULT 0,			-- amount paid in invoice currency	
   fk_paiement      integer NOT NULL,
   num_paiement     varchar(50),
   note             text,
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
index 767dc4da007..3fa57f98624 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
@@ -33,4 +33,7 @@ create table llx_societe_remise_except
   fk_facture			integer,
   fk_facture_source		integer,
   description			text NOT NULL
+  multicurrency_amount_ht	double(24,8) NOT NULL,
+  multicurrency_amount_tva	double(24,8) DEFAULT 0 NOT NULL,
+  multicurrency_amount_ttc	double(24,8) DEFAULT 0 NOT NULL,
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 23f9ba4b532..8f8b92e108f 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 2000d27d3d4..fd6da3816ea 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -475,7 +475,51 @@ class MultiCurrency extends CommonObject
 		$resql = $db->query($sql);
 		if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
 		else return array(0, 1);
-	 }
+	 }  
+	 
+	 /**
+	  * Get the conversion of amount with invoice rate
+	  * 
+	  * @param	int		$fk_facture		id of facture
+	  * @param	double	$amount			amount to convert
+	  * @param	string	$way			dolibarr mean the amount is in dolibarr currency
+	  * @param	string	$table			facture or facture_fourn
+	  * 
+	  * @return	double					amount converted
+	  */
+	  public static function getAmountConversionFromInvoiceRate($fk_facture, $amount, $way='dolibarr', $table='facture')
+	  {
+		 global $db;
+		 
+		 $multicurrency_tx = self::getInvoiceRate($fk_facture, $table);
+		 
+		 if ($multicurrency_tx) 
+		 {
+		 	if ($way == 'dolibarr') return $amount * $multicurrency_tx;
+			else return $amount / $multicurrency_tx;
+		 }
+		 else return $amount;
+	  }
+	  
+	  /**
+	   *  Get current invoite rate
+	   * 
+	   *  @param	int 	$fk_facture 	id of facture
+	   *  @param 	string 	$table 			facture or facture_fourn
+	   */
+	   public static function getInvoiceRate($fk_facture, $table='facture')
+	   {
+		 global $db;
+		 
+		 $sql = 'SELECT multicurrency_tx FROM '.MAIN_DB_PREFIX.$table.' WHERE rowid = '.$fk_facture;
+		 $resql = $db->query($sql);
+		 if ($resql && ($line = $db->fetch_object($resql)))
+		 {
+		 	return $line->multicurrency_tx;
+		 }
+		 
+		 return false;
+	   }
 }
 
 /**

From 6662c1b5e1a5782dbf98403a910bd2e68525ea4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Feb 2016 23:37:34 +0100
Subject: [PATCH 120/421] NEW Can select dynamicaly number of lines to show on
 page on product, shipment, contact, orders, thirdparties Fix can make a
 shipment for product not predefined in multiwarehouse mode

---
 htdocs/commande/list.php          | 21 ++++++-
 htdocs/contact/list.php           | 23 ++++----
 htdocs/core/lib/functions.lib.php | 40 +++++++------
 htdocs/expedition/card.php        | 98 +++++++++++++++++++------------
 htdocs/expedition/list.php        | 46 ++++++++++++---
 htdocs/product/list.php           | 24 ++++----
 htdocs/societe/list.php           |  2 +-
 7 files changed, 164 insertions(+), 90 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 5a112e60861..ce6df0524c4 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -64,10 +64,10 @@ $id = (GETPOST('orderid')?GETPOST('orderid'):GETPOST('id','int'));
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'commande', $id,'');
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -90,6 +90,19 @@ $fieldstosearchall = array(
 );
 if (empty($user->socid)) $fieldstosearchall["c.note_private"]="NotePrivate";
 
+$arrayfields=array(
+);
+// Extra fields
+/*
+ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+ {
+ foreach($extrafields->attribute_label as $key => $val)
+ {
+ $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+ }
+ }
+ */
+
 
 /*
  * Actions
@@ -257,6 +270,7 @@ if ($resql)
 	$title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 
 	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($socid > 0)             $param.='&socid='.$socid;
 	if ($viewstatut != '')      $param.='&viewstatut='.$viewstatut;
 	if ($ordermonth)      		$param.='&ordermonth='.$ordermonth;
@@ -272,7 +286,6 @@ if ($resql)
 	if ($optioncss != '')       $param.='&optioncss='.$optioncss;
 
 	$num = $db->num_rows($resql);
-	print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_commercial.png');
 	
 	// Lignes des champs de filtre
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -283,7 +296,9 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
-    if ($sall)
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
+	
+	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index b319072dc68..f06de2ec8ec 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -67,6 +67,7 @@ $optioncss = GETPOST('optioncss','alpha');
 $type=GETPOST("type");
 $view=GETPOST("view");
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
@@ -76,7 +77,6 @@ $begin=GETPOST('begin');
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="p.lastname";
 if ($page < 0) { $page = 0; }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 
 $langs->load("companies");
@@ -345,12 +345,12 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if($view == "recent")
 {
     $sql.= $db->order("p.datec","DESC");
-    $sql.= $db->plimit($conf->liste_limit+1, $offset);
+    $sql.= $db->plimit($limit+1, $offset);
 }
 else
 {
     $sql.= $db->order($sortfield,$sortorder);
-    $sql.= $db->plimit($conf->liste_limit+1, $offset);
+    $sql.= $db->plimit($limit+1, $offset);
 }
 
 //print $sql;
@@ -361,11 +361,14 @@ if ($result)
 	$num = $db->num_rows($result);
     $i = 0;
 
-	$param ='&begin='.urlencode($begin).'&view='.urlencode($view).'&userid='.urlencode($userid).'&contactname='.urlencode($sall);
-    $param.='&type='.urlencode($type).'&view='.urlencode($view).'&search_lastname='.urlencode($search_lastname).'&search_firstname='.urlencode($search_firstname).'&search_societe='.urlencode($search_societe).'&search_email='.urlencode($search_email);
+    $param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    $param.='&begin='.urlencode($begin).'&view='.urlencode($view).'&userid='.urlencode($userid).'&contactname='.urlencode($sall);
+    $param.='&type='.urlencode($type).'&view='.urlencode($view);
     if (!empty($search_categ)) $param.='&search_categ='.urlencode($search_categ);
     if ($search_lastname != '') $param.='&amp;search_lastname='.urlencode($search_lastname);
     if ($search_firstname != '') $param.='&amp;search_firstname='.urlencode($search_firstname);
+    if ($search_societe != '') $param.='&amp;search_societe='.urlencode($search_societe);
     if ($search_zip != '') $param.='&amp;search_zip='.urlencode($search_zip);
     if ($search_town != '') $param.='&amp;search_town='.urlencode($search_town);
     if ($search_job != '') $param.='&amp;search_job='.urlencode($search_job);
@@ -385,8 +388,6 @@ if ($result)
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
     } 	
     
-    print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,'title_companies.png');
-
     print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -395,6 +396,8 @@ if ($result)
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
+    print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit);
+
     if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -739,10 +742,10 @@ if ($result)
 
     print "</table>";
 
+    if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit, 1);
+    
     print '</form>';
-
-    if ($num > $limit) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
-
+    
     $db->free($result);
 }
 else
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index efa80e70554..d5f7345d7a7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2955,28 +2955,29 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
 /**
  *	Print a title with navigation controls for pagination
  *
- *	@param	string	$titre				Title to show (required)
- *	@param	string	$page				Numero of page to show in navigation links (required)
- *	@param	string	$file				Url of page (required)
- *	@param	string	$options         	parametres complementaires lien ('' par defaut)
- *	@param	string	$sortfield       	champ de tri ('' par defaut)
- *	@param	string	$sortorder       	ordre de tri ('' par defaut)
- *	@param	string	$center          	chaine du centre ('' par defaut). We often find here string $massaction comming from $form->selectMassAction() 
- *	@param	int		$num				number of records found by select with limit+1
- *	@param	int		$totalnboflines		Total number of records/lines for all pages (if known)
- *	@param	string	$picto				Icon to use before title (should be a 32x32 transparent png file)
- *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
- *  @param	string	$morehtml			More html to show
- *  @param  string  $morecss            More css to the table
- *  @param  int     $limit              Max number of lines (-1 = use default, 0 = no limit, > 0 = limit)
+ *	@param	string	    $titre				Title to show (required)
+ *	@param	string	    $page				Numero of page to show in navigation links (required)
+ *	@param	string	    $file				Url of page (required)
+ *	@param	string	    $options         	parametres complementaires lien ('' par defaut)
+ *	@param	string    	$sortfield       	champ de tri ('' par defaut)
+ *	@param	string	    $sortorder       	ordre de tri ('' par defaut)
+ *	@param	string	    $center          	chaine du centre ('' par defaut). We often find here string $massaction comming from $form->selectMassAction() 
+ *	@param	int		    $num				number of records found by select with limit+1
+ *	@param	int		    $totalnboflines		Total number of records/lines for all pages (if known)
+ *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
+ *	@param	int		    $pictoisfullpath	1=Icon name is a full absolute url of image
+ *  @param	string	    $morehtml			More html to show
+ *  @param  string      $morecss            More css to the table
+ *  @param  int|string  $limit              Max number of lines (-1 = use default, 0 = no limit, > 0 = limit).
+ *  @param  int         $hideselectlimit    Force to hide select limit
  *	@return	void
  */
-function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1)
+function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
 {
 	global $conf,$langs;
 	
 	$savlimit = $limit;
-	
+
 	if ($picto == 'setup') $picto='title_setup.png';
 	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
 	if ($limit < 0) $limit = $conf->liste_limit;
@@ -3057,7 +3058,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 			$pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><span '.(empty($conf->dol_use_jmobile)?'class="active"':'data-role="button"').'>'.($page+1)."</li>";
 		}
 	}
-	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $savlimit, $totalnboflines);		// output the div and ul for previous/last completed with page numbers into $pagelist
+	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $savlimit, $totalnboflines, $hideselectlimit);		// output the div and ul for previous/last completed with page numbers into $pagelist
 	print '</td>';
 
 	print '</tr></table>'."\n";
@@ -3075,14 +3076,15 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
  *  @param	string			$afterarrows		HTML content to show after arrows. Must NOT contains '<li> </li>' tags.
  *  @param  int             $limit              Max nb of record to show  (-1 = no combo with limit, 0 = no limit, > 0 = limit)
  *	@param	int		        $totalnboflines		Total number of records/lines for all pages (if known)
+ *  @param  int             $hideselectlimit    Force to hide select limit
  *	@return	void
  */
-function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0)
+function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0, $hideselectlimit=0)
 {
 	global $conf, $langs;
 
 	print '<div class="pagination"><ul>';
-	if ((int) $limit >= 0)
+	if ((int) $limit >= 0 && empty($hideselectlimit))
 	{
 	    $pagesizechoices='10:10,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
 	    //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index f543f265d40..92b09af3a5d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -199,7 +199,7 @@ if (empty($reshook))
 			$batch="batchl".$i."_0";
 			$stockLocation="ent1".$i."_0";
 	    	$qty = "qtyl".$i;
-
+ 
 			if (isset($_POST[$batch]))
 			{
 				//shipment line with batch-enable product
@@ -242,7 +242,8 @@ if (empty($reshook))
 			}
 			else
 			{
-				//shipment line for product with no batch management
+			    var_dump($_POST); var_dump($batch);
+				//shipment line for product with no batch management and no multiple stock location
 				if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int');
 			}
 			
@@ -549,7 +550,7 @@ if ($action == 'create2')
     $action=''; $id=''; $ref='';
 }
 
-// Mode creation. TODO This part seems to not be used at all. Receipt record is created by the action "create_delivery" not from a form. 
+// Mode creation. 
 if ($action == 'create')
 {
     $expe = new Expedition($db);
@@ -577,9 +578,6 @@ if ($action == 'create')
 
             if (! empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
 
-            /*
-             *   Document source
-            */
             print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="add">';
@@ -711,9 +709,7 @@ if ($action == 'create')
 
             dol_fiche_end();
 
-            /*
-             * Expedition Lines
-             */
+            // Shipment lines
 
             $numAsked = count($object->lines);
 
@@ -745,9 +741,9 @@ if ($action == 'create')
             print '<table class="noborder" width="100%">';
 
 
-            /* Lecture des expeditions deja effectuees */
+            // Lecture des expeditions deja effectuees
             $object->loadExpeditions();
-
+            
             if ($numAsked)
             {
                 print '<tr class="liste_titre">';
@@ -792,9 +788,9 @@ if ($action == 'create')
                 if (! empty($line->date_end)) $type=1;
 
                 print "<tr ".$bc[$var].">\n";
-
+                
                 // Product label
-                if ($line->fk_product > 0)
+                if ($line->fk_product > 0)  // Predefined product ?
                 {
                     $product->fetch($line->fk_product);
                     $product->load_stock();
@@ -819,12 +815,12 @@ if ($action == 'create')
                     {
                         print ($line->desc && $line->desc!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->desc):'';
                     }
-
+                    
                     print '</td>';
                 }
                 else
 				{
-                    print "<td>";
+				    print "<td>";
                     if ($type==1) $text = img_object($langs->trans('Service'),'service');
                     else $text = img_object($langs->trans('Product'),'product');
 
@@ -846,7 +842,7 @@ if ($action == 'create')
                 print '</td>';
                 $qtyProdCom=$line->qty;
 
-                // Qty already sent
+                // Qty already shipped
                 print '<td align="center">';
                 $quantityDelivered = $object->expeditions[$line->id];
                 print $quantityDelivered;
@@ -863,9 +859,9 @@ if ($action == 'create')
 					$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 				}
                 $warehouse_id = GETPOST('entrepot_id','int');
-				
+			
 				$warehouseObject = null;
-				if ($warehouse_id > 0)
+				if ($warehouse_id > 0 || ! ($line->fk_product > 0))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 				{
 					//ship from preselected location
 					$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
@@ -942,7 +938,7 @@ if ($action == 'create')
 						print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
 
 						$staticwarehouse=new Entrepot($db);
-						$staticwarehouse->fetch($warehouse_id);
+						if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
 						
 						$subj=0;
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
@@ -970,16 +966,18 @@ if ($action == 'create')
 									$quantityToBeDelivered = 0;
 								}
 								$subj++;
+								print '</td></tr>';
 							}
 						}
 						else
 						{
-							print '<tr><td colspan="3" ></td><td align="center">';
+							print '<tr><td colspan="3"></td><td align="center">';
 							print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
 							print '</td>';
 							
 							print '<td align="left">';
 							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle);
+							print '</td></tr>';
 						}
 					}
 				}
@@ -988,13 +986,16 @@ if ($action == 'create')
 					// ship from multiple locations
 					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
 					{
-						print '<td></td><td></td></tr>';	// end line and start a new one for each warehouse
+					    print '<td></td><td></td></tr>';	// end line and start a new one for each warehouse
+						
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						$subj=0;
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse) {
+						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse) 
+						{
 							$warehouseObject=new Entrepot($db);
 							$warehouseObject->fetch($warehouse_id);
-							if ($stock_warehouse->real > 0) {
+							if ($stock_warehouse->real > 0) 
+							{
 								$stock = + $stock_warehouse->real; // Convert it to number
 								$deliverableQty = min($quantityToBeDelivered,$stock);
 								// Quantity to send
@@ -1039,7 +1040,7 @@ if ($action == 'create')
 						{
 							$product->get_sousproduits_arbo();
 							$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-							if(count($prods_arbo) > 0)
+							if (count($prods_arbo) > 0)
 							{
 								foreach($prods_arbo as $key => $value)
 								{
@@ -1049,10 +1050,12 @@ if ($action == 'create')
 									{
 										$img=img_warning($langs->trans("StockTooLow"));
 									}
-									print "<tr ".$bc[$var]."><td>&nbsp; &nbsp; &nbsp; ->
+									print "<tr ".$bc[$var]."><td>";
+									print "&nbsp; &nbsp; &nbsp; ->
 									<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 									</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
-									<td align=\"center\">".$value['stock']." ".$img."</td></tr>";
+									<td align=\"center\">".$value['stock']." ".$img."</td>";
+									print "</tr>";
 								}
 							}
 						}
@@ -1060,11 +1063,12 @@ if ($action == 'create')
 					else
 					{
 						print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
-						
+
 						$subj=0;
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse) {
+						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse) 
+						{
 							$warehouseObject=new Entrepot($db);
 							$warehouseObject->fetch($warehouse_id);
 							if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
@@ -1073,7 +1077,7 @@ if ($action == 'create')
 									//var_dump($dbatch);
 									$batchStock = + $dbatch->qty;		// To get a numeric
 									$deliverableQty = min($quantityToBeDelivered,$batchStock);
-									print '<tr><td colspan="3" ></td><td align="center">';
+									print '<tr><td colspan="3"></td><td align="center">';
 									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '</td>';
 									 
@@ -1091,25 +1095,44 @@ if ($action == 'create')
 									}
 									//dol_syslog('deliverableQty = '.$deliverableQty.' batchStock = '.$batchStock);
 									$subj++;
+									print '</td></tr>';
 								}
 							}
 						}
 					}
-					if ($subj == 0)
+					if ($subj == 0) // Line not shown yet
 					{
 						print '<tr><td colspan="3" ></td><td align="center">';
-						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
-						print '</td>';
-						
-						print '<td align="left">';
-						if ($warehouseObject) 
+						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
+    						//$disabled='disabled="disabled"';
+    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled?' '.$disabled:'').'> ';
 						}
 						else
 						{
-							print img_warning().' '.$langs->trans("StockTooLow");
+						    print $langs->trans("NA");
 						}
+						print '</td>';
+						
+						print '<td align="left">';
+						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+						{
+    						if ($warehouseObject) 
+    						{
+    							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
+    						}
+    						else
+    						{
+    						    if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
+    						    else print '';
+    						}
+						}
+						else
+						{
+						    print $langs->trans("Service");
+						}
+						print '</td>';
+						print '</tr>';
 					}
 				}
 				
@@ -1576,6 +1599,7 @@ else if ($id || $ref)
 				{
 					print (! empty($lines[$i]->description) && $lines[$i]->description!=$lines[$i]->product)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
 				}
+				print "</td>\n";
 			}
 			else
 			{
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index c8dd6445ae2..5e7fe3b6a1e 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -42,17 +42,16 @@ $search_company = GETPOST("search_company");
 $sall = GETPOST('sall');
 $optioncss = GETPOST('optioncss','alpha');
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-
+if (! $sortfield) $sortfield="e.ref";
+if (! $sortorder) $sortorder="DESC";
 if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="e.ref";
-if (! $sortorder) $sortorder="DESC";
 
 $viewstatut=GETPOST('viewstatut');
 
@@ -71,6 +70,19 @@ $fieldstosearchall = array(
     's.nom'=>"ThirdParty"
 );
 
+$arrayfields=array(
+);
+// Extra fields
+/*
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+    }
+}
+*/
+
 
 /*
  * View
@@ -129,18 +141,22 @@ if ($resql)
 
 	$expedition = new Expedition($db);
 
-	$param="";
+	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($search_ref_exp) $param.= "&amp;search_ref_exp=".$search_ref_exp;
 	if ($search_ref_liv) $param.= "&amp;search_ref_liv=".$search_ref_liv;
 	if ($search_company) $param.= "&amp;search_company=".$search_company;
 	if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
 
-	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords);
-
-
 	$i = 0;
-    print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['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_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords, '', 0, '', '', $limit);
 
     if ($sall)
     {
@@ -149,6 +165,18 @@ if ($resql)
     }
     
     $moreforfilter='';
+    if (! empty($moreforfilter))
+    {
+        print '<div class="liste_titre liste_titre_bydiv centpercent">';
+        print $moreforfilter;
+        $parameters=array('type'=>$type);
+        $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+        print '</div>';
+    }
+
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     
     print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 088f7e73c66..c25c4c1ce0a 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -314,6 +314,8 @@ else
 		    setEventMessages($langs->trans("ProductDeleted", GETPOST('delprod')), null, 'mesgs');
 	    }
 
+	    $param='';
+        if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	    if ($search_categ > 0) $param.="&amp;search_categ=".$search_categ;
     	if ($sref) $param="&amp;sref=".$sref;
     	if ($search_ref_supplier) $param="&amp;search_ref_supplier=".$search_ref_supplier;
@@ -337,7 +339,16 @@ else
 	        if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	    } 	
 		
-    	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,'title_products.png');
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+        if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+		print '<input type="hidden" name="action" value="list">';
+		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+		print '<input type="hidden" name="type" value="'.$type.'">';
+
+	    print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_products.png', 0, '', '', $limit);
 
     	if (! empty($catid))
     	{
@@ -368,15 +379,6 @@ else
     	}
     	else
     	{
-    		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
-            if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    		print '<input type="hidden" name="action" value="list">';
-    		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    		print '<input type="hidden" name="type" value="'.$type.'">';
-
     	    if ($sall)
             {
                 foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -781,8 +783,8 @@ else
     		$db->free($resql);
 
     		print "</table>";
-    		print '</form>';
     	}
+    	print '</form>';
     }
     else
     {
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index dc9ed9dd252..19149d3fe3c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -83,7 +83,7 @@ $page=GETPOST("page",'int');
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="s.nom";
 if ($page == -1) { $page = 0 ; }
-$offset = $limit * $page ;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 

From e169cd3364b64b50a79c2069eab3c55caa98595b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Feb 2016 23:48:18 +0100
Subject: [PATCH 121/421] Fix usage of filter into selection of email members
 into emailing.

---
 htdocs/comm/mailing/cibles.php                  | 1 +
 htdocs/core/modules/mailings/fraise.modules.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d3aa3557c89..af6d8b94c28 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -95,6 +95,7 @@ if ($action == 'add')
 
 			// Add targets into database
 			$obj = new $classname($db);
+			dol_syslog("Call add_to_target on class ".$classname);
 			$result=$obj->add_to_target($id,$filtersarray);
 		}
 	}
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index ca9f2b11f0d..42f59e7c2fb 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -123,7 +123,7 @@ class mailing_fraise extends MailingTargets
         $s.='<option value="0">'.$langs->trans("MemberStatusResiliatedShort").'</option>';
         $s.='</select> ';
         $s.=$langs->trans("Type").': ';
-        $s.='<select name="filter" class="flat">';
+        $s.='<select name="filtertype" class="flat">';
         $sql = "SELECT rowid, libelle, statut";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type";
         $sql.= " WHERE entity = ".$conf->entity;
@@ -212,7 +212,7 @@ class mailing_fraise extends MailingTargets
         if ($dateendsubscriptionafter > 0)  $sql.=" AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
         if ($dateendsubscriptionbefore > 0) $sql.=" AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
         $sql.= " AND a.fk_adherent_type = ta.rowid";
-        if ($_POST['filter']) $sql.= " AND ta.rowid='".$_POST['filter']."'";
+        if ($_POST['filtertype']) $sql.= " AND ta.rowid='".$_POST['filtertype']."'";
         $sql.= " ORDER BY a.email";
         //print $sql;
 

From 1d5bd7208ed1c302a7ef74e5321c776fd6685d20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Feb 2016 00:24:32 +0100
Subject: [PATCH 122/421] Packager can publish release candidates on foundation
 server

---
 build/makepack-dolibarr.pl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 1d6542eafc9..c8b3c7664e2 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -1150,14 +1150,16 @@ if ($nboftargetok) {
 	    		
 	    		if ($target eq 'SF') { 
 	    			$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
-		    		print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."\n";
+		    		print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."/".$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
 	    		}
 	    		else
 	    		{
+	    			$dirnameonly=$file;
+	    			$dirnameonly =~ s/.*\/([^\/]+)\/[^\/]+$/$1/;  
 	    			$filenameonly=$file;
-	    			$filenameonly =~ s/.*\/([^\/]+\/[^\/]+)$/$1/;      # removes path  
-	    			$destFolder="$NEWPUBLISH/$filenameonly";
-		    		print "Publish file ".$file." to $NEWPUBLISH/".$filenameonly."\n";
+	    			$filenameonly =~ s/.*\/[^\/]+\/([^\/])+$/$1/;  
+	    			$destFolder="$NEWPUBLISH/$dirnameonly";
+		    		print "Publish file ".$file." to $NEWPUBLISH/".$dirnameonly."\n";
 	    		}
 
 				# mkdir	   

From b47252fcb6a206d3c73eec4127f05007dac71b76 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Thu, 11 Feb 2016 06:39:02 +0100
Subject: [PATCH 123/421] Modifiy menu for accountancy module - New balance
 feature

---
 htdocs/core/menus/init_menu_auguria.sql |  6 +++---
 htdocs/core/menus/standard/eldy.lib.php |  7 ++++---
 htdocs/langs/en_US/accountancy.lang     | 20 +++++---------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 1e5062f7e1d..0d95d94c721 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -217,9 +217,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	-- Journals
 	-- insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2420__+MAX_llx_menu__, 'accountancy', 'journal', 2400__+MAX_llx_menu__, '/accountancy/journal/index.php?leftmenu=journal', 'Journaux', 1, 'accountancy', '$user->rights->accounting->comptarapport->lire', '', 0, 7, __ENTITY__);
 	-- General Ledger
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?leftmenu=bookkeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2431__+MAX_llx_menu__, 'accountancy', '', 2430__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyyear.php', 'ByYear', 2, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2432__+MAX_llx_menu__, 'accountancy', '', 2430__+MAX_llx_menu__, '/accountancy/bookkeeping/balancebymonth.php', 'AccountBalanceByMonth', 2, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
+	-- Balance
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2435__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
 	-- Reports
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 0497b50308f..7ae6ea1a1a1 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -968,9 +968,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 
 				// General Ledger
-				$newmenu->add("/accountancy/bookkeeping/list.php?leftmenu=bookkeeping",$langs->trans("Bookkeeping"),1,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookkeeping');
-				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/listbyyear.php",$langs->trans("ByYear"),2,$user->rights->accounting->mouvements->lire);
-				if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balancebymonth.php",$langs->trans("AccountBalanceByMonth"),2,$user->rights->accounting->mouvements->lire);
+				$newmenu->add("/accountancy/bookkeeping/list.php",$langs->trans("Bookkeeping"),1,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookkeeping');
+
+				// Balance
+				$newmenu->add("/accountancy/bookkeeping/balance",$langs->trans("AccountBalance"),1,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'balance');
 
 				// Reports
 				$langs->load("compta");
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 9f3941a42ec..9948afa4800 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -48,7 +48,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -105,7 +105,6 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
-NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -154,8 +153,6 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -166,15 +163,8 @@ Fieldname=Name of Field
 Headername=Name in header
 Type=Type of fields
 Param=Additionnal parameters
-EnabledProduct=In product
-EnabledTiers=In third party
-EnabledVat=In VAT
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
 
-## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
\ No newline at end of file
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
\ No newline at end of file

From 87fee74fb12a8f6db1ab3759b76a100ddc9558d4 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Thu, 11 Feb 2016 06:44:35 +0100
Subject: [PATCH 124/421] Modify menu for accountancy module - New balance
 feature

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

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 9948afa4800..9149c5d35ba 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -167,4 +167,4 @@ EnabledProduct=In Product
 EnabledTiers=In Tiers
 EnabledVat=In Vat
 
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
\ No newline at end of file
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s

From f1a26cf54b3c88bde2738edc0d22ed649af5c101 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Thu, 11 Feb 2016 06:49:49 +0100
Subject: [PATCH 125/421] Correct problem of merging for language file

---
 htdocs/langs/en_US/accountancy.lang | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 9149c5d35ba..6039ec88013 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -105,6 +105,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -153,6 +154,8 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,8 +166,15 @@ Fieldname=Name of Field
 Headername=Name in header
 Type=Type of fields
 Param=Additionnal parameters
-EnabledProduct=In Product
-EnabledTiers=In Tiers
-EnabledVat=In Vat
+EnabledProduct=In product
+EnabledTiers=In third party
+EnabledVat=In VAT
 
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductBuy=Mode purchases
+OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
+OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
\ No newline at end of file

From a430b59bac0e5920ee92ff910222845df4001597 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 11 Feb 2016 09:41:45 +0100
Subject: [PATCH 126/421] Add MAIN_VIEW_LINE_NUMBER for members list

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index b19c6b2e35d..843d8e7663f 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -227,6 +227,10 @@ if ($resql)
 
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
 	print '<tr class="liste_titre">';
+	if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+	{
+		print '<td width="5" align="center">&nbsp;</td>';
+	}
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
@@ -245,6 +249,8 @@ if ($resql)
 
 	// Line for filters fields
 	print '<tr class="liste_titre">';
+	
+	print '<td class="liste_titre">&nbsp;</td>';
 
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" name="search_ref" value="'.$search_ref.'" size="4"></td>';
@@ -303,6 +309,11 @@ if ($resql)
 
 		$var=!$var;
 		print "<tr ".$bc[$var].">";
+		
+		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+		{
+			print '<td align="center">'.($i+1).'</td>';
+		}
 
 		// Ref
 		print "<td>";

From 875e01aeee1b282600e0445de3425c52ae5307e0 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 11 Feb 2016 09:50:35 +0100
Subject: [PATCH 127/421] New add recurrence fields on create form of invoice
 model Fix missing fields in database about multicurrency

---
 .../facture/class/facture-rec.class.php       | 93 ++++++++++++++++++-
 htdocs/compta/facture/class/facture.class.php | 60 ++++++++++++
 htdocs/compta/facture/fiche-rec.php           | 92 +++++++++++++++++-
 htdocs/core/class/commonobject.class.php      |  2 +-
 .../install/mysql/migration/3.9.0-4.0.0.sql   | 17 +++-
 .../install/mysql/tables/llx_facture_rec.sql  | 10 +-
 .../mysql/tables/llx_facturedet_rec.sql       |  9 +-
 htdocs/langs/en_US/bills.lang                 |  8 +-
 8 files changed, 283 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index f2ef90677c5..91e3388c8ff 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -30,6 +30,7 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 
 /**
@@ -83,7 +84,20 @@ class FactureRec extends Facture
 		// Clean parameters
 		$this->titre=trim($this->titre);
 		$this->usenewprice=empty($this->usenewprice)?0:$this->usenewprice;
-
+		
+		// No frequency defined then no next date to execution
+		if (empty($this->frequency)) 
+		{
+			$this->frequency=0;
+			$this->date_when=NULL;
+		}
+		
+		
+		$this->frequency=abs($this->frequency);
+		$this->nb_gen_done=0;
+		$this->nb_gen_max=empty($this->nb_gen_max)?0:$this->nb_gen_max;
+		$this->auto_validate=empty($this->auto_validate)?0:$this->auto_validate;
+		
 		$this->db->begin();
 
 		// Charge facture modele
@@ -108,6 +122,13 @@ class FactureRec extends Facture
 			$sql.= ", fk_cond_reglement";
 			$sql.= ", fk_mode_reglement";
 			$sql.= ", usenewprice";
+			$sql.= ", frequency";
+			$sql.= ", unit_frequency";
+			$sql.= ", date_when";
+			$sql.= ", date_last_gen";
+			$sql.= ", nb_gen_done";
+			$sql.= ", nb_gen_max";
+			$sql.= ", auto_validate";
 			$sql.= ") VALUES (";
 			$sql.= "'".$this->titre."'";
 			$sql.= ", ".$facsrc->socid;
@@ -122,6 +143,13 @@ class FactureRec extends Facture
 			$sql.= ", '".$facsrc->cond_reglement_id."'";
 			$sql.= ", '".$facsrc->mode_reglement_id."'";
 			$sql.= ", ".$this->usenewprice;
+			$sql.= ", ".$this->frequency;
+			$sql.= ", '".$this->db->escape($this->unit_frequency)."'";
+			$sql.= ", ".(!empty($this->date_when)?"'".$this->db->idate($this->date_when)."'":'NULL');
+			$sql.= ", ".(!empty($this->date_last_gen)?"'".$this->db->idate($this->date_last_gen)."'":'NULL');
+			$sql.= ", ".$this->nb_gen_done;
+			$sql.= ", ".$this->nb_gen_max;
+			$sql.= ", ".$this->auto_validate;
 			$sql.= ")";
 
 			if ($this->db->query($sql))
@@ -198,6 +226,7 @@ class FactureRec extends Facture
 		$sql.= ', f.date_lim_reglement as dlr';
 		$sql.= ', f.note_private, f.note_public, f.fk_user_author';
 		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement';
+		$sql.= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.usenewprice, f.auto_validate';
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
 		$sql.= ', el.fk_source';
@@ -255,6 +284,14 @@ class FactureRec extends Facture
 				$this->modelpdf               = $obj->model_pdf;
 				$this->rang					  = $obj->rang;
 				$this->special_code			  = $obj->special_code;
+				$this->frequency			  = $obj->frequency;
+				$this->unit_frequency		  = $obj->unit_frequency;
+				$this->date_when			  = $obj->date_when;
+				$this->date_last_gen		  = $obj->date_last_gen;
+				$this->nb_gen_done			  = $obj->nb_gen_done;
+				$this->nb_gen_max			  = $obj->nb_gen_max;
+				$this->usenewprice			  = $obj->usenewprice;
+				$this->auto_validate		  = $obj->auto_validate;
 
 				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
 
@@ -468,7 +505,7 @@ class FactureRec extends Facture
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
 			$total_ttc = $tabprice[2];
-
+			
 			$product_type=$type;
 			if ($fk_product)
 			{
@@ -529,6 +566,58 @@ class FactureRec extends Facture
 		}
 	}
 
+	/**
+	 * Return the next date of 
+	 * 
+	 * @return	timestamp	false if KO, timestamp if OK
+	 */
+	function getNextDate()
+	{
+		if (empty($this->date_when)) return false;
+		return dol_time_plus_duree($this->date_when, $this->frequency, $this->unit_frequency);
+	}
+	
+	/**
+	 *  Create all recurrents invoices 
+	 * 
+	 *  @return		int		number of created invoices
+	 */
+	function createRecurringInvoices()
+	{
+		global $db,$user;
+		
+		$nb_create=0;
+		
+		$today = date('Y-m-d 23:59:59');
+		
+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_rec';
+		$sql.= ' WHERE date_when IS NOT NULL';
+		$sql.= ' AND date_when <= "'.$db->escape($today).'"';
+		$sql.= ' AND nb_gen_done < nb_gen_max';
+		
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			while ($line = $db->fetch_object($resql))
+			{
+				$facturerec = new FactureRec($db);
+				$facturerec->fetch($line->rowid);
+				
+				$facture = new Facture($db);
+				
+				$result = $facture->createFromRec($user, $facturerec);
+				
+				// >0 create and validate if auto_validate
+				// =0 create but not validate if auto_validate
+				// <0 broken
+				if ($result >= 0) $nb_create++;
+
+			}
+		}
+		
+		return $nb_create;
+	}
+	
 	/**
 	 *	Return clicable name (with picto eventually)
 	 *
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index fe38c17ff0d..edb22982843 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -917,6 +917,66 @@ class Facture extends CommonInvoice
 		else return -1;
 	}
 
+	/**
+	 *	Create a new invoice in database from facturerec
+	 *
+	 *	@param      User	$user    		Object user that ask creation
+	 *	@return		int						<0 if KO, 0 if not validate, >0 if OK
+	 */
+	function createFromRec($user, $object)
+	{
+
+		// Clean parameters
+		if (! $this->type) $this->type = self::TYPE_STANDARD;
+		$this->ref_client=trim($this->ref_client);
+		$this->note_private=trim($this->note_private);
+		$this->note_public=trim($this->note_public);
+		//if (! $this->remise) $this->remise = 0;
+		if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
+		$this->brouillon = 1;
+		
+		// Charge facture source
+		$facture=new Facture($object->db);
+
+		$facture->fk_facture_source = $object->fk_facture_source;
+		$facture->type 			    = $object->type;
+		$facture->socid 		    = $object->socid;
+		$facture->date              = dol_mktime(12, 0, 0, date('m'), date('d'), date('Y'));
+		$facture->note_public       = $object->note_public;
+		$facture->note_private      = $object->note_private;
+		$facture->ref_client        = $object->ref_client;
+		$facture->modelpdf          = $object->modelpdf;
+		$facture->fk_project        = $object->fk_project;
+		$facture->cond_reglement_id = $object->cond_reglement_id;
+		$facture->mode_reglement_id = $object->mode_reglement_id;
+		$facture->remise_absolue    = $object->remise_absolue;
+		$facture->remise_percent    = $object->remise_percent;
+		$facture->fk_incoterms		= $object->fk_incoterms;
+		$facture->location_incoterms= $object->location_incoterms;
+
+		$facture->lines		    	= $object->lines;	// Tableau des lignes de factures
+		$facture->products		    = $object->lines;	// Tant que products encore utilise
+
+		// Loop on each line of new invoice
+		foreach($facture->lines as $i => $line)
+		{
+			$facture->lines[$i]->fk_prev_id = $object->lines[$i]->rowid;
+		}
+
+		dol_syslog(get_class($this)."::createFromRec socid=".$this->socid." nboflines=".count($facture->lines));
+
+		$facid = $facture->create($user);
+		if ($facid <= 0) return -1;
+
+		if ($object->auto_validate)
+		{
+			$result = $facture->validate($user);
+			if ($result<=0) return 0;
+		}
+			
+		return $facid;
+	}
+
 	/**
 	 *      Return clicable link of object (with eventually picto)
 	 *
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 5f17c5d49bb..b9c3b58a224 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -75,12 +75,42 @@ if ($action == 'add')
 		$error++;
 	}
 
+	$frequency=GETPOST('frequency', 'int');
+	$reyear=GETPOST('reyear');
+	$remonth=GETPOST('remonth');
+	$reday=GETPOST('reday');
+	$nb_gen_max=GETPOST('nb_gen_max', 'int');
+	
+	if (GETPOST('frequency'))
+	{
+		if (empty($reyear) || empty($remonth) || empty($reday)) 
+		{
+			setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Date")), null, 'errors');
+			$action = "create";
+			$error++;	
+		}
+		if (empty($nb_gen_max))
+		{
+			setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("MaxPeriodNumber")), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+	}
+
 	if (! $error)
 	{
 		$object->titre = GETPOST('titre', 'alpha');
 		$object->note_private  = GETPOST('note_private');
 		$object->usenewprice = GETPOST('usenewprice');
-
+		
+		$object->frequency = $frequency;
+		$object->unit_frequency = GETPOST('unit_frequency', 'alpha');
+		$object->nb_gen_max = $nb_gen_max;
+		$object->auto_validate = GETPOST('auto_validate', 'int');
+		
+		$date_next_execution = dol_mktime(12, 0, 0, $remonth, $reday, $reyear);
+		$object->date_when = $date_next_execution;
+		
 		if ($object->create($user, $id) > 0)
 		{
 			$id = $object->id;
@@ -185,6 +215,38 @@ if ($action == 'create')
 
 		print '<br>';
 
+		
+		// Recurrence
+		$title = $langs->trans("Recurrence");
+		print load_fiche_titre($title);
+		
+		print '<table class="border" width="100%">';
+		
+		// Frequency
+		print "<tr><td>".$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'))."</td><td>";
+		print "<input type='text' name='frequency' value='".GETPOST('frequency', 'int')."' size='5' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency')?GETPOST('unit_frequency'):'m'));
+		print "</td></tr>";
+		
+		// First date of execution for cron
+		print "<tr><td>".$langs->trans('NextDateToExecution')."</td><td>";
+		$date_next_execution = isset($date_next_execution) ? $date_next_execution : dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+		print $form->select_date($date_next_execution, '', 0, 0, '', "add", 1, 1, 1);
+		print "</td></tr>";
+		
+		// Number max of generation
+		print "<tr><td>".$langs->trans("MaxPeriodNumber")."</td><td>";
+		print "<input type='text' name='nb_gen_max' value='' size='5' />";
+		print "</td></tr>";
+
+		// Auto validate the invoice
+		print "<tr><td>".$langs->trans("InvoiceAutoValidate")."</td><td>";
+		print $form->selectyesno('auto_validate', 0, 1);
+		print "</td></tr>";
+
+		print "</table>";
+
+		print '<br>';
+
 		$title = $langs->trans("ProductsAndServices");
 		if (empty($conf->service->enabled))
 			$title = $langs->trans("Products");
@@ -446,6 +508,34 @@ else
 
 			print '</div>';
 
+			/*
+			 * Recurrence
+			 */
+			if ($object->frequency > 0)
+			{
+				$title = $langs->trans("Recurrence");
+				print load_fiche_titre($title);
+				
+				print '<div class="tabBar">';
+				print '<table class="border" width="100%">';
+
+				print '<tr><td width="25%">'.$langs->trans("Frequency").'</td>';
+				print '<td>'.$langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency).'</td>';
+				
+				print '<tr><td width="25%">'.$langs->trans("NextDateToExecution").'</td>';
+				print '<td>'.dol_print_date($object->date_when, 'daytext').'</td>';
+				
+				print '<tr><td width="25%">'.$langs->trans("MaxPeriodNumber").' / '.$langs->trans("RestPeriodNumber").'</td>';
+				print '<td>'.$object->nb_gen_max.' / '.($object->nb_gen_max-$object->nb_gen_done).'</td>';
+				
+				print '<tr><td width="25%">'.$langs->trans("InvoiceAutoValidate").'</td>';
+				print '<td>'.yn($object->auto_validate).'</td>';
+				
+				print '</table>';
+				print '</div>';
+				print '<br />';
+			}
+
 			/*
 			 * Lines
 			 */
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f7cb1ff7881..f17be59d0db 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2322,7 +2322,7 @@ abstract class CommonObject
                 {
                     $error++;
                     $this->error=$this->db->lasterror();
-                    $this->error[]=$this->db->lasterror();
+                    $this->errors[]=$this->db->lasterror();
                 }
             }
 
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 50e0c4d2e56..57f3c10ebe4 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -211,4 +211,19 @@ ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
  
- 
\ No newline at end of file
+
+ALTER TABLE llx_facture_rec ADD COLUMN auto_validate integer DEFAULT 0;
+
+ALTER TABLE llx_facture_rec ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_facturedet_rec ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index 7c1151f36ca..19fdb14516b 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -50,6 +50,13 @@ create table llx_facture_rec
   note_private       text,
   note_public        text,
 
+  fk_multicurrency          integer,
+  multicurrency_code        varchar(255),
+  multicurrency_tx          double(24,8) DEFAULT 1,
+  multicurrency_total_ht    double(24,8) DEFAULT 0,
+  multicurrency_total_tva   double(24,8) DEFAULT 0,
+  multicurrency_total_ttc   double(24,8) DEFAULT 0,
+
   usenewprice        integer DEFAULT 0,			-- update invoice with current price of product instead of recorded price
   frequency          integer,						-- frequency (for example: 3 for every 3 month)
   unit_frequency     varchar(2) DEFAULT 'm',		-- 'm' for month (date_when must be a day <= 28), 'y' for year, ... 
@@ -57,5 +64,6 @@ create table llx_facture_rec
   date_when          datetime DEFAULT NULL,		-- date for next gen (when an invoice is generated, this field must be updated with next date)
   date_last_gen      datetime DEFAULT NULL,		-- date for last gen (date with last successfull generation of invoice)
   nb_gen_done        integer DEFAULT NULL,		-- nb of generation done (when an invoice is generated, this field must incremented)
-  nb_gen_max         integer DEFAULT NULL		    -- maximum number of generation
+  nb_gen_max         integer DEFAULT NULL,		    -- maximum number of generation
+  auto_validate      integer DEFAULT 0		-- 0 to create in draft, 1 to create and validate the new invoice
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
index 164dc2f94d5..e0e7358af0c 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
@@ -48,5 +48,12 @@ create table llx_facturedet_rec
   special_code		integer UNSIGNED DEFAULT 0,	-- code pour les lignes speciales
   rang				integer DEFAULT 0,				-- ordre d'affichage
   fk_contract_line  integer NULL,					-- id of contract line when predefined invoice comes from contract lines
-  fk_unit         integer    DEFAULT NULL
+  fk_unit         integer    DEFAULT NULL,
+  
+  fk_multicurrency          integer,
+  multicurrency_code        varchar(255),
+  multicurrency_subprice    double(24,8) DEFAULT 0,
+  multicurrency_total_ht    double(24,8) DEFAULT 0,
+  multicurrency_total_tva   double(24,8) DEFAULT 0,
+  multicurrency_total_ttc   double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 23f9ba4b532..754ddc1547c 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -305,7 +305,13 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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=Next date to execution
+MaxPeriodNumber=Max period number
+InvoiceAutoValidate=Automatically validate invoice
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate

From 518080468e90617a9cb7e130f620c119a01cb0a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Feb 2016 10:39:01 +0100
Subject: [PATCH 128/421] Fix button create template must be visible only if
 amount is != 0

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

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index eb3f969890b..090a82cbaa2 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3313,7 +3313,9 @@ else if ($id > 0 || ! empty($ref))
 			print ' ';
 
 			print $prevsits[0]->situation_counter;
-			for ($i = 1; $i < count($prevsits); $i++) {
+			$cprevsits = count($prevsits);
+
+		  for ($i = 1; $i < $cprevsits; $i++) {
 				print ' + ';
 				print $prevsits[$i]->situation_counter;
 			}
@@ -3334,7 +3336,7 @@ else if ($id > 0 || ! empty($ref))
 			print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>';
 
 			// Previous situation(s) deduction(s)
-			for ($i = 0; $i < count($prevsits); $i++) {
+			for ($i = 0; $i < $cprevsits; $i++) {
 				print '<tr><td>';
 				print '<a href="' . $_SERVER['PHP_SELF'] . '?facid=' . $prevsits[$i]->id . '">';
 				print $langs->trans('SituationDeduction');
@@ -3629,6 +3631,7 @@ else if ($id > 0 || ! empty($ref))
 				}
 			}
 
+			// deprecated. Useless because now we can use templates
 			if (! empty($conf->global->FACTURE_SHOW_SEND_REMINDER)) 			// For backward compatibility
 			{
 				if (($object->statut == 1 || $object->statut == 2) && $resteapayer > 0) {
@@ -3684,7 +3687,7 @@ else if ($id > 0 || ! empty($ref))
 
 			// Classify paid
 			if ($object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement && (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0))
-				|| ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 0 && $resteapayer == 0 && $user->rights->facture->paiement && empty($discount->id))
+				|| ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 0 && $object->total_ttc > 0 && $resteapayer == 0 && $user->rights->facture->paiement && empty($discount->id))
 			)
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a></div>';
@@ -3714,10 +3717,10 @@ else if ($id > 0 || ! empty($ref))
 				print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&amp;action=clone&amp;object=invoice">' . $langs->trans("ToClone") . '</a></div>';
 			}
 
-			// Clone as predefined
+			// Clone as predefined / Create template
 			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $object->statut == 0 && $user->rights->facture->creer)
 			{
-				if (! $objectidnext)
+				if (! $objectidnext && count($object->lines) > 0)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="facture/fiche-rec.php?facid=' . $object->id . '&amp;action=create">' . $langs->trans("ChangeIntoRepeatableInvoice") . '</a></div>';
 				}
@@ -3732,7 +3735,7 @@ else if ($id > 0 || ! empty($ref))
 				}
 			}
 
-			//Create next situation invoice
+			// Create next situation invoice
 			if ($user->rights->facture->creer && ($object->type == 5) && ($object->statut == 1 || $object->statut == 2)) {
 				if ($object->is_last_in_cycle() && $object->situation_final != 1) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=create&amp;type=5&amp;origin=facture&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '" >' . $langs->trans('CreateNextSituationInvoice') . '</a></div>';

From 51cc252d4a8a4229a429e288c55c85ac1aaf9d1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Feb 2016 15:47:47 +0100
Subject: [PATCH 129/421] Fix: submit was no more possible from keyboard

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1c9dd350859..c694933f85c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -503,7 +503,8 @@ class Form
     		$ret.='<option value="'.$code.'"'.($disabled?' disabled="disabled"':'').'>'.$label.'</option>';
     	}
     	$ret.='</select>';
-    	$ret.='<input type="submit" name="confirmmassaction" disabled="disabled" class="button hideobject massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
+    	// Warning: if you set submit button to disabled, post using Enter will no more work
+    	$ret.='<input type="submit" name="confirmmassaction" class="button hideobject massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
     	$ret.='</div>';
     	
     	$ret.='<!-- JS CODE TO ENABLE mass action select -->
@@ -516,7 +517,6 @@ class Form
 	  				/* console.log( index + ": " + $( this ).text() ); */
 	  				if ($(this).is(\':checked\')) atleastoneselected++;
 	  			});
-	  			console.log(atleastoneselected);
 	  			if (atleastoneselected)
 	  			{
 	  				jQuery(".massaction").show();
@@ -530,6 +530,7 @@ class Form
     		jQuery(".checkforselect").click(function() {
     			initCheckForSelect();
 	  		});
+    	    /* Warning: if you set submit button to disabled, post using Enter will no more work
 	  		jQuery(".massactionselect").change(function() {
 	  			console.log( $( this ).val() );
 	  			if ($(this).val() != \'0\')
@@ -541,6 +542,7 @@ class Form
 	  				jQuery(".massactionconfirmed").prop(\'disabled\', true);
 	  			}
 	  		});
+    	    */
     	});
 		</script>
     	';

From e67be201ed800ae34b8b83669ca1bf2d5823384c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Feb 2016 16:49:13 +0100
Subject: [PATCH 130/421] NEW Can select number of lines on page list for
 projects and tasks

---
 htdocs/core/lib/functions.lib.php |  7 ++++---
 htdocs/projet/list.php            | 33 +++++++++++++++----------------
 htdocs/projet/tasks/list.php      |  9 +++++----
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d4d74ec3fe6..ba8ed5624d1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2970,7 +2970,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
  *	@param	int		    $pictoisfullpath	1=Icon name is a full absolute url of image
  *  @param	string	    $morehtml			More html to show
  *  @param  string      $morecss            More css to the table
- *  @param  int|string  $limit              Max number of lines (-1 = use default, 0 = no limit, > 0 = limit).
+ *  @param  int         $limit              Max number of lines (-1 = use default, 0 = no limit, > 0 = limit).
  *  @param  int         $hideselectlimit    Force to hide select limit
  *	@return	void
  */
@@ -2983,7 +2983,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	if ($picto == 'setup') $picto='title_setup.png';
 	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
 	if ($limit < 0) $limit = $conf->liste_limit;
-	if ($savlimit >= 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
+	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
 	{
 		$nextpage = 1;
 	}
@@ -2991,7 +2991,8 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	{
 		$nextpage = 0;
 	}
-
+	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
+	
 	print "\n";
 	print "<!-- Begin title '".$titre."' -->\n";
 	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 75dca94540b..627bb67ff53 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -50,12 +50,12 @@ if ($socid > 0)
 if (!$user->rights->projet->lire) accessforbidden();
 
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
-
 if (! $sortfield) $sortfield="p.ref";
 if (! $sortorder) $sortorder="ASC";
 $offset = $conf->liste_limit * $page ;
@@ -71,6 +71,7 @@ $search_all=GETPOST("search_all");
 $search_status=GETPOST("search_status",'int');
 $search_opp_status=GETPOST("search_opp_status",'alpha');
 $search_opp_percent=GETPOST("search_opp_percent",'alpha');
+$search_opp_amount=GETPOST("search_opp_amount",'alpha');
 $search_public=GETPOST("search_public",'int');
 $search_user=GETPOST('search_user','int');
 $search_sale=GETPOST('search_sale','int');
@@ -88,16 +89,6 @@ $year	= GETPOST('year','int');
 
 if ($search_status == '') $search_status=-1;	// -1 or 1
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-if ($page == -1) { $page = 0; }
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield='p.ref';
-if (! $sortorder) $sortorder='DESC';
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $contextpage='projectlist';
@@ -160,6 +151,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_year="";
 	$search_status=-1;
 	$search_opp_status=-1;
+	$search_opp_amount='';
+	$search_opp_percent='';
 	$search_public="";
 	$search_sale="";
 	$search_user='';
@@ -237,6 +230,8 @@ if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$soc
 if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
 if ($search_label) $sql .= natural_search('p.title', $search_label);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
+if ($search_opp_amount) $sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
+if ($search_opp_percent) $sql .= natural_search('p.opp_percent', $search_opp_percent, 1);
 if ($smonth > 0)
 {
     if ($syear > 0 && empty($sday))
@@ -301,6 +296,7 @@ if ($resql)
 	$num = $db->num_rows($resql);
 
 	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($sday)              		$param.='&sday='.$day;
 	if ($smonth)              		$param.='&smonth='.$smonth;
 	if ($syear)               		$param.='&syear=' .$syear;
@@ -329,7 +325,6 @@ if ($resql)
 	
 	$text=$langs->trans("Projects");
 	if ($search_user == $user->id) $text=$langs->trans('MyProjects');
-	print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num,'','title_project');
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -340,7 +335,9 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
-    // Show description of content
+	print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_project', 0, '', '', $limit);
+	
+	// Show description of content
 	if ($search_user == $user->id) print $langs->trans("MyProjectsDesc").'<br><br>';
 	else
 	{
@@ -471,8 +468,9 @@ if ($resql)
 	}
 	if (! empty($arrayfields['p.opp_amount']['checked']))
 	{
-		print '<td class="liste_titre nowrap">';
-	    print '</td>';
+		print '<td class="liste_titre nowrap right">';
+    	print '<input type="text" class="flat" name="search_opp_amount" size="3" value="'.$search_opp_amount.'">';
+		print '</td>';
 	}
 	if (! empty($arrayfields['p.fk_opp_status']['checked']))
 	{
@@ -482,8 +480,9 @@ if ($resql)
     }
 	if (! empty($arrayfields['p.opp_percent']['checked']))
 	{
-		print '<td class="liste_titre nowrap">';
-	    print '</td>';
+		print '<td class="liste_titre nowrap right">';
+    	print '<input type="text" class="flat" name="search_opp_percent" size="2" value="'.$search_opp_percent.'">';
+		print '</td>';
 	}
     // Extra fields
     if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 98bbff88483..d258dbb1e38 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -74,10 +74,10 @@ $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
 if (!$user->rights->projet->lire) accessforbidden();
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -300,7 +300,8 @@ if ($resql)
     $num = $db->num_rows($resql);
 
     $param='';
-	if ($sday)              		$param.='&sday='.$day;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    if ($sday)              		$param.='&sday='.$day;
 	if ($smonth)              		$param.='&smonth='.$smonth;
 	if ($syear)               		$param.='&syear=' .$syear;
 	if ($day)               		$param.='&day='.$day;
@@ -327,8 +328,6 @@ if ($resql)
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
     }
         
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
-    
     print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -338,6 +337,8 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="type" value="'.$type.'">';
     
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_project', 0, '', '', $limit);
+    
     // Show description of content
     if ($search_task_user == $user->id) print $langs->trans("MyTasksDesc").'<br><br>';
     else

From d038ca1875b0ea30ff70db52e48fa6516a572d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 11 Feb 2016 20:01:51 +0100
Subject: [PATCH 131/421] FIX #4597 PHP 7 Uniform Variable Syntax

PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
---
 htdocs/admin/delais.php                 | 13 ++--
 htdocs/admin/dict.php                   | 95 +++++++++++++------------
 htdocs/admin/oauth.php                  |  7 +-
 htdocs/core/class/extrafields.class.php | 49 ++++++-------
 htdocs/core/lib/files.lib.php           | 21 +++---
 htdocs/core/lib/functions2.lib.php      |  4 +-
 htdocs/exports/class/export.class.php   | 11 +--
 htdocs/imports/class/import.class.php   |  7 +-
 8 files changed, 107 insertions(+), 100 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index b43235ca1ec..2b52372046b 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Simon Tosser         <simon@kornog-computing.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+/* Copyright (C) 2001-2004  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005       Simon Tosser            <simon@kornog-computing.com>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.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
@@ -158,7 +159,7 @@ if ($action == 'edit')
     		foreach($delays as $delay)
     		{
     			$var=!$var;
-    			$value=(! empty($conf->global->$delay['code'])?$conf->global->$delay['code']:0);
+				$value=(! empty($conf->global->{$delay['code']})?$conf->global->{$delay['code']}:0);
     			print '<tr '.$bc[$var].'>';
     			print '<td width="20px">'.img_object('',$delay['img']).'</td>';
     			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td>';
@@ -205,7 +206,7 @@ else
     		foreach($delays as $delay)
     		{
     			$var=!$var;
-    			$value=(! empty($conf->global->$delay['code'])?$conf->global->$delay['code']:0);
+				$value=(! empty($conf->global->{$delay['code']})?$conf->global->{$delay['code']}:0);
     			print '<tr '.$bc[$var].'>';
     			print '<td width="20px">'.img_object('',$delay['img']).'</td>';
     			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 418e164bc94..6c2b1f6a027 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1,15 +1,16 @@
 <?php
-/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2011      Remy Younes          <ryounes@gmail.com>
- * Copyright (C) 2012-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2012      Christophe Battarel	<christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015      Ferran Marcet        <fmarcet@2byte.es>
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2013  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2011-2015  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
+ * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
+ * Copyright (C) 2011-2015  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.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
@@ -1146,7 +1147,7 @@ if ($id)
                         {
                             $showfield=1;
                         	$align="left";
-                            $valuetoshow=$obj->$fieldlist[$field];
+                            $valuetoshow=$obj->{$fieldlist[$field]};
                             if ($value == 'type_template')
                             {
                                 $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
@@ -1183,77 +1184,77 @@ if ($id)
                             else if ($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=($obj->code && $key != "PaymentCondition".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                                 $valuetoshow=nl2br($valuetoshow);
                             }
                             else if ($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]);
+                                $valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow=($obj->code && $key != "AvailabilityType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow=($obj->code && $key != "Action".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if (! 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]);
+                                $valuetoshow=($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow=($key != strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow=($key != strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow=($obj->code && $key != "Civility".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow=($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow=($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow=($obj->code && $key != "PaymentType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow=($obj->code && $key != "DemandReasonType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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];
+                                $valuetoshow=($obj->code && $key != $obj->code)?$key:$obj->{$fieldlist[$field]};
                             }
                             else if ($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]);
+                                $valuetoshow=($obj->code && $key != "SendingMethod".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
                             }
                             else if ($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]);
+                                $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
                             }
                             else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') {
                                 $showfield=0;
@@ -1263,16 +1264,16 @@ if ($id)
                             }
                             else if ($fieldlist[$field]=='label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
 	                            $langs->load("products");
-	                            $valuetoshow=$langs->trans($obj->$fieldlist[$field]);
+	                            $valuetoshow=$langs->trans($obj->{$fieldlist[$field]});
                             }
                             else if ($fieldlist[$field]=='short_label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
 	                            $langs->load("products");
-	                            $valuetoshow = $langs->trans($obj->$fieldlist[$field]);
+	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
                             }
                             else if (($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]);
+                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
                             }
 
 							else if ($fieldlist[$field]=='localtax1_type') {
@@ -1484,7 +1485,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		{
 			if (! in_array('country',$fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
-				$country_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
+				$country_id = (! empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
 				print '<td>';
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
@@ -1498,7 +1499,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		}
 		elseif ($fieldlist[$field] == 'region_id')
 		{
-			$region_id = (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:0);
+			$region_id = (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:0);
 			print '<td>';
 			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
 			print '</td>';
@@ -1513,21 +1514,21 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		elseif ($fieldlist[$field] == 'type_template')
 		{
 			print '<td>';
-			print $form->selectarray('type_template', $elementList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
+			print $form->selectarray('type_template', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
 			print '</td>';
 		}
 		// Le type de l'element (pour les type de contact)
 		elseif ($fieldlist[$field] == 'element')
 		{
 			print '<td>';
-			print $form->selectarray('element', $elementList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
+			print $form->selectarray('element', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
 			print '</td>';
 		}
 		// La source de l'element (pour les type de contact)
 		elseif ($fieldlist[$field] == 'source')
 		{
 			print '<td>';
-			print $form->selectarray('source', $sourceList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
+			print $form->selectarray('source', $sourceList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
 			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
@@ -1538,18 +1539,18 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		}
 		elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm' || $fieldlist[$field] == 'deductible') {
 			print '<td>';
-			print $form->selectyesno($fieldlist[$field],(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''),1);
+			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'))) {
 			$align="left";
 			if (in_array($fieldlist[$field],array('taux','localtax1','localtax2'))) $align="right";	// Fields aligned on right
 			print '<td align="'.$align.'">';
-			print '<input type="text" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'">';
+			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'))) {
-			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea></td>';
+			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea></td>';
 		}
 		elseif (in_array($fieldlist[$field], array('content')))
 		{
@@ -1560,18 +1561,18 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			else print '<td>';
 			if ($context != 'hide')
 			{
-				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea>';
-				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''), '', 140, 'dolibarr_mailings', 'In', 0, false, true, ROWS_5, '90%');
+				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
+				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, true, ROWS_5, '90%');
 				print $doleditor->Create(1);
 			}
 			else print '&nbsp;';
 			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
-			print '<td><input type="text" class="flat" value="'.price((! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'')).'" size="8" name="'.$fieldlist[$field].'"></td>';
+			print '<td><input type="text" class="flat" value="'.price((! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')).'" size="8" name="'.$fieldlist[$field].'"></td>';
 		}
-		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>';
+		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>';
 		}
 		elseif ($fieldlist[$field]=='unit') {
 			print '<td>';
@@ -1581,14 +1582,14 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 					'point' => $langs->trans('SizeUnitpoint'),
 					'inch' => $langs->trans('SizeUnitinch')
 			);
-			print $form->selectarray('unit', $units, (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''), 0, 0, 0);
+			print $form->selectarray('unit', $units, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 0, 0, 0);
 			print '</td>';
 		}
 		// Le type de taxe locale
 		elseif ($fieldlist[$field] == 'localtax1_type' || $fieldlist[$field] == 'localtax2_type')
 		{
 			print '<td align="center">';
-			print $form->selectarray($fieldlist[$field], $localtax_typeList, (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
+			print $form->selectarray($fieldlist[$field], $localtax_typeList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
 			print '</td>';
 		}
 		else
@@ -1603,7 +1604,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			if ($fieldlist[$field]=='accountancy_code_sell') $size='size="10" ';
 			if ($fieldlist[$field]=='accountancy_code_buy') $size='size="10" ';
 			if ($fieldlist[$field]=='sortorder') $size='size="2" ';
-			print '<input type="text" '.$size.' class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" name="'.$fieldlist[$field].'">';
+			print '<input type="text" '.$size.' class="flat" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
 	}
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 2adf79a6174..3bcbe990f87 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015       Frederic France     <frederic.france@free.fr>
+ * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.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
@@ -346,14 +347,14 @@ foreach ($list as $key)
     $var = !$var;
     print '<tr '.$bc[$var].' class="value">';
     print '<td><label for="'.$key[1].'">'.$langs->trans($key[1]).'</label></td>';
-    print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->$key[1].'">';
+    print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->{$key[1]}.'">';
     print '</td></tr>';
 
     // Api Secret
     $var = !$var;
     print '<tr '.$bc[$var].' class="value">';
     print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
-    print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->$key[2].'">';
+    print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
     print '</td></tr>';
 
 }
@@ -368,4 +369,4 @@ print '</form>';
 
 
 llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index ee5f1465e3f..d63c2536476 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1,12 +1,13 @@
 <?php
-/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier	    <benoit.mortier@opensides.be>
- * Copyright (C) 2009-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013	   Florian Henry        <forian.henry@open-concept.pro>
- * Copyright (C) 2015	   Charles-Fr BENKE     <charles.fr@benke.fr>
+/* Copyright (C) 2002-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003  Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2004       Sebastien Di Cintio     <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2009-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013       Florian Henry           <forian.henry@open-concept.pro>
+ * Copyright (C) 2015       Charles-Fr BENKE        <charles.fr@benke.fr>
+ * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.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
@@ -867,7 +868,7 @@ class ExtraFields
 						}
 						else
 						{
-							$labeltoshow=$obj->$InfoFieldList[1];
+							$labeltoshow=$obj->{$InfoFieldList[1]};
 						}
 						$labeltoshow=dol_trunc($labeltoshow,45);
 
@@ -888,12 +889,12 @@ class ExtraFields
 						{
 							if(!$notrans)
 							{
-								$translabel=$langs->trans($obj->$InfoFieldList[1]);
-								if ($translabel!=$obj->$InfoFieldList[1]) {
+								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
+								if ($translabel!=$obj->{$InfoFieldList[1]}) {
 									$labeltoshow=dol_trunc($translabel,18);
 								}
 								else {
-									$labeltoshow=dol_trunc($obj->$InfoFieldList[1],18);
+									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
 							if (empty($labeltoshow)) $labeltoshow='(not defined)';
@@ -1044,7 +1045,7 @@ class ExtraFields
 								$labeltoshow .= $obj->$field_toshow . ' ';
 							}
 						} else {
-							$labeltoshow = $obj->$InfoFieldList[1];
+							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
 						$labeltoshow = dol_trunc($labeltoshow, 45);
 
@@ -1065,11 +1066,11 @@ class ExtraFields
 							$out .= '/>' . $labeltoshow . '<br>';
 						} else {
 							if (! $notrans) {
-								$translabel = $langs->trans($obj->$InfoFieldList[1]);
-								if ($translabel != $obj->$InfoFieldList[1]) {
+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
 								} else {
-									$labeltoshow = dol_trunc($obj->$InfoFieldList[1], 18);
+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
 							if (empty($labeltoshow))
@@ -1263,13 +1264,13 @@ class ExtraFields
 				else
 				{
 					$translabel='';
-					if (!empty($obj->$InfoFieldList[1])) {
-						$translabel=$langs->trans($obj->$InfoFieldList[1]);
+					if (!empty($obj->{$InfoFieldList[1]})) {
+						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
 					}
-					if ($translabel!=$obj->$InfoFieldList[1]) {
+					if ($translabel!=$obj->{$InfoFieldList[1]}) {
 						$value=dol_trunc($translabel,18);
 					}else {
-						$value=$obj->$InfoFieldList[1];
+						$value=$obj->{$InfoFieldList[1]};
 					}
 				}
 			}
@@ -1343,13 +1344,13 @@ class ExtraFields
 							}
 						} else {
 							$translabel = '';
-							if (! empty($obj->$InfoFieldList[1])) {
-								$translabel = $langs->trans($obj->$InfoFieldList[1]);
+							if (! empty($obj->{$InfoFieldList[1]})) {
+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 							}
-							if ($translabel != $obj->$InfoFieldList[1]) {
+							if ($translabel != $obj->{$InfoFieldList[1]}) {
 								$value .= dol_trunc($translabel, 18) . '<BR>';
 							} else {
-								$value .= $obj->$InfoFieldList[1] . '<BR>';
+								$value .= $obj->{$InfoFieldList[1]} . '<BR>';
 							}
 						}
 					}
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3728644a401..25b5712d3f4 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2008-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012-2015	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015		Marcos García		<marcosgdf@gmail.com>
+/* Copyright (C) 2008-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2015  Regis Houssin       <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012       Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.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
@@ -2256,18 +2257,18 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		// Define $accessallowed
 		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
 		{
-			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;
+			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;
 		}
 		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
 		{
-			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;
+			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;
 		}
 		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
 		{
-			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;
+			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;
 		}
 		else
 		{
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index f2b13d79d0f..deab2457c8b 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2014       Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2015       Ferran Marcet               <fmarcet@2byte.es>
- * Copyright (C) 2015       Raphaël Doursenaud          <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2015-2016  Raphaël Doursenaud          <rdoursenaud@gpcsolutions.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
@@ -1910,7 +1910,7 @@ function fetchObjectByElement($element_id, $element_type)
 	global $db,$conf;
 
     $element_prop = getElementProperties($element_type);
-    if (is_array($element_prop) && $conf->$element_prop['module']->enabled)
+    if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)
     {
         dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');
 
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 3a3436c71a9..7912b4f189f 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2005-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2012		Charles-Fr BENKE	<charles.fr@benke.fr>
+/* Copyright (C) 2005-2011  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin       <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012       Charles-Fr BENKE    <charles.fr@benke.fr>
+ * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.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
@@ -131,11 +132,11 @@ class Export
     									//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
     									if (! empty($perm[2]))
     									{
-    										$bool=$user->rights->$perm[0]->$perm[1]->$perm[2];
+    										$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
     									}
     									else
     									{
-    										$bool=$user->rights->$perm[0]->$perm[1];
+    										$bool=$user->rights->{$perm[0]}->{$perm[1]};
     									}
     									if ($perm[0]=='user' && $user->admin) $bool=true;
     									if (! $bool) break;
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 2c17dd44f02..9a4d58aa65f 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2011       Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.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
@@ -106,11 +107,11 @@ class Import
 						//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
 						if ($perm[2])
 						{
-						$bool=$user->rights->$perm[0]->$perm[1]->$perm[2];
+						$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
 						}
 						else
 						{
-						$bool=$user->rights->$perm[0]->$perm[1];
+						$bool=$user->rights->{$perm[0]}->{$perm[1]};
 						}
 						if ($perm[0]=='user' && $user->admin) $bool=true;
 						//print $bool." $perm[0]"."<br>";

From bc33b19d7d11e4d1346e20f70a14d9d6840f4896 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Feb 2016 20:24:15 +0100
Subject: [PATCH 132/421] NEW Can change dynamically number of records visible
 into lists.

---
 htdocs/adherents/cotisations.php       | 81 +++++++++++++------------
 htdocs/adherents/list.php              | 28 +++++----
 htdocs/comm/action/listactions.php     | 48 +++++++++------
 htdocs/comm/action/peruser.php         |  4 +-
 htdocs/comm/action/rapport/index.php   | 28 ++++++++-
 htdocs/compta/bank/search.php          | 84 +++++++++++++++-----------
 htdocs/compta/paiement/cheque/list.php | 46 +++++++++-----
 htdocs/compta/paiement/list.php        | 18 ++++--
 htdocs/compta/tva/index.php            |  4 +-
 htdocs/contact/list.php                | 15 +++--
 htdocs/core/lib/functions.lib.php      | 10 +--
 htdocs/fourn/facture/list.php          | 13 ++--
 htdocs/loan/index.php                  | 25 ++++++--
 13 files changed, 250 insertions(+), 154 deletions(-)

diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index 7ff98ceb503..301664fab83 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo <jlb@j1b.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,19 +32,20 @@ $langs->load("members");
 
 $filter=$_GET["filter"];
 $statut=isset($_GET["statut"])?$_GET["statut"]:1;
-$search_ref=GETPOST('search_ref');
-$search_lastname=GETPOST('search_lastname');
-$search_login=GETPOST('search_login');
-$search_note=GETPOST('search_note');
+$search_ref=GETPOST('search_ref','alpha');
+$search_lastname=GETPOST('search_lastname','alpha');
+$search_login=GETPOST('search_login','alpha');
+$search_note=GETPOST('search_note','alpha');
 $search_account=GETPOST('search_account','int');
-$search_amount=GETPOST('search_amount','int');
+$search_amount=GETPOST('search_amount','alpha');
 $optioncss = GETPOST('optioncss','alpha');
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0 ; }
-$offset = $conf->liste_limit * $page ;
+$offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) {  $sortorder="DESC"; }
@@ -101,28 +102,21 @@ if ($search_ref)
 	if (is_numeric($search_ref)) $sql.= " AND (c.rowid = ".$db->escape($search_ref).")";
 	else $sql.=" AND 1 = 2";    // Always wrong
 }
-if ($search_lastname)
-{
-	$sql.= " AND (d.firstname LIKE '%".$db->escape($search_lastname)."%' OR d.lastname LIKE '%".$db->escape($search_lastname)."%' OR d.societe LIKE '%".$db->escape($search_lastname)."%')";
-}
-if ($search_login)
-{
-	$sql.= " AND d.login LIKE '%".$db->escape($search_login)."%'";
-}
-if ($search_note)
-{
-	$sql.= " AND c.note LIKE '%".$db->escape($search_note)."%'";
-}
-if ($search_account > 0)
-{
-	$sql.= " AND b.fk_account = ".$search_account;
-}
-if ($search_amount)
-{
-	$sql.=" AND c.cotisation = ".$db->escape($search_amount);
-}
+if ($search_lastname) $sql.= natural_search(array('d.firstname','d.lastname','d.societe'), $search_lastname);
+if ($search_login) $sql.= natural_search('c.cotisation', $search_login);
+if ($search_note)  $sql.= natural_search('c.note', $search_note);
+if ($search_account > 0) $sql.= " AND b.fk_account = ".$search_account;
+if ($search_amount) $sql.= natural_search('c.cotisation', $search_amount, 1);
 $sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->plimit($limit+1, $offset);
 
 $result = $db->query($sql);
 if ($result)
@@ -133,24 +127,29 @@ if ($result)
     $title=$langs->trans("ListOfSubscriptions");
     if (! empty($date_select)) $title.=' ('.$langs->trans("Year").' '.$date_select.')';
 
-    $param="";
+    $param='';
     $param.="&statut=$statut&date_select=$date_select";
-
     if ($search_lastname) $param.="&search_lastname=".$search_lastname;
 	if ($search_login)    $param.="&search_login=".$search_login;
 	if ($search_acount)   $param.="&search_account=".$search_account;
 	if ($search_amount)   $param.="&search_amount=".$search_amount;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
+    
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
+    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, 'title_generic.png', 0, '', '', $limit);
 
 	if ($sall)
 	{
 		print $langs->trans("Filter")." (".$langs->trans("Ref").", ".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
 	}
 
-
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].($param?'?'.$param:'').'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<table class="noborder" width="100%">';
 
     print '<tr class="liste_titre">';
@@ -164,7 +163,8 @@ if ($result)
     }
     print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"c.dateadh",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"c.datef",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"c.cotisation",$param,"",'colspan="2" align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"c.cotisation",$param,"",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('');
     print "</tr>\n";
 
 
@@ -199,7 +199,7 @@ if ($result)
 	print '</td>';
 	
     // Action column
-    print '<td class="liste_titre" colspan="2" align="right">';
+    print '<td class="liste_titre" align="right">';
     $searchpitco=$form->showFilterAndCheckAddButtons(0);
     print $searchpitco;
     print '</td>';  
@@ -270,7 +270,9 @@ if ($result)
         print '<td align="center">'.dol_print_date($db->jdate($objp->datef),'day')."</td>\n";
 
         // Price
-        print '<td align="right" colspan="2">'.price($objp->cotisation).'</td>';
+        print '<td align="right">'.price($objp->cotisation).'</td>';
+        
+        print '<td></td>';
 
         print "</tr>";
 
@@ -290,7 +292,8 @@ if ($result)
     }
    	print '<td>&nbsp;</td>';
    	print '<td>&nbsp;</td>';
-   	print '<td align="right" colspan="2">'.price($total)."</td>\n";
+   	print '<td align="right">'.price($total)."</td>\n";
+   	print '<td></td>';
     print "</tr>\n";
 
     print "</table>";
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index b19c6b2e35d..f287e5bbf9a 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -50,11 +50,12 @@ $catid        = GETPOST("catid",'int');
 $sall=GETPOST("sall");
 $optioncss = GETPOST('optioncss','alpha');
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page ;
+$offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) { $sortorder=($filter=='outofdate'?"ASC":"DESC"); }
@@ -143,6 +144,7 @@ if ($filter == 'outofdate') $sql.=" AND (datefin IS NULL OR datefin < '".$db->id
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
+$sql.= $db->order($sortfield,$sortorder);
 
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = 0;
@@ -152,9 +154,8 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	if ($resql) $nbtotalofrecords = $db->num_rows($resql);
 	else dol_print_error($db);
 }
-// Add order and limit
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
+// Add limit
+$sql.= $db->plimit($limit+1, $offset);
 
 dol_syslog("get list", LOG_DEBUG);
 $resql = $db->query($sql);
@@ -185,7 +186,8 @@ if ($resql)
 		$titre.=" (".$membertype->libelle.")";
 	}
 
-	$param="";
+	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($statut != "") $param.="&statut=".$statut;
 	if ($search_nom)   $param.="&search_nom=".$search_nom;
 	if ($search_login) $param.="&search_login=".$search_login;
@@ -193,12 +195,17 @@ if ($resql)
 	if ($filter)       $param.="&filter=".$filter;
 	if ($type > 0)     $param.="&type=".$type;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
-	print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].($param?'?'.$param:'').'">';
+	
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
+	print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
+	
 	if ($sall)
 	{
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -396,10 +403,7 @@ if ($resql)
 	print "</table>\n";
 	print '</form>';
 
-	if ($num > $conf->liste_limit)
-	{
-		print_barre_liste('',$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
-	}
+	if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit, 1);
 }
 else
 {
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 447a247ad56..ed8227a1cb8 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -72,11 +72,11 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 	$filtert=$user->id;
 }
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0 ; }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 if (! $sortorder)
 {
@@ -142,20 +142,8 @@ $form=new Form($db);
 $userstatic=new User($db);
 
 $nav='';
-$nav.='<form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-if ($optioncss != '') $nav.= '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-if ($actioncode) $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
-if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav.='<input type="hidden" name="status" value="'.$status.'">';
-if ($filter)  $nav.='<input type="hidden" name="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="showbirthday" value="1">';
-if ($pid)    $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
-if ($type)   $nav.='<input type="hidden" name="type" value="'.$type.'">';
-if ($usergroup) $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
 $nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
 $nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
-$nav.='</form>';
 
 $now=dol_now();
 
@@ -166,6 +154,7 @@ llxHeader('',$langs->trans("Agenda"),$help_url);
 $listofextcals=array();
 
 $param='';
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($actioncode != '') $param.="&actioncode=".$actioncode;
 if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&status=".$status;
 if ($filter) $param.="&filter=".$filter;
@@ -220,6 +209,14 @@ if ($dateselect > 0) $sql.= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AN
 if ($datestart > 0) $sql.= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart+3600*24-1)."'";
 if ($dateend > 0) $sql.= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend+3600*24-1)."'";
 $sql.= $db->order($sortfield,$sortorder);
+
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+}
+
 $sql.= $db->plimit($limit + 1, $offset);
 //print $sql;
 
@@ -279,13 +276,30 @@ if ($resql)
     	$s = $hookmanager->resPrint;
     }
 
-    print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $link, $num, 0, '', 0, $nav);
 
-
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?'.$param.'">'."\n";
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="list">';
+    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="type" value="'.$type.'">';
+    $nav='';
+    if ($optioncss != '') $nav.= '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    if ($actioncode) $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
+    if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav.='<input type="hidden" name="status" value="'.$status.'">';
+    if ($filter)  $nav.='<input type="hidden" name="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="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;
+    
+    print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $link, $num, -1 * $nbtotalofrecords, '', 0, $nav, '', $limit);
 
-	$i = 0;
+    $i = 0;
 	print '<table class="liste" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 318e96f7122..35b89ff129d 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -242,10 +242,10 @@ $max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));
 
 $tmpday = $first_day;
 
-$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n";
 $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
 $nav.=" </span>\n";
-$nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+$nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n";
 $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
 $picto='calendarweek';
 
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 6a33e83e585..e62af271c49 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -37,11 +37,11 @@ $action=GETPOST('action','alpha');
 $month=GETPOST('month');
 $year=GETPOST('year');
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0 ; }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="a.datep";
@@ -84,6 +84,14 @@ $sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
 //$sql.= " AND percent = 100";
 $sql.= " GROUP BY year, month, df";
 $sql.= " ORDER BY year DESC, month DESC, df DESC";
+
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+}
+
 $sql.= $db->plimit($limit+1,$offset);
 
 //print $sql;
@@ -93,7 +101,18 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 
-	print_barre_liste($langs->trans("Actions"), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num);
+	$param='';
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	
+	print_barre_liste($langs->trans("Actions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 	$i = 0;
 	print '<table class="noborder" width="100%">';
@@ -143,6 +162,9 @@ if ($resql)
 		$i++;
 	}
 	print "</table>";
+	
+	print '</form>';
+	
 	$db->free($resql);
 }
 else
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index f5231a87ef8..e3b121065ef 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -42,14 +42,16 @@ $langs->load("margins");
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'banque');
 
-$description=GETPOST("description");
-$debit=GETPOST("debit");
-$credit=GETPOST("credit");
-$type=GETPOST("type");
-$account=GETPOST("account");
+$description=GETPOST("description",'alpha');
+$debit=GETPOST("debit",'alpha');
+$credit=GETPOST("credit",'alpha');
+$type=GETPOST("type",'alpha');
+$account=GETPOST("account",'alpha');
 $bid=GETPOST("bid","int");
 $search_dt_start = dol_mktime(0, 0, 0, GETPOST('search_start_dtmonth', 'int'), GETPOST('search_start_dtday', 'int'), GETPOST('search_start_dtyear', 'int'));
 $search_dt_end = dol_mktime(0, 0, 0, GETPOST('search_end_dtmonth', 'int'), GETPOST('search_end_dtday', 'int'), GETPOST('search_end_dtyear', 'int'));
+$search_thirdparty=GETPOST("thirdparty",'alpha');
+$search_req_nb=GETPOST("req_nb",'alpha');
 
 $param='';
 if (!empty($description)) $param.='&description='.$description;
@@ -63,14 +65,14 @@ if (dol_strlen($search_dt_start) > 0)
 if (dol_strlen($search_dt_end) > 0)
 	$param .= '&search_end_dtmonth=' . GETPOST('search_end_dtmonth', 'int') . '&search_end_dtday=' . GETPOST('search_end_dtday', 'int') . '&search_end_dtyear=' . GETPOST('search_end_dtyear', 'int');
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 if (! $sortorder) $sortorder='DESC';
 if (! $sortfield) $sortfield='b.dateo';
 
@@ -82,6 +84,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$credit="";
 	$account="";
 	$bid="";
+	$search_req_nb='';
+	$search_thirdparty='';
 }
 
 /*
@@ -111,15 +115,15 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = b.rowid AND
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON bu.url_id = s.rowid";
 $sql.= " WHERE b.fk_account = ba.rowid";
 $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
-if (GETPOST("req_nb"))
+if ($search_req_nb)
 {
-    $sql.= " AND b.num_chq LIKE '%".$db->escape(GETPOST("req_nb"))."%'";
-    $param.='&amp;req_nb='.urlencode(GETPOST("req_nb"));
+    $sql.= " AND b.num_chq LIKE '%".$db->escape($search_req_nb)."%'";
+    $param.='&amp;req_nb='.urlencode($search_req_nb);
 }
-if (GETPOST("thirdparty"))
+if ($search_thirdparty)
 {
-    $sql.=" AND s.nom LIKE '%".$db->escape(GETPOST("thirdparty"))."%'";
-    $param.='&amp;thirdparty='.urlencode(GETPOST("thirdparty"));
+    $sql.=" AND s.nom LIKE '%".$db->escape($search_thirdparty)."%'";
+    $param.='&amp;thirdparty='.urlencode($search_thirdparty);
 }
 if ($bid)
 {
@@ -137,22 +141,19 @@ if (dol_strlen($search_dt_end)>0) {
 	$sql .= " AND b.dateo <= '" . $db->idate($search_dt_end) . "'";
 }
 // Search criteria amount
-$si=0;
 $debit = price2num(str_replace('-','',$debit));
 $credit = price2num(str_replace('-','',$credit));
-if (is_numeric($debit)) {
-	$si++;
-	$sqlw[$si] .= " b.amount = -" . $debit;
-}
-if (is_numeric($credit)) {
-	$si++;
-	$sqlw[$si] .= " b.amount = " . $credit;
-}
-// Other search criteria
-for ($i = 1 ; $i <= $si; $i++) {
-	$sql .= " AND " . $sqlw[$i];
-}
+if ($debit) $sql.= natural_search('- b.amount', $debit, 1);
+if ($credit) $sql.= natural_search('b.amount', $credit, 1);
 $sql.= $db->order($sortfield,$sortorder);
+
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+}
+
 $sql.= $db->plimit($limit+1,$offset);
 //print $sql;
 
@@ -164,25 +165,30 @@ if ($resql)
 	$num = $db->num_rows($resql);
 	$i = 0;
 
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+	print '<input type="hidden" name="action" value="search">';
+	if (! empty($_REQUEST['bid'])) print '<input type="hidden" name="bid" value="'.$_REQUEST["bid"].'">';
+	
 	// Title
 	$bankcateg=new BankCateg($db);
 	if (GETPOST("bid"))
 	{
 		$result=$bankcateg->fetch(GETPOST("bid"));
-		print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num,'', 'title_bank.png');
+		print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', 0, '', '', $limit);
 	}
 	else
 	{
-		print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', 'title_bank.png');
+		print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', 0, '', '', $limit);
 	}
-
-	print '<form method="post" action="search.php" name="search_form">'."\n";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
-	print '<input type="hidden" name="action" value="search">';
-	if (! empty($_REQUEST['bid'])) print '<input type="hidden" name="bid" value="'.$_REQUEST["bid"].'">';
 	
 	$moreforfilter = '';
-	
 	$moreforfilter.='<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('Period') . ' ('.$langs->trans('DateOperationShort').') : ' . $langs->trans('StartDate') . ' ';
 	$moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 1);
@@ -209,6 +215,7 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Debit"),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Credit"),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Account"),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -218,17 +225,18 @@ if ($resql)
     print '<td class="liste_titre" align="center">';
     $form->select_types_paiements(empty($type)?'':$type, 'type', '', 2, 0, 1, 8);
     print '</td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="req_nb" value="'.GETPOST("req_nb").'" size="2"></td>';
+    print '<td class="liste_titre"><input type="text" class="flat" name="req_nb" value="'.$search_req_nb.'" size="2"></td>';
     print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="description" size="10" value="'.$description.'">';
 	print '</td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="thirdparty" value="'.GETPOST("thirdparty").'" size="10"></td>';
+    print '<td class="liste_titre"><input type="text" class="flat" name="thirdparty" value="'.$search_thirdparty.'" size="10"></td>';
 	print '<td class="liste_titre" align="right">';
 	print '<input type="text" class="flat" name="debit" size="4" value="'.$debit.'">';
 	print '</td>';
 	print '<td class="liste_titre" align="right">';
 	print '<input type="text" class="flat" name="credit" size="4" value="'.$credit.'">';
 	print '</td>';
+	print '<td></td>';
     print '<td class="liste_titre" align="right">';
     $searchpitco=$form->showFilterAndCheckAddButtons(0);
     print $searchpitco;
@@ -325,6 +333,9 @@ if ($resql)
 			$bankaccountstatic->label=$objp->bankref;
 			print $bankaccountstatic->getNomUrl(1);
 			print "</td>\n";
+			
+			print '<td></td>';
+			
 			print "</tr>";
 		}
 		$i++;
@@ -336,6 +347,7 @@ if ($resql)
 		print '<td  align="right">' . price($total_debit * - 1) . '</td>';
 		print '<td  align="right">' . price($total_credit) . '</td>';
 		print '<td></td>';
+		print '<td></td>';
 		print '</tr>';
 	}
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 2b3a7153793..5b4929ae42b 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -38,12 +38,13 @@ $langs->load("bills");
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'banque', '','');
 
-$search_ref = GETPOST('search_ref','int');
+$search_ref = GETPOST('search_ref','alpha');
 $search_account = GETPOST('search_account','int');
 $search_amount = GETPOST('search_amount','alpha');
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
@@ -101,6 +102,7 @@ else if ($year > 0)
 {
 	$sql.= " AND bc.date_bordereau BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 }
+$sql.= $db->order($sortfield,$sortorder);
 
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -109,29 +111,36 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= " ORDER BY $sortfield $sortorder";
 $sql.= $db->plimit($limit+1, $offset);
 //print "$sql";
 
 $resql = $db->query($sql);
-
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	$params='';
+	$param='';
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 
-	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
-
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	
+	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', '', '', $limit);
+	
 	print '<table class="liste">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bc.number","",$params,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"dp","",$params,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$params,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("NbOfCheques"),$_SERVER["PHP_SELF"],"bc.nbcheque","",$params,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"bc.amount","",$params,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"bc.statut","",$params,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bc.number","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("NbOfCheques"),$_SERVER["PHP_SELF"],"bc.nbcheque","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"bc.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"bc.statut","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
 	print "</tr>\n";
 
 	// Lignes des champs de filtre
@@ -151,6 +160,7 @@ if ($resql)
 	print '<td class="liste_titre" align="right">';
 	print '<input class="flat" type="text" size="6" name="search_amount" value="'.$search_amount.'">';
 	print '</td>';
+	print '<td></td>';
     print '<td class="liste_titre" align="right">';
     $searchpitco=$form->showFilterAndCheckAddButtons(0);
     print $searchpitco;
@@ -192,7 +202,11 @@ if ($resql)
     		// Statut
     		print '<td align="right">';
     		print $checkdepositstatic->LibStatut($objp->statut,5);
-    		print "</td></tr>\n";
+    		print '</td>';
+    		
+    		print '<td></td>';
+    		
+            print "</tr>\n";
     		$i++;
     	}
     }
@@ -200,7 +214,7 @@ if ($resql)
     {
    		$var=!$var;
    		print "<tr ".$bc[$var].">";
-   		print '<td colspan="6">'.$langs->trans("None")."</td>";
+   		print '<td colspan="7">'.$langs->trans("None")."</td>";
    		print '</tr>';
     }
 	print "</table>";
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 33576328786..bcca56ed645 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -57,9 +57,9 @@ $search_amount=GETPOST("search_amount",'alpha');    // alpha because we must be
 $search_company=GETPOST("search_company",'alpha');
 $search_payment_num=GETPOST('search_payment_num','alpha');
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
@@ -184,6 +184,7 @@ else
 	$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 	$sql.=$hookmanager->resPrint;
 }
+$sql.= $db->order($sortfield,$sortorder);
 
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -192,12 +193,10 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
 //print "$sql";
 
 $resql = $db->query($sql);
-
 if ($resql)
 {
     $num = $db->num_rows($resql);
@@ -211,9 +210,16 @@ if ($resql)
     $paramlist.=($search_payment_num?"&search_payment_num=".urlencode($search_payment_num):"");
     if ($optioncss != '') $paramlist.='&optioncss='.urlencode($optioncss);
     
-    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num, $nbtotalofrecords,'title_accountancy.png');
-
-    print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+    
+    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num, $nbtotalofrecords,'title_accountancy.png', 0, '', '', $limit);
+    
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"p.rowid","",$paramlist,"",$sortfield,$sortorder);
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 6445eb09f02..4090f2904b7 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -113,8 +113,8 @@ llxHeader();
 $tva = new Tva($db);
 
 
-$textprevyear="<a href=\"index.php?year=" . ($year_current-1) . "\">".img_previous()."</a>";
-$textnextyear=" <a href=\"index.php?year=" . ($year_current+1) . "\">".img_next()."</a>";
+$textprevyear="<a href=\"index.php?year=" . ($year_current-1) . "\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>";
+$textnextyear=" <a href=\"index.php?year=" . ($year_current+1) . "\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>";
 
 print load_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index f06de2ec8ec..8db9b90ff49 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -73,7 +73,6 @@ $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
 $userid=GETPOST('userid','int');
 $begin=GETPOST('begin');
-
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="p.lastname";
 if ($page < 0) { $page = 0; }
@@ -333,6 +332,16 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 
+// Add order
+if($view == "recent")
+{
+    $sql.= $db->order("p.datec","DESC");
+}
+else
+{
+    $sql.= $db->order($sortfield,$sortorder);
+}
+
 // Count total nb of records
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -341,15 +350,13 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
     $nbtotalofrecords = $db->num_rows($result);
 }
 
-// Add order and limit
+// Add limit
 if($view == "recent")
 {
-    $sql.= $db->order("p.datec","DESC");
     $sql.= $db->plimit($limit+1, $offset);
 }
 else
 {
-    $sql.= $db->order($sortfield,$sortorder);
     $sql.= $db->plimit($limit+1, $offset);
 }
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ba8ed5624d1..534b4f31d86 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2965,7 +2965,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
  *	@param	string	    $sortorder       	ordre de tri ('' par defaut)
  *	@param	string	    $center          	chaine du centre ('' par defaut). We often find here string $massaction comming from $form->selectMassAction() 
  *	@param	int		    $num				number of records found by select with limit+1
- *	@param	int		    $totalnboflines		Total number of records/lines for all pages (if known)
+ *	@param	int		    $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value to no show number.
  *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
  *	@param	int		    $pictoisfullpath	1=Icon name is a full absolute url of image
  *  @param	string	    $morehtml			More html to show
@@ -2979,7 +2979,9 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	global $conf,$langs;
 	
 	$savlimit = $limit;
-
+    $savtotalnboflines = $totalnboflines;
+    $totalnboflines=abs($totalnboflines);
+    
 	if ($picto == 'setup') $picto='title_setup.png';
 	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
 	if ($limit < 0) $limit = $conf->liste_limit;
@@ -3000,9 +3002,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	// Left
 	if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, '', $pictoisfullpath).'</td>';
 	print '<td class="nobordernopadding"><div class="titre">'.$titre;
-	if (!empty($totalnboflines) && !empty($titre)) {
-		print ' ('.$totalnboflines.')';
-	}
+	if (!empty($titre) && $savtotalnboflines > 0) print ' ('.$totalnboflines.')';
 	print '</div></td>';
 
 	// Center
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 3c238a2f6f8..5a8760eafa8 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013	   Philippe Grand		<philippe.grand@atoo-net.com>
  * Copyright (C) 2013	   Florian Henry		<florian.henry@open-concept.pro>
@@ -60,8 +60,8 @@ $page=GETPOST("page",'int');
 $sortorder = GETPOST("sortorder",'alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 
-if ($page == -1) { $page = 0 ; }
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+if ($page == -1) { $page = 0 ; }
 $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -233,7 +233,6 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
 
@@ -261,9 +260,7 @@ if ($resql)
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 	if ($search_status >= 0)  	$param.="&search_status=".$search_status;
 
-	print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy');
-	
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="list">';
@@ -271,7 +268,9 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
-    if ($search_all)
+	print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy',0,'','',$limit);
+	
+	if ($search_all)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index f08618e2313..3d13c9c82fa 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -1,7 +1,8 @@
 <?php
 /* Copyright (C) 2014       Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
- * Copyright (C) 2015		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015		Juanjo Menent		 <jmenent@2byte.es>
+ * Copyright (C) 2016		Laurent Destailleur  <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
@@ -61,6 +62,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_amount="";
 }
 
+
 /*
  *	View
  */
@@ -83,12 +85,14 @@ if ($filtre) {
 }
 $sql.= " GROUP BY l.rowid, l.label, l.capital, l.datestart, l.dateend";
 $sql.= $db->order($sortfield,$sortorder);
-$numall = 0;
+
+$nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
-    $numall = $db->num_rows($result);
+    $nbtotalofrecords = $db->num_rows($result);
 }
+
 $sql.= $db->plimit($limit+1, $offset);
 
 //print $sql;
@@ -105,9 +109,15 @@ if ($resql)
     if ($search_amount) $param.="&amp;search_amount=".$search_amount_ht;
     if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
 
-    print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $numall,'title_generic.png');
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+    
+    print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
 
     print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
@@ -116,6 +126,7 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Capital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
     print "</tr>\n";
 
 	// Filters lines
@@ -124,6 +135,7 @@ if ($resql)
 	print '<td class="liste_titre"><input class="flat" size="12" type="text" name="search_label" value="'.$search_label.'"></td>';
 	print '<td class="liste_titre" align="right" ><input class="flat" size="8" type="text" name="search_amount" value="'.$search_amount.'"></td>';
 	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td></td>';
 	print '<td align="right" class="liste_titre">';
 	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
@@ -154,6 +166,8 @@ if ($resql)
 
 		print '<td align="right" class="nowrap">'.$loan_static->LibStatut($obj->paid,5,$obj->alreadypayed).'</a></td>';
 
+		print '<td></td>';
+		
         print "</tr>\n";
 
 		$i++;
@@ -167,6 +181,7 @@ else
 {
     dol_print_error($db);
 }
+
 llxFooter();
 
 $db->close();

From 1a45ab9d506623f9814418d9a1bb7a1bfc15f955 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Thu, 11 Feb 2016 20:02:06 +0100
Subject: [PATCH 133/421] Fix missing vars in fetch_product_fournisseur_price

---
 htdocs/fourn/class/fournisseur.product.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 4865eac6951..09c2130e435 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -51,6 +51,7 @@ class ProductFournisseur extends Product
     var $ref_supplier;			  // ref supplier (can be set by get_buyprice)
     var $vatrate_supplier;		  // default vat rate for this supplier/qty/product (can be set by get_buyprice)
 
+    var $fourn_id;                //supplier id
     var $fourn_qty;               // quantity for price (can be set by get_buyprice)
     var $fourn_pu;			       // unit price for quantity (can be set by get_buyprice)
 
@@ -354,7 +355,7 @@ class ProductFournisseur extends Product
      */
     function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
     {
-        $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability,";
+        $sql = "SELECT pfp.rowid, s.rowid as fourn_id, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability,";
         $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges, pfp.fk_supplier_price_expression, pfp.delivery_time_days"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE pfp.rowid = ".$rowid;
@@ -367,6 +368,7 @@ class ProductFournisseur extends Product
             if ($obj)
             {
             	$this->product_fourn_price_id	= $rowid;
+                $this->fourn_id					= $obj->fourn_id;
             	$this->fourn_ref				= $obj->ref_fourn; // deprecated
 	            $this->ref_supplier             = $obj->ref_fourn;
             	$this->fourn_price				= $obj->price;
@@ -379,6 +381,7 @@ class ProductFournisseur extends Product
             	$this->fourn_tva_tx					= $obj->tva_tx;
             	$this->product_id				= $obj->fk_product;	// deprecated
             	$this->fk_product				= $obj->fk_product;
+            	$this->id						= $obj->fk_product;
             	$this->fk_availability			= $obj->fk_availability;
 				$this->delivery_time_days		= $obj->delivery_time_days;
             	//$this->fourn_tva_npr			= $obj->fourn_tva_npr; // TODO this field not exist in llx_product_fournisseur_price. We should add it ?

From 158906455a33146a6b042191d2dacb81ee23d2fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Feb 2016 20:40:33 +0100
Subject: [PATCH 134/421] NEW Can change dynamically number of records visible
 into lists.

---
 htdocs/comm/propal/list.php       | 38 +++++++++++------------
 htdocs/contrat/list.php           | 51 +++++++++++++++++++------------
 htdocs/fichinter/list.php         | 39 ++++++++++++-----------
 htdocs/fourn/commande/list.php    |  7 +++--
 htdocs/supplier_proposal/card.php |  2 +-
 htdocs/supplier_proposal/list.php | 30 +++++++++---------
 6 files changed, 89 insertions(+), 78 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 55d8b49fa46..74ac2fdd7ea 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2013 Regis Houssin         <regis.houssin@capnetworks.com>
@@ -67,6 +67,18 @@ $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 $year=GETPOST("year");
 $month=GETPOST("month");
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield='p.ref';
+if (! $sortorder) $sortorder='DESC';
+
+
 // Nombre de ligne pour choix de produit/service predefinis
 $NBLINES=4;
 
@@ -144,19 +156,6 @@ $companystatic=new Societe($db);
 
 $now=dol_now();
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
-if (! $sortfield) $sortfield='p.datep';
-if (! $sortorder) $sortorder='DESC';
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-
-
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
 $sql.= ' s.rowid, s.nom as name, s.town, s.client, s.code_client,';
@@ -227,8 +226,6 @@ if ($search_user > 0)
 {
     $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user;
 }
-
-
 $sql.= ' ORDER BY '.$sortfield.' '.$sortorder.', p.ref DESC';
 
 $nbtotalofrecords = 0;
@@ -255,6 +252,7 @@ if ($result)
 	}
 
 	$param='&socid='.$socid.'&viewstatut='.$viewstatut;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($month)              $param.='&month='.$month;
 	if ($year)               $param.='&year='.$year;
     if ($search_ref)         $param.='&search_ref=' .$search_ref;
@@ -267,17 +265,17 @@ if ($result)
 	if ($search_town)		 $param.='&search_town='.$search_town;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
-	print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_commercial.png');
-
 	// Lignes des champs de filtre
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-    if ($sall)
+	print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_commercial.png', 0, '', '', $limit);
+	
+	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         //sort($fieldstosearchall);
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index f9e7351ed87..b374e7d59b9 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -36,13 +36,6 @@ $langs->load("products");
 $langs->load("companies");
 $langs->load("compta");
 
-$sortfield=GETPOST('sortfield','alpha');
-$sortorder=GETPOST('sortorder','alpha');
-$page=GETPOST('page','int');
-if ($page == -1) { $page = 0 ; }
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-$offset = $limit * $page ;
-
 $search_name=GETPOST('search_name');
 $search_contract=GETPOST('search_contract');
 $search_ref_supplier=GETPOST('search_ref_supplier','alpha');
@@ -55,8 +48,16 @@ $search_product_category=GETPOST('search_product_category','int');
 
 $optioncss = GETPOST('optioncss','alpha');
 
-if (! $sortfield) $sortfield="c.rowid";
-if (! $sortorder) $sortorder="DESC";
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield='c.ref';
+if (! $sortorder) $sortorder='DESC';
 
 // Security check
 $id=GETPOST('id','int');
@@ -152,7 +153,15 @@ if ($result)
     $totalnboflines = $db->num_rows($result);
 }
 $sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit + 1, $offset);
+
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->plimit($limit + 1, $offset);
 
 $resql=$db->query($sql);
 if ($resql)
@@ -160,8 +169,14 @@ if ($resql)
     $num = $db->num_rows($resql);
     $i = 0;
 
-    print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_name='.$search_name, $sortfield, $sortorder,'',$num,$totalnboflines,'title_commercial.png');
-
+    $param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    $param.='&search_contract='.$search_contract;
+    $param.='&search_name='.$search_name;
+    $param.='&search_ref_supplier='.$search_ref_supplier;
+    $param.='&search_sale=' .$search_sale;
+    if ($optioncss != '') $param.='&optioncss='.$optioncss;
+    
     print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -169,7 +184,9 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-    if ($sall)
+    print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num,$totalnboflines,'title_commercial.png', 0, '', '', $limit);
+
+	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
@@ -218,13 +235,7 @@ if ($resql)
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
     print '<tr class="liste_titre">';
 
-    $param='&search_contract='.$search_contract;
-    $param.='&search_name='.$search_name;
-    $param.='&search_ref_supplier='.$search_ref_supplier;
-    $param.='&search_sale=' .$search_sale;
-    if ($optioncss != '') $param.='&optioncss='.$optioncss;
-
-    print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.ref","","$param",'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("RefSupplier"), $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("ThirdParty"), $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder);
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index cf40a285996..f919ad0d9d1 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -42,9 +42,9 @@ $fichinterid = GETPOST('id','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'ficheinter', $fichinterid,'fichinter');
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST('page','int');
 if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
@@ -123,13 +123,15 @@ if ($socid)
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
+$sql.= $db->order($sortfield,$sortorder);
+
 $totalnboflines=0;
 $result=$db->query($sql);
 if ($result)
 {
     $totalnboflines = $db->num_rows($result);
 }
-$sql.= $db->order($sortfield,$sortorder);
+
 $sql.= $db->plimit($limit+1, $offset);
 //print $sql;
 
@@ -138,15 +140,14 @@ if ($result)
 {
 	$num = $db->num_rows($result);
 
-	$urlparam='';
-	if ($socid) $urlparam.="&socid=".$socid;
-	if ($search_ref) $urlparam.="&search_ref=".urlencode($search_ref);
-	if ($search_company) $urlparam.="&search_company=".urlencode($search_company);
-	if ($search_desc) $urlparam.="&search_desc=".urlencode($search_desc);
-	if ($search_status != '' && $search_status > -1) $urlparam.="&search_status=".urlencode($search_status);
-	if ($optioncss != '') $urlparam.='&optioncss='.$optioncss;
-
-	print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_commercial.png');
+	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($socid) $param.="&socid=".$socid;
+	if ($search_ref) $param.="&search_ref=".urlencode($search_ref);
+	if ($search_company) $param.="&search_company=".urlencode($search_company);
+	if ($search_desc) $param.="&search_desc=".urlencode($search_desc);
+	if ($search_status != '' && $search_status > -1) $param.="&search_status=".urlencode($search_status);
+	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -155,7 +156,9 @@ if ($result)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-    if ($sall)
+	print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit);
+	
+	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
@@ -164,16 +167,16 @@ if ($result)
     print '<table class="noborder" width="100%">';
 
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.ref","",$urlparam,'width="15%"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$urlparam,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"f.description","",$urlparam,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.ref","",$param,'width="15%"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"f.description","",$param,'',$sortfield,$sortorder);
 	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
 	{
 		print_liste_field_titre('',$_SERVER["PHP_SELF"],'');
-		print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fd.date","",$urlparam,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fd.date","",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$param,'align="right"',$sortfield,$sortorder);
 	}
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 3f4aee09bcd..14e28b9fe9f 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -197,7 +197,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
+$sql.= $db->plimit($limit+1, $offset);
 
 $resql = $db->query($sql);
 if ($resql)
@@ -217,7 +217,6 @@ if ($resql)
 	if ($billed != '')          $param.="billed=".$billed; 
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -226,7 +225,9 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 	
-    if ($sall)
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
+	
+	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 82eeb323a36..c03d3edadaa 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -222,7 +222,7 @@ if (empty($reshook))
 		$date_delivery = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
 
 		if ($socid < 1) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Customer")), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
 			$action = 'create';
 			$error ++;
 		}
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 31589bad334..30c56182380 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -78,6 +78,17 @@ if (! empty($socid))
 }
 $result = restrictedArea($user, $module, $objectid, $dbtable);
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield='p.date_livraison';
+if (! $sortorder) $sortorder='DESC';
+
 if (GETPOST("button_removefilter") || GETPOST("button_removefilter_x"))	// Both tests are required to be compatible with all browsers
 {
     $search_categ='';
@@ -137,19 +148,6 @@ $companystatic=new Societe($db);
 
 $now=dol_now();
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
-if (! $sortfield) $sortfield='p.date_livraison';
-if (! $sortorder) $sortorder='DESC';
-
-
 $sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,';
 $sql.= ' p.rowid as supplier_proposalid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_livraison as dp,';
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
@@ -221,10 +219,8 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-
 $sql.= $db->plimit($limit + 1,$offset);
 $result=$db->query($sql);
-
 if ($result)
 {
 	$objectstatic=new SupplierProposal($db);
@@ -238,6 +234,7 @@ if ($result)
 	}
 
 	$param='&socid='.$socid.'&viewstatut='.$viewstatut;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($month)              $param.='&month='.$month;
 	if ($year)               $param.='&year='.$year;
     if ($search_ref)         $param.='&search_ref=' .$search_ref;
@@ -246,7 +243,6 @@ if ($result)
 	if ($search_sale > 0)    $param.='&search_sale='.$search_sale;
 	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
 	if ($search_author)  	 $param.='&search_author='.$search_author;
-	print_barre_liste($langs->trans('ListOfSupplierProposal').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 
 	// Lignes des champs de filtre
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
@@ -256,6 +252,8 @@ if ($result)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	
+	print_barre_liste($langs->trans('ListOfSupplierProposal').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
+
 	if ($sall)
 	{
 	    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);

From ad534c90e63cb1fce495c8b576710e68836840f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 12 Feb 2016 10:34:21 +0100
Subject: [PATCH 135/421] Update 3.8.0-3.9.0.sql

---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 7c372a5c394..41166b0de06 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -34,9 +34,6 @@ ALTER TABLE llx_actioncomm ADD COLUMN email_tocc varchar(256) after email_to;
 ALTER TABLE llx_actioncomm ADD COLUMN email_tobcc varchar(256) after email_tocc;
 
 
-UPDATE llx_commande_fourn set billed=1 where statut = 8;
-UPDATE llx_commande_fourn set statut=5 where statut = 8 and billed=1;
-
 ALTER TABLE llx_user MODIFY COLUMN pass varchar(128);
 ALTER TABLE llx_user MODIFY COLUMN pass_temp varchar(128); 
 
@@ -111,6 +108,9 @@ ALTER TABLE llx_commande ADD COLUMN fk_warehouse integer DEFAULT NULL AFTER fk_s
 ALTER TABLE llx_commande_fournisseur ADD COLUMN billed smallint DEFAULT 0 AFTER fk_statut;
 ALTER TABLE llx_commande_fournisseur ADD INDEX billed (billed);
 
+UPDATE llx_commande_fournisseur set billed=1 where statut = 8;
+UPDATE llx_commande_fournisseur set statut=5 where statut = 8 and billed=1;
+
 ALTER TABLE llx_product ADD COLUMN cost_price	double(24,8) DEFAULT NULL;
 
 ALTER TABLE llx_ecm_directories MODIFY COLUMN fullpath varchar(750);

From 756b50b9d320ebbc0d5cc3103051aa20313d452a Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Fri, 12 Feb 2016 12:06:23 +0100
Subject: [PATCH 136/421] FIX : search product in customer product prices
 doesn't work

---
 htdocs/product/class/productcustomerprice.class.php |  2 ++
 htdocs/societe/price.php                            | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 86228db70c5..f2adc298a76 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -346,6 +346,8 @@ class Productcustomerprice extends CommonObject
 					$sql .= ' AND ' . $key . ' = \'' . $value . '\'';
 				} elseif ($key == 'soc.nom') {
 					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
+				} elseif ($key == 'prod.ref') {
+					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
 				} else {
 					$sql .= ' AND ' . $key . ' = ' . $value;
 				}
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 82adbd96607..0259150ccc4 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -241,9 +241,9 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		't.fk_soc' => $object->id
 	);
 
-	$search_soc = GETPOST('search_soc');
-	if (! empty($search_soc)) {
-		$filter ['soc.nom'] = $search_soc;
+	$search_prod = GETPOST('search_prod');
+	if (! empty($search_prod)) {
+		$filter ['prod.ref'] = $search_prod;
 	}
 
 	if ($action == 'add_customer_price') {
@@ -487,7 +487,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			setEventMessage($prodcustprice->error, 'errors');
 		}
 
-		$option = '&search_soc=' . $search_soc . '&id=' . $object->id;
+		$option = '&search_prod=' . $search_prod . '&id=' . $object->id;
 
 		print_barre_liste($langs->trans('PriceByCustomer'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords);
 
@@ -512,7 +512,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			print '</tr>';
 
 			print '<tr class="liste_titre">';
-			print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
+			print '<td><input type="text" class="flat" name="search_prod" value="' . $search_prod . '" size="20"></td>';
 			print '<td colspan="8">&nbsp;</td>';
 			// Print the search button
 			print '<td class="liste_titre" align="right">';

From 1c6d154a775a11bf048082ea245cf703fb54f829 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 Feb 2016 12:19:11 +0100
Subject: [PATCH 137/421] Fix: disabling option lead in not working dolibarr

---
 htdocs/admin/confexped.php | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index ea05c683ef7..85682960df9 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -2,8 +2,8 @@
 /* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2011-2015 Juanjo Menent		<jmenent@2byte.es>ù
- * Copyright (C) 2015			 Claudio Aschieri	<c.aschieri@19.coop>
+ * Copyright (C) 2011-2016 Juanjo Menent		<jmenent@2byte.es>ù
+ * Copyright (C) 2015      Claudio Aschieri     <c.aschieri@19.coop>
  *
  * 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,21 +38,34 @@ if (!$user->admin)
 
 $action=GETPOST('action','alpha');
 
+
+/*
+ * Actions
+ */
+
 // Shipment note
+if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+{
+    // This option should always be set to on when module is on.
+    dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1",'chaine',0,'',$conf->entity);
+}
+/*
 if ($action == 'activate_sending')
 {
     dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1",'chaine',0,'',$conf->entity);
     header("Location: confexped.php");
     exit;
 }
-else if ($action == 'disable_sending')
+if ($action == 'disable_sending')
 {
 	dolibarr_del_const($db, "MAIN_SUBMODULE_EXPEDITION",$conf->entity);
     header("Location: confexped.php");
     exit;
 }
+*/
+
 // Delivery note
-else if ($action == 'activate_delivery')
+if ($action == 'activate_delivery')
 {
     dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1",'chaine',0,'',$conf->entity);    // We must also enable this
     dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1",'chaine',0,'',$conf->entity);
@@ -68,8 +81,9 @@ else if ($action == 'disable_delivery')
 
 
 /*
- * Affiche page
+ * View
  */
+
 $dir = DOL_DOCUMENT_ROOT."/core/modules/expedition/";
 $form=new Form($db);
 
@@ -102,16 +116,15 @@ print '<td>'.$langs->trans("SendingsAbility").'</td>';
 print '<td align="center" width="20">';
 print '</td>';
 print '<td align="center" width="100">';
-
-if (empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+print $langs->trans("Required");
+/*if (empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 {
 	print '<a href="confexped.php?action=activate_sending">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 }
 else
 {
 	print '<a href="confexped.php?action=disable_sending">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
-}
-
+}*/
 print "</td>";
 print '</tr>';
 

From 969314e73153ea534b5434300c4c91cd99632bef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 Feb 2016 12:19:32 +0100
Subject: [PATCH 138/421] Fix: disabling option lead in not working dolibarr

---
 htdocs/core/modules/modExpedition.class.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 314536c28b5..6d29a426afd 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -83,7 +83,7 @@ class modExpedition extends DolibarrModules
 		// Constants
 		$this->const = array();
 		$r=0;
-
+		
 		$this->const[$r][0] = "EXPEDITION_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "rouget";
@@ -124,7 +124,15 @@ class modExpedition extends DolibarrModules
 		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/delivery";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
-
+		$r++;
+		
+		$this->const[$r][0] = "MAIN_SUBMODULE_EXPEDITION";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "1";
+		$this->const[$r][3] = "Enable shipments";
+		$this->const[$r][4] = 0;
+		$r++;
+		
 		// Boxes
 		$this->boxes = array();
 

From c4812abd62d7139fa0328ddf28e826c020a304be Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 12 Feb 2016 12:31:43 +0100
Subject: [PATCH 139/421] Fix can update fields of facture rec Fix create
 invoice from facture rec don't get all properties and add fk_account

---
 .../facture/class/facture-rec.class.php       | 165 ++++-
 htdocs/compta/facture/class/facture.class.php |   2 +
 htdocs/compta/facture/fiche-rec.php           | 567 ++++++++++++------
 .../install/mysql/migration/3.9.0-4.0.0.sql   |   1 +
 .../install/mysql/tables/llx_facture_rec.sql  |   2 +-
 5 files changed, 542 insertions(+), 195 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 91e3388c8ff..26659db4796 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -119,6 +119,7 @@ class FactureRec extends Facture
 			$sql.= ", note_public";
 			$sql.= ", fk_user_author";
 			$sql.= ", fk_projet";
+			$sql.= ", fk_account";
 			$sql.= ", fk_cond_reglement";
 			$sql.= ", fk_mode_reglement";
 			$sql.= ", usenewprice";
@@ -140,6 +141,7 @@ class FactureRec extends Facture
 			$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
 			$sql.= ", '".$user->id."'";
 			$sql.= ", ".(! empty($facsrc->fk_project)?"'".$facsrc->fk_project."'":"null");
+			$sql.= ", ".(! empty($facsrc->fk_account)?"'".$facsrc->fk_account."'":"null");
 			$sql.= ", '".$facsrc->cond_reglement_id."'";
 			$sql.= ", '".$facsrc->mode_reglement_id."'";
 			$sql.= ", ".$this->usenewprice;
@@ -225,11 +227,33 @@ class FactureRec extends Facture
 		$sql = 'SELECT f.titre,f.fk_soc,f.amount,f.tva,f.total,f.total_ttc,f.remise_percent,f.remise_absolue,f.remise';
 		$sql.= ', f.date_lim_reglement as dlr';
 		$sql.= ', f.note_private, f.note_public, f.fk_user_author';
-		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement';
+		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet';
+		$sql.= ', f.fk_account';
 		$sql.= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.usenewprice, f.auto_validate';
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
 		$sql.= ', el.fk_source';
+		
+		/*
+		$sql.= ', f.remise_percent, f.remise_absolue, f.remise';
+		$sql.= ', f.datef as df';
+		$sql.= ', f.date_lim_reglement as dlr';
+		$sql.= ', f.datec as datec';
+		$sql.= ', f.date_valid as datev';
+		$sql.= ', f.tms as datem';
+		$sql.= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf';
+		$sql.= ', f.fk_facture_source';
+		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet, f.extraparams';
+		$sql.= ', f.situation_cycle_ref, f.situation_counter, f.situation_final';
+		$sql.= ', f.fk_account';
+		$sql.= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
+		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
+        $sql.= ', f.fk_incoterms, f.location_incoterms';
+        $sql.= ", i.libelle as libelle_incoterms";
+		*/
+		
+		
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_rec as f';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
@@ -277,6 +301,7 @@ class FactureRec extends Facture
 				$this->cond_reglement         = $obj->cond_reglement_libelle;
 				$this->cond_reglement_doc     = $obj->cond_reglement_libelle_doc;
 				$this->fk_project             = $obj->fk_projet;
+				$this->fk_account             = $obj->fk_account;
 				$this->fk_facture_source      = $obj->fk_facture_source;
 				$this->note_private           = $obj->note_private;
 				$this->note_public            = $obj->note_public;
@@ -690,4 +715,142 @@ class FactureRec extends Facture
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+	
+	/**
+     *	Update frequency and unit
+     *
+     *	@param     	int		$frequency		value of frequency
+	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
+     *	@return		int						<0 if KO, >0 if OK
+     */
+    function setFrequencyAndUnit($frequency=0,$unit='')
+    {
+        if (! $this->table_element)
+        {
+            dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+
+		if (empty($frequency) && empty($unit))
+        {
+            dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with params frequency and unit not defined",LOG_ERR);
+            return -2;
+        }
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        if (!empty($frequency)) $sql.= ' SET frequency = '.$frequency;
+        if (!empty($unit)) 
+        {
+        	if (!empty($frequency)) $sql .= ',';
+			else $sql .= ' SET';
+        	$sql.= ' unit_frequency = "'.$this->db->escape($unit).'"';
+		}
+        $sql.= ' WHERE rowid = '.$this->id;
+
+        dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            if (!empty($frequency)) $this->frequency = $frequency;
+			if (!empty($unit)) $this->unit_frequency = $unit;
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+    
+	/**
+     *	Update the next date of execution
+     *
+     *	@param     	datetime	$date	date of execution (format timestamp)
+     *	@return		int					<0 if KO, >0 if OK
+     */
+    function setNextDate($date)
+    {
+        if (! $this->table_element)
+        {
+            dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+		$date = $this->db->idate($date);
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' SET date_when = "'.$date.'"';
+        $sql.= ' WHERE rowid = '.$this->id;
+
+        dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            $this->date_when = $date;
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+	
+	/**
+     *	Update the maximum period
+     *
+     *	@param     	int		$nb		number of maximum period
+     *	@return		int				<0 if KO, >0 if OK
+     */
+    function setMaxPeriod($nb)
+    {
+        if (! $this->table_element)
+        {
+            dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+		
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' SET nb_gen_max = '.$nb;
+        $sql.= ' WHERE rowid = '.$this->id;
+
+        dol_syslog(get_class($this)."::setMaxPeriod", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            $this->nb_gen_max = $nb;
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+	
+	/**
+     *	Update the auto validate invoice
+     *
+     *	@param     	int		$validate		0 to create in draft, 1 to create and validate invoice
+     *	@return		int						<0 if KO, >0 if OK
+     */
+    function setAutoValidate($validate)
+    {
+        if (! $this->table_element)
+        {
+            dol_syslog(get_class($this)."::setAutoValidate was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+		
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' SET auto_validate = '.$validate;
+        $sql.= ' WHERE rowid = '.$this->id;
+
+        dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            $this->auto_validate = $validate;
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
 }
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index edb22982843..a10202470c4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -278,6 +278,8 @@ class Facture extends CommonInvoice
 			$result=$_facrec->fetch($this->fac_rec);
 
 			$this->fk_project        = $_facrec->fk_project;
+			$this->fk_account        = $_facrec->fk_account;
+			$this->note_private      = $_facrec->note_private;
 			$this->cond_reglement_id = $_facrec->cond_reglement_id;
 			$this->mode_reglement_id = $_facrec->mode_reglement_id;
 			$this->remise_absolue    = $_facrec->remise_absolue;
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index b9c3b58a224..ae1e74829d9 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -58,7 +58,14 @@ if ($sortfield == "")
 $sortfield="f.datef";
 
 $object = new FactureRec($db);
-
+if ($id > 0 && $action != 'create' && $action != 'add')
+{
+	$ret = $object->fetch($id);
+	if (!$ret)
+	{
+		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
+	}
+}
 
 /*
  * Actions
@@ -134,6 +141,54 @@ if ($action == 'delete' && $user->rights->facture->supprimer)
 
 
 
+// Update field
+// Set condition
+if ($action == 'setconditions' && $user->rights->facture->creer)
+{
+	$result=$object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+
+}
+// Set mode
+elseif ($action == 'setmode' && $user->rights->facture->creer)
+{
+	$result=$object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+}
+// Set project
+elseif ($action == 'classin' && $user->rights->facture->creer)
+{
+	$object->setProject(GETPOST('projectid', 'int'));
+}
+// Set bank account
+elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
+{
+    $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+}
+// 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
+elseif ($action == 'setdate_when' && $user->rights->facture->creer)
+{
+	$date = dol_mktime(12, 0, 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
+	if (!empty($date)) $object->setNextDate($date);
+}
+// Set max period
+elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
+{
+	$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
+}
+// Set auto validate
+elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
+{
+	$object->setAutoValidate(GETPOST('auto_validate', 'int'));
+}
+// Set note
+$permissionnote=$user->rights->facture->creer;	// Used by the include of actions_setnotes.inc.php
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+
+
 /*
  *	View
  */
@@ -164,6 +219,7 @@ if ($action == 'create')
 
 		$rowspan=4;
 		if (! empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++;
+		if ($object->fk_account > 0) $rowspan++;
 
 		print '<table class="border" width="100%">';
 
@@ -211,6 +267,14 @@ if ($action == 'create')
 			print "</td></tr>";
 		}
 
+		// Project
+		if ($object->fk_account > 0)
+		{
+			print "<tr><td>".$langs->trans('BankAccount')."</td><td>";
+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+			print "</td></tr>";
+		}
+
 		print "</table>";
 
 		print '<br>';
@@ -456,206 +520,323 @@ else
 	/*
 	 * View mode
 	 */
-	if ($id > 0)
+	if ($object->id > 0)
 	{
-		if ($object->fetch($id) > 0)
+		$object->fetch_thirdparty();
+
+		$author = new User($db);
+		$author->fetch($object->user_author);
+
+		$head=array();
+		$h=0;
+		$head[$h][0] = $_SERVER["PHP_SELF"].'?id='.$object->id;
+		$head[$h][1] = $langs->trans("CardBill");
+		$head[$h][2] = 'card';
+
+		dol_fiche_head($head, 'card', $langs->trans("PredefinedInvoices"),0,'bill');	// Add a div
+
+		print '<table class="border" width="100%">';
+
+		print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
+		print '<td colspan="4">'.$object->titre.'</td>';
+
+		print '<tr><td>'.$langs->trans("Customer").'</td>';
+		print '<td colspan="3">'.$object->thirdparty->getNomUrl(1,'customer').'</td></tr>';
+
+		print "<tr><td>".$langs->trans("Author").'</td><td colspan="3">'.$author->getFullName($langs)."</td></tr>";
+
+		print '<tr><td>'.$langs->trans("AmountHT").'</td>';
+		print '<td colspan="3"><b>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</b></td>';
+		print '</tr>';
+
+		print '<tr><td>'.$langs->trans("AmountVAT").'</td><td colspan="3">'.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'</td>';
+		print '</tr>';
+		print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="3">'.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'</td>';
+		print '</tr>';
+
+		// Payment term
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('PaymentConditionsShort');
+		print '</td>';
+		if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer)
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($object->type != Facture::TYPE_CREDIT_NOTE)
 		{
-			$object->fetch_thirdparty();
-
-			$author = new User($db);
-			$author->fetch($object->user_author);
-
-			$head=array();
-			$h=0;
-			$head[$h][0] = $_SERVER["PHP_SELF"].'?id='.$object->id;
-			$head[$h][1] = $langs->trans("CardBill");
-			$head[$h][2] = 'card';
-
-			dol_fiche_head($head, 'card', $langs->trans("PredefinedInvoices"),0,'bill');	// Add a div
-
-			print '<table class="border" width="100%">';
-
-			print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
-			print '<td colspan="4">'.$object->titre.'</td>';
-
-			print '<tr><td>'.$langs->trans("Customer").'</td>';
-			print '<td colspan="3">'.$object->thirdparty->getNomUrl(1,'customer').'</td></tr>';
-
-			print "<tr><td>".$langs->trans("Author").'</td><td colspan="3">'.$author->getFullName($langs)."</td></tr>";
-
-			print '<tr><td>'.$langs->trans("AmountHT").'</td>';
-			print '<td colspan="3"><b>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</b></td>';
-			print '</tr>';
-
-			print '<tr><td>'.$langs->trans("AmountVAT").'</td><td colspan="3">'.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'</td>';
-			print '</tr>';
-			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="3">'.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'</td>';
-			print '</tr>';
-
-			// Payment term
-			print '<tr><td>'.$langs->trans("PaymentConditions").'</td><td colspan="3">';
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'none');
-			print "</td></tr>";
-
-			// Payment mode
-			print '<tr><td>'.$langs->trans("PaymentMode").'</td><td colspan="3">';
-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id,'none');
-			print "</td></tr>";
-
-			print '<tr><td>'.$langs->trans("Comment").'</td><td colspan="3">'.nl2br($object->note_private)."</td></tr>";
-
-			print "</table>";
-
-			print '</div>';
-
-			/*
-			 * Recurrence
-			 */
-			if ($object->frequency > 0)
-			{
-				$title = $langs->trans("Recurrence");
-				print load_fiche_titre($title);
-				
-				print '<div class="tabBar">';
-				print '<table class="border" width="100%">';
-
-				print '<tr><td width="25%">'.$langs->trans("Frequency").'</td>';
-				print '<td>'.$langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency).'</td>';
-				
-				print '<tr><td width="25%">'.$langs->trans("NextDateToExecution").'</td>';
-				print '<td>'.dol_print_date($object->date_when, 'daytext').'</td>';
-				
-				print '<tr><td width="25%">'.$langs->trans("MaxPeriodNumber").' / '.$langs->trans("RestPeriodNumber").'</td>';
-				print '<td>'.$object->nb_gen_max.' / '.($object->nb_gen_max-$object->nb_gen_done).'</td>';
-				
-				print '<tr><td width="25%">'.$langs->trans("InvoiceAutoValidate").'</td>';
-				print '<td>'.yn($object->auto_validate).'</td>';
-				
-				print '</table>';
-				print '</div>';
-				print '<br />';
+			if ($action == 'editconditions') {
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
+			} else {
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
 			}
+		} else {
+			print '&nbsp;';
+		}
+		print '</td></tr>';
 
-			/*
-			 * Lines
-			 */
-
-			$title = $langs->trans("ProductsAndServices");
-			if (empty($conf->service->enabled))
-				$title = $langs->trans("Products");
-			else if (empty($conf->product->enabled))
-				$title = $langs->trans("Services");
-
-			print load_fiche_titre($title);
-
-			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("Description").'</td>';
-			print '<td align="right">'.$langs->trans("Price").'</td>';
-			print '<td align="center">'.$langs->trans("ReductionShort").'</td>';
-			print '<td align="center">'.$langs->trans("Qty").'</td>';
-			if ($conf->global->PRODUCT_USE_UNITS) {
-				print '<td align="left">'.$langs->trans("Unit").'</td>';
-			}
-			print '</tr>';
-
-			$num = count($object->lines);
-			$i = 0;
-			$var=true;
-			while ($i < $num)
-			{
-				$var=!$var;
-
-				$product_static=new Product($db);
-
-				// Show product and description
-				$type=(isset($object->lines[$i]->product_type)?$object->lines[$i]->product_type:$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;
-				if (! empty($objp->date_end)) $type=1;
-
-				// Show line
-				print "<tr ".$bc[$var].">";
-				if ($object->lines[$i]->fk_product > 0)
-				{
-					print '<td>';
-					print '<a name="'.$object->lines[$i]->id.'"></a>'; // ancre pour retourner sur la ligne
-
-					// Show product and description
-					$product_static->type=$object->lines[$i]->fk_product_type;
-					$product_static->id=$object->lines[$i]->fk_product;
-					$product_static->ref=$object->lines[$i]->product_ref;
-					$text=$product_static->getNomUrl(1);
-					$text.= ' - '.(! empty($object->lines[$i]->label)?$object->lines[$i]->label:$object->lines[$i]->product_label);
-					$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($object->lines[$i]->desc));
-					print $form->textwithtooltip($text,$description,3,'','',$i);
-
-					// Show range
-					print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end);
-
-					// Add description in form
-					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-						print (! empty($object->lines[$i]->desc) && $object->lines[$i]->desc!=$fac->lines[$i]->product_label)?'<br>'.dol_htmlentitiesbr($object->lines[$i]->desc):'';
-
-					print '</td>';
-				}
-				else
-				{
-					print '<td>';
-
-					if ($type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
-
-					if (! empty($object->lines[$i]->label)) {
-
-						$text.= ' <strong>'.$object->lines[$i]->label.'</strong>';
-						print $form->textwithtooltip($text,dol_htmlentitiesbr($object->lines[$i]->desc),3,'','',$i);
-
-					} else {
-
-						print $text.' '.nl2br($object->lines[$i]->desc);
-					}
-
-					// Show range
-					print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end);
-
-					print '</td>';
-				}
-				print '<td align="right">'.price($object->lines[$i]->price).'</td>';
-				print '<td align="center">'.$object->lines[$i]->remise_percent.' %</td>';
-				print '<td align="center">'.$object->lines[$i]->qty.'</td>';
-				if ($conf->global->PRODUCT_USE_UNITS) {
-					print "<td align=\"left\">".$object->lines[$i]->getLabelOfUnit()."</td>";
-				}
-				print "</tr>\n";
-				$i++;
-			}
-			print '</table>';
-
-
-
-			/**
-			 * Barre d'actions
-			 */
-			print '<div class="tabsAction">';
-
-			if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->creer)
-			{
-			    	echo '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$object->thirdparty->id.'&amp;fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
-			}
-
-			if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
-			{
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
-			}
-
-			print '</div>';
+		// Payment mode
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('PaymentMode');
+		print '</td>';
+		if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer)
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editmode')
+		{
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT');
 		}
 		else
 		{
-			print $langs->trans("ErrorRecordNotFound");
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
 		}
+		print '</td></tr>';
+
+		
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer);
+		print '</td><td colspan="5">';
+		print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':60');
+		print '</td>';
+		print '</tr>';
+		
+		// Project
+		if (! empty($conf->projet->enabled)) {
+			$langs->load('projects');
+			print '<tr>';
+			print '<td>';
+	
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('Project');
+			print '</td>';
+			if ($action != 'classify') {
+				print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=classify&amp;facid=' . $object->id . '">';
+				print img_edit($langs->trans('SetProject'), 1);
+				print '</a></td>';
+			}
+			print '</tr></table>';
+	
+			print '</td><td colspan="3">';
+			if ($action == 'classify') {
+				$form->form_project($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
+			} else {
+				$form->form_project($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0);
+			}
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Bank Account
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('BankAccount');
+		print '<td>';
+		if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
+		    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editbankaccount')
+		{
+		    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+		}
+		else
+		{
+		    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+		}
+		print "</td>";
+		print '</tr>';
+
+
+		print "</table>";
+
+		print '</div>';
+
+		/*
+		 * Recurrence
+		 */
+		$title = $langs->trans("Recurrence");
+		print load_fiche_titre($title);
+		
+		print '<div class="tabBar">';
+		print '<table class="border" width="100%">';
+
+		// if "frequency" is empty or = 0, the reccurence is disabled
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Frequency');
+		print '</td>';
+		if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer)
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editfrequency')
+		{
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"] . '?facid=' . $object->id.'">';
+            print '<input type="hidden" name="action" value="setfrequency">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+            print '<tr><td>';
+            print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency?$object->unit_frequency:'m'));
+            print '</td>';
+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            print '</tr></table></form>';
+		}
+		else 
+		{
+			print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
+		}
+		print '</td></tr>';
+		
+		// Date when
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer);
+		print '</td><td colspan="5">';
+		print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'datepicker');
+		print '</td>';
+		print '</tr>';
+		
+		
+		// Max period / Rest period
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+		print '</td><td colspan="5">';
+		print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+		print '</td>';
+		print '</tr>';
+		print '<tr><td width="25%">'.$langs->trans("RestPeriodNumber").'</td>';
+		print '<td>'.($object->nb_gen_max-$object->nb_gen_done).'</td>';
+		
+		// Auto validate
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans("InvoiceAutoValidate"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
+		print '</td><td colspan="5">';
+		$select = 'select;0:'.$langs->trans('No').',1:'.$langs->trans('Yes');
+		print $form->editfieldval($langs->trans("InvoiceAutoValidate"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
+		print '</td>';
+		print '</tr>';
+		
+		print '</table>';
+		print '</div>';
+		print '<br />';
+
+		/*
+		 * Lines
+		 */
+
+		$title = $langs->trans("ProductsAndServices");
+		if (empty($conf->service->enabled))
+			$title = $langs->trans("Products");
+		else if (empty($conf->product->enabled))
+			$title = $langs->trans("Services");
+
+		print load_fiche_titre($title);
+
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td align="right">'.$langs->trans("Price").'</td>';
+		print '<td align="center">'.$langs->trans("ReductionShort").'</td>';
+		print '<td align="center">'.$langs->trans("Qty").'</td>';
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			print '<td align="left">'.$langs->trans("Unit").'</td>';
+		}
+		print '</tr>';
+
+		$num = count($object->lines);
+		$i = 0;
+		$var=true;
+		while ($i < $num)
+		{
+			$var=!$var;
+
+			$product_static=new Product($db);
+
+			// Show product and description
+			$type=(isset($object->lines[$i]->product_type)?$object->lines[$i]->product_type:$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;
+			if (! empty($objp->date_end)) $type=1;
+
+			// Show line
+			print "<tr ".$bc[$var].">";
+			if ($object->lines[$i]->fk_product > 0)
+			{
+				print '<td>';
+				print '<a name="'.$object->lines[$i]->id.'"></a>'; // ancre pour retourner sur la ligne
+
+				// Show product and description
+				$product_static->type=$object->lines[$i]->fk_product_type;
+				$product_static->id=$object->lines[$i]->fk_product;
+				$product_static->ref=$object->lines[$i]->product_ref;
+				$text=$product_static->getNomUrl(1);
+				$text.= ' - '.(! empty($object->lines[$i]->label)?$object->lines[$i]->label:$object->lines[$i]->product_label);
+				$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($object->lines[$i]->desc));
+				print $form->textwithtooltip($text,$description,3,'','',$i);
+
+				// Show range
+				print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end);
+
+				// Add description in form
+				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+					print (! empty($object->lines[$i]->desc) && $object->lines[$i]->desc!=$fac->lines[$i]->product_label)?'<br>'.dol_htmlentitiesbr($object->lines[$i]->desc):'';
+
+				print '</td>';
+			}
+			else
+			{
+				print '<td>';
+
+				if ($type==1) $text = img_object($langs->trans('Service'),'service');
+				else $text = img_object($langs->trans('Product'),'product');
+
+				if (! empty($object->lines[$i]->label)) {
+
+					$text.= ' <strong>'.$object->lines[$i]->label.'</strong>';
+					print $form->textwithtooltip($text,dol_htmlentitiesbr($object->lines[$i]->desc),3,'','',$i);
+
+				} else {
+
+					print $text.' '.nl2br($object->lines[$i]->desc);
+				}
+
+				// Show range
+				print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end);
+
+				print '</td>';
+			}
+			print '<td align="right">'.price($object->lines[$i]->price).'</td>';
+			print '<td align="center">'.$object->lines[$i]->remise_percent.' %</td>';
+			print '<td align="center">'.$object->lines[$i]->qty.'</td>';
+			if ($conf->global->PRODUCT_USE_UNITS) {
+				print "<td align=\"left\">".$object->lines[$i]->getLabelOfUnit()."</td>";
+			}
+			print "</tr>\n";
+			$i++;
+		}
+		print '</table>';
+
+
+
+		/**
+		 * Barre d'actions
+		 */
+		print '<div class="tabsAction">';
+
+		if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->creer)
+		{
+		    	echo '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$object->thirdparty->id.'&amp;fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
+		}
+
+		if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
+		}
+
+		print '</div>';
+		
 	}
 	else
 	{
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 57f3c10ebe4..279db6998a4 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -213,6 +213,7 @@ ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAUL
  
 
 ALTER TABLE llx_facture_rec ADD COLUMN auto_validate integer DEFAULT 0;
+ALTER TABLE llx_facture_rec ADD COLUMN fk_account integer DEFAULT 0;
 
 ALTER TABLE llx_facture_rec ADD COLUMN fk_multicurrency integer;
 ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_code varchar(255);
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index 19fdb14516b..11e152bcfc2 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -46,7 +46,7 @@ create table llx_facture_rec
   fk_cond_reglement  integer DEFAULT 0,  -- condition de reglement
   fk_mode_reglement  integer DEFAULT 0,  -- mode de reglement (Virement, Prelevement)
   date_lim_reglement date,				   -- date limite de reglement
-
+  fk_account         integer,
   note_private       text,
   note_public        text,
 

From 2796875ed173241dc268448a652ff4b99e50b8db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 Feb 2016 13:58:24 +0100
Subject: [PATCH 140/421] Can select size of list of targets of email

---
 htdocs/comm/mailing/cibles.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index af6d8b94c28..f817e7898d3 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -38,11 +38,12 @@ $langs->load("mails");
 if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
 
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
@@ -367,11 +368,15 @@ if ($object->fetch($id) >= 0)
 	if ($search_email)  $sql.= " AND mc.email  LIKE '%".$db->escape($search_email)."%'";
 	if (!empty($search_dest_status)) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
 	$sql .= $db->order($sortfield,$sortorder);
-	$sql .= $db->plimit($conf->liste_limit+1, $offset);
+
+	$totalnbofrecord=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
+	
+	$sql .= $db->plimit($limit+1, $offset);
 
 	$resql=$db->query($sql);
 	if ($resql)
 	{
+	    
 		$num = $db->num_rows($resql);
 
 		$param = "&amp;id=".$object->id;
@@ -389,7 +394,7 @@ if ($object->fetch($id) >= 0)
 			$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">';
 		}
 
-		print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,'');
+		print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$totalnbofrecord,'',0,'','',$limit);
 
 		print '</form>';
 
@@ -399,7 +404,8 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
-
+		print '<input type="hidden" name="limit" value="'.$limit.'">';
+		
 
 		if ($page)			$param.= "&amp;page=".$page;
 		print '<table class="noborder" width="100%">';

From d0ab1db19b239ef8f9c9fc28beb73a7c3577ac88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 Feb 2016 14:21:44 +0100
Subject: [PATCH 141/421] NEW When emailing is not sent completely, show
 progression

---
 htdocs/comm/mailing/cibles.php                | 23 ++++++++++---
 htdocs/comm/mailing/class/mailing.class.php   | 34 ++++++++++++++++++-
 .../mysql/tables/llx_mailing_cibles.sql       |  2 +-
 htdocs/langs/en_US/mails.lang                 |  1 +
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index f817e7898d3..0c133fac6df 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -196,7 +196,9 @@ if ($object->fetch($id) >= 0)
 	print '</td></tr>';
 
 	// Status
-	print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
+	print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4);
+	if ($object->statut == 2) print ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.')';
+	print '</td></tr>';
 
 	// Nb of distinct emails
 	print '<tr><td width="25%">';
@@ -369,8 +371,14 @@ if ($object->fetch($id) >= 0)
 	if (!empty($search_dest_status)) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
 	$sql .= $db->order($sortfield,$sortorder);
 
-	$totalnbofrecord=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
-	
+	// Count total nb of records
+	$nbtotalofrecords = 0;
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+	    $result = $db->query($sql);
+	    $nbtotalofrecords = $db->num_rows($result);
+	}
+	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
 	$sql .= $db->plimit($limit+1, $offset);
 
 	$resql=$db->query($sql);
@@ -394,7 +402,7 @@ if ($object->fetch($id) >= 0)
 			$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">';
 		}
 
-		print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$totalnbofrecord,'',0,'','',$limit);
+		print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$nbtotalofrecords,'',0,'','',$limit);
 
 		print '</form>';
 
@@ -548,7 +556,12 @@ if ($object->fetch($id) >= 0)
 		}
 		else
 		{
-			print '<tr '.$bc[false].'><td colspan="8">'.$langs->trans("NoTargetYet").'</td></tr>';
+			if ($object->statut < 2) 
+			{
+			    print '<tr '.$bc[false].'><td colspan="8">';
+    			print $langs->trans("NoTargetYet");
+    			print '</td></tr>';
+			}
 		}
 		print "</table><br>";
 
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 7ac91d1ab31..0ac16635beb 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -80,7 +80,7 @@ class Mailing extends CommonObject
 		$this->statut_dest[-1] = 'MailingStatusError';
 		$this->statut_dest[1] = 'MailingStatusSent';
 		$this->statut_dest[2] = 'MailingStatusRead';
-		$this->statut_dest[3] = 'MailingStatusNotContact';
+		$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe';    // Read but ask to not be contacted anymore
 
 	}
 
@@ -477,6 +477,38 @@ class Mailing extends CommonObject
 		}
 	}
 
+	
+	/**
+	 *  Count number of target with status
+	 *
+	 *  @param  string     Mode ('alreadysent' = Sent success or error) 
+	 *  @return int        Nb of target with status
+	 */
+	function countNbOfTargets($mode)
+	{
+	    $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+	    $sql.= " WHERE fk_mailing = ".$this->id;
+	    if ($mode == 'alreadysent') $sql.= " AND statut <> 0";
+	    else 
+	    {
+	        $this->error='BadValueForParameterMode';
+	        return -2;
+	    }
+	     
+	    $resql=$this->db->query($sql);
+	    if ($resql)
+	    {
+	        $obj = $this->db->fetch_object($resql);
+	        if ($obj) return $obj->nb;
+	    }
+	    else
+	    {
+	        $this->error=$this->db->lasterror();
+	        return -1;
+	    }
+	    return 0;
+	}
+	
 
 	/**
 	 *  Retourne le libelle du statut d'un mailing (brouillon, validee, ...
diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
index a2210ac0155..72fdeca2925 100644
--- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
@@ -29,7 +29,7 @@ create table llx_mailing_cibles
   email				varchar(160) NOT NULL,
   other				varchar(255) NULL,
   tag				varchar(128) NULL,
-  statut			smallint NOT NULL DEFAULT 0,
+  statut			smallint NOT NULL DEFAULT 0,		-- -1 = error, 0 = not sent, ...
   source_url		varchar(160),
   source_id			integer,
   source_type		varchar(16),
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 94a74604901..a5f620c7a7a 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?

From 94732b8ae941cd9623ea27751f6b30321fdca89c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 Feb 2016 14:23:40 +0100
Subject: [PATCH 142/421] NEW When emailing is not sent completely, show
 progression

---
 htdocs/comm/mailing/card.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e54aeb1c8a5..a468e79e23a 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -818,7 +818,9 @@ else
 			print '</td></tr>';
 
 			// Status
-			print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
+			print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4);
+			if ($object->statut == 2) print ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.')';
+			print'</td></tr>';
 
 			// Nb of distinct emails
 			print '<tr><td>';

From e9ffbd140626e0a228edaa28ffcadef759067a01 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 Feb 2016 14:27:59 +0100
Subject: [PATCH 143/421] FIX When an email was partially sent from GUI, it was
 not possible to finish from CLI.

---
 scripts/emailings/mailing-send.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index cfe26e3d2a4..f1ebe332372 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -68,7 +68,7 @@ if (! empty($login)) $user->fetch('',$login);
 $sql = "SELECT m.rowid, m.titre, m.sujet, m.body,";
 $sql.= " m.email_from, m.email_replyto, m.email_errorsto";
 $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
-$sql.= " WHERE m.statut = 1";
+$sql.= " WHERE m.statut IN (1,2)";
 if ($id != 'all')
 {
 	$sql.= " AND m.rowid= ".$id;

From 428a7e70423732033ebf0f80b8381aedc8619b8f Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 12 Feb 2016 15:55:55 +0100
Subject: [PATCH 144/421] FIX remove comment, calcul next date for recurring
 invoice, increment nb_gen_done

---
 .../facture/class/facture-rec.class.php       | 42 ++++++----------
 htdocs/compta/facture/class/facture.class.php | 50 ++++++++-----------
 htdocs/compta/facture/fiche-rec.php           |  8 +--
 3 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 26659db4796..60aebfb7dc3 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -233,27 +233,6 @@ class FactureRec extends Facture
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
 		$sql.= ', el.fk_source';
-		
-		/*
-		$sql.= ', f.remise_percent, f.remise_absolue, f.remise';
-		$sql.= ', f.datef as df';
-		$sql.= ', f.date_lim_reglement as dlr';
-		$sql.= ', f.datec as datec';
-		$sql.= ', f.date_valid as datev';
-		$sql.= ', f.tms as datem';
-		$sql.= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf';
-		$sql.= ', f.fk_facture_source';
-		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet, f.extraparams';
-		$sql.= ', f.situation_cycle_ref, f.situation_counter, f.situation_final';
-		$sql.= ', f.fk_account';
-		$sql.= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
-		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
-		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
-        $sql.= ', f.fk_incoterms, f.location_incoterms';
-        $sql.= ", i.libelle as libelle_incoterms";
-		*/
-		
-		
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_rec as f';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
@@ -599,7 +578,7 @@ class FactureRec extends Facture
 	function getNextDate()
 	{
 		if (empty($this->date_when)) return false;
-		return dol_time_plus_duree($this->date_when, $this->frequency, $this->unit_frequency);
+		return dol_time_plus_duree(strtotime($this->date_when), $this->frequency, $this->unit_frequency);
 	}
 	
 	/**
@@ -627,15 +606,20 @@ class FactureRec extends Facture
 			{
 				$facturerec = new FactureRec($db);
 				$facturerec->fetch($line->rowid);
-				
+			
 				$facture = new Facture($db);
-				
 				$result = $facture->createFromRec($user, $facturerec);
 				
 				// >0 create and validate if auto_validate
 				// =0 create but not validate if auto_validate
 				// <0 broken
-				if ($result >= 0) $nb_create++;
+				if ($result >= 0)
+				{
+					$next_date = $facturerec->getNextDate();
+					$facturerec->setNextDate($next_date,1);
+					
+					$nb_create++;
+				}
 
 			}
 		}
@@ -764,10 +748,11 @@ class FactureRec extends Facture
 	/**
      *	Update the next date of execution
      *
-     *	@param     	datetime	$date	date of execution (format timestamp)
-     *	@return		int					<0 if KO, >0 if OK
+     *	@param     	datetime	$date					date of execution
+     *	@param     	int			$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
+     *	@return		int									<0 if KO, >0 if OK
      */
-    function setNextDate($date)
+    function setNextDate($date, $increment_nb_gen_done=0)
     {
         if (! $this->table_element)
         {
@@ -777,6 +762,7 @@ class FactureRec extends Facture
 		$date = $this->db->idate($date);
         $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
         $sql.= ' SET date_when = "'.$date.'"';
+        if ($increment_nb_gen_done>0) $sql.= ', nb_gen_done = nb_gen_done + 1';
         $sql.= ' WHERE rowid = '.$this->id;
 
         dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index a10202470c4..dd1d9b6ca8c 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -922,47 +922,41 @@ class Facture extends CommonInvoice
 	/**
 	 *	Create a new invoice in database from facturerec
 	 *
-	 *	@param      User	$user    		Object user that ask creation
-	 *	@return		int						<0 if KO, 0 if not validate, >0 if OK
+	 *	@param      User		$user    		Object user that ask creation
+	 *	@param      FactureRec	$facturerec    	Object facturerec source
+	 *	@return		int							<0 if KO, 0 if not validate, >0 if OK
 	 */
-	function createFromRec($user, $object)
+	function createFromRec($user, $facturerec)
 	{
 
 		// Clean parameters
-		if (! $this->type) $this->type = self::TYPE_STANDARD;
-		$this->ref_client=trim($this->ref_client);
-		$this->note_private=trim($this->note_private);
-		$this->note_public=trim($this->note_public);
-		//if (! $this->remise) $this->remise = 0;
-		if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
+		$this->type = self::TYPE_STANDARD;
 		$this->brouillon = 1;
 		
 		// Charge facture source
-		$facture=new Facture($object->db);
+		$facture=new Facture($facturerec->db);
 
-		$facture->fk_facture_source = $object->fk_facture_source;
-		$facture->type 			    = $object->type;
-		$facture->socid 		    = $object->socid;
+		$facture->socid 		    = $facturerec->socid;
 		$facture->date              = dol_mktime(12, 0, 0, date('m'), date('d'), date('Y'));
-		$facture->note_public       = $object->note_public;
-		$facture->note_private      = $object->note_private;
-		$facture->ref_client        = $object->ref_client;
-		$facture->modelpdf          = $object->modelpdf;
-		$facture->fk_project        = $object->fk_project;
-		$facture->cond_reglement_id = $object->cond_reglement_id;
-		$facture->mode_reglement_id = $object->mode_reglement_id;
-		$facture->remise_absolue    = $object->remise_absolue;
-		$facture->remise_percent    = $object->remise_percent;
-		$facture->fk_incoterms		= $object->fk_incoterms;
-		$facture->location_incoterms= $object->location_incoterms;
+		$facture->note_public       = $facturerec->note_public;
+		$facture->note_private      = $facturerec->note_private;
+		$facture->fk_project        = $facturerec->fk_project;
+		$facture->fk_account        = $facturerec->fk_account;
+		$facture->cond_reglement_id = $facturerec->cond_reglement_id;
+		$facture->mode_reglement_id = $facturerec->mode_reglement_id;
+		
+		$new_date_lim_reglement = $facture->calculate_date_lim_reglement();
+		$facture->date_lim_reglement = $new_date_lim_reglement;
+		
+		$facture->remise_absolue    = $facturerec->remise_absolue;
+		$facture->remise_percent    = $facturerec->remise_percent;
 
-		$facture->lines		    	= $object->lines;	// Tableau des lignes de factures
-		$facture->products		    = $object->lines;	// Tant que products encore utilise
+		$facture->lines		    	= $facturerec->lines;	// Tableau des lignes de factures
 
 		// Loop on each line of new invoice
 		foreach($facture->lines as $i => $line)
 		{
-			$facture->lines[$i]->fk_prev_id = $object->lines[$i]->rowid;
+			$facture->lines[$i]->fk_prev_id = $facturerec->lines[$i]->rowid;
 		}
 
 		dol_syslog(get_class($this)."::createFromRec socid=".$this->socid." nboflines=".count($facture->lines));
@@ -970,7 +964,7 @@ class Facture extends CommonInvoice
 		$facid = $facture->create($user);
 		if ($facid <= 0) return -1;
 
-		if ($object->auto_validate)
+		if ($facturerec->auto_validate)
 		{
 			$result = $facture->validate($user);
 			if ($result<=0) return 0;
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index ae1e74829d9..0d462d25066 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -121,7 +121,8 @@ if ($action == 'add')
 		if ($object->create($user, $id) > 0)
 		{
 			$id = $object->id;
-			$action = '';
+			header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $id);
+			exit;
 		}
 		else
 		{
@@ -134,13 +135,12 @@ if ($action == 'add')
 // Delete
 if ($action == 'delete' && $user->rights->facture->supprimer)
 {
-	$object->fetch($id);
 	$object->delete();
-	$id = 0 ;
+	header("Location: " . $_SERVER['PHP_SELF'] );
+	exit;
 }
 
 
-
 // Update field
 // Set condition
 if ($action == 'setconditions' && $user->rights->facture->creer)

From 1143612bc0b4817c0cd55443fb56161ef9d57235 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 12 Feb 2016 16:03:01 +0100
Subject: [PATCH 145/421] Fix add key in traduction lang

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

diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 754ddc1547c..503dc5bb492 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -311,6 +311,7 @@ FrequencyPer_y=Every %s years
 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=Next date to execution
 MaxPeriodNumber=Max period number
+RestPeriodNumber=Rest period number
 InvoiceAutoValidate=Automatically validate invoice
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate

From 4f6289bea0c63efcec52f1b9423f87176573703d Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 12 Feb 2016 16:09:50 +0100
Subject: [PATCH 146/421] Fix test if frequency is defined to create or not by
 the cron

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

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 60aebfb7dc3..16dcedc3035 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -595,7 +595,7 @@ class FactureRec extends Facture
 		$today = date('Y-m-d 23:59:59');
 		
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_rec';
-		$sql.= ' WHERE date_when IS NOT NULL';
+		$sql.= ' WHERE date_when IS NOT NULL AND frequency > 0';
 		$sql.= ' AND date_when <= "'.$db->escape($today).'"';
 		$sql.= ' AND nb_gen_done < nb_gen_max';
 		

From 0063635c67c24101d316a5198e5486ef08df14fd Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Fri, 12 Feb 2016 23:49:24 +0100
Subject: [PATCH 147/421] fix:no transaction in this place

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

diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 5bcbab5934a..94c7b7bf860 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -66,8 +66,6 @@ abstract class CommonObjectLine extends CommonObject
 
 		$langs->load('products');
 
-		$this->db->begin();
-
 		$label_type = 'label';
 
 		if ($type == 'short')

From 04114a5e1e43ad143e133c6ece18d40dc436a865 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Feb 2016 03:11:27 +0100
Subject: [PATCH 148/421] Provide a better explanation on how the module
 dynamic price works

---
 htdocs/langs/en_US/products.lang        |  2 ++
 htdocs/product/admin/dynamic_prices.php | 15 +++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index b8a7d377904..3dfabdc124d 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -295,7 +295,9 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value. 
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index 45086630c47..84ec54433cd 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -142,17 +142,20 @@ if (!empty($action) && empty($cancel)) {
  * View
  */
 
-//Header
 llxHeader("","",$langs->trans("CardProduct".$product->type));
+
 print load_fiche_titre($langs->trans("DynamicPriceConfiguration"));
 $form = new Form($db);
 
+print $langs->trans("DynamicPriceDesc").'<br>';
+print '<br>';
+
 //Global variables table
 if ($action != 'create_updater' && $action != 'edit_updater') {
     print $langs->trans("GlobalVariables");
     print '<table summary="listofattributes" class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Code").'</td>';
+    print '<td>'.$langs->trans("Variable").'</td>';
     print '<td>'.$langs->trans("Description").'</td>';
     print '<td>'.$langs->trans("Value").'</td>';
     print '<td width="80">&nbsp;</td>'; //Space for buttons
@@ -184,7 +187,7 @@ if ($action == 'create_variable' || $action == 'edit_variable') {
     print '<br><table summary="listofattributes" class="border centpercent">';
     //Code
     print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Code").'</td>';
+    print '<td class="fieldrequired">'.$langs->trans("Variable").'</td>';
     print '<td class="valeur"><input type="text" name="code" size="20" value="'.(empty($price_globals->code)?'':$price_globals->code).'"></td>';
     print '</tr>';
     //Description
@@ -205,7 +208,7 @@ if ($action == 'create_variable' || $action == 'edit_variable') {
     print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
     print '</div>';
     print '</form>';
-} else {
+} else if ($action != 'create_updater') {
     //Action Buttons
     print '<div class="tabsAction">';
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("Add").'</a>';
@@ -219,7 +222,7 @@ if ($action != 'create_variable' && $action != 'edit_variable') {
     print $langs->trans("GlobalVariableUpdaters");
     print '<table summary="listofattributes" class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Code").'</td>';
+    print '<td>'.$langs->trans("VariableToUpdate").'</td>';
     print '<td>'.$langs->trans("Description").'</td>';
     print '<td>'.$langs->trans("Type").'</td>';
     print '<td>'.$langs->trans("Parameters").'</td>';
@@ -264,7 +267,7 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
     print '<br><table summary="listofattributes" class="border centpercent">';
     //Code
     print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Code").'</td><td>';
+    print '<td class="fieldrequired">'.$langs->trans("VariableToUpdate").'</td><td>';
     $globals_list = array();
     foreach ($price_globals->listGlobalVariables() as $entry) {
         $globals_list[$entry->id]=$entry->code;

From ecc338b1eb8048869aba9223f9db704c4421cfc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Feb 2016 03:25:20 +0100
Subject: [PATCH 149/421] Clean module

---
 htdocs/admin/multicurrency.php                 | 11 +++++++----
 htdocs/core/modules/modMultiCurrency.class.php |  8 +++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index b5485392816..c721f63a050 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -85,7 +85,7 @@ if ($action == 'add_currency')
 
 	if ($currency->create($user) > 0)
 	{
-		if ($currency->addRate($rate)) setEventMessages($langs->trans('SuccessAddRate'), array());
+		if ($currency->addRate($rate)) setEventMessages($langs->trans('RecordSaved'), array());
 		else setEventMessages($langs->trans('ErrorAddRateFail'), array(), 'errors');
 	}
 	else setEventMessages($langs->trans('ErrorAddCurrencyFail'), array());
@@ -112,7 +112,7 @@ elseif ($action == 'update_currency')
 		
 		if ($currency->fetch($fk_multicurrency) > 0)
 		{
-			if ($currency->delete() > 0) setEventMessages($langs->trans('SuccessDeleteCurrency'), array());
+			if ($currency->delete() > 0) setEventMessages($langs->trans('RecordDeleted'), array());
 			else setEventMessages($langs->trans('ErrorDeleteCurrencyFail'), array(), 'errors');
 		}
 	}
@@ -131,10 +131,13 @@ if ($resql)
 	}
 }
 
+
 /*
  * View
  */
-$page_name = "multicurrency";
+
+$page_name = "MultiCurrency";
+
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
@@ -147,7 +150,7 @@ $head = multicurrencyAdminPrepareHead();
 dol_fiche_head(
     $head,
     'settings',
-    $langs->trans("Module500000Name"),
+    $langs->trans("ModuleSetup"),
     0,
     "multicurrency"
 );
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 6642e33719f..48ce8bc3bc0 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -46,7 +46,7 @@ class modMultiCurrency extends DolibarrModules
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
+		$this->numero = 40000;
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'multicurrency';
 
@@ -54,14 +54,12 @@ class modMultiCurrency extends DolibarrModules
 		// It is used to group modules in module setup page
 		$this->family = "financial";
 		// Module position in the family
-		$this->module_position = 500;
-		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-		$this->familyinfo = array('financial' => array('position'=>'009', 'label'=>$langs->trans("ModuleFamilyFinancial")));
+		$this->module_position = 555;
 
 		// 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));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Description of module MyModule";
+		$this->description = "Module to enter elements with a foreign currency";
 		
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
 		$this->version = 'development';

From cd3a531449cc0edff4db3192b9104c8d407aa4a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Feb 2016 03:33:41 +0100
Subject: [PATCH 150/421] Debug multicurrency

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 82697c331a2..668855672a5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3772,14 +3772,14 @@ class Form
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
             print '<tr><td>';
-            print '<input type="text" name="'.$htmlname.'" value="'.(!empty($rate) ? $rate : 1).'" size="10" />';
+            print '<input type="text" name="'.$htmlname.'" value="'.(!empty($rate) ? price($rate) : 1).'" size="10" />';
             print '</td>';
             print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
             print '</tr></table></form>';
         }
         else
         {
-        	print !empty($rate) ? $rate : 1;
+        	print !empty($rate) ? price(price2num($rate), 1, $langs) : 1;
         }
     }
 

From 298be09ee25071188526bd8f61abc57693221ab6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Feb 2016 03:38:56 +0100
Subject: [PATCH 151/421] Uniformize behaviour by adding the back to list on
 thirdparty card

---
 htdocs/societe/soc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 8852f22686f..1d269753536 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -108,7 +108,7 @@ if (empty($reshook))
             exit;
         }    
     }
-    
+
 	if ($action == 'confirm_merge' && $confirm == 'yes')
 	{
 		$object->fetch($socid);
@@ -1921,8 +1921,9 @@ else
 
         dol_htmloutput_errors($error,$errors);
 
+        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
         
-        dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
+        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
         
         
         print '<div class="fichecenter">';

From 5e608c9ab461f21e48ea2119fbd2aae96b74c9be Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 13 Feb 2016 06:58:46 +0100
Subject: [PATCH 152/421] Move files from common directory to each template

---
 .../{common => eldy/img}/weather/index.html      |   0
 .../img}/weather/weather-clear-night.png         | Bin
 .../img}/weather/weather-clear.png               | Bin
 .../img}/weather/weather-clouds-night.png        | Bin
 .../img}/weather/weather-clouds.png              | Bin
 .../img}/weather/weather-few-clouds-night.png    | Bin
 .../img}/weather/weather-few-clouds.png          | Bin
 .../img}/weather/weather-freezing-rain.png       | Bin
 .../img}/weather/weather-hail.png                | Bin
 .../img}/weather/weather-many-clouds.png         | Bin
 .../img}/weather/weather-mist.png                | Bin
 .../img}/weather/weather-showers-day.png         | Bin
 .../img}/weather/weather-showers-night.png       | Bin
 .../weather/weather-showers-scattered-day.png    | Bin
 .../weather/weather-showers-scattered-night.png  | Bin
 .../img}/weather/weather-showers-scattered.png   | Bin
 .../img}/weather/weather-showers.png             | Bin
 .../img}/weather/weather-snow-rain.png           | Bin
 .../img}/weather/weather-snow-scattered-day.png  | Bin
 .../weather/weather-snow-scattered-night.png     | Bin
 .../img}/weather/weather-snow-scattered.png      | Bin
 .../img}/weather/weather-snow.png                | Bin
 .../img}/weather/weather-storm-day.png           | Bin
 .../img}/weather/weather-storm-night.png         | Bin
 .../img}/weather/weather-storm.png               | Bin
 htdocs/theme/md/img/weather/index.html           |   0
 .../theme/md/img/weather/weather-clear-night.png | Bin 0 -> 2433 bytes
 htdocs/theme/md/img/weather/weather-clear.png    | Bin 0 -> 7724 bytes
 .../md/img/weather/weather-clouds-night.png      | Bin 0 -> 4481 bytes
 htdocs/theme/md/img/weather/weather-clouds.png   | Bin 0 -> 6414 bytes
 .../md/img/weather/weather-few-clouds-night.png  | Bin 0 -> 2328 bytes
 .../theme/md/img/weather/weather-few-clouds.png  | Bin 0 -> 5858 bytes
 .../md/img/weather/weather-freezing-rain.png     | Bin 0 -> 5360 bytes
 htdocs/theme/md/img/weather/weather-hail.png     | Bin 0 -> 5421 bytes
 .../theme/md/img/weather/weather-many-clouds.png | Bin 0 -> 4502 bytes
 htdocs/theme/md/img/weather/weather-mist.png     | Bin 0 -> 1617 bytes
 .../theme/md/img/weather/weather-showers-day.png | Bin 0 -> 7300 bytes
 .../md/img/weather/weather-showers-night.png     | Bin 0 -> 6327 bytes
 .../weather/weather-showers-scattered-day.png    | Bin 0 -> 6533 bytes
 .../weather/weather-showers-scattered-night.png  | Bin 0 -> 5322 bytes
 .../md/img/weather/weather-showers-scattered.png | Bin 0 -> 5210 bytes
 htdocs/theme/md/img/weather/weather-showers.png  | Bin 0 -> 5373 bytes
 .../theme/md/img/weather/weather-snow-rain.png   | Bin 0 -> 5857 bytes
 .../img/weather/weather-snow-scattered-day.png   | Bin 0 -> 7257 bytes
 .../img/weather/weather-snow-scattered-night.png | Bin 0 -> 5912 bytes
 .../md/img/weather/weather-snow-scattered.png    | Bin 0 -> 5336 bytes
 htdocs/theme/md/img/weather/weather-snow.png     | Bin 0 -> 5691 bytes
 .../theme/md/img/weather/weather-storm-day.png   | Bin 0 -> 7792 bytes
 .../theme/md/img/weather/weather-storm-night.png | Bin 0 -> 7772 bytes
 htdocs/theme/md/img/weather/weather-storm.png    | Bin 0 -> 7563 bytes
 50 files changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/theme/{common => eldy/img}/weather/index.html (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-clear-night.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-clear.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-clouds-night.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-clouds.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-few-clouds-night.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-few-clouds.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-freezing-rain.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-hail.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-many-clouds.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-mist.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-showers-day.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-showers-night.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-showers-scattered-day.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-showers-scattered-night.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-showers-scattered.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-showers.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-snow-rain.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-snow-scattered-day.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-snow-scattered-night.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-snow-scattered.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-snow.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-storm-day.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-storm-night.png (100%)
 rename htdocs/theme/{common => eldy/img}/weather/weather-storm.png (100%)
 create mode 100644 htdocs/theme/md/img/weather/index.html
 create mode 100644 htdocs/theme/md/img/weather/weather-clear-night.png
 create mode 100644 htdocs/theme/md/img/weather/weather-clear.png
 create mode 100644 htdocs/theme/md/img/weather/weather-clouds-night.png
 create mode 100644 htdocs/theme/md/img/weather/weather-clouds.png
 create mode 100644 htdocs/theme/md/img/weather/weather-few-clouds-night.png
 create mode 100644 htdocs/theme/md/img/weather/weather-few-clouds.png
 create mode 100644 htdocs/theme/md/img/weather/weather-freezing-rain.png
 create mode 100644 htdocs/theme/md/img/weather/weather-hail.png
 create mode 100644 htdocs/theme/md/img/weather/weather-many-clouds.png
 create mode 100644 htdocs/theme/md/img/weather/weather-mist.png
 create mode 100644 htdocs/theme/md/img/weather/weather-showers-day.png
 create mode 100644 htdocs/theme/md/img/weather/weather-showers-night.png
 create mode 100644 htdocs/theme/md/img/weather/weather-showers-scattered-day.png
 create mode 100644 htdocs/theme/md/img/weather/weather-showers-scattered-night.png
 create mode 100644 htdocs/theme/md/img/weather/weather-showers-scattered.png
 create mode 100644 htdocs/theme/md/img/weather/weather-showers.png
 create mode 100644 htdocs/theme/md/img/weather/weather-snow-rain.png
 create mode 100644 htdocs/theme/md/img/weather/weather-snow-scattered-day.png
 create mode 100644 htdocs/theme/md/img/weather/weather-snow-scattered-night.png
 create mode 100644 htdocs/theme/md/img/weather/weather-snow-scattered.png
 create mode 100644 htdocs/theme/md/img/weather/weather-snow.png
 create mode 100644 htdocs/theme/md/img/weather/weather-storm-day.png
 create mode 100644 htdocs/theme/md/img/weather/weather-storm-night.png
 create mode 100644 htdocs/theme/md/img/weather/weather-storm.png

diff --git a/htdocs/theme/common/weather/index.html b/htdocs/theme/eldy/img/weather/index.html
similarity index 100%
rename from htdocs/theme/common/weather/index.html
rename to htdocs/theme/eldy/img/weather/index.html
diff --git a/htdocs/theme/common/weather/weather-clear-night.png b/htdocs/theme/eldy/img/weather/weather-clear-night.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-clear-night.png
rename to htdocs/theme/eldy/img/weather/weather-clear-night.png
diff --git a/htdocs/theme/common/weather/weather-clear.png b/htdocs/theme/eldy/img/weather/weather-clear.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-clear.png
rename to htdocs/theme/eldy/img/weather/weather-clear.png
diff --git a/htdocs/theme/common/weather/weather-clouds-night.png b/htdocs/theme/eldy/img/weather/weather-clouds-night.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-clouds-night.png
rename to htdocs/theme/eldy/img/weather/weather-clouds-night.png
diff --git a/htdocs/theme/common/weather/weather-clouds.png b/htdocs/theme/eldy/img/weather/weather-clouds.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-clouds.png
rename to htdocs/theme/eldy/img/weather/weather-clouds.png
diff --git a/htdocs/theme/common/weather/weather-few-clouds-night.png b/htdocs/theme/eldy/img/weather/weather-few-clouds-night.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-few-clouds-night.png
rename to htdocs/theme/eldy/img/weather/weather-few-clouds-night.png
diff --git a/htdocs/theme/common/weather/weather-few-clouds.png b/htdocs/theme/eldy/img/weather/weather-few-clouds.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-few-clouds.png
rename to htdocs/theme/eldy/img/weather/weather-few-clouds.png
diff --git a/htdocs/theme/common/weather/weather-freezing-rain.png b/htdocs/theme/eldy/img/weather/weather-freezing-rain.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-freezing-rain.png
rename to htdocs/theme/eldy/img/weather/weather-freezing-rain.png
diff --git a/htdocs/theme/common/weather/weather-hail.png b/htdocs/theme/eldy/img/weather/weather-hail.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-hail.png
rename to htdocs/theme/eldy/img/weather/weather-hail.png
diff --git a/htdocs/theme/common/weather/weather-many-clouds.png b/htdocs/theme/eldy/img/weather/weather-many-clouds.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-many-clouds.png
rename to htdocs/theme/eldy/img/weather/weather-many-clouds.png
diff --git a/htdocs/theme/common/weather/weather-mist.png b/htdocs/theme/eldy/img/weather/weather-mist.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-mist.png
rename to htdocs/theme/eldy/img/weather/weather-mist.png
diff --git a/htdocs/theme/common/weather/weather-showers-day.png b/htdocs/theme/eldy/img/weather/weather-showers-day.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-showers-day.png
rename to htdocs/theme/eldy/img/weather/weather-showers-day.png
diff --git a/htdocs/theme/common/weather/weather-showers-night.png b/htdocs/theme/eldy/img/weather/weather-showers-night.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-showers-night.png
rename to htdocs/theme/eldy/img/weather/weather-showers-night.png
diff --git a/htdocs/theme/common/weather/weather-showers-scattered-day.png b/htdocs/theme/eldy/img/weather/weather-showers-scattered-day.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-showers-scattered-day.png
rename to htdocs/theme/eldy/img/weather/weather-showers-scattered-day.png
diff --git a/htdocs/theme/common/weather/weather-showers-scattered-night.png b/htdocs/theme/eldy/img/weather/weather-showers-scattered-night.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-showers-scattered-night.png
rename to htdocs/theme/eldy/img/weather/weather-showers-scattered-night.png
diff --git a/htdocs/theme/common/weather/weather-showers-scattered.png b/htdocs/theme/eldy/img/weather/weather-showers-scattered.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-showers-scattered.png
rename to htdocs/theme/eldy/img/weather/weather-showers-scattered.png
diff --git a/htdocs/theme/common/weather/weather-showers.png b/htdocs/theme/eldy/img/weather/weather-showers.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-showers.png
rename to htdocs/theme/eldy/img/weather/weather-showers.png
diff --git a/htdocs/theme/common/weather/weather-snow-rain.png b/htdocs/theme/eldy/img/weather/weather-snow-rain.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-snow-rain.png
rename to htdocs/theme/eldy/img/weather/weather-snow-rain.png
diff --git a/htdocs/theme/common/weather/weather-snow-scattered-day.png b/htdocs/theme/eldy/img/weather/weather-snow-scattered-day.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-snow-scattered-day.png
rename to htdocs/theme/eldy/img/weather/weather-snow-scattered-day.png
diff --git a/htdocs/theme/common/weather/weather-snow-scattered-night.png b/htdocs/theme/eldy/img/weather/weather-snow-scattered-night.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-snow-scattered-night.png
rename to htdocs/theme/eldy/img/weather/weather-snow-scattered-night.png
diff --git a/htdocs/theme/common/weather/weather-snow-scattered.png b/htdocs/theme/eldy/img/weather/weather-snow-scattered.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-snow-scattered.png
rename to htdocs/theme/eldy/img/weather/weather-snow-scattered.png
diff --git a/htdocs/theme/common/weather/weather-snow.png b/htdocs/theme/eldy/img/weather/weather-snow.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-snow.png
rename to htdocs/theme/eldy/img/weather/weather-snow.png
diff --git a/htdocs/theme/common/weather/weather-storm-day.png b/htdocs/theme/eldy/img/weather/weather-storm-day.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-storm-day.png
rename to htdocs/theme/eldy/img/weather/weather-storm-day.png
diff --git a/htdocs/theme/common/weather/weather-storm-night.png b/htdocs/theme/eldy/img/weather/weather-storm-night.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-storm-night.png
rename to htdocs/theme/eldy/img/weather/weather-storm-night.png
diff --git a/htdocs/theme/common/weather/weather-storm.png b/htdocs/theme/eldy/img/weather/weather-storm.png
similarity index 100%
rename from htdocs/theme/common/weather/weather-storm.png
rename to htdocs/theme/eldy/img/weather/weather-storm.png
diff --git a/htdocs/theme/md/img/weather/index.html b/htdocs/theme/md/img/weather/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/md/img/weather/weather-clear-night.png b/htdocs/theme/md/img/weather/weather-clear-night.png
new file mode 100644
index 0000000000000000000000000000000000000000..9407b2b4f012de17999fb3695ddc14fb5787289e
GIT binary patch
literal 2433
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-clear.png b/htdocs/theme/md/img/weather/weather-clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b5c71297be93d30ea29eadc000fd86d8df8b06d
GIT binary patch
literal 7724
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-clouds-night.png b/htdocs/theme/md/img/weather/weather-clouds-night.png
new file mode 100644
index 0000000000000000000000000000000000000000..85dc1b8db34ed3637e89cebc59c063c1b6bb6983
GIT binary patch
literal 4481
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
TKQhBC00000NkvXXu0mjfwqlP`

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-clouds.png b/htdocs/theme/md/img/weather/weather-clouds.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9156874f0b89d437da73f3b746cc3b24adb55dd
GIT binary patch
literal 6414
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-few-clouds-night.png b/htdocs/theme/md/img/weather/weather-few-clouds-night.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bf2322a35b7a183d45674e33f4ee95d1a8e96d7
GIT binary patch
literal 2328
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-few-clouds.png b/htdocs/theme/md/img/weather/weather-few-clouds.png
new file mode 100644
index 0000000000000000000000000000000000000000..2818985f4779629bbe1860f15512b771351a3898
GIT binary patch
literal 5858
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-freezing-rain.png b/htdocs/theme/md/img/weather/weather-freezing-rain.png
new file mode 100644
index 0000000000000000000000000000000000000000..87eceb70117cc3270818f728d031bc403a3f72a1
GIT binary patch
literal 5360
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
O0000<MNUMnLSTYb6e2YM

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-hail.png b/htdocs/theme/md/img/weather/weather-hail.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3529c231f74f12d7577faaf2c203f5e83f20bea
GIT binary patch
literal 5421
zcmV+|71HX7P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#32;bRa{vGvuK)lWuK`{fksJU300(qQO+^RT3IYx<48t_Nga7~l24YJ`L;(K)
z{{a7>y{D4^02HlBL_t(|+U=SNbQNWm$E)h?dCAL5LPA19AYqLNDu@UwGU^;fP`lmG
z)1xpwwjMWJM$mC<x8tBa?xU!u-HvDUxS+HO?uv{G3J5MBi);yD3)$DVRMq_MS5-ZU
z6Ec8;(+(e0YWtRZ|9AiDX$RZEcCa062iw7RupMj%+yB$1|J)P)@sEGh;_<i<4u=Dg
zNW@=TTbpcYX-V_k{#62S+ikaL!C=rRE-nu1x)$V7ps28@tgO8Jq-aJ)`Py~sUS7F!
z<(HL}l})o|&9Z(q09<$7by~lE{fuZd8t&b@cmLtT5B*2OF#4Nm(-(_njYHgV&9-&R
zvUi~c&n*7p%g0(<TXv2dIno?6W=!X)>~0Cu^<NYKXt%rcS+{PTzI^#|zo>OnQ<D{o
z#Ug=#zi2@DfZt?iXP?7$1<V@hbXw=S^V~MfbkyvseZG22)t_^6^VSX<HY^ng1Z<D_
zPUr5PdDjBUfdgRErcDNt)v#rK>(;IMs#U8pN=l0VKAI67vwHRSi-!!YI5`{&9p?}D
z%WTW`X&TI%mL3cSY}>LrQ}2Obb+mVUymi~QnTH;F=r-mxd2V$&>~79o4(71;3jpKC
zkJnB={d9juMkLtM(yB$nVJj;h4`%SdG)>*-^QFtm%8u*Tuk_!|bh?*mTCG06KZ9$(
z;qz$$zhCEGNeJfcw3${UTehXic*}GE2?c|#8#Zp3R#9=tvaGDEq|2z;`P>623dElq
z0RMO2eWz7dSB6SU%TA0$!e`Xi)o=Bqo=CDV5C{&mOcV9pwX9E3(FGkH?FEL;Kc7FA
zN+vZwO#6L4?tKbLOC-<1*)bto5Y}w~^wig%NF;)(R4NTHDf*bnWYTVHYqL8#I&4f!
z$F%HTy?R+_NH<#W^EW>>>x)KXMLF^KT~Ir$sHjL0pG>9n=9U%%25n4Xf@xV{pW)YO
zB2_gQqQx);1WiDIQK3@-;7OgyJbxnZ6DA4*!-1VUciQXMuTL{aEEEd$0_aF-zkdBO
zua#9*TfPT~wi8Y`!OF?WQDgTT00BH!W@hHlKrk=_I{h#Q@o8I_NT*Fbkxc2jVMOU>
zYr3IXiXl{+_o;MRLz)^*LZKE4hwOkqpxdtcbC&-u7@QgCGmJiUb#*7kva-gO6c@K=
z$Kyw18s&ly0tn{i<!y;)#~<IgY2#m>fByL`YuBz#KKkgR_I`^3t5>g%W<(-aWo2dF
z!M&mE7)sjP+wGRtRweBqCJ_n+HN)`f0Hc@|)#cF96s7(|2Q4!*s$n)tSbzujG|K^t
zhROJt&Z-8iOkT!K$5iyr&R85BM5H<riKUx2ZTeI7)~)}Uo15Eo>Zzyp1cJS<AyiC2
zq$T#KRM?v!917|(u`o(}=b53~u6oND%vi^e6$5CIh8m*<AsfFST{SSXQ>mm5Sa7I2
zroa+_S;~z9#WM}&*JTY(YI&Xq@d0B84<7tfJSToTz|TP-ZGddiZ2X7~4fd{GyR<D^
zwiuX{&}`yZ&C=3Ri}9T!N6!F2t=ZVvxH=LJ*K?mI#6ya5aA9|}O*7<@!_qAX#oqls
zo4ye4_yC+Hn&LzQh-7647~2vPNJ5d`$sg#7X$3lr2LYQV4%5>GNubcOL~cPr?;9KH
z>uUgDr8rK`R!vQfuc4tKN{SuH&W;TU2IEoIY-nn1So!U@jhpc=E#>9qY4Q{0NP7ez
z8qKh4YFZnGM<K{>_%)ai0ug_L&=o-Pz>8lHTZU)Ak*@TEak>G3qXAwtkUplaL@7Y&
znz#w%qF&JOC-hSsd!bX*K+)=fU~u4103w;syuT$c$rfM$A<Q)8MTLbYn3fr)Pa%^i
zyDKd0y|uZy<t=>7OH003v|{v_vF-n>4_LZ%X#nPqEH5j2$LBM$!jTMJ#N^n!X`{lf
z<I_a-QN5I?KT<VqksKg!I2yyXFyJ^q%Z&zHClV>8L82}+VV(D;n%9#LbI5z85r#L9
z%mFQ|C1JA_Fe6;)n599kp|ghGjV~|}-iB|!`DW6}RjVp@?ARfZ#Fm<+yXKoQW4c~h
zS=~+;tO$le6+(b8&6<i3fZ#0BQMl-0;C`gaGo&8YAx{zgR~7CO`Wz6LS5FgG0Yklm
zA>~|QMy+GI`2*u+O*G1{&Mf7avBJd=i{uq?89Gu)Xaqz7ntKib%QQrGfaWK>Zi9~&
z9B9DD5b6)}lTSXe{|5k5r~Y1RY^noP^9R!0kt|q*<Q)yw>EHsO7O<2_InR+is|zlQ
z2pAEGdErhGhsmfhiDZI%b*;`wPdQRkou!|t#=)R#Rvw^T>k=M%>8nH^XPoyBP=s#F
zi7KIZJp1_K;*!()_U${dv~OueZeH%@0Rslq{ul(`lTSXW4JaQZYO<@ozV>4hm7T~T
z2gq{`6&9StC+(=cA`G9+V}*rc(lZm@yNto8FlKSjvt%OW^f8r5sP}Yt4_l_`Bz>PU
z1=Za59&ny!d26{*$eYJgK^F|$52@LJSwh$yN!6N%1AQOIoS?4xZvf=a!i5XPiHXlj
z;a!_K+IQ@%X{Ig+GdPDZqofESj&uy&3x^7bXf#tNnZh&zVxM|zTdTt`0HFGeO{%_(
za{&}d8=kZ|oNI_vzJ&J*6fcLcL{m5b&;vvI!=wU0)YC!G?&1vKhXXK_8Ih`xYR@5r
zHh%i)r<&JP-AY)|ArQMtW|kE9xh5+X`wfHwuw@7%0HB}^N5Uc<SAw>(ZIUQOJmZz7
z1cD*WCm=L8+io@}o?9^qgVY61gu$#7qaL-IXKow-<w@2B+VL4Y>yqq5!Vz6e4W@Jj
zuwy!&@8M7|$~bvZTv%8*mRzDr9Ay^(7_2g|jzqf#fqhua9}0&2n1Pa@lL9EUbiBLn
zI5ytP;vzLw7l>VYL<V?IoK_AJEpiES3|mqF#jL9lj8W3|&_G9AyLO8!_n@ig9$*Lp
z%}D7uW587aiKsctJLO<I0cT5bdooV(_09k&uJ8l$R@SIz`{qReu{shRT02a!ph!+7
zIwC#KQ3XA96^&3T%A9VJ!*eA?7WA$?byvjWXOvbrSP2MD2!sG9GKlGLW=_Whl-)b{
z!J-Sa3kKs89ZtAs4nlH3Xmk(9yu1dWIb@h3^sYW&!GZ-^|Ni}L_Vp~XsM@^T+*6n=
zPX;3?WqY3OdX3sZc7D`*&ui0^t+JA`agr4A1CA6$nvSh{{zF$z&2^?YR$<(+Zvhpp
zOeSH}9jBb6n{SYED?mME5MJHA2PLGG8k=<d5YN3Pp_D#z^79Mozxd({*96=)efo4c
znGZhr;O6}NUNf^}+0&UklV?RpyV!s#1}kmAICKHUG)#rE*DTjlD-A&s(jW7L7{`WF
zQtnwn&95>+o&!Pv)ARcjaZ36CC`>En9pBL@G-`6K_8<f-=bpjzQ})hSRmO8|%Xn%L
z5t^&1inIs?UKBI%d1k;x*M?17M1=M1;?CW;apOGBD*z&klzE^J6tHL60O{gxy-*2J
zp0h)Wx=0`OOfqLuu9ZZX!l@-XWsas|+E$XI3Urybgz(O0qMV4Q-aPjbwJx62(=N`k
zF5Mg%>Fzt6c8t5_6k5%nefF8{>t-)d`{08Qtf51PCfK`c!47Nla&jsNbEBcb=Vfr7
zv*XNyAP?F$L_?bAc|A~^vu8#C#9pF0Fe3p$5#}XS&CShRt1!vA>$W0ublDp6(rTV7
zsk`fPt$H|N+A$xme*gg<$|i_jSXi);LaW}d?WP@b%rW-3apO#ErG?!Y=Cpimt*y51
z#B8bbkW@(R71TF0=#7m{T5e7b(IMbKZY!swa)2ZUK+-p;Y@Mbw0{UG0c9>`TT!}bD
z)Q~co!z+<pdw0wW-{NVKVi53c0ol#Yq*Qi7Cui{~1{&t?v@Mq%i(SEeV8n<KclKB;
zvkeYojXpA>p$xi#?CTWq3rMFK^{mHK#7hmXtlHuOEWNgNmsVe2?@3zDj_s$NG&$fz
z4Ld-EsqC8f@|<g%CS!HklB1eqOo}2%(&Mfh9A3i2Bd-Q<iZdAP90D<AF*7x<&ofIv
z!@N{qqF#c+ZhDUZxLKl(AMmv_H)q6ia{97FoNcluoM3Y_GwRRI%DSPgz3un$c#eQ2
z;nGW&orK16gOwZeA=WlJ0i>RD<*74v>#4O3p+8D~8~`|!s(a2)LBYubfWOQyeUvtE
zt)hook9(Qd=2<!?Cw}!F?;TB;FhS$1j!ssnA9mPb_D3Imq@hAO&SW4H&w`jyOq|Dr
z;v~bGlYe^uEpE|KMF8Sfu?b@rI*l+LL{w7o2@AqRn(GGFbd(ZsA7K6@%!i~T<%lp|
z^#`mDQ6>i@qk~fm{c|h_ouJ^r+2p>BaVzj=o6+7+@i+5+@~4)YZ@$?mC@9FF*oc!2
z_C^bG*oo=GwGdqj!D5`>K}0JxMk(Okjhfeexn#*ScA;A7mk%M?INWPXN=il%dENu$
zM<I4QYMjC^4CG7FKSS_BHb`Fy(3oce?E%(Rq51pozkisIH_wTr>DR)XDY|7sON4bZ
z=pz86Y0ap9HAPW^HB!u%_Wx7>?z-zP>zs4WY5DNO4?7-s;DO&Ab<|PWbLPyMMb2Gu
z(n%*>!ud_^=VRX%+H%wA(W47d$3loIp(vTVnkM?o_lX5;zZX%LR4rb-IDPH4*N%tL
zb$~f|)TmJ>Kyc*SZ@;~#qM{=C+H0?ckYY1?fZ6N|CSY_Sj(R!Y6SOCuctX*2$|<J^
zFuM2xZzGrW?PbfB*{{6v%HA<KZQ8UxFTM2AADFzj2Tho?X3ZKKf@G0vX3w5|`L=D_
zO!!-H`|Y;}q|eNmGe=R1Zim4&ci(+?(eCDY<dH{a5svNc+qdt!@x~j60o1*(zyA8f
zd+)thy@wG$3ESBK@zmpwKmG^4YK3+;7uu8g^wUq@&m8Z)^UgbG|M>l$Xn=9rX{XJ_
z%a2BNmUDk3hqAXpg9aH$JVtCyBe_bX-9gD2K#kW`RaJeqWXTc>kG}YgH{M7|e;8QC
z(bo;-=_ymD#F1z@s=4{qS6{6KEVUq#EaEo?5*1>YN8LpiU39%Dibs&B?$uXc{VHp}
z$0xhq%%9vH@fTir;dRh{4c{9?6OO<2)?2^2<BmHv><s`Kn<YNk^hBZtx1JP?f1(|G
z?6EU>-^ADB={MYP!!WMHe8}*29A<YjodV<BbI&d0cnL>38rxkvaNxkR(6sgP?%j9a
zodEzFHgDd%1Z~*X9ZfKv$v)q5%%co*xrQyThq~*B36;XU_a!Tc-zemAuK=*-&Yk;P
z_TSIIrv4)LE&zF`*Ub=8io+2byB^7$$tG)hPe2_qWXLgS(6JC`Aej+;`t+I1W5vX?
z&px}8<94s_@ZrO?GtM}plzKjfR;;?^mRl?wX#rc`WjYN<d(`gMK?`S-)J;N5^D)tR
zS6p$$lD#zn?cs+Xt`yUBZ#^_ENhUZ{`U+ufD(viG!@*TUl!U7oo<4yWNBZ5jv17-^
zjz9kRw*ajKtvFF~w9h~PeB;+&e|;qyH|DFazPe*~W1o8JsU^=n_uSya4?jE~;cODq
z>sk))V?!f4s24WFKpz~|*QCt1zWCycJNI-vK4UxTxE3GLL<E?PL!0}<4?mdQ?Oen7
z5op`*sO3|b;d880<9?4^k)NL*;eBty=xS=1ZUul~1mHTQy+3Eewsh1u#NqdzO`JGU
zJM+vl)iqKpxap>wD)87DKOQTovz$?7qlYDY_uY5jBZNPbh+re}rG(Ke?<KZBg8l!N
z>gwuxLR<O1@bHuJ0904!NO}d@#TQ?k1prsWROQh}9~~olJcx#v#PBDty6UPcAA0B^
z)$g8r?iq&%zZBbj46weMI(6#M6)RS3fWc<$RY$Wjhz#v$hU5U3q2`99viN{egw(V6
zQ2MNEhLuF7xuohH0JP(P0zeoVPW*ip=T-COn{Q5@F=Ivpns6klcq<X3hOBO_WNI*P
z;2izl))XHvb)45lha7UqKj4%Ck3II-Aix+2gVk@n_153DwzdvD?zrRb!?FJP^2;w@
zK!PJX&Z?qhE)9kw9u16bAmmPEJsU@Di$(y-E}n1Q?*JgBvteSe1O$F!Gmi6o?DHFr
zXCQJtOn=O;$Zo@FeMwb$A6cT3KGL$u+-76%2{t6^CQqI`1xG4{OYsp$9C0BGwE)r(
ze8f0@KrtJT=Cf5di7^_v#Sbtyr!yUIzx}o;XA-NaXwx%<&!*wDOE0~&YQF*iaWBK{
zStLF?UwGk#&*a(t_upTOcfJHEYS^uOk2{svo`sW&o`3%NZ8$GQEQ!q$G-WBrXp*7p
zk+x4t;Egmw?d#lEVOpQ_U9X*SQ}{{VsieJ`XxcnHdAE)hO&mfht+RGEAV{nSfc@Wm
zJ^j+`l1nb>J8#~+#YlU{qD70Y#4r4~uYqPvBLd80XZl~b59});=bd+6FY1whd->&;
zFLP=7<r{_4S(t(;zXw7i7Gb035|jUQ=bd+s>gLyKzrIG+RYsDsf}hIPQAlkB1PimV
zIhrVz0AbG?X>$SgKOXh=|4o5_56GP~Y0?O)xh9e)8|P+Y+cqXKdoQL5&YwSjlV}p5
z@u8oSK11udh4_{C$)uB$@#q=*vH&@K9e!XVSz9|HO&+OmCLdt;bPhslgrm2!rIso^
zP{Ir0nC3~1FUWIVM3{>1t}}_wA@9Hc{u|W#H+N&xI{x4a{6Pm^-lpF=ynET+5JOEr
znQ^n2r{4kLp71mtHMPm1)h377E{V!nJxKaL=%c_QCJ*UO+bDepU2wq#6G)-6wO_vV
zoCnBOl4M})^-0R9)Rv0R?xFuj6dhBr^ED(m-Nj&wynUS<+TTbEli<7|8o)M|&92Kr
za`I>o{dIPCdT|c!%VL*Zc3FS+4o@cQ`#<I7BNQqp@!@nLxq8O_T7=9s&Nh235ke}y
zdk?G$^xWD>Tt3*}L=Yh&RFIj}15)hdA4mXv9KU$OdA3kkEhRLr!O{LJn=5SxYVH35
X>>>ee_X$r`00000NkvXXu0mjf%OhY5

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-many-clouds.png b/htdocs/theme/md/img/weather/weather-many-clouds.png
new file mode 100644
index 0000000000000000000000000000000000000000..53e1db6fb323d2b42bdf4dc321be165e2efe87b5
GIT binary patch
literal 4502
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-mist.png b/htdocs/theme/md/img/weather/weather-mist.png
new file mode 100644
index 0000000000000000000000000000000000000000..5428e1159568f142ecd4a7d599b310899d14a603
GIT binary patch
literal 1617
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
P00000NkvXXu0mjfPCfE8

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-showers-day.png b/htdocs/theme/md/img/weather/weather-showers-day.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c53bf3e1b1988afbbc6021643f83747b27fa730
GIT binary patch
literal 7300
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-showers-night.png b/htdocs/theme/md/img/weather/weather-showers-night.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a794fbc48207cf6b9cddbc749c19a1791e74a34
GIT binary patch
literal 6327
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-showers-scattered-day.png b/htdocs/theme/md/img/weather/weather-showers-scattered-day.png
new file mode 100644
index 0000000000000000000000000000000000000000..96a574f6805096bbdbb723bf5025c3fc0453ed41
GIT binary patch
literal 6533
zcmV;08G7c4P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02{9W02{9XUK)`c00007bV*G`2iOV&
z5ga2kNM^+V02u{IL_t(|+U0r+kR8`?UH6?kGw=W1FBXekVgW9=OZ-8CAVms<AdwPj
zN>)f&PD+eamaU3nyAmp~5{F78m(5t^k}Ks@CAM6Sos=xevSQ0DP>3jr1yM9W68wMg
zA;86FvA|;gZ{NQ6=FR8cbl*2`K_Vc*L?lErO<dl2Gd*{1pYA^07bLt}MeEmGe~HF3
zyM)%4);n<m5dI%Uyz2~qrW=7};Wc}E-z^r@lS!C+{eJcH08tH`!9mdP834TSDx2rf
z>vZ)!?OkT1656gwu#Dk*hXl`6Z>>}SE+W7`7yuR*0kwYPkacA)r621;p%MxB!X{x1
zwiJP~<cJW2esKpvq0iO_H)6U|WrWLX{R0BvD_;TKsDZ1$xBAlG4x}Af>+K*4?J!Iw
z^p^opNe5H)q>};-4aWwR6w0Rv$<O2(9#kQg`cHR@cQpX|CpU_(eGR}-prReMtbTsC
zH21$l<5@s`V7&z8X@R=zR;3MvxkB@9%hp!4pux+l3Lu2Ks6<7B3bT-`KsF27ta0GO
zb~5k0y8!^FihBPoX_*6GWzV}h@(X%@S-@3!2}{z_I@PV^1cLHc>1w7Zu-;>Z*#iCU
z)3(<M=dvjssXmnRE_P1#VKv><&j9Kl5OJcNf%V@HUkCVOJ7n<icKhcFz-#jzcf1&Z
za#8>NZ8>!w=2g$(vi7f81)}NbbTJ1ItwgMqDM_w|$nOCitdkK8fU~q(C~uVv3Twft
z_v%QmQdVsMPbWOE!B&~|Wd+p${&W1z{p*DO@y#-{l3DvhPXxRN8kZCa@4WEGEkp<#
z4-H9}eW|ANqpO@#HwwM}@dl(D>vhyE6*hC0buOzB2eqhgKv6Fe06iLX8syTDR=!5C
z9FP?W3cE0DYH;e=D9qXdq5*UseF1I-5goWC0kw1xxvF<|tTL{rU0JC#b)f*!B{%oZ
zdHzNK*bngdknpZPpF~(v*70pxs7y+!bD`z;Y=QLY3EeS!EuLMu5|Xo2`Ijsm<~Hd_
z4EkQf_oJXA^wgpy+@efH4cE5MOGi{dP!eJDalraZ*jU}8Fghxdubxu%5gWnr(d%3p
z3Hhq-JCuUbslYA;HT~db#Jir=?|1}osG)&132^YkX}V}6US5OIs<BS!K2e8>H7QG`
zQ>f=X-OS$swYf=1SGMRdtSn4HU+wh5W)-dMwzC_PmRl5-lg1zlz+0@Vh1%&L@{iA_
zx|bGnJ^rNaCW#!I2~13!)_(UYt(C@FE*E9IqnNL()Y<t48NU!6_+T1rF8~0)oeGHY
z{0;yhAOeg23E+4ysL3szNUp-LkyV|uYd|k~xR@?$yOP2Pt^rWjRO-{Eg`>$GiNdZz
zdi70cW%B?S&<J_O3v{I<Xd2Clm!USfZ_!D;dZs)WJ!naI1%fUMyh0riUQ{`eh2rTM
zYoa)&g266u)V#Ih;YM{1q^$wn5(MuU04$AjAnY<^bO3=&K?5GUvsWqKMlqcLH@p?V
zOM>!?%33N+9}hklEDW#BZ@NcXDFGloKoJ^y5ibH)0f0i#k))9#Adczk__t5?j9AaQ
zZt^53>m`&arSp}udZzCvdZjGd%~xUjBS8>A!LpzxT<{RD2nPVDCS;X{EFSK!TDAT@
zjZwdr=Pb0Wk1N&eop^qJ)V8({W;X0bw3h(w5YQ4d5CBD7qp-bTyr?GQ73h#=-+{0a
z!2C;pzSudc_NDXbv*5raES8^vW^P_*#-0kVJ(G1P9;*n`Irsl0LJQs@dH(s2;e&fN
z`!{Vp(#ZBN^yw(-#=6soAg%{FTR(TSu^Z;Q2D6)Yqi|=*cpp%z*06YvK=8~%L;zL<
zh>=MPG^xQUQm5wu*lxc&`{J`J(|y9T!sIk4HLLnxKB`w#S76Oq5YL6v2}-_8IO**p
z!Owp7vnYhXk<z@F5^L>LDwS~^%h|iPQ2T|=e>>aRQ_Di{Vj32*x!F^=v-wJ`KYzn6
zKxYb23L27z)w;IW`vNWwRjo824b4D6L<U6kegv{CAd%`$pL=?GbmjHx1<~0oVzayh
z$DE&t<jE?eTd!+vaC1}uG9ZqcIRfF&48Z3<|9LDHi-~MDTe2)GnQ$A$(M)!I|Imgl
z#ZpJt@t61So0ytAnSz5}Ix|)Eqe^D}aC0zO1R;wS8QTD`?3U+ktCa#GP63{1TwrcC
zUej#I0E7-fsnDd3)0YGPr88Z#6Jlql$kxD`-=i%EL4(w5h<Tcj4$pT=F*Asw(LL*4
zw<k#a-<H9xTerg6wQF&4aZ!(qj0lG$olbWU02{V#-Fmm{x_yy~+@9{9Yo#r-yysH!
zj`yEE+54l3h3e4(fqgT_&W<`trR+{1V{0@L?U0X+kG(Hq>z7%;<Uh~Gc(7>Z2#5mG
z4Zuoy;FL60UupIi`*a|a&<~j?tD&Q*$NNIDuyO`K&SO_NgV*iRm+b?zUe>{>sVVsG
zcfV`-zMoM_IfxhuA&SXla(K;}HMg%?wdzB;Ty}s<U=&42k-*`K<^#4<>L1$nkETv6
z9X(V1%hPIdc3q|vft5$l`aCK00otT0*t2Xr5)ko>7wrdiD+(9@O+zqfA%Woo;55i0
zfIT0TD${sdhb;BueAgH@lTU(-js$jn$w@kvUc|IM^nno0PY1B`g=iUo;o)J}vSkZG
zEZ_OgcQBL5h;q3Mb8~Z+lyb$uz`z~d-QCw7I&|nLMZitu`7NZgg2}YiZ)>EW&;$~+
zgh61tr05>nHBy~$uZrwbX<42EE_n#^fTDwpkTKC|K#4Kg!G)oX;bzux1fV7zp+GYL
z;YmY=g4UE-g^klN2%Y*Va3&8a=nYZlhU_R&0S^}d!>XDC6seqCcxtVdaUP4Fo}MfK
zl82*Elbk$tD(N~-W^C+4C<J0xSJy{2ZrJ!m6qqMaJTf#%Y8Dxb1P<7?4J>RtMS<~{
zCgJDwZ)Dw6c~fQ~*9#)E1i}%3=AB6ZO|BC;z?k@!djO0>-x#mVwTTo^palPJ07O%C
zZ;{rLG$<9)3cMML)DSvERDM53F7*e|%aID_EuAE`1XrY00M!Y<c*_Yb@4x?kCb9DB
zp`nlU_4VzZotd2>gCUVjc9M7d$bj0J@iSwi*N%RK7AXm^&?aEQFai#BA$SN-S{s%o
z0BNxC>NVtrng%@=s2FmKo(V7^tRaFZoF}Cv;B$`!5-h<8#9&~&2(PCinwi&pnj19g
zTo&WX5f5gzNT<Rkb~<kJ7+Ar}pcBWXE>sl;4WS|*#*ajJ*R)w!QvTY6{P5_=$bGJx
zSl!*#ZNe<@16){KB%*Wm)x%fcC@GoASY&Y6cs4j_Ho>DI2?&dawAe`;0R{*IfY$B&
zMGR`j=m;HJ!vgJD;QKkCvl`t?fOLDnmJ?7cOhGE`(|QaN#@%pa*k3~{5|G1xnJ~pN
zfeMKrNUs^q9&wWMPXnrxD8d=&B;$J^y12WP`FuWMS#pHR*Z?Ohu{eZ52r3R=ujyk(
zrjoiPWSj!lVI!MOAN(LNk?JN~NG1~6mNwHA>2L(Jl9s?QL5zWqp4|_#dIeaC%}{UF
zAz9o6ZfXE*lw^wyp+5;{rXGYs?l~xxDzt70D0Hg@2IN(kY})Js!1Kk|z!;?Zbu&AH
zVT!aJ3YOX#(Q_<<i$oHWyWKrKBes+d3Pc+uXvZ~S9Y!3UAzy2ZvylO4`T<Zy&;$TB
zeV;?zpr3FP$RbdHKuaslhMQDC<25&j>5*RnH=PHxvtZL&EILkj{wd@NNacSOs@@@}
zPws*4?$eM-H%zGm&0q&H5u*9iwpv3hn*X4(Y>SMwEr{GC`1wAJR^;>#)_VGfw2)K{
z<@g?0swRbnnuL=IIiJmLErdkEMWwWE`b{m+gqQgW1K<+?Y<v)gtdB&1Y&=jOpdGqq
zK$N49^tA6a0hfy^ty>u2$1za?paDz7d?J8FX$8XCL^?w-HS;}s_6j6j&UX*AsDqAb
zq~p_bi&9Ba)JVcc1E+Ts2Amp!?dtQ0^>MJpI9TEwYPkrZy#%9k0e0=b&<7Cb`?IsN
z$5-_BET)plJnv3`AXb-<N+qxr!&>u34M7VuIUh->r6rL7Z0ROl0>R;mz%dVsjdN^N
zQKTu7;ygxEB@mGYbA|v~gMlL>g?S!FngPi31Vs2zs8k*TS)2s{4KlC>ezOMkCE}l&
zf`->Y0JxyN1(5aQ;5H^er<zM5ndk$sw`n_Yz&(pPcc>}I?csQ@(&q~ib}zI@km+@4
zX{kcqHhjwl@Zf0B8pyB&(#+o0VaWMtz%j|qo|l&SO%anYUc`1jYBTXOWTIr!6y}j2
zgB=FaC<x@chA89L(9BX=U^`@3GY^%eYbfGQgH}G!9_Ts&wmSkL68QNpaD`*4gkPV8
z+3*n%&f|^6+RUpttNw`a+%X-c79l|?Svr@*(vh@ML~|ZALk+&HR%?;8rAMJ_;x8sK
z%}%0w8d?#+#$jLy&U>a(P8aPs1g<TO;ZnrLn>X44kLDTcad=B9(0D)Y7fiWiU>FDj
z(h`=51f-d@T*sz+4A^!Eg7x%%0yyo^V;~}Peh3wZi)ww*>4Eg{Cjr%M<(cyjtZ~by
z7o`xLxYTjTstlYJGixdko@(NCCltgYvspKonw~#AGdKJ9y*)i2VulZx*%6I_QgXA>
zVt;OE(B*rQH^81mts-N9Hg(!~m5pkbKXX5wPC?W2TIYDgcC*AIPKh>9HUZ`EZvz;b
zW`Wn^RI!0YN|*Zy;-RJ1o{WZ(<p_#Y%9^a+T%Ma98$jVL>aOwJs_tXD!%mcB{i^fP
zb5~ad&NOi2(@N3@xxkJeJND`yCKJi-Y&NrjQ@v$m$Poc((jkmDhG3(h`-VNCO=w|c
z4g%~&2Fw`NE}KnG0h3}3jPX9{hm_C!US!s_rHn&gg0)PUuRjg)4FO0%#YEd~wrDVa
zT5S@wT&Fa2=QjH8VBj}y2x~JF&pdtjo1^_dePZR-eTbGy1fdM+-KO=eZ+#2a4G%}T
zTyAoDdggJe>vM=$v@BVW+}Xs0<Oe>eNVSL%MY~65!#HBtSo1s#1J>sViRaKXOSCRM
zHw_d<O2tH}+o{kto=40JF&oA@#@lUut@xWX!uIp!s9`}3ytYNro3Y(w$w`%0szk5*
z{LAWx!%@B_=K7m@#hFkA@m~!dJ9Z2f78d0A_?eDsZRtiTX&)e_zm|Ib;eo+{F8&yA
zl95liuGyqAOv0pyK-GiWV`D5Gm4Qf=3kOGo(QEoG5_D|`h;NVtc(BB6GwX6S;PM-j
zDaO%aqQpc?%q~VhqW5aGy6FH~<a}YxSaEp@f{3|m{E5e(xOZme{Qd_Xcp!Y;ahQ&@
zc<|ssu~@Bk4G&-aIpTs{h!_#-f*KwwLyN%KmQ82O=2V>D)cqkDZ|*TjyitdY5DgEj
zixo{Muvf6{A#TV>mxpPV+WXZPD#mg@V7#pr4P)T)0m}&TAB0RM%`Y2(4G3|S(aR}l
z7B}gNX!oqXD!0pTo_iJms;>j!+_`hSxCtEcey3K-vR#)#2#9q9)8k8M<$r7pdkZ<|
zIKL@fpzbx6Qvs0k)Wv$e&gG1++abz^^V~8tjszW7nzmp}q;bf%#|77_3pz?irUa{K
zS%=?5`fbX#QYP)V-*EE9fo&tJAMJYfv3z~=`zq1$e;fSz*T2q;A2mFG^7Q!lLsV*1
zgIK%KXz+3-?32lasry#Ec`A`66_9=_)oPiI#}WCN@n)7hWJ~s{SRQ~e39^0+7Mf_l
z_I)#gc#b`9M!QQ2;&+W`1g}x&3wD%AF>c+>x^b^zKr_S2y>wzk9Xxcy^6Q4=_U+pT
zqobpmRKrTOUhnDY+C|0{1-3TLq$T2hKc-~UDzlN&9EZ&_V}$AYz=WLvLd6HC3x<HX
z<}(EUHk;KDpEAStJ#)?J*RCcImr8a5Ig77jvlw)Cf;J>8EJ^Q$CM^P=BeESi!0S5m
z^9y@VolH*b-u;+v17KwD-o5P6s8A|bC}ht&wk+0awfTCz!HA|9YG!V_X2Xy|DkdEs
zz#+(<F`JMaA)G&m#!$~|vN1FQz8AB<j=M$UDNZL%@1q|B!_miwE~U*kX>iJzu9HEC
zqXrD0(BL%~$K?uCr}rE5U2W3B5Gp&;KY8l(4;L!c)70SxV`F160I?iBdK9*7+UVEn
z{;{)XCm%X|=+KW|Id<$gkzt`w$oEr-2|^#aYh#IxZ}$SR2h1j8uP8F!GsBO|7K*kf
zCHEMH7osR+Z!kz0gJr<9NslFtE*j=Kjzlo)NNIF1Ziv`O{uTy79A)jY&;kG{o%6MN
z{b)W{oJG`;1sBPI0|(%dA3q#y-Lk1xE|=!1VVS3LxUp0&T}xgPF~Y`+ahn|X=S>c`
zHYnyg)-}faVHkIOlFOzUiG;)DPjmFJ5YX|uF*TsjG}`U8F+dx+pc5aQP^s3NG-Io@
z0!NUJ)2@B;l<8D@NF!v(l(U&^W=g^v$mY$PHT`W-aPX;TE98C;0R)AmMnpq?e!%^>
z%U(2yvzJ>(Ve_H3H`<|ZW~wlTQ$+hb5VyiCJeyJ&msB=LMLtK!YYRIA#>a1M&JJ<8
z<YPBQQM(t`Cfa;I<{lNFV3~|fX|?)R^xY$fEEcOvzlZQ9^5~<F;?bkWT(soYzP{dn
znQ)w)w4pR0RB3?<Z6tCXdx#9RXw#-FwgrVT)Pyou6b8Yu9S&KYOtdNr3N+=4=H<?>
zbry*UFp5~m02+tEG7$noyE<?~#$d;sq|N($XbU2(!x#WJCeDz-rI%>m!SwXh?;>1A
z_Uze%<Kq*~QoT`1rP2drK!!e0<z^z8N~AkVrGJ&nX6~jn+h+r8A9F9%Y88hdY6e0e
znvx~jxoz|@KKQ71=V!oRX5-s2+r+0z(~L1dW?onf;0OC>@Rx4u(K-f__t0nt+yQdb
zGUqUuysl;;ItwU@34pgKpZLTlaNW91C}qfw(<e^WVbxVRSuT|}c6W7ti8i)DAe7in
zDP@u!gzZBEq6mYCJb+CC&x%OsaTQ5{QX)aKq+9j4SxN|jQYlsO{KySLm31sNMG@za
zPLrPJm>UQOkJsV%pPb4jW*0$zc+Juhb18-W5=D5i-e{5@DJw=2BXUHI`05A|`2?lR
zQ&Z=szK`%T$mUI(;I6xW$;l)W1tFa>sIY^|Pp*(J^b#j<tK4;Z!PzzZftx<C=P!Ob
zvwg7gYt&FlL~JO4DbrMmrLHKntY#o)m+IO%@O<NA_uiTRNu@5%?w`(m9Gh_0#`4rJ
zQ)#y7P^F$d<$Pgga$f%8uJRw~Fwn`QPX44i_{$4pGgs{%_J5BY#C+^M_0r<zsk!jF
zTd&XVLC}h@3JBC%(sd^T71aVi^fF25A-oN8`)#+urW<b*Im*q6iSwd=aDZSBaH;8w
zhYl`m=pNnn^(X)4fBn&?KGO9+Qe9n8pI?CPQkGK@cI@~o=aEM~8gRD!@a*WnYb<)J
z|NJvQ{^#G`*X#ZFzxZ!%JxJ%j@Wp>NRUqE@#$W!8)pyVDj7>aubYW$E@22<f+^K6z
zW3Xk*6XM~AZ%{UIOn-ldh%XP{JGJt+>(iARw-*oJmB`v)DXBxLwB`Hy_rLm84Odv+
zu-ZKL9JHMv?)#rdrf&VUZ~mD+^kH!+-F0{T!KeP@cunv8^}h-LAO*2}`OB}@%M5<n
z{ms8UJaOm!56$tnul)ZfSo#kaM^^ay9scI>cQ<Z?Wp9kVczEHteUE$-NA@bXgrLmb
zoE8X`>FEWooNokx!tzZU)~;CLdmif`Txqd;e)Ust2D;tzxzE6*#ep}GM8}Tdb+>=<
zkJDY-KMHRqshhLc-}|4wx?<C(KLJ--R=w}Ha@YUUZyb4}=-PPCAKkp=lYjOgTtT^_
zDX{*7JAZ5AO;@j_OZQSyy#215|6~7fPuF`E04LHPnmqREi*y;l#gh9cYrFE<o6f#^
z>MXoh1yN*a%D&O#&f&Xn%CESt1aGG#f5U<Iq!d24_HruaO}{@>SpUGkz5*$5g>4`G
z%3!8<;O{Q?|1$2ld&hk@e`MqP-*W(LyJP#;Zn*urYao03$~V(1cF3M)Wo8N96;k^3
z&%PavNB6d`41MvD3H2L)@|=d;FYI_z09I}-raIOa-u?(Ee#wILuaw~}%DOxM%hrvz
z-TGf4y}RdUt|T~(i&JyKfgc?>1l1qE@MgO6XP%y~&%C$*Z?}wo{2TYKy7f=*f2;Z*
z`@;i!{_S5M(@^-ww_H{^fA6Zxsbsr1tdq$VT|c)z;FeEb|C#G{^xX_^Q7ovX4?X$f
zS@2#sbUEErKJnW$W!_Audj5qYVdLx+{Ji9jfB&sdui5!;KKhpX|3tQ6C(4)gSpW6^
zBKN+}{q;;{<vq8+|BrI(7ry;F_w6~YGkte|^1apyUtZ8nTs1U!UjcnU3>CZ!M8cI6
r-Bd@Oc;dj5-=D$i#6v%TcY*wG4Rx2hF+$e>00000NkvXXu0mjf#BYrL

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-showers-scattered-night.png b/htdocs/theme/md/img/weather/weather-showers-scattered-night.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cf3dd242e0d9fbddf1a575ecb198d4c11fe2bdc
GIT binary patch
literal 5322
zcmV;*6gBIKP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#32;bRa{vGvuK)lWuK`{fksJU300(qQO+^RT3Ih=%3tl7S0{{R324YJ`L;(K)
z{{a7>y{D4^02E3|L_t(|+U;5ia2(Z{?w;=HxksbXE%}yh3Cp&O4LH8Au~~501iNBG
z2q_GyCE=)$+Ti8#+UpHVvSGItQlV<I*{dK0YvK^t1#@kHV!0f!*#)!sh<wP0WLuIg
zjYb;H(bK)(_p2W^iDkPAq8P$+Iz8R}j{pDu??2uX+86DM_C@=m{V_NFToT50T_uz6
z`0?XLXJ@BTUS2NmEz5G^@puv69CqcU>-uLO0Ht&~o%TQW*kg(J-+zDR*s){h*3{HY
zgu=CGTA@&I^7(wqG|ioR_wN0$t*!09SFc{(22ipD1VFf-IRKR6?d|P>2OoTJa&>j}
zt+<wt9zD7=5C~{~zhC1WO3H7;FbIS;FfgDUJ9f<N?(W`<u|Hd}V#P+VB#pU>1mZIR
z0F^Hmi{_no-Z>@~i><G(ufGP?Hhn&y<~WWhY}>Z<gVi;@=R00(iu%!LR6BI&(7po)
z4y?cV=9`~H-vN&i=PUqJO7H3EvF^V6?kh%(8ub%cuYyX_!T>{*Q$X;}ra*uj@R8qm
z2|M5_^6kYJUwj60e|OEAHLV^S&OHFA{GL5~LigNr&#hCYO!+}56!M3|VX-9dw0eJk
zzfx8d4+evxXh}&4m8J_2EPm&F;wE5^xX0$roA+RjYwo@G-uJMa4G_*904OXXdvMjN
zRjbcC@4Wk{Fa;;AOG`_o5Byp{U?T`roFMQHu-IQfP%Ox1vjT>S6PZj#+p=X#J3#sJ
z`t|F#oec=SVf1<bEw|jV5=#6Pl;S%o%lBGuZ?A@wr{!`vT9(%2#c#AY`%+={Q@`1d
z-*_i$_*=jlKYn~I`aS;e!w=V<jeh1Z5x{rH9d|UrLO+6^n^ca}Rg|VBsh9$bR-^Ll
z$3_dQcf2DFDpn}PrEeq>5tbmfOxU(<+XIL-H(<VgW`|)1VEOXpIt83Rf4+9`;KA_j
z-MjCDqGhB$l~A-*$`cILlnd}ZDXwTt01h8MOeXLh<AaQ=tE=NT{^olD2Eld3x^?TG
zdg!5tevWzQ3cp_fZoKhE9YX7trR(u{nFU3oel%JDk$En<ETOXW^Ks+GG2)ZHbOX6g
z7LdO&juvHnkY^N11Wf3zlvQqY^ypDqokKY%zY7SEVJ%qjTq2R^A-R4p0Ni@(tvZAZ
zLZKwA6~a1^c)X;cv9V!JGMTL2v17+e5c2B~Tt_2SnY$^xfIv{#_?t0+!qc*SeSIGl
zK9!Y~%mRF7A6^`<vIT>yR#jC+SKx1c<Hd1}V8K$b;Bf}TPYl3}88fsA6DH`OpgU>O
zB%g%_E0qI)sTa(cu@Zh=S9FSj>Z<C=rr(Uxn2AK`!o!D;l)mu73$z-A6y^5q+oz%A
zrNSzz(|`GmmL`SynvtE#i1Mjaig#59@EgYqASj0TPApHLVR;TGi@t{MPYvY;<{3&=
zHoc>xLwn+hCk&t+#Ud6aDgymdEY^UiyBPGlEFO=Ircoe}PQP^>S61_zW)kthN5$WI
z>n$p%3L6TpQW-5M_lk-NwLZU50ipSkBS-kmu>^>U)7o?m6%WV;DU7gxAixBS^DcVx
z%{R*yE?k)5v_k^W(9obwpFaH~h&FEAsG~sfm6eroAp;B7qE26m2`6vgzI_)MFb9^O
zjy_B`27@;X9gxEPSU?+mr!8N$OdC0Jr1tdFPt%H`1m`9QR76#F@K^C^Hf32VN99$d
zCwOEF-}4>g0`>(TRgEJ?jNmuULvR8cHf)#;05%Q<0R7m9jYtf}hJ}l^i`Ke-e<)yC
z(Y<^3*@$gA{Ao$^)aJW%pI!pNvk*3fZUzL`l~oj#X&vQ<WQ6)XdGciKjW^z)WtavT
zq^Jy)qOvkaS67$X2aqii8?ZJNAq(UiVhhJHKFAowC^T-AG*p`sJooS4&nlDaHRIDS
zDc<h@uy*ZQ2C=en_4Uh<PA)yxb*u{tYr#;c0)y+IQ2(KWhxRs2Zdy`w?4(aKbU%Qx
z?IJ0Qg>kWVr;-lS86q_At|NGhCqZ~!Zn}!_iq@pC@>^Bl@SU&$jS8xof$>L`$h5lZ
zPXPI>G6;c_pxM;a#J*%p4f^^{83f_Ke&nx)rb&}-4+Mhasw%5A7yk<Rg5J~Hi$E7}
zCpJu+ZJK@y%IXA%%2VM2eHfPsAPionL8XNOMTY<g5WMj>gw1grg`)7ZwkU^nH4};=
zd%&t01~)3E3LsjQ7Ui=Fj&uzwF8x$iP!}7{4VZ43b}3r|uA-k303a1K4095wHd@zx
zW)T*&3pNFHN$+efuSd-=>COh_91VTE=$qH_@IlTT2nMuJFzEVCzfJ(j1P*Wr0{Y@6
zeM{lvNhpJO07VBVq}tIDKq+#zy}u1nyjxX!RD$lJY67x{Ku`w77=9z&IiCH=0`_B2
zRW-(`0l)%*s_N=Vh}M=4Ux!C&t`!i0Y+BN``CCG|i%AGTE??lnE&$MT5J0F6R{#dO
zj&babAp{G2XPT4IP$sM`T(n4wMxqE(Apyzbtr8N{O=xrH&C`w?J`5K*On0L4q&S&F
zrR5HTF&0QL#3>R39|5DRWQR(joR|I6tjSIZ09Z{!<sl$sH-xIX!L$<4vACPd=Ukue
z(}ep%Z}=Smpz;OVmMBj@4GNV5uI2aZ;?I`fWj`r&T+vdl%8E)+SXhB)>TUSMg;XFD
zx2c0dv~o*J3zYApqGDmL#URQ%`_uZgGL?s$@=oTdl9)0Pye{;0P6+^FejYxyySApf
zHyjF;a3E}m1xz3x6grc~Fs-OS9O&~!({xS4)B)gN-%tP`SdtN37Alm%@`FJ|#tfB!
zXi>oe1A)H80|;r!oNOM`I7SqlFma-`Yv)cV<&e_q#7J$HVEK_+9{|EL$KqX_?2u=q
zZ34^wA95=(L?!4t@Rt+>gR+uG<susZBoqtkxYOFM)a*V1hv9}3LvVR!-sNIqQTac2
z@aDHnH=EORV8~|y(1KNX7qDf3O9lC?Sb;eWfEW;KmLy8Fe)x126ZtJad%)_0!FtTt
zF#S%(_oe%g`dXPDQCoC#EZx9G?eZ?MKP3R^bbk?LYZlZM{&_*nrCVC!H^Klarxy$#
z{a((S0FX<%1^gzy(VCv}gCjg^3R_4^_K`~z7bY-MNYoY(e1^|+1s~ZVV*}P8%^Ojq
zaa{slu%+}JWP@ZGnsAU|p>RZNJa3XV5*wpU&pbnhu;2D2OO~{vu+vV}jO(wz7Ev=*
zOqL~^V$o<l1yQ>+5m*TYA&H9t4Nw;9pufZku8eo0y!26JG%oxjWtrx5rwI0(D2_P4
z2q;2+w3XFP03~b6yj<U7n?bgT(g?ncM`~B-`MoPZ*m$4rO{r4)KU(*<zWbY9dvasP
zj<#`5@LNI9XYrKbU`xxM2SUM6RV)^riubJDDI^&|i(moSvWf*!IN-fRPZ3ZQD#}Jc
ztf+a4D`j)VoIB`ZBA|S;0f@v0?~nsoNao_YhL_8gH}O#=GM_L58!FsMd$N=N$RYz5
z(-mXNmuAgo@Z`vg;RX@I@IMj=7;iE;e2f98lS#26qU@2*&aPi0S09H!rKk-Orc^ef
zAaZyfk=qeLkQKaWMMY(&MrHXOpcOm|7u8*gCCm#JNCCwn$qSSM6z5RN^OE_cxoQnZ
ztSxJJ<MKAyV=I=yNQ1^XsWC1w-XtU8Xe0EiM3MVOef_x9)~#Dz)khS3<dH|1W?ZBT
z`)Fr}fdFD0Za-W|r~5*IU@*c|!=gnURr8|IcA-cUF+E}96k|HnnI6*&SmH(w6$b!W
z_^wUG=t6@`@~94=NpYqy(A&aA#t8soT>;Sp((x)x%E7S&+;2!s@!a&pfr=q=O3>BG
zKH>qLUIuFpz5e>^&dHl09wh2GP4)Gr)0GVk6K|@iu3pG3FHrX}9;8yenggU`C}3n^
z&*uV&0Z5(lPWiG#_<^hrA7mLwuyl1)rCAWjQ<zp(0=p_>cmY)%hp`@TP8^={ou?uH
zN8lqE%)(59qUSO`#R^xI;C_=Z1S+xDnc3Uh{Xclyck-#QoU^%TEJ1>SU<K&O?Jsn(
z1R#2XW%`Nc$$ylfH5rj5LieHS>c>U8Qyc6dbXW_<l%k54D27K>_Nu)-Q>7@bnhK_h
z^6FBc(DLFIbOSptR1b&347QYO@bX&{k9^)-NY}xN%JR8^P$<Il%9CAyg@f#zTK6Ax
z(2{6#DZEYJ_GoWeq$n;1DO{-hc<|x5sUtuDbd}$k<{*SA0*J+Zq`5)rE9Ll(bpM#b
zs!17+ODV7XoC}IODL3JBAtwMTw-WF1vXBA|BUwju9z4|kEYfBV7=HqQS6_XV0KidP
zJC)94s;es(!aAj-DTN0ZqKNpWCnQrKDa-s%rIjKSoKpJ98URKhsEDF4hx0en7@uXF
zE51q^D`4a|-A`E_ldGyuEbM{rWdMmuj1hD(l;Aeqf;(CoN5xalYjt<`JfF)BwBuaD
zRRBnP{`u!g$zmc|mI8f`!g{3$irol)ItGThS5Rz#Vypu^%Zc?!OIk*RkmAQQDKr%&
z@>B*_f$zNNFDcR6NJ-G*c=abQR&(5Rp|1+Oq_b3=1VPmZs&0@u04KrK889;#KY(>9
zGiAg_8ZzIy|G=+$Qt1Pza0}cr3jnI^+O<oYKCL<5pUJnhw;y?S$M)?n{ida5H-aHf
zs!B#0a3uOZixf1ays8B}3y6>uR{i-(uDldIETxqtP1YFf?_$SE>Cxu|SOmlGxr<^K
z*HLc6{+x$yr7VokR8mrIp&%?1?kHEGTf=or5UX~T#7mE%a4ISQRO25QwO3yLufmM!
z)B4NGlHDj+x^V>7j7o8`fz?%RrxjJ147z%U5{?2zeyhGzKJT6VGwm^R@CpV&WqmN6
zu>ok#t1D1xWnQYhE}p3RWC?G}p<)Gp^UkzKg~=f0cDy*383{+~u|gE8v`1snjv-Hl
z&p-cs7pFyqEnELL1@mVKK4|HB`)gVY$^~deL7Y~m&nv-|H5B!EM~3lIptm3J1V>Y)
zFs<$u>;gf-l~=(|z@`p}?5^4hV=gMl`2m8>g{7OY&HDohL6se>q+bb$MqO>)Rd6Y@
zH{JJrj2ODT_S$Ruu3aq%_vVbcx|;6>Eo%W5jzIb}CP+b$A~r1bP}Ja&lc9ta+KQs2
zGJG*hA(@&;Sr;cqgMN$-P}Id;>B!S2x(Wd!K<p!cdNfdhP>813V55Ig)f(u;@l4Hy
zA_{m9fPfb`nb}w&K<+|kXUBcIc80cT(<c4k!8WTeGms32Bcq`}6bq#BDIE$2Bjw5D
zpT}d-m6%iQ4Jff!=;$g9c@)%L0wJl9DN*^h+7^5Dy`(_9C}1$M@wFFiR5}$GRHb!K
zZ$W$UtuFnmmsfkvG3Y}BxdL~uWG!P3!Q{Ly8^T!uECv8)*{;6&YQ3>>nr@ml4d?D_
z&1j>>#?7*1vbn0VVjTpViuse&6D|^>fpoQLfC*VPV@I6>cm}9R&C)tLfW|@kCSGN9
zT@(z$VkVf8$`*=&g6+gC!|4FyEcD6Y9@Wv%CtHLz=pWe984Dfj)y&1?`}&}Kjwjh*
zcxh$;r&*A}b%>-6t~vdPS342N+c0)($I*`GbnO$g^QTSIu3Y(5D;f$We5O^VId(bH
zPdrhQs6k9%sa$!W$6DC1XwITd55L|ub4==6ID#~F-N=9wopc#wfKrwXHj0zpe%*X~
zTjnb(E~|P0);a#`uJ{T)=U&-d*6}sV3L4l`IPdHY-InU?3NO2);%|#U2g(HA$kbfh
z*LrmPr44!bv~R#J=JQ+sulM|p<MxG@Tol^`0yzM$Kwv_Fz>$Je>@Vc)Y&2vtwte!p
z`0~rOX|reh;_%J3wxhn0V@3n^g5H<Q`<~s>GqtMef`5AF$rpZn-IB_mh4Dv@Om~k~
zm5k99dE~7JgE6qfaevj`^cMrY*>RVR`S6=Cvh&Ep{}#v;A|<Qux}_t5xbf&?Pa1Vs
z{q^3q_jdM-$UHx7!TkB|(T)!9@Kck`RAps_#E7R_N3O|qre@D9-En0w=GP3zbZygd
z4Wz~&-haQV4RbTkqL1(PU+(N!@U4IUm!Uc|F8#afe!9EgUGVLn7w{M!s$X=>4T0}G
zwWIBdwa*^s+Qa{!$RyYQHnZ%HOZc5ruDkbx9X;>A`pSl(rq#{(ya)nKs<X3as53q`
zM=zT*bwX`zKATmA$?!IR^*66O9q9h*o4zr`H|uos2FqtPG%mjDA0w4Bmz`FC@VwYX
ztA2EU?X(-N9(LtN&Al^z(e;n+9Ex4dSN(Y2^lSe0>EV=VSY2SspDehudCtTM_!&4A
zi)UUr?{7vnR9Aj(0kDehWk*`}e1M;Y-}xB-`h?1o*qrt~``fk8X=BY3!!0({=Zc1v
zb4qG2On$11hHkSypJ*m-nsBBrWz&9GpP2H4JBGmphFSNf?~RGpjQ&qKv^h<iwQ|<&
z^OiKv|J(s^!P1$3|E0wjo~OkYk2qbw(sHvpm+I;}H>6H}`^HbB@Tj`rd-Zp{(&pUu
z)Aw90{^ePx1z^OC(s22d#HY`I(shOw`O~tqov87Of0)sH`6WNmB9~Tw;!L7<>b)Ju
z3!7isyj@GbyzO*-yAQqFo$30Z=TkRk(^no{HR_UoUVFCvmp`z1(>=dvaka#?7oV|n
z$*NIj>JqD(+GvJqEB|11z{S^G^o<K=)y+HGi43hjvi+S8+O_Pq?Puy6E(xx|Eqb~>
z>7(0r+5_z!+8?Sd{mTtEj9+l~va_!LgRz7^SawE>jlAg3;&X5MMOSphRba{=VY_7Y
z<M-aa>3|!pTY1g7Q3?-d(*wb=^<!>N==?9sZ0B46z#P`q+?=!X?YB3-^IVsnZhQ8{
ca{++=2XtXQ63ho4e*gdg07*qoM6N<$f~)v1%>V!Z

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-showers-scattered.png b/htdocs/theme/md/img/weather/weather-showers-scattered.png
new file mode 100644
index 0000000000000000000000000000000000000000..f66251cb03495dc346670749c4e2b94b0dc71e89
GIT binary patch
literal 5210
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
UTPU)(wEzGB07*qoM6N<$f{Nzu#Q*>R

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-showers.png b/htdocs/theme/md/img/weather/weather-showers.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e7eb470bdde0b795d8e0edcbbb8ad4c3285b1b7
GIT binary patch
literal 5373
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
bgQEWeq}?xghYGaC00000NkvXXu0mjfGrlmK

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-snow-rain.png b/htdocs/theme/md/img/weather/weather-snow-rain.png
new file mode 100644
index 0000000000000000000000000000000000000000..a17abce95ab226989d33742f3316d2ebf0fdd43e
GIT binary patch
literal 5857
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-snow-scattered-day.png b/htdocs/theme/md/img/weather/weather-snow-scattered-day.png
new file mode 100644
index 0000000000000000000000000000000000000000..af7c14b7a86d7fc9ca35be15e71fb67803b13aff
GIT binary patch
literal 7257
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-snow-scattered-night.png b/htdocs/theme/md/img/weather/weather-snow-scattered-night.png
new file mode 100644
index 0000000000000000000000000000000000000000..e77c698d6edeacfd185285cf1dc37628d1455f8e
GIT binary patch
literal 5912
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-snow-scattered.png b/htdocs/theme/md/img/weather/weather-snow-scattered.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbe45aafb0e2eed50b41d576323051f6d73e2617
GIT binary patch
literal 5336
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-snow.png b/htdocs/theme/md/img/weather/weather-snow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9221ad9dbcef2790fe749b407b221b6cdb9448c0
GIT binary patch
literal 5691
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-storm-day.png b/htdocs/theme/md/img/weather/weather-storm-day.png
new file mode 100644
index 0000000000000000000000000000000000000000..f744587bcf64c70f3636c7b703fab5c261233bbe
GIT binary patch
literal 7792
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
Cy8A!?

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-storm-night.png b/htdocs/theme/md/img/weather/weather-storm-night.png
new file mode 100644
index 0000000000000000000000000000000000000000..98f8f31e524fcfc69d5b2c538c84df3ba760784a
GIT binary patch
literal 7772
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/weather/weather-storm.png b/htdocs/theme/md/img/weather/weather-storm.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b0defa75b2211619c1a956d1627aa3572decc4f
GIT binary patch
literal 7563
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

literal 0
HcmV?d00001


From 47f60e1f8d42273c42a2597f506b1f81dcce9193 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 13 Feb 2016 07:53:50 +0100
Subject: [PATCH 153/421] Add function img_weather

---
 htdocs/admin/delais.php           | 10 +++++-----
 htdocs/core/lib/functions.lib.php | 21 +++++++++++++++++++++
 htdocs/index.php                  | 10 +++++-----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 0a744a047a5..82a56a60f11 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -261,24 +261,24 @@ $text=''; $options='height="60px"';
 print '<table>';
 print '<tr>';
 print '<td>';
-print img_picto_common($text,'weather/weather-clear.png',$options);
+print img_weather($text,'weather-clear.png',$options);
 print '</td><td>= '.$level0.'</td>';
 print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
 print '<td>';
-print img_picto_common($text,'weather/weather-few-clouds.png',$options);
+print img_weather($text,'weather-few-clouds.png',$options);
 print '</td><td>&lt;= '.$level1.'</td>';
 print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
 print '<td>';
-print img_picto_common($text,'weather/weather-clouds.png',$options);
+print img_weather($text,'weather-clouds.png',$options);
 print '</td><td>&lt;= '.$level2.'</td>';
 print '</tr>';
 
 print '<tr><td>';
-print img_picto_common($text,'weather/weather-many-clouds.png',$options);
+print img_weather($text,'weather-many-clouds.png',$options);
 print '</td><td>&lt;= '.$level3.'</td>';
 print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
 print '<td>';
-print img_picto_common($text,'weather/weather-storm.png',$options);
+print img_weather($text,'weather-storm.png',$options);
 print '</td><td>&gt; '.$level3.'</td>';
 print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
 print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 534b4f31d86..ce566e6f9eb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2170,6 +2170,27 @@ function img_object($titlealt, $picto, $options = '', $pictoisfullpath = false)
 	return img_picto($titlealt, 'object_'.$picto, $options, $pictoisfullpath);
 }
 
+/**
+ *	Show weather picto
+ *
+ *	@param      string		$titlealt         	Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
+ *	@param      string		$picto       		Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
+ *	@param		string		$options			Add more attribute on img tag
+ *	@param		int			$pictoisfullpath	If 1, image path is a full path
+ *	@return     string      					Return img tag
+ *  @see        #img_object, #img_picto
+ */
+function img_weather($titlealt, $picto, $options = '', $pictoisfullpath = 0)
+{
+	global $conf;
+
+	if (! preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+
+	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
+
+	return img_picto($titlealt, $path, $options, 1);
+}
+
 /**
  *	Show picto (generic function)
  *
diff --git a/htdocs/index.php b/htdocs/index.php
index 0bb3b41ffb2..af3636f2b99 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -618,10 +618,10 @@ function showWeather($totallate,$text,$options)
     $level2=$offset+2*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
     $level3=$offset+3*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
 
-    if ($totallate <= $level0) $out.=img_picto_common($text,'weather/weather-clear.png',$options);
-    if ($totallate > $level0 && $totallate <= $level1) $out.=img_picto_common($text,'weather/weather-few-clouds.png',$options);
-    if ($totallate > $level1 && $totallate <= $level2) $out.=img_picto_common($text,'weather/weather-clouds.png',$options);
-    if ($totallate > $level2 && $totallate <= $level3) $out.=img_picto_common($text,'weather/weather-many-clouds.png',$options);
-    if ($totallate > $level3) $out.=img_picto_common($text,'weather/weather-storm.png',$options);
+    if ($totallate <= $level0) $out.=img_weather($text,'weather-clear.png',$options);
+    if ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text,'weather-few-clouds.png',$options);
+    if ($totallate > $level1 && $totallate <= $level2) $out.=img_weather($text,'weather-clouds.png',$options);
+    if ($totallate > $level2 && $totallate <= $level3) $out.=img_weather($text,'weather-many-clouds.png',$options);
+    if ($totallate > $level3) $out.=img_weather($text,'weather-storm.png',$options);
     return $out;
 }

From 9c20bf1b2e0a7f5fca21d91e685d0f7b74bfc32b Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 13 Feb 2016 08:03:49 +0100
Subject: [PATCH 154/421] Updated: User accountancy code depends on Accounting
 module, not Salaries module

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8e3dce72196..e428d53a6e2 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
  * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
  *
@@ -1065,7 +1065,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print "</tr>\n";
 
 	// Accountancy code
-	if ($conf->salaries->enabled)
+	if ($conf->accounting->enabled)
 	{
 		print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
@@ -1402,7 +1402,7 @@ else
 		    print "</tr>\n";
 
 			// Accountancy code
-			if ($conf->salaries->enabled)
+			if ($conf->accounting->enabled)
 			{
 				print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
 				print '<td>'.$object->accountancy_code.'</td>';
@@ -2173,7 +2173,7 @@ else
 		    print "</tr>\n";
 
 		    // Accountancy code
-			if ($conf->salaries->enabled)
+			if ($conf->accounting->enabled)
 			{
 				print "<tr>";
 				print '<td>'.$langs->trans("AccountancyCode").'</td>';

From 45cc841b923bf8d7693d71827f65d6b7924cd08d Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 13 Feb 2016 08:10:13 +0100
Subject: [PATCH 155/421] Correct travis

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

diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 0ac16635beb..d9cc6f31d23 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -481,8 +481,8 @@ class Mailing extends CommonObject
 	/**
 	 *  Count number of target with status
 	 *
-	 *  @param  string     Mode ('alreadysent' = Sent success or error) 
-	 *  @return int        Nb of target with status
+	 *  @param  string	$mode   Mode ('alreadysent' = Sent success or error) 
+	 *  @return int        		Nb of target with status
 	 */
 	function countNbOfTargets($mode)
 	{

From a95a810d68ffe1217d9e2a1782df1a96e242f547 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 13 Feb 2016 10:25:37 +0100
Subject: [PATCH 156/421] add categorie user based on contact user

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index a35fc566ea1..832b1ec3693 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2013       Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2016       Charlie Benk	    <charlie@patas-monkey.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
@@ -47,6 +48,7 @@ class Categorie extends CommonObject
 	const TYPE_CUSTOMER = 2;
 	const TYPE_MEMBER = 3;
 	const TYPE_CONTACT = 4;
+	const TYPE_USER = 4;  // categorie contact and user are same
 
 	/**
 	 * @var array ID mapping from type string
@@ -59,6 +61,7 @@ class Categorie extends CommonObject
 		'customer' => 2,
 		'member'   => 3,
 		'contact'  => 4,
+		'user'     => 4,
 	);
 	/**
 	 * @var array Foreign keys mapping from type string
@@ -71,6 +74,7 @@ class Categorie extends CommonObject
 		'supplier' => 'soc',
 		'member'   => 'member',
 		'contact'  => 'socpeople',
+		'user'  => 'user',
 	);
 	/**
 	 * @var array Category tables mapping from type string
@@ -83,6 +87,7 @@ class Categorie extends CommonObject
 		'supplier' => 'fournisseur',
 		'member'   => 'member',
 		'contact'  => 'contact',
+		'user'  => 'user',
 	);
 	/**
 	 * @var array Object class mapping from type string
@@ -95,6 +100,7 @@ class Categorie extends CommonObject
 		'supplier' => 'Fournisseur',
 		'member'   => 'Adherent',
 		'contact'  => 'Contact',
+		'user'     => 'User',
 	);
 	/**
 	 * @var array Object table mapping from type string
@@ -107,6 +113,7 @@ class Categorie extends CommonObject
 		'supplier' => 'societe',
 		'member'   => 'adherent',
 		'contact'  => 'socpeople',
+		'user'     => 'user',
 	);
 
 	public $element='category';

From c910fd151fac97352e728339df2300f78319f2d7 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 13 Feb 2016 10:27:12 +0100
Subject: [PATCH 157/421] add setcategorie on user class

---
 htdocs/user/class/user.class.php | 44 ++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 51aefa8d4de..9266ebb4d7f 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -751,6 +751,50 @@ class User extends CommonObject
 		}
 	}
 
+	/**
+	 * 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
+	 */
+	public function setCategories($categories)
+	{
+		// 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, Categorie::TYPE_USER, '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) {
+				$c->del_type($this, 'user');
+			}
+		}
+		foreach ($to_add as $add) {
+			if ($c->fetch($add) > 0) {
+				$c->add_type($this, 'user');
+			}
+		}
+
+		return;
+	}
 
 	/**
 	 *    	Delete the user

From 5e288db0e5036712a91c6083c8ea2dfc1e36df30 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 13 Feb 2016 10:42:45 +0100
Subject: [PATCH 158/421] add categorie user based on contact user

allow to add categorie to user, the same as contact user (because user and contact are persons too)
---
 htdocs/user/card.php | 99 ++++++++++++++++++++++++++++++++------------
 1 file changed, 72 insertions(+), 27 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8e3dce72196..99e803e649c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2013-2015 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
  * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
+ * Copyright (C) 2015      Charlie Benke  	<charlie@patas-monkey.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
@@ -43,6 +44,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 if (! empty($conf->ldap->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 if (! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php');
+if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
 
 $id			= GETPOST('id','int');
 $action		= GETPOST('action','alpha');
@@ -244,7 +247,11 @@ if (empty($reshook)) {
 				if (isset($_POST['password']) && trim($_POST['password'])) {
 					$object->setPassword($user, trim($_POST['password']));
 				}
-
+            			if (! empty($conf->categorie->enabled)) {
+					// Categories association
+					$usercats = GETPOST( 'usercats', 'array' );
+					$object->setCategories($usercats);
+				}
 				$db->commit();
 
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
@@ -472,7 +479,13 @@ if (empty($reshook)) {
                         }
                     }
                 }
-
+            	if (! $error && ! count($object->errors))
+            	{
+			// Then we add the associated categories
+			$categories = GETPOST( 'usercats', 'array' );
+			$object->setCategories($categories);
+		}
+			
                 if (!$error && !count($object->errors)) {
                     setEventMessages($langs->trans("UserModified"), null, 'mesgs');
                     $db->commit();
@@ -1081,7 +1094,16 @@ if (($action == 'create') || ($action == 'adduserldap'))
 		print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
 		print '</td></tr>';
 	}
-
+	
+	// Categories
+	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) {
+		print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td><td colspan="3">';
+		$cate_arbo = $form->select_all_categories( Categorie::TYPE_USER, null, 'parent', null, null, 1 );
+		print $form->multiselectarray( 'usercats', $cate_arbo, GETPOST( 'usercats', 'array' ), null, null, null,
+			null, '90%' );
+		print "</td></tr>";
+	}
+	
     // Note
     print '<tr><td class="tdtop">';
     print $langs->trans("Note");
@@ -1425,7 +1447,16 @@ else
                 print '</td>';
                 print "</tr>\n";
             }
-            
+
+            // Categories
+	    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+	    {
+		print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
+		print '<td colspan="3">';
+		print $form->showCategories( $object->id, 'user', 1 );
+		print '</td></tr>';
+	    }
+
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {
@@ -2172,33 +2203,47 @@ else
 		    print '</td>';
 		    print "</tr>\n";
 
-		    // Accountancy code
-			if ($conf->salaries->enabled)
+		// Accountancy code
+		if ($conf->salaries->enabled)
+		{
+			print "<tr>";
+			print '<td>'.$langs->trans("AccountancyCode").'</td>';
+			print '<td>';
+			if ($caneditfield)
 			{
-				print "<tr>";
-				print '<td>'.$langs->trans("AccountancyCode").'</td>';
-				print '<td>';
-				if ($caneditfield)
-				{
-					print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
-				}
-				else
-				{
-					print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
-					print $object->accountancy_code;
-				}
-				print '</td>';
-				print "</tr>";
+				print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
 			}
+			else
+			{
+				print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
+				print $object->accountancy_code;
+			}
+			print '</td>';
+			print "</tr>";
+		}
 
-			// User color
-			if (! empty($conf->agenda->enabled))
-            {
-				print '<tr><td>'.$langs->trans("ColorUser").'</td>';
-				print '<td>';
-				print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
-				print '</td></tr>';
+		// User color
+		if (! empty($conf->agenda->enabled))
+	        {
+			print '<tr><td>'.$langs->trans("ColorUser").'</td>';
+			print '<td>';
+			print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
+			print '</td></tr>';
+		}
+
+		// Categories
+		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) {
+			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
+			print '<td colspan="3">';
+			$cate_arbo = $form->select_all_categories( Categorie::TYPE_CONTACT, null, null, null, null, 1 );
+			$c = new Categorie( $db );
+			$cats = $c->containing( $object->id, Categorie::TYPE_CONTACT );
+			foreach ($cats as $cat) {
+				$arrayselected[] = $cat->id;
 			}
+			print $form->multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' );
+			print "</td></tr>";
+		}
 
             // Status
             print '<tr><td>'.$langs->trans("Status").'</td>';

From e3444e08a7fad56c992d1b0fea1ddf11402948c9 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 13 Feb 2016 10:50:46 +0100
Subject: [PATCH 159/421] Create llx_categorie_user.sql

---
 .../mysql/tables/llx_categorie_user.sql       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_categorie_user.sql

diff --git a/htdocs/install/mysql/tables/llx_categorie_user.sql b/htdocs/install/mysql/tables/llx_categorie_user.sql
new file mode 100644
index 00000000000..52ca5adf61f
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_user.sql
@@ -0,0 +1,27 @@
+-- ============================================================================
+-- Copyright (C) 2016	Charlie Benke	<charlie@patas-monkey.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 <http://www.gnu.org/licenses/>.
+--
+-- ===========================================================================
+--
+-- Table structure for table `llx_categorie_user`
+--
+
+CREATE TABLE IF NOT EXISTS `llx_categorie_user` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_user` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_user`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From b21b5e7bb8f7219f101ffed4f0122c6176381d5e Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 13 Feb 2016 10:51:24 +0100
Subject: [PATCH 160/421] Create llx_categorie_user.key.sql

---
 htdocs/install/mysql/tables/llx_categorie_user.key.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_categorie_user.key.sql

diff --git a/htdocs/install/mysql/tables/llx_categorie_user.key.sql b/htdocs/install/mysql/tables/llx_categorie_user.key.sql
new file mode 100644
index 00000000000..ca807397046
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_user.key.sql
@@ -0,0 +1,2 @@
+ALTER TABLE llx_categorie_user ADD INDEX  `idx_categorie_user_fk_categorie` (`fk_categorie`);
+ALTER TABLE llx_categorie_user ADD INDEX  `idx_categorie_user_fk_user` (`fk_user`);

From 006c546a87fd63b09b53d2416879f242684a64e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Feb 2016 10:51:42 +0100
Subject: [PATCH 161/421] Fix select number of records in list

---
 htdocs/societe/list.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 19149d3fe3c..d263e37573e 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -418,6 +418,8 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 
+$sql.= $db->order($sortfield,$sortorder);
+
 // Count total nb of records
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -426,7 +428,6 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
 
 $resql = $db->query($sql);
@@ -815,7 +816,7 @@ if ($resql)
 
 	$var=True;
 
-	while ($i < min($num,$conf->liste_limit))
+	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($resql);
 		$var=!$var;

From 23cb0d437cd5305ccb243640e22ffd1bfc7bfff8 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 13 Feb 2016 10:53:01 +0100
Subject: [PATCH 162/421] Update 3.9.0-4.0.0.sql

---
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 50e0c4d2e56..82c901ef8c1 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -22,6 +22,17 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+
+CREATE TABLE IF NOT EXISTS `llx_categorie_user` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_user` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_user`)
+) ENGINE=InnoDB;
+
+ALTER TABLE llx_categorie_user ADD INDEX  `idx_categorie_user_fk_categorie` (`fk_categorie`);
+ALTER TABLE llx_categorie_user ADD INDEX  `idx_categorie_user_fk_user` (`fk_user`);
+
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN validated tinyint DEFAULT 0 NOT NULL;
 ALTER TABLE llx_bank_account MODIFY COLUMN accountancy_journal varchar(16) DEFAULT NULL;
 
@@ -211,4 +222,4 @@ ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
  
- 
\ No newline at end of file
+ 

From 07afad41a201534881e8a111dd1e1096aac9cd2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Feb 2016 10:54:06 +0100
Subject: [PATCH 163/421] Add feature to select number of record into list in
 the skeleton template.

---
 dev/skeletons/skeleton_list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index 80e3e38f438..28333b3edee 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -237,7 +237,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$nbtotalofrecords = $db->num_rows($result);
 }	
 
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
+$sql.= $db->plimit($limit+1, $offset);
 
 
 dol_syslog($script_file, LOG_DEBUG);
@@ -257,9 +257,9 @@ if ($resql)
         $tmpkey=preg_replace('/search_options_/','',$key);
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
     } 
-    
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies');
-    
+
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
+
 
 	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -359,7 +359,7 @@ if ($resql)
         
     
     $i = 0;
-    while ($i < $num)
+    while ($i < min($num, $limit))
     {
         $obj = $db->fetch_object($resql);
         if ($obj)

From 9f4909d8b1b02cb2297041de576cfc916de0ac4c Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 13 Feb 2016 17:27:53 +0100
Subject: [PATCH 164/421] Update categorie.class.php

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 832b1ec3693..5198da7efb2 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2013       Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2016       Charlie Benk	    <charlie@patas-monkey.com>
+ * Copyright (C) 2016       Charlie Benke	    <charlie@patas-monkey.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 1f99ce8ae94eb9546f63e56dd9570d282550c93c Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sun, 14 Feb 2016 01:21:56 +0100
Subject: [PATCH 165/421] Fix var typo

---
 htdocs/fourn/class/fournisseur.product.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 09c2130e435..41da86cd9bf 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -355,7 +355,7 @@ class ProductFournisseur extends Product
      */
     function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
     {
-        $sql = "SELECT pfp.rowid, s.rowid as fourn_id, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability,";
+        $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability,";
         $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges, pfp.fk_supplier_price_expression, pfp.delivery_time_days"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE pfp.rowid = ".$rowid;
@@ -368,7 +368,7 @@ class ProductFournisseur extends Product
             if ($obj)
             {
             	$this->product_fourn_price_id	= $rowid;
-                $this->fourn_id					= $obj->fourn_id;
+                $this->fourn_id					= $obj->fk_soc;
             	$this->fourn_ref				= $obj->ref_fourn; // deprecated
 	            $this->ref_supplier             = $obj->ref_fourn;
             	$this->fourn_price				= $obj->price;

From e7a7909b9d1f713083d28c5f7f1161ec40d5304c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 14 Feb 2016 12:16:17 +0100
Subject: [PATCH 166/421] Update rappro.php

---
 htdocs/compta/bank/rappro.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 6e91a180e50..11cd92cdbbc 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
@@ -147,6 +148,7 @@ $memberstatic=new Adherent($db);
 $paymentstatic=new Paiement($db);
 $paymentsupplierstatic=new PaiementFourn($db);
 $paymentvatstatic=new TVA($db);
+$remisestatic = new RemiseCheque($db);
 
 $acct = new Account($db);
 $acct->fetch($id);
@@ -155,7 +157,9 @@ $now=dol_now();
 
 $sql = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type as type";
 $sql.= ", b.fk_bordereau";
+$sql.= ", bc.number";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
+$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bordereau_cheque as bc ON bc.rowid=b.fk_bordereau';
 $sql.= " WHERE rappro=0 AND fk_account=".$acct->id;
 $sql.= " ORDER BY dateo ASC";
 $sql.= " LIMIT 1000";	// Limit to avoid page overload
@@ -292,7 +296,13 @@ if ($resql)
 		// Type + Number
 		$label=($langs->trans("PaymentType".$objp->type)!="PaymentType".$objp->type)?$langs->trans("PaymentType".$objp->type):$objp->type;  // $objp->type is a code
 		if ($label=='SOLD') $label='';
-		print '<td class="nowrap">'.$label.($objp->num_chq?' '.$objp->num_chq:'').($objp->fk_bordereau>0?' ('.$objp->fk_bordereau.')':'').'</td>';
+        $link='';
+        if ($objp->fk_bordereau>0) {
+            $remisestatic->id = $objp->fk_bordereau;
+            $remisestatic->ref = $objp->number;
+            $link = ' '.$remisestatic->getNomUrl(1);
+        }
+		print '<td class="nowrap">'.$label.($objp->num_chq?' '.$objp->num_chq:'').$link.'</td>';
 
 		// Description
         print '<td valign="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'">';

From 99efbd3464170c8e72f550338548bb76ee4984a2 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sun, 14 Feb 2016 14:26:04 +0100
Subject: [PATCH 167/421] Check if dynamic price is enabled

---
 htdocs/core/boxes/box_produits.php               | 4 ++--
 htdocs/core/boxes/box_produits_alerte_stock.php  | 4 ++--
 htdocs/core/class/html.form.class.php            | 6 +++---
 htdocs/fourn/class/fournisseur.product.class.php | 5 +++--
 htdocs/product/class/product.class.php           | 7 ++++---
 htdocs/product/fournisseurs.php                  | 2 +-
 htdocs/product/index.php                         | 3 ++-
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 042526224a2..c8ef1b5f558 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -116,11 +116,11 @@ class box_produits extends ModeleBoxes
                         'text' => $objp->label,
                     );
 
-                    if (empty($objp->fk_price_expression)) {
+                    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 dinamic price
+	                else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 66f1cbbfe3b..5a718b79696 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -123,12 +123,12 @@ class box_produits_alerte_stock extends ModeleBoxes
                         'text' => $objp->label,
                     );
 
-                    if (empty($objp->fk_price_expression))
+                    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 dinamic price
+	                else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 668855672a5..a71f161fe37 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1790,7 +1790,7 @@ class Form
 				}
 				else
 				{
-                    if (!empty($objp->fk_price_expression)) {
+                    if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression)) {
                         $price_product = new Product($this->db);
                         $price_product->fetch($objp->rowid, '', '', 1);
                         $priceparser = new PriceParser($this->db);
@@ -2168,7 +2168,7 @@ class Form
                 {
                     $outqty=$objp->quantity;
 					$outdiscount=$objp->remise_percent;
-                    if (!empty($objp->fk_supplier_price_expression)) {
+                    if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
                         $priceparser = new PriceParser($this->db);
                         $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_supplier_price_expression, $objp->quantity, $objp->tva_tx);
                         if ($price_result >= 0) {
@@ -2307,7 +2307,7 @@ class Form
                     }
                     $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
 
-                    if (!empty($objp->fk_supplier_price_expression)) {
+                    if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
                         $priceparser = new PriceParser($this->db);
                         $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_supplier_price_expression, $objp->quantity, $objp->tva_tx);
                         if ($price_result >= 0) {
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 41da86cd9bf..ed0dcb96680 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -355,6 +355,7 @@ class ProductFournisseur extends Product
      */
     function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
     {
+        global $conf;
         $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability,";
         $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges, pfp.fk_supplier_price_expression, pfp.delivery_time_days"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
@@ -473,7 +474,7 @@ class ProductFournisseur extends Product
                 $prodfourn->fourn_tva_npr					= $record["info_bits"];
                 $prodfourn->fk_supplier_price_expression    = $record["fk_supplier_price_expression"];
 
-                if (!empty($prodfourn->fk_supplier_price_expression)) {
+                if (!empty($conf->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {
                     $priceparser = new PriceParser($this->db);
                     $price_result = $priceparser->parseProductSupplier($prodid, $prodfourn->fk_supplier_price_expression, $prodfourn->fourn_qty, $prodfourn->fourn_tva_tx);
                     if ($price_result >= 0) {
@@ -572,7 +573,7 @@ class ProductFournisseur extends Product
                 {
                     $fourn_price = $record["price"];
                     $fourn_unitprice = $record["unitprice"];
-                    if (!empty($record["fk_supplier_price_expression"])) {
+                    if (!empty($conf->dynamicprices->enabled) && !empty($record["fk_supplier_price_expression"])) {
                         $priceparser = new PriceParser($this->db);
                         $price_result = $priceparser->parseProductSupplier($prodid, $record["fk_supplier_price_expression"], $record["quantity"], $record["tva_tx"]);
                         if ($price_result >= 0) {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9ccb295406a..2891b2e1cf9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1278,6 +1278,7 @@ class Product extends CommonObject
 	 */
 	function get_buyprice($prodfournprice,$qty,$product_id=0,$fourn_ref=0)
 	{
+		global $conf;
 		$result = 0;
 
 		// We do select by searching with qty and prodfournprice
@@ -1294,7 +1295,7 @@ class Product extends CommonObject
 			$obj = $this->db->fetch_object($resql);
 			if ($obj && $obj->quantity > 0)		// If found
 			{
-                if (!empty($obj->fk_supplier_price_expression))
+                if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression))
                 {
 					require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
                 	$priceparser = new PriceParser($this->db);
@@ -1329,7 +1330,7 @@ class Product extends CommonObject
 					$obj = $this->db->fetch_object($resql);
 					if ($obj && $obj->quantity > 0)		// If found
 					{
-		                if (!empty($obj->fk_supplier_price_expression))
+		                if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression))
 		                {
 							require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 		                	$priceparser = new PriceParser($this->db);
@@ -1785,7 +1786,7 @@ class Product extends CommonObject
 					}
 				}
 
-                if (!empty($this->fk_price_expression) && empty($ignore_expression))
+                if (!empty($conf->dynamicprices->enabled) && !empty($this->fk_price_expression) && empty($ignore_expression))
                 {
 					require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
                 	$priceparser = new PriceParser($this->db);
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 0fe2769803d..bd4d60b5370 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -225,7 +225,7 @@ if (empty($reshook))
 				}
 				else
 				{
-					if ($price_expression !== '')
+					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
 						$priceparser = new PriceParser($db);
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index ccba0f887eb..2fa1ec06fb3 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -307,7 +307,8 @@ if ($result)
 			// Sell price
 			if (empty($conf->global->PRODUIT_MULTIPRICES))
 			{
-                if (!empty($objp->fk_price_expression)) {
+                if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression))
+                {
                 	$product = new Product($db);
                 	$product->fetch($objp->rowid);
                     $priceparser = new PriceParser($db);

From b1568a7319e7fd3b6fb49b41b9a6be6d261ae14b Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sun, 14 Feb 2016 14:46:58 +0100
Subject: [PATCH 168/421] Better Add buttons in dynamicprice module

---
 htdocs/langs/en_US/products.lang        |  2 ++
 htdocs/product/admin/dynamic_prices.php | 23 ++++++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 3dfabdc124d..bf223e0e33e 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -296,6 +296,8 @@ ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value. 
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index 84ec54433cd..7c9a46d8972 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -173,6 +173,16 @@ if ($action != 'create_updater' && $action != 'edit_updater') {
         print '</tr>';
     }
     print '</table>';
+
+    if (empty($action))
+    {
+        //Action Buttons
+        print '<div class="tabsAction">';
+        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("AddVariable").'</a>';
+        print '</div>';
+        //Separator is only need for updaters table is showed after buttons
+        print '<br><br>';
+    }
 }
 
 //Global variable editor
@@ -253,6 +263,14 @@ if ($action != 'create_variable' && $action != 'edit_variable') {
         print '</tr>';
     }
     print '</table>';
+
+    if (empty($action))
+    {
+        //Action Buttons
+        print '<div class="tabsAction">';
+        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater">'.$langs->trans("AddUpdater").'</a>';
+        print '</div>';
+    }
 }
 
 //Updater editor
@@ -321,11 +339,6 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
     print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
     print '</div>';
     print '</form>';
-} else {
-    //Action Buttons
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater">'.$langs->trans("Add").'</a>';
-    print '</div>';
 }
 
 llxFooter();

From 6bfc3f446f0106f6f8ae19349e76c40681cc4f57 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sun, 14 Feb 2016 14:50:10 +0100
Subject: [PATCH 169/421] Use setSupplierPriceExpression instead of product
 setPriceExpression

---
 htdocs/product/fournisseurs.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index bd4d60b5370..535420d3243 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -235,8 +235,10 @@ if (empty($reshook))
 							setEventMessages($priceparser->translatedError(), null, 'errors');
 						}
 					}
-					if (! $error && ! empty($conf->dynamicprices->enabled)) {
-						$ret=$object->setPriceExpression($price_expression);
+					if (! $error && ! empty($conf->dynamicprices->enabled))
+					{
+						//Set the price expression for this supplier price
+						$ret=$object->setSupplierPriceExpression($price_expression);
 						if ($ret < 0)
 						{
 							$error++;

From 89657d043945dc24870d1aed482462aa16e12377 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sun, 14 Feb 2016 17:28:31 +0100
Subject: [PATCH 170/421] Changed Price Parser functions and added
 testExpression

---
 htdocs/core/class/html.form.class.php         |  18 ++-
 .../fourn/class/fournisseur.product.class.php |  10 +-
 htdocs/product/class/product.class.php        |  20 ++-
 .../class/price_parser.class.php              | 139 +++++++++---------
 htdocs/product/dynamic_price/editor.php       |   6 +-
 htdocs/product/fournisseurs.php               |  10 +-
 6 files changed, 118 insertions(+), 85 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a71f161fe37..07ea1fc6edf 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2084,7 +2084,7 @@ class Form
 
         $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
         $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
-        $sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
+        $sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name";
         $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";
         if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
@@ -2169,8 +2169,14 @@ class Form
                     $outqty=$objp->quantity;
 					$outdiscount=$objp->remise_percent;
                     if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
+                        $prod_supplier = new ProductFournisseur($this->db);
+                        $prod_supplier->product_fourn_price_id = $objp->idprodfournprice;
+                        $prod_supplier->id = $objp->fk_product;
+                        $prod_supplier->fourn_qty = $objp->quantity;
+                        $prod_supplier->fourn_tva_tx = $objp->tva_tx;
+                        $prod_supplier->fk_supplier_price_expression = $objp->fk_supplier_price_expression;
                         $priceparser = new PriceParser($this->db);
-                        $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_supplier_price_expression, $objp->quantity, $objp->tva_tx);
+                        $price_result = $priceparser->parseProductSupplier($prod_supplier);
                         if ($price_result >= 0) {
                             $objp->fprice = $price_result;
                             if ($objp->quantity >= 1)
@@ -2308,8 +2314,14 @@ class Form
                     $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
 
                     if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
+                        $prod_supplier = new ProductFournisseur($this->db);
+                        $prod_supplier->product_fourn_price_id = $objp->idprodfournprice;
+                        $prod_supplier->id = $productid;
+                        $prod_supplier->fourn_qty = $objp->quantity;
+                        $prod_supplier->fourn_tva_tx = $objp->tva_tx;
+                        $prod_supplier->fk_supplier_price_expression = $objp->fk_supplier_price_expression;
                         $priceparser = new PriceParser($this->db);
-                        $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_supplier_price_expression, $objp->quantity, $objp->tva_tx);
+                        $price_result = $priceparser->parseProductSupplier($prod_supplier);
                         if ($price_result >= 0) {
                             $objp->fprice = $price_result;
                             if ($objp->quantity >= 1)
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index ed0dcb96680..0bf0492b411 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -476,7 +476,7 @@ class ProductFournisseur extends Product
 
                 if (!empty($conf->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {
                     $priceparser = new PriceParser($this->db);
-                    $price_result = $priceparser->parseProductSupplier($prodid, $prodfourn->fk_supplier_price_expression, $prodfourn->fourn_qty, $prodfourn->fourn_tva_tx);
+                    $price_result = $priceparser->parseProductSupplier($prodfourn);
                     if ($price_result >= 0) {
                     	$prodfourn->fourn_price = $price_result;
                     	$prodfourn->fourn_unitprice = null; //force recalculation of unitprice, as probably the price changed...
@@ -574,8 +574,14 @@ class ProductFournisseur extends Product
                     $fourn_price = $record["price"];
                     $fourn_unitprice = $record["unitprice"];
                     if (!empty($conf->dynamicprices->enabled) && !empty($record["fk_supplier_price_expression"])) {
+                        $prod_supplier = new ProductFournisseur($this->db);
+                        $prod_supplier->product_fourn_price_id = $record["product_fourn_price_id"];
+                        $prod_supplier->id = $prodid;
+                        $prod_supplier->fourn_qty = $record["quantity"];
+                        $prod_supplier->fourn_tva_tx = $record["tva_tx"];
+                        $prod_supplier->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
                         $priceparser = new PriceParser($this->db);
-                        $price_result = $priceparser->parseProductSupplier($prodid, $record["fk_supplier_price_expression"], $record["quantity"], $record["tva_tx"]);
+                        $price_result = $priceparser->parseProductSupplier($prod_supplier);
                         if ($price_result >= 0) {
                             $fourn_price = price2num($price_result,'MU');
                             if ($record["quantity"] != 0)
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 2891b2e1cf9..721f3c38759 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1298,8 +1298,14 @@ class Product extends CommonObject
                 if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression))
                 {
 					require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-                	$priceparser = new PriceParser($this->db);
-                    $price_result = $priceparser->parseProductSupplier($obj->fk_product, $obj->fk_supplier_price_expression, $obj->quantity, $obj->tva_tx);
+                    $prod_supplier = new ProductFournisseur($this->db);
+                    $prod_supplier->product_fourn_price_id = $obj->rowid;
+                    $prod_supplier->id = $obj->fk_product;
+                    $prod_supplier->fourn_qty = $obj->quantity;
+                    $prod_supplier->fourn_tva_tx = $obj->tva_tx;
+                    $prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
+                    $priceparser = new PriceParser($this->db);
+                    $price_result = $priceparser->parseProductSupplier($prod_supplier);
                     if ($price_result >= 0) {
                     	$obj->price = $price_result;
                     }
@@ -1333,8 +1339,14 @@ class Product extends CommonObject
 		                if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression))
 		                {
 							require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-		                	$priceparser = new PriceParser($this->db);
-		                    $price_result = $priceparser->parseProductSupplier($obj->fk_product, $obj->fk_supplier_price_expression, $obj->quantity, $obj->tva_tx);
+		                    $prod_supplier = new ProductFournisseur($this->db);
+		                    $prod_supplier->product_fourn_price_id = $obj->rowid;
+		                    $prod_supplier->id = $obj->fk_product;
+		                    $prod_supplier->fourn_qty = $obj->quantity;
+		                    $prod_supplier->fourn_tva_tx = $obj->tva_tx;
+		                    $prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
+		                    $priceparser = new PriceParser($this->db);
+		                    $price_result = $priceparser->parseProductSupplier($prod_supplier);
 		                    if ($result >= 0) {
 		                    	$obj->price = $price_result;
 		                    }
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 4a7bdb7acf6..eb1ef4e4345 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -131,6 +131,15 @@ class PriceParser
 	public function parseExpression($product, $expression, $values)
 	{
 		global $user;
+
+		//Check if empty
+		$expression = trim($expression);
+		if (empty($expression))
+		{
+			$this->error = array(20, null);
+			return -2;
+		}
+
 		//Accessible product values by expressions
 		$values = array_merge($values, array(
 			"tva_tx" => $product->tva_tx,
@@ -169,14 +178,6 @@ class PriceParser
 			$values["global_".$entry->code] = $entry->value;
 		}
 
-		//Check if empty
-		$expression = trim($expression);
-		if (empty($expression))
-		{
-			$this->error = array(20, null);
-			return -2;
-		}
-
 		//Prepare the lib, parameters and values
 		$em = new EvalMath();
 		$em->suppress_errors = true; //Don't print errors on page
@@ -221,40 +222,11 @@ class PriceParser
 	}
 
 	/**
-	 *	Calculates product price based on product id and string expression
-	 *
-	 *	@param	Product				$product    	The Product object to get information
-	 *	@param	string 				$expression     The expression to parse
-	 *	@param	array 				$extra_values   Any aditional values for expression
-	 *  @return int 				> 0 if OK, < 1 if KO
-	 */
-	public function parseProductExpression($product, $expression, $extra_values = array())
-	{
-		//Get the supplier min
-		$productFournisseur = new ProductFournisseur($this->db);
-		$supplier_min_price = $productFournisseur->find_min_price_product_fournisseur($product->id);
-
-		//Accessible values by expressions
-		$extra_values = array_merge($extra_values, array(
-			"supplier_min_price" => $supplier_min_price,
-		));
-
-		//Parse the expression and return the price, if not error occurred check if price is higher than min
-		$result = $this->parseExpression($product, $expression, $extra_values);
-		if (empty($this->error)) {
-			if ($result < $product->price_min) {
-				$result = $product->price_min;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 *	Calculates product price based on product id and expression id
+	 *	Calculates product price based on product id and associated expression
 	 *
 	 *	@param	Product				$product    	The Product object to get information
 	 *	@param	array 				$extra_values   Any aditional values for expression
-	 *  @return int 								> 0 if OK, < 1 if KO
+	 *	@return int 						> 0 if OK, < 1 if KO
 	 */
 	public function parseProduct($product, $extra_values = array())
 	{
@@ -266,55 +238,80 @@ class PriceParser
 			return -1;
 		}
 
-		//Parse the expression and return the price
-		return $this->parseProductExpression($product, $price_expression->expression, $extra_values);
-	}
-
-	/**
-	 *	Calculates supplier product price based on product id and string expression
-	 *
-	 *	@param	int					$product_id    	The Product id to get information
-	 *	@param	string 				$expression     The expression to parse
-	 *	@param	int					$quantity     	Supplier Min quantity
-	 *	@param	int					$tva_tx     	Supplier VAT rate
-	 *	@param	array 				$extra_values   Any aditional values for expression
-	 *  @return int 				> 0 if OK, < 1 if KO
-	 */
-	public function parseProductSupplierExpression($product_id, $expression, $quantity = null, $tva_tx = null, $extra_values = array())
-	{
-		//Get the product data
-		$product = new ProductFournisseur($this->db);
-		$product->fetch($product_id, '', '', 1);
+		//Get the supplier min
+		$productFournisseur = new ProductFournisseur($this->db);
+		$supplier_min_price = $productFournisseur->find_min_price_product_fournisseur($product->id);
 
 		//Accessible values by expressions
 		$extra_values = array_merge($extra_values, array(
-			"supplier_quantity" => $quantity,
-			"supplier_tva_tx" => $tva_tx,
+			"supplier_min_price" => $supplier_min_price,
 		));
-		return $this->parseExpression($product, $expression, $extra_values);
+
+		//Parse the expression and return the price, if not error occurred check if price is higher than min
+		$result = $this->parseExpression($product, $price_expression->expression, $extra_values);
+		if (empty($this->error)) {
+			if ($result < $product->price_min) {
+				$result = $product->price_min;
+			}
+		}
+		return $result;
 	}
 
 	/**
-	 *	Calculates supplier product price based on product id and expression id
+	 *	Calculates supplier product price based on product supplier price and associated expression
 	 *
-	 *	@param	int					$product_id    	The Product id to get information
-	 *	@param	int 				$expression_id  The expression to parse
-	 *	@param	int					$quantity     	Min quantity
-	 *	@param	int					$tva_tx     	VAT rate
-	 *	@param	array 				$extra_values   Any aditional values for expression
+	 *	@param	ProductFournisseur	$product_supplier   The Product supplier object to get information
+	 *	@param	array 				$extra_values       Any aditional values for expression
 	 *  @return int 				> 0 if OK, < 1 if KO
 	 */
-	public function parseProductSupplier($product_id, $expression_id, $quantity = null, $tva_tx = null, $extra_values = array())
+	public function parseProductSupplier($product_supplier, $extra_values = array())
 	{
 		//Get the expression from db
 		$price_expression = new PriceExpression($this->db);
-		$res = $price_expression->fetch($expression_id);
-		if ($res < 1) {
+		$res = $price_expression->fetch($product_supplier->fk_supplier_price_expression);
+		if ($res < 1)
+		{
 			$this->error = array(19, null);
 			return -1;
 		}
 
+		//Get the product data (use ignore_expression to avoid possible recursion)
+		$product_supplier->fetch($product_supplier->id, '', '', 1);
+
+		//Accessible values by expressions
+		$extra_values = array_merge($extra_values, array(
+			"supplier_quantity" => $product_supplier->fourn_qty,
+			"supplier_tva_tx" => $product_supplier->fourn_tva_tx,
+		));
+
 		//Parse the expression and return the price
-		return $this->parseProductSupplierExpression($product_id, $price_expression->expression, $quantity, $tva_tx, $extra_values);
+		return $this->parseExpression($product_supplier, $price_expression->expression, $extra_values);
+	}
+
+	/**
+	 *	Tests string expression for validity
+	 *
+	 *	@param	int					$product_id    	The Product id to get information
+	 *	@param	string 				$expression     The expression to parse
+	 *	@param	array 				$extra_values   Any aditional values for expression
+	 *  @return int 				> 0 if OK, < 1 if KO
+	 */
+	public function testExpression($product_id, $expression, $extra_values = array())
+	{
+		//Get the product data
+		$product = new Product($this->db);
+		$product->fetch($product_id, '', '', 1);
+
+		//Values for product expressions
+		$extra_values = array_merge($extra_values, array(
+			"supplier_min_price" => 1,
+		));
+
+		//Values for supplier product expressions
+		$extra_values = array_merge($extra_values, array(
+			"supplier_quantity" => 2,
+			"supplier_tva_tx" => 3,
+		));
+		return $this->parseExpression($product, $expression, $extra_values);
 	}
 }
\ No newline at end of file
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index d7d059ae10d..9b20371ea5b 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *  \file	   htdocs/product/expression/editor.php
+ *  \file	   htdocs/product/dynamic_price/editor.php
  *  \ingroup	product
  *  \brief	  Page for editing expression
  */
@@ -73,7 +73,7 @@ if ($action == 'add')
 		{
 			//Check the expression validity by parsing it
             $priceparser = new PriceParser($db);
-            $price_result = $priceparser->parseProductSupplierExpression($id, $expression, 0, 0);
+            $price_result = $priceparser->testExpression($id, $expression);
             if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
 			}
@@ -113,7 +113,7 @@ if ($action == 'update')
 		{
 			//Check the expression validity by parsing it
             $priceparser = new PriceParser($db);
-            $price_result = $priceparser->parseProductSupplierExpression($id, $expression, 0, 0);
+            $price_result = $priceparser->testExpression($id, $expression);
             if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
 			}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 535420d3243..db6adb52648 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -228,8 +228,14 @@ if (empty($reshook))
 					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
-						$priceparser = new PriceParser($db);
-						$price_result = $priceparser->parseProductSupplier($id, $price_expression, $quantity, $tva_tx);
+                        $prod_supplier = new ProductFournisseur($this->db);
+	                    $prod_supplier->id = $prodid;
+                        $prod_supplier->fourn_qty	= $quantity;
+	                    $prod_supplier->fourn_tva_tx = $tva_tx;
+	                    $prod_supplier->fourn_id = $id_fourn;
+	                    $prod_supplier->fk_supplier_price_expression = $price_expression;
+                        $priceparser = new PriceParser($db);
+                        $price_result = $priceparser->parseProductSupplier($prod_supplier);
 						if ($price_result < 0) { //Expression is not valid
 							$error++;
 							setEventMessages($priceparser->translatedError(), null, 'errors');

From 0e2be880c5591b49e18622479b68871a8a3aa024 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sun, 14 Feb 2016 19:05:43 +0100
Subject: [PATCH 171/421] Convert null to string

---
 htdocs/product/dynamic_price/class/price_parser.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index eb1ef4e4345..0f4ff5a0dbb 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -188,7 +188,8 @@ class PriceParser
 		$expression = str_replace("\n", $this->separator_chr, $expression);
 		foreach ($values as $key => $value)
 		{
-			$expression = str_replace($this->special_chr.$key.$this->special_chr, "$value", $expression);
+			if ($value === null) $value = "NULL";
+			$expression = str_replace($this->special_chr.$key.$this->special_chr, strval($value), $expression);
 		}
 		$expressions = explode($this->separator_chr, $expression);
 		$expressions = array_slice($expressions, 0, $this->limit);

From cc174daa13a859075a90e34371e5584e2242c049 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Feb 2016 20:12:47 +0100
Subject: [PATCH 172/421] Prepare 3.8.4

---
 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 77ba2788d99..7bf8271606d 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -30,7 +30,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.3');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.4');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants

From b7ae5bac6f15570afba5d00e229feae69a7af24a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Feb 2016 20:48:25 +0100
Subject: [PATCH 173/421] Fix: The text "All" is not appropriate.

---
 htdocs/core/class/html.form.class.php | 17 ++++++++++-------
 htdocs/product/price.php              | 27 ++++++++++++++++++---------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c694933f85c..5078b5932c9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -894,7 +894,7 @@ class Form
      *	@param	string	$selected       Preselected type
      *	@param  string	$htmlname       Name of field in form
      *  @param  string	$filter         optional filters criteras (example: 's.rowid <> x', 's.client IN (1,3)')
-     *	@param	int		$showempty		Add an empty field
+     *	@param	string	$showempty		Add an empty field (Can be '1' or text to use on empty line)
      * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
      * 	@param	int		$forcecombo		Force to use combo box
      *  @param	array	$events			Ajax event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
@@ -903,7 +903,7 @@ class Form
      *	@param  string	$moreparam      Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
      * 	@return	string					HTML string with select box for thirdparty.
      */
-    function select_company($selected='', $htmlname='socid', $filter='', $showempty=0, $showtype=0, $forcecombo=0, $events=array(), $limit=0, $morecss='minwidth100', $moreparam='')
+    function select_company($selected='', $htmlname='socid', $filter='', $showempty='', $showtype=0, $forcecombo=0, $events=array(), $limit=0, $morecss='minwidth100', $moreparam='')
     {
     	$out='';
 
@@ -949,7 +949,7 @@ class Form
      *	@param	string	$selected       Preselected type
      *	@param  string	$htmlname       Name of field in form
      *  @param  string	$filter         optional filters criteras (example: 's.rowid <> x', 's.client in (1,3)')
-     *	@param	int		$showempty		Add an empty field
+     *	@param	string	$showempty		Add an empty field (Can be '1' or text to use on empty line)
      * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
      * 	@param	int		$forcecombo		Force to use combo box
      *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
@@ -960,7 +960,7 @@ class Form
      *	@param  string	$moreparam      Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
      * 	@return	string					HTML string with
      */
-    function select_thirdparty_list($selected='',$htmlname='socid',$filter='',$showempty=0, $showtype=0, $forcecombo=0, $events=array(), $filterkey='', $outputmode=0, $limit=0, $morecss='minwidth100', $moreparam='')
+    function select_thirdparty_list($selected='',$htmlname='socid',$filter='',$showempty='', $showtype=0, $forcecombo=0, $events=array(), $filterkey='', $outputmode=0, $limit=0, $morecss='minwidth100', $moreparam='')
     {
         global $conf,$user,$langs;
 
@@ -1017,10 +1017,13 @@ class Form
             $out.= '<select id="'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'"'.($moreparam?' '.$moreparam:'').' name="'.$htmlname.'"'.$nodatarole.'>'."\n";
 
             $textifempty='';
-            // Do not use textempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
-            //$textifempty=' ';
+            // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
             //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-            if (! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $textifempty.=$langs->trans("All");
+            if (! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) 
+            {
+                if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty); 
+                else $textifempty.=$langs->trans("All");
+            }
             if ($showempty) $out.= '<option value="-1">'.$textifempty.'</option>'."\n";
 
             $num = $this->db->num_rows($resql);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index f10d8f17922..7abaf2c6b99 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -44,6 +44,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 $langs->load("products");
 $langs->load("bills");
+$langs->load("companies");
 
 $mesg=''; $error=0; $errors=array();
 
@@ -346,8 +347,16 @@ if (empty($reshook))
 		$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
 		$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
 
+		if (! ($prodcustprice->fk_soc > 0))
+		{
+		    $langs->load("errors");
+		    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
+		    $error++;
+		    $action='add_customer_price';
+		}
 		if (! empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $prodcustprice->price_min<$maxpricesupplier)
 		{
+		    $langs->load("errors");
 			setEventMessages($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')), null, 'errors');
 			$error++;
 			$action='add_customer_price';
@@ -548,7 +557,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 				print '<tr><td>' . $langs->trans("PriceByQuantity") . ' ' . $i;
 				print '</td><td>';
 
-				if ($object->prices_by_qty [$i] == 1) {
+				if ($object->prices_by_qty[$i] == 1) {
 					print '<table width="50%" class="border" summary="List of quantities">';
 
 					print '<tr class="liste_titre">';
@@ -558,7 +567,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 					print '<td align="right">' . $langs->trans("Discount") . '</td>';
 					print '<td>&nbsp;</td>';
 					print '</tr>';
-					foreach ($object->prices_by_qty_list [$i] as $ii => $prices) {
+					foreach ($object->prices_by_qty_list[$i] as $ii => $prices) {
 						if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
 							print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 							print '<input type="hidden" name="action" value="update_price_by_qty">';
@@ -574,7 +583,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 							print '</form>';
 						} else {
 							print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-							print '<td>' . $prices ['quantity'] . '</td>';
+							print '<td>' . $prices['quantity'] . '</td>';
 							print '<td align="right">' . price($prices['price']) . '</td>';
 							print '<td align="right">' . price($prices['unitprice']) . '</td>';
 							print '<td align="right">' . price($prices['remise_percent']) . ' %</td>';
@@ -1177,7 +1186,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 	if ($action == 'add_customer_price')
 	{
-		// Create mode
+		// Form to add a new customer price
 		$maxpricesupplier = $object->min_recommended_price();
 
 		print load_fiche_titre($langs->trans('PriceByCustomer'));
@@ -1188,19 +1197,19 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
 		print '<table class="border" width="100%">';
 		print '<tr>';
-		print '<td>' . $langs->trans('ThirdParty') . '</td>';
+		print '<td class="fieldrequired">' . $langs->trans('ThirdParty') . '</td>';
 		print '<td>';
-		print $form->select_company('', 'socid', 's.client in (1,2,3) AND s.rowid NOT IN (SELECT fk_soc FROM ' . MAIN_DB_PREFIX . 'product_customer_price WHERE fk_product='.$object->id.')', 1, 0, 0, array(), 0, 'minwidth300');
+		print $form->select_company('', 'socid', 's.client in (1,2,3) AND s.rowid NOT IN (SELECT fk_soc FROM ' . MAIN_DB_PREFIX . 'product_customer_price WHERE fk_product='.$object->id.')', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
 		print '</td>';
 		print '</tr>';
 
 		// VAT
-		print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
+		print '<tr><td class="fieldrequired">' . $langs->trans("VATRate") . '</td><td>';
 		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr);
 		print '</td></tr>';
 
 		// Price base
-		print '<tr><td width="15%">';
+		print '<tr><td class="fieldrequired">';
 		print $langs->trans('PriceBase');
 		print '</td>';
 		print '<td>';
@@ -1209,7 +1218,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</tr>';
 
 		// Price
-		print '<tr><td width="20%">';
+		print '<tr><td class="fieldrequired">';
 		$text = $langs->trans('SellingPrice');
 		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
 		print '</td><td>';

From 2f99273734482ed88d3e537eea0c9dbce35b1cb2 Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Fri, 12 Feb 2016 23:49:24 +0100
Subject: [PATCH 174/421] fix:no transaction in this place

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

diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 5bcbab5934a..94c7b7bf860 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -66,8 +66,6 @@ abstract class CommonObjectLine extends CommonObject
 
 		$langs->load('products');
 
-		$this->db->begin();
-
 		$label_type = 'label';
 
 		if ($type == 'short')

From 834f0b20ae4cd9dff9b9ccad1064d82ae5ac67fb Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Fri, 12 Feb 2016 23:49:24 +0100
Subject: [PATCH 175/421] fix:no transaction in this place

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

diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index ef854a2452e..f9f2e3c889f 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -69,8 +69,6 @@ abstract class CommonObjectLine extends CommonObject
 
 		$langs->load('products');
 
-		$this->db->begin();
-
 		$label_type = 'label';
 
 		if ($type == 'short')

From 13c85516eee4ec976194248df856aae98742e474 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Feb 2016 21:58:54 +0100
Subject: [PATCH 176/421] Doc comment

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

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 08106bc2151..c7d9d385385 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -268,7 +268,7 @@ if (empty($reshook))
 		{
 			$db->begin();
 
-			// Si on a selectionne une propal a copier, on realise la copie
+			// If we select proposal to clone during creation (when option PROPAL_CLONE_ON_CREATE_PAGE is on)
 			if (GETPOST('createmode') == 'copy' && GETPOST('copie_propal'))
 			{
 				if ($object->fetch(GETPOST('copie_propal')) > 0) {

From 2fd01d71cfd8ec3e46b8b1bb860a90aad8664e65 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Feb 2016 22:20:42 +0100
Subject: [PATCH 177/421] Fix #4548 Check on stock enough must be done
 according to warehouse

---
 htdocs/expedition/class/expedition.class.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 9ad2108519a..c885a03145d 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -856,13 +856,23 @@ class Expedition extends CommonObject
 				return -1;
 			}
 
-			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)	// FIXME Check is done for stock of product, it must be done for stock of product into warehouse if $entrepot_id defined
+			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
 			{
+			    // Check must be done for stock of product into warehouse if $entrepot_id defined
 				$product=new Product($this->db);
 				$result=$product->fetch($fk_product);
-				$product_type=$product->type;
 
-				if ($product_type == 0 && $product->stock_reel < $qty)
+				$product_type=$product->type;
+				if ($entrepot_id > 0) {
+                    $product->load_stock();
+				    $product_stock = $product->stock_warehouse[$entrepot_id]->real;
+				}
+				else 
+				{
+				    $product_stock = $product->stock_reel;
+				}
+				
+				if ($product_type == 0 && $product_stock < $qty)
 				{
 					$this->error=$langs->trans('ErrorStockIsNotEnough');
 					$this->db->rollback();

From a72c49f57bf642146e4dce070ae972ae7954959c Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sat, 23 Jan 2016 19:46:55 +0100
Subject: [PATCH 178/421] Form changes to add duration info

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 668855672a5..85844b51dff 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1865,6 +1865,8 @@ class Form
         $outlabel=$objp->label;
         $outdesc=$objp->description;
         $outtype=$objp->fk_product_type;
+        $outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration,0,dol_strlen($objp->duration)-1):'';
+        $outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration,-1):'';
 
         $opt = '<option value="'.$objp->rowid.'"';
         $opt.= ($objp->rowid == $selected)?' selected':'';
@@ -2009,24 +2011,19 @@ class Form
             $outval.=' - '.$langs->transnoentities("Stock").':'.$objp->stock;
         }
 
-        if ($objp->duration)
+        if ($outdurationvalue && $outdurationunit)
         {
-            $duration_value = substr($objp->duration,0,dol_strlen($objp->duration)-1);
-            $duration_unit = substr($objp->duration,-1);
-            if ($duration_value > 1)
+            $da=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
+            if (isset($da[$outdurationunit]))
             {
-                $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
+                $key = $da[$outdurationunit].($outdurationvalue > 1?'s':'');
+                $opt.= ' - '.$outdurationvalue.' '.$langs->trans($key);
+                $outval.=' - '.$outdurationvalue.' '.$langs->transnoentities($key);
             }
-            else
-            {
-                $dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
-            }
-            $opt.= ' - '.$duration_value.' '.($dur[$duration_unit]?$langs->trans($dur[$duration_unit]):'');
-            $outval.=' - '.$duration_value.' '.($dur[$duration_unit]?$langs->transnoentities($dur[$duration_unit]):'');
         }
 
         $opt.= "</option>\n";
-		$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount);
+		$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit);
 	}
 
     /**
@@ -2082,7 +2079,7 @@ class Form
 
         $langs->load('stocks');
 
-        $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
+        $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, p.fk_product_type,";
         $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
         $sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
@@ -2140,6 +2137,9 @@ class Form
                 $outval='';
                 $outqty=1;
 				$outdiscount=0;
+                $outtype=$objp->fk_product_type;
+                $outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration,0,dol_strlen($objp->duration)-1):'';
+                $outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration,-1):'';
 
                 $opt = '<option value="'.$objp->idprodfournprice.'"';
                 if ($selected && $selected == $objp->idprodfournprice) $opt.= ' selected';
@@ -2227,7 +2227,7 @@ class Form
                 // "key" value of json key array is used by jQuery automatically as selected value
                 // "label" value of json key array is used by jQuery automatically as text for combo box
                 $out.=$opt;
-                array_push($outarray, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'discount'=>$outdiscount, 'disabled'=>(empty($objp->idprodfournprice)?true:false)));
+                array_push($outarray, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'discount'=>$outdiscount, 'type'=>$outtype, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'disabled'=>(empty($objp->idprodfournprice)?true:false)));
 				// Exemple of var_dump $outarray
 				// array(1) {[0]=>array(6) {[key"]=>string(1) "2" ["value"]=>string(3) "ppp"
 				//           ["label"]=>string(76) "ppp (<strong>f</strong>ff2) - ppp - 20,00 Euros/1unité (20,00 Euros/unité)"

From 5841055d9a58e10edb30473012a3cf527f9e79a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 14 Feb 2016 22:53:00 +0100
Subject: [PATCH 179/421] Update releve.php

---
 htdocs/compta/bank/releve.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 0025fb62fd8..43587cfa6a0 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
@@ -91,7 +92,7 @@ $paymentsupplierstatic=new PaiementFourn($db);
 $paymentvatstatic=new TVA($db);
 $bankstatic=new Account($db);
 $banklinestatic=new AccountLine($db);
-
+$remisestatic = new RemiseCheque($db);
 
 // Load account
 $object = new Account($db);
@@ -328,9 +329,11 @@ else
 	$sql = "SELECT b.rowid, b.dateo as do, b.datev as dv,";
 	$sql.= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 	$sql.= " b.fk_bordereau,";
+    $sql.= " bc.number,";
 	$sql.= " ba.rowid as bankid, ba.ref as bankref, ba.label as banklabel";
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql.= ", ".MAIN_DB_PREFIX."bank as b";
+    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bordereau_cheque as bc ON bc.rowid=b.fk_bordereau';
 	$sql.= " WHERE b.num_releve='".$db->escape($num)."'";
 	if (!isset($num))	$sql.= " OR b.num_releve is null";
 	$sql.= " AND b.fk_account = ".$object->id;
@@ -374,7 +377,13 @@ else
             } else {
                 $type_label=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$objp->fk_type;
             }
-			print '<td class="nowrap">'.$type_label.' '.($objp->num_chq?$objp->num_chq:'').($objp->fk_bordereau>0?' ('.$objp->fk_bordereau.')':'').'</td>';
+            $link='';
+            if ($objp->fk_bordereau>0) {
+                $remisestatic->id = $objp->fk_bordereau;
+                $remisestatic->ref = $objp->number;
+                $link = ' '.$remisestatic->getNomUrl(1);
+            }
+			print '<td class="nowrap">'.$type_label.' '.($objp->num_chq?$objp->num_chq:'').$link.'</td>';
 
 			// Description
 			print '<td valign="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$object->id.'">';

From 3925ae0742f2d5b0b22f513986e280026e76a925 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Feb 2016 23:53:42 +0100
Subject: [PATCH 180/421] Fix: we loose ability to refresh contact list when
 changing a company on contact tab

---
 htdocs/core/class/html.formcompany.class.php | 16 +++++++---
 htdocs/core/lib/ajax.lib.php                 | 32 ++++++++++++++------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index e91184ede12..40276b6205d 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -564,16 +564,21 @@ class FormCompany
 				}
 			}
 
-			// Refresh contacts list on thirdparty list change
-			$htmloption='';
 
 			$events=array();
+			// Add an entry 'method' to say 'yes, we must execute url with param action = method';
+			// Add an entry 'url' to say which url to execute
+			// Add an entry htmlname to say which element we must change once url is called 
+			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines 
+			// To refresh contacts list on thirdparty list change
 			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
+			
 			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
 			{
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					$("#search_'.$htmlname.'").change(function() {
+					    console.log("Call runJsCodeForEvent'.$htmlname.'");
 						var obj = '.json_encode($events).';
 						$.each(obj, function(key,values) {
 							if (values.method.length) {
@@ -583,7 +588,7 @@ class FormCompany
 						/* Clean contact */
 						$("div#s2id_contactid>a>span").html(\'\');
 					});
-
+								    
 					// Function used to execute events when search_htmlname change
 					function runJsCodeForEvent'.$htmlname.'(obj) {
 						var id = $("#'.$htmlname.'").val();
@@ -609,6 +614,7 @@ class FormCompany
 											}
 										}
 									});
+						            /* console.log("Change select#"+htmlname+" with content "+response.value) */
 									$("select#" + htmlname).html(response.value);
 								}
 							}
@@ -619,8 +625,8 @@ class FormCompany
 			}
 
 			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
-			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" '.$htmloption.' />';
-			print ajax_autocompleter(($socid?$socid:-1),$htmlname,DOL_URL_ROOT.'/societe/ajaxcompanies.php','',$minLength);
+			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
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index fa150e6fbb7..4b3ab3b32f4 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -35,29 +35,40 @@
  *  @param	string	$urloption			More parameters on URL request
  *  @param	int		$minLength			Minimum number of chars to trigger that Ajax search
  *  @param	int		$autoselect			Automatic selection if just one value
- *  @param	array	$ajaxoptions		Multiple options array (Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done)
+ *  @param	array	$ajaxoptions		Multiple options array 
+ *                                          Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
+ *                                          Ex: array('disabled'=>
+ *                                          Ex: array('show'=>
+ *                                          Ex: array('update_textarea'=>
  *	@return string              		Script
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
 {
     if (empty($minLength)) $minLength=1;
 
+    // Input search_htmlname is original field
+    // Input htmlname is a second input field used when using ajax autocomplete.
 	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
 
-	$script.= '<script type="text/javascript">';
+	$script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
+	$script.= '<script type="text/javascript">'."\n";
 	$script.= '$(document).ready(function() {
 					var autoselect = '.$autoselect.';
 					var options = '.json_encode($ajaxoptions).';
 
-					// Remove product id before select another product
-					// use keyup instead change to avoid loosing the product id
+					/* Remove product id before select another product use keyup instead of change to avoid loosing the product id. This is needed only for select of predefined product */
+					/* TODO Check if we can remove this */
 					$("input#search_'.$htmlname.'").keydown(function() {
 						$("#'.$htmlname.'").val("");
 					});
-					$("input#search_'.$htmlname.'").change(function() {
+						    
+					/* I disable this. A call to trigger is already done later into the select action of the autocomplete code 
+						$("input#search_'.$htmlname.'").change(function() {
+					    console.log("Call the change trigger on input '.$htmlname.' because of a change on search_'.$htmlname.' was triggered");
 						$("#'.$htmlname.'").trigger("change");
-					});
-					// Check when keyup
+					});*/
+
+					// Check options for secondary actions when keyup
 					$("input#search_'.$htmlname.'").keyup(function() {
 						    if ($(this).val().length == 0)
 						    {
@@ -123,8 +134,9 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 						},
 						dataType: "json",
     					minLength: '.$minLength.',
-    					select: function( event, ui ) {		// Function ran when new value is selected into javascript combo
-    						$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
+    					select: function( event, ui ) {		// Function ran once new value has been selected into javascript combo
+    						console.log("Call change on input '.$htmlname.' because of select definition of autocomplete select call on input#search_'.$htmlname.'");
+    					    $("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
     						// Disable an element
     						if (options.option_disabled) {
     							if (ui.item.disabled) {
@@ -167,6 +179,8 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 									}
     							});
     						}
+    						console.log("ajax_autocompleter new value selected, we trigger change on original component");
+    						$("#search_'.$htmlname.'").trigger("change");	// We have changed value of the combo select, we must be sure to trigger all js hook binded on this event. This is required to trigger other javascript change method binded on original field by other code.
     					}
     					,delay: 500
 					}).data("ui-autocomplete")._renderItem = function( ul, item ) {

From 51ededc794db5b50a9eb7723883343cc8c4f78ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 00:02:07 +0100
Subject: [PATCH 181/421] Fix duplicate template crabe and crevette. crevette
 was not updated and contains old code compared to crabe. To manage situation
 invoice with a PDF, code must be included into crabe (with some test if
 invoice is a situation invoice or not to manage if to have different code)

---
 .../facture/doc/pdf_crevette.modules.php      | 2040 -----------------
 1 file changed, 2040 deletions(-)
 delete mode 100644 htdocs/core/modules/facture/doc/pdf_crevette.modules.php

diff --git a/htdocs/core/modules/facture/doc/pdf_crevette.modules.php b/htdocs/core/modules/facture/doc/pdf_crevette.modules.php
deleted file mode 100644
index 6cac6b47f92..00000000000
--- a/htdocs/core/modules/facture/doc/pdf_crevette.modules.php
+++ /dev/null
@@ -1,2040 +0,0 @@
-<?php
-/* Copyright (C) 2004-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2014	Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012      	Christophe Battarel <christophe.battarel@altairis.fr>
- * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
- * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.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 <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
- */
-
-/**
- *	\file       htdocs/core/modules/facture/doc/pdf_crabe.modules.php
- *	\ingroup    facture
- *	\brief      File of class to generate customers invoices from crabe model
- */
-
-require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-
-/**
- *	Class to manage PDF invoice template Crabe
- */
-class pdf_crevette extends ModelePDFFactures
-{
-    var $db;
-    var $name;
-    var $description;
-    var $type;
-
-    var $phpmin = array(4,3,0); // Minimum version of PHP required by module
-    var $version = 'dolibarr';
-
-    var $page_largeur;
-    var $page_hauteur;
-    var $format;
-	var $marge_gauche;
-	var	$marge_droite;
-	var	$marge_haute;
-	var	$marge_basse;
-
-	var $emetteur;	// Objet societe qui emet
-
-	/**
-	 * @var bool Situation invoice type
-	 */
-	public $situationinvoice;
-
-	/**
-	 * @var float X position for the situation progress column
-	 */
-	public $posxprogress;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf,$langs,$mysoc;
-
-		$langs->load("main");
-		$langs->load("bills");
-
-		$this->db = $db;
-		$this->name = "crevette";
-		$this->description = $langs->trans('PDFCrevetteDescription');
-
-		// Dimension page pour format A4
-		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
-		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 1;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 1;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   // Support add of a watermark on drafts
-
-		$this->franchise=!$mysoc->tva_assuj;
-
-		// Get source company
-		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
-
-		// Define position of columns
-		$this->posxdesc=$this->marge_gauche+1;
-		if($conf->global->PRODUCT_USE_UNITS)
-		{
-			$this->posxtva=99;
-			$this->posxup=114;
-			$this->posxqty=133;
-			$this->posxunit=150;
-		}
-		else
-		{
-			$this->posxtva=112;
-			$this->posxup=126;
-			$this->posxqty=145;
-		}
-		$this->posxdiscount=162;
-		$this->posxprogress=162; // Only displayed for situation invoices
-		$this->postotalht=174;
-		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_UNITPRICE)) $this->posxup = $this->posxqty;
-		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
-		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$this->posxpicture-=20;
-			$this->posxtva-=20;
-			$this->posxup-=20;
-			$this->posxqty-=20;
-			$this->posxdiscount-=20;
-			$this->postotalht-=20;
-		}
-
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
-		$this->situationinvoice=False;
-	}
-
-
-	/**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int         	    			1=OK, 0=KO
-	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
-	{
-		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		$outputlangs->load("main");
-		$outputlangs->load("dict");
-		$outputlangs->load("companies");
-		$outputlangs->load("bills");
-		$outputlangs->load("products");
-
-		$nblignes = count($object->lines);
-
-		// Loop on each lines to detect if there is at least one image to show
-		$realpatharray=array();
-		if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
-		{
-			for ($i = 0 ; $i < $nblignes ; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
-
-				$objphoto = new Product($this->db);
-				$objphoto->fetch($object->lines[$i]->fk_product);
-
-				$pdir = get_exdir($object->lines[$i]->fk_product,2,0,0,'product') . $object->lines[$i]->fk_product ."/photos/";
-				$dir = $conf->product->dir_output.'/'.$pdir;
-
-				$realpath='';
-				foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
-				{
-					$filename=$obj['photo'];
-					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
-					$realpath = $dir.$filename;
-					break;
-				}
-
-				if ($realpath) $realpatharray[$i]=$realpath;
-			}
-		}
-		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
-
-		if ($conf->facture->dir_output)
-		{
-			$object->fetch_thirdparty();
-
-			$deja_regle = $object->getSommePaiement();
-			$amount_credit_notes_included = $object->getSumCreditNotesUsed();
-			$amount_deposits_included = $object->getSumDepositsUsed();
-
-			// Definition of $dir and $file
-			if ($object->specimen)
-			{
-				$dir = $conf->facture->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
-			{
-				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->facture->dir_output . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
-			}
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return 0;
-				}
-			}
-
-			if (file_exists($dir))
-			{
-				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-				// Create pdf instance
-				$pdf=pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-				$heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
-
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-
-                // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-				    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-				    $tplidx = $pdf->importPage(1);
-                }
-
-				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
-
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Invoice"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Invoice"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
-
-				// Positionne $this->atleastonediscount si on a au moins une remise
-				for ($i = 0 ; $i < $nblignes ; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
-						$this->atleastonediscount++;
-					}
-				}
-				if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS))
-				{
-					$this->posxpicture+=($this->postotalht - $this->posxdiscount);
-					$this->posxtva+=($this->postotalht - $this->posxdiscount);
-					$this->posxup+=($this->postotalht - $this->posxdiscount);
-					$this->posxqty+=($this->postotalht - $this->posxdiscount);
-					$this->posxdiscount+=($this->postotalht - $this->posxdiscount);
-					//$this->postotalht;
-				}
-
-				// Situation invoice handling
-				if ($object->situation_cycle_ref)
-				{
-					$this->situationinvoice = True;
-					$progress_width = 14;
-					$this->posxtva -= $progress_width;
-					$this->posxup -= $progress_width;
-					$this->posxqty -= $progress_width;
-					$this->posxdiscount -= $progress_width;
-					$this->posxunit -= $progress_width;
-					//$this->posxprogress -= $progress_width;
-					$this->posxpicture -= $progress_width;
-					$this->postotalht += 8;
-				}
-
-				// New page
-				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				$pagenb++;
-
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
-
-				$tab_top = 90;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
-
-				// Incoterm
-				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
-				{
-					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
-						$tab_top = 88;
-
-						$pdf->SetFont('','', $default_font_size - 1);
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
-						$nexY = $pdf->GetY();
-						$height_incoterms=$nexY-$tab_top;
-
-						// Rect prend une longueur en 3eme param
-						$pdf->SetDrawColor(192,192,192);
-						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
-
-						$tab_top = $nexY+6;
-						$height_incoterms += 4;
-					}
-				}
-
-				// Affiche notes
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
-				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
-					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
-						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
-						$salerepobj=new User($this->db);
-						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
-					}
-				}
-				if ($notetoshow)
-				{
-					$tab_top = 88 + $height_incoterms;
-
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
-
-					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
-
-					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
-				}
-				else
-				{
-					$height_note=0;
-				}
-				
-				if ($this->situationinvoice)
-				{
-					$object->fetchPreviousNextSituationInvoice();
-					
-					$total_decompte = $object->total_ht;
-					
-					if (count($object->tab_previous_situation_invoice) > 0)
-					{
-						foreach ($object->tab_previous_situation_invoice as $prev_invoice) 
-						{
-							$total_decompte += $prev_invoice->total_ht;
-						}
-					}
-			
-					$top = $tab_top;
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, $langs->trans('PDFCrevetteSituationInvoiceTitle'), 0, 1);
-					
-					$pdf->SetFont('','', $default_font_size - 2);
-					$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
-					$pdf->writeHTMLCell(90, 3, $this->posxdesc+100, $tab_top, $titre, 0, 1, false, true, 'R');
-					$pdf->SetFont('','', $default_font_size);
-					
-					$pdf->Line($this->posxdesc-1, $pdf->GetY(), $this->page_largeur-$this->marge_droite, $pdf->GetY());
-					
-					$nexY = $pdf->GetY();
-					$tab_top = $nexY+1;
-					$pdf->writeHTMLCell(90, 3, $this->posxdesc-1, $tab_top, $langs->trans('PDFCrevetteSituationInvoiceLineDecompte'), 0, 1);
-					$price_display = price(abs($total_decompte));
-					$pdf->writeHTMLCell(90, 3, $this->posxdesc+100, $tab_top, $price_display, 0, 1, false, true, 'R');
-					
-					if (count($object->tab_previous_situation_invoice) > 0)
-					{
-						$object->totalTCCPreviousSitutationInvoice = 0;
-						
-						foreach ($object->tab_previous_situation_invoice as $prev_invoice)
-						{
-							$nexY = $pdf->GetY();
-							$tab_top = $nexY+1;
-							$pdf->writeHTMLCell(90, 3, $this->posxdesc-1, $tab_top, $langs->trans('PDFCrevetteSituationInvoiceLine', $prev_invoice->situation_counter, $prev_invoice->ref, dol_print_date($prev_invoice->date)), 0, 1);
-							
-							$price_display = -1 * abs($prev_invoice->total_ht);
-							$price_display = price($price_display);
-							$pdf->writeHTMLCell(90, 3, $this->posxdesc+100, $tab_top, $price_display, 0, 1, false, true, 'R');
-							
-							$object->totalTCCPreviousSitutationInvoice += $prev_invoice->total_ttc;
-						}
-						
-						$nexY = $pdf->GetY();
-						$height_situation=$nexY-$top;
-						
-						$tab_height = $tab_height - $height_situation;
-						$tab_top = $nexY+7;
-					}
-					
-					$this->page =1;
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot  + 1;
-					
-					// Affiche zone infos
-					$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
-					
-					// Affiche zone totaux
-					foreach ($object->lines as $line)
-					{
-						$vatrate=(string) $line->tva_tx;
-						
-						$prev_progress = $line->get_prev_progress();
-						if ($prev_progress > 0) $tvaligne = $line->total_tva * ($line->situation_percent - $prev_progress) / $line->situation_percent;
-						else $tvaligne = $line->total_tva;
-	
-						if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					
-						if (($line->info_bits & 0x01) == 0x01) $vatrate.='*';
-						if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
-						$this->tva[$vatrate] += $tvaligne;
-					}
-
-					$posy=$this->_tableau_tot_situation($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
-					$this->tva = array();
-					
-					// Pied de page
-					$this->_pagefoot($pdf,$object,$outputlangs,1);
-					if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
-			
-					// Page break
-					$pageposbefore=$pdf->getPage();
-					$pdf->AddPage();
-					$pagenb++;
-					if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					$pdf->setPage($pageposbefore+1);
-					$showpricebeforepagebreak=0;
-					
-					$iniY = $tab_top_newpage+10;
-					$curY = $tab_top_newpage+10;
-					$nexY = $tab_top_newpage+10;
-				}
-				else 
-				{
-					$iniY = $tab_top + 7;
-					$curY = $tab_top + 7;
-					$nexY = $tab_top + 7;
-				}
-
-				// Loop on each lines
-				for ($i = 0; $i < $nblignes; $i++)
-				{
-					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
-
-					// Define size of image if we need it
-					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
-
-					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
-
-					$showpricebeforepagebreak=1;
-					$posYAfterImage=0;
-					$posYAfterDescription=0;
-
-					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
-						$pdf->AddPage('','',true);
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-						$pdf->setPage($pageposbefore+1);
-
-						$curY = $tab_top_newpage;
-						$showpricebeforepagebreak=0;
-					}
-
-					if (isset($imglinesize['width']) && isset($imglinesize['height']))
-					{
-						$curX = $this->posxpicture-1;
-						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
-						// $pdf->Image does not increase value return by getY, so we save it manually
-						$posYAfterImage=$curY+$imglinesize['height'];
-					}
-
-					// Description of product line
-					$curX = $this->posxdesc-1;
-
-					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
-					$pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
-						$pdf->rollbackTransaction(true);
-						$pageposafter=$pageposbefore;
-						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
-						$pageposafter=$pdf->getPage();
-						$posyafter=$pdf->GetY();
-						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
-							{
-								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-								$pdf->setPage($pageposafter+1);
-							}
-						}
-						else
-						{
-							// We found a page break
-							$showpricebeforepagebreak=0;
-						}
-					}
-					else	// No pagebreak
-					{
-						$pdf->commitTransaction();
-					}
-					$posYAfterDescription=$pdf->GetY();
-
-					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
-					
-					$pdf->setPage($pageposbefore);
-					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-
-					// We suppose that a too long description or photo were moved completely on next page
-					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-					}
-
-					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
-
-					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-					{
-						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-						$pdf->SetXY($this->posxtva, $curY);
-						$pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R');
-					}
-
-					// Unit price before discount
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_UNITPRICE))
-					{
-						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
-						$pdf->SetXY($this->posxup, $curY);
-						$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
-					}
-					
-					// Quantity
-					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY($this->posxqty, $curY);
-					// Enough for 6 chars
-					if($conf->global->PRODUCT_USE_UNITS)
-					{
-						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R');
-					}
-					else
-					{
-						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
-					}
-
-					// Unit
-					if($conf->global->PRODUCT_USE_UNITS)
-					{
-						if ($this->situationinvoice) 
-						{
-							$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
-							$pdf->SetXY($this->posxunit, $curY);
-							$pdf->MultiCell($this->posxprogress-$this->posxunit-0.8, 4, $unit, 0, 'L');
-						}
-						else
-						{
-							$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
-							$pdf->SetXY($this->posxunit, $curY);
-							$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');	
-						}
-					}
-
-					// Discount on line
-					if ($object->lines[$i]->remise_percent)
-					{
-                        $pdf->SetXY($this->posxdiscount-2, $curY);
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
-						$pdf->MultiCell($this->posxprogress-$this->posxdiscount, 3, $remise_percent, 0, 'R');
-					}
-
-					if ($this->situationinvoice)
-					{
-						// Situation progress
-						$progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
-						$pdf->SetXY($this->posxprogress, $curY);
-						$pdf->MultiCell($this->postotalht-$this->posxprogress, 3, $progress, 0, 'R');
-					}
-
-					// Total HT line
-					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
-
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					$prev_progress = $object->lines[$i]->get_prev_progress();
-					if ($prev_progress > 0) // Compute progress from previous situation
-					{
-						$tvaligne = $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-					} else {
-						$tvaligne = $object->lines[$i]->total_tva;
-					}
-					$localtax1ligne=$object->lines[$i]->total_localtax1;
-					$localtax2ligne=$object->lines[$i]->total_localtax2;
-					$localtax1_rate=$object->lines[$i]->localtax1_tx;
-					$localtax2_rate=$object->lines[$i]->localtax2_tx;
-					$localtax1_type=$object->lines[$i]->localtax1_type;
-					$localtax2_type=$object->lines[$i]->localtax2_type;
-
-					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
-
-					$vatrate=(string) $object->lines[$i]->tva_tx;
-
-					// Retrieve type from database for backward compatibility with old records
-					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
-					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
-					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0, $object->thirdparty, $mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
-					}
-
-				    // retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
-						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
-						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
-
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
-					$this->tva[$vatrate] += $tvaligne;
-
-					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
-
-					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
-					{
-						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
-						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
-						$pdf->SetLineStyle(array('dash'=>0));
-					}
-
-					$nexY+=2;    // Passe espace entre les lignes
-
-					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
-						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						$pagenb++;
-						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						// New page
-						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-				}
-
-				// Show square
-				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;
-				}
-				elseif ($this->situationinvoice && $pagenb == 2)
-				{
-					$this->_tableau($pdf, $tab_top_newpage+4, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter - 4, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				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;
-				}
-
-				// Affiche zone infos
-				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
-
-				// Affiche zone totaux
-				$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
-
-				// Affiche zone versements
-				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
-				{
-					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
-				}
-
-				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
-
-				$pdf->Close();
-
-				$pdf->Output($file,'F');
-
-				// Add pdfgeneration hook
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				return 1;   // Pas d'erreur
-			}
-			else
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","FAC_OUTPUTDIR");
-			return 0;
-		}
-		$this->error=$langs->trans("ErrorUnknown");
-		return 0;   // Erreur par defaut
-	}
-
-
-	/**
-	 *  Show payments table
-	 *
-     *  @param	PDF			$pdf           Object PDF
-     *  @param  Object		$object         Object invoice
-     *  @param  int			$posy           Position y in PDF
-     *  @param  Translate	$outputlangs    Object langs for output
-     *  @return int             			<0 if KO, >0 if OK
-	 */
-	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
-	{
-		global $conf;
-
-        $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-        $tab3_posx = 120;
-		$tab3_top = $posy + 8;
-		$tab3_width = 80;
-		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$tab3_posx -= 20;
-		}
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("PaymentsBackAlreadyDone");
-
-		$pdf->SetFont('','', $default_font_size - 3);
-		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
-
-		$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
-
-		$pdf->SetFont('','', $default_font_size - 4);
-		$pdf->SetXY($tab3_posx, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+21, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+40, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+58, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
-
-		$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
-
-		$y=0;
-
-		$pdf->SetFont('','', $default_font_size - 4);
-
-		// Loop on each deposits and credit notes included
-		$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
-		$sql.= " re.description, re.fk_facture_source,";
-		$sql.= " f.type, f.datef";
-		$sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re, ".MAIN_DB_PREFIX ."facture as f";
-		$sql.= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			$invoice=new Facture($this->db);
-			while ($i < $num)
-			{
-				$y+=3;
-				$obj = $this->db->fetch_object($resql);
-
-				if ($obj->type == 2) $text=$outputlangs->trans("CreditNote");
-				elseif ($obj->type == 3) $text=$outputlangs->trans("Deposit");
-				else $text=$outputlangs->trans("UnknownType");
-
-				$invoice->fetch($obj->fk_facture_source);
-
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, price($obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
-
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
-
-				$i++;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-
-		// Loop on each payment
-		$sql = "SELECT p.datep as date, p.fk_paiement as type, p.num_paiement as num, pf.amount as amount,";
-		$sql.= " cp.code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
-		$sql.= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
-		$sql.= " ORDER BY p.datep";
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num) {
-				$y+=3;
-				$row = $this->db->fetch_object($resql);
-
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
-				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
-
-				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
-				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
-
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
-
-				$i++;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-
-	}
-
-
-	/**
-	 *   Show miscellaneous information (payment mode, payment term, ...)
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
-	 */
-	function _tableau_info(&$pdf, $object, $posy, $outputlangs)
-	{
-		global $conf;
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
-
-			$posy=$pdf->GetY()+4;
-		}
-
-		$posxval=52;
-
-		// Show payments conditions
-		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement))
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$titre = $outputlangs->transnoentities("PaymentConditions").':';
-			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posxval, $posy);
-			$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
-			$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
-			$pdf->MultiCell(80, 4, $lib_condition_paiement,0,'L');
-
-			$posy=$pdf->GetY()+3;
-		}
-
-		if ($object->type != 2)
-		{
-			// Check a payment mode is defined
-			if (empty($object->mode_reglement_code)
-			&& empty($conf->global->FACTURE_CHQ_NUMBER)
-			&& empty($conf->global->FACTURE_RIB_NUMBER))
-			{
-				$this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
-			}
-			// Avoid having any valid PDF with setup that is not complete
-			elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER))
-				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER)))
-			{
-				$outputlangs->load("errors");
-
-				$pdf->SetXY($this->marge_gauche, $posy);
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup",$object->mode_reglement_code);
-				$pdf->MultiCell(80, 3, $this->error,0,'L',0);
-				$pdf->SetTextColor(0,0,0);
-
-				$posy=$pdf->GetY()+1;
-			}
-
-			// Show payment mode
-			if ($object->mode_reglement_code
-			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR')
-			{
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->SetXY($this->marge_gauche, $posy);
-				$titre = $outputlangs->transnoentities("PaymentMode").':';
-				$pdf->MultiCell(80, 5, $titre, 0, 'L');
-
-				$pdf->SetFont('','', $default_font_size - 2);
-				$pdf->SetXY($posxval, $posy);
-				$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
-				$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
-
-				$posy=$pdf->GetY()+2;
-			}
-
-			// Show payment mode CHQ
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-			{
-				// Si mode reglement non force ou si force a CHQ
-				if (! empty($conf->global->FACTURE_CHQ_NUMBER))
-				{
-					$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-					{
-						$account = new Account($this->db);
-						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
-						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
-						$posy=$pdf->GetY()+1;
-
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
-							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
-			            }
-					}
-					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-					{
-						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
-						$posy=$pdf->GetY()+1;
-
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
-							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-							$posy=$pdf->GetY()+2;
-			            }
-					}
-				}
-			}
-
-			// If payment mode not forced or forced to VIR, show payment with BAN
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-			{
-				if (! empty($object->fk_account) || ! empty($conf->global->FACTURE_RIB_NUMBER))
-				{
-					$bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
-					$account = new Account($this->db);
-					$account->fetch($bankid);
-
-					$curx=$this->marge_gauche;
-					$cury=$posy;
-
-					$posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
-
-					$posy+=2;
-				}
-			}
-		}
-
-		return $posy;
-	}
-
-
-	/**
-	 *	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	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
-	 */
-	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
-	{
-		global $conf,$mysoc;
-
-        $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$tab2_top = $posy;
-		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// Tableau total
-		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$col2x-=20;
-		}
-		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
-
-		$useborder=0;
-		$index = 0;
-
-		// Total HT
-		$pdf->SetFillColor(255,255,255);
-		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
-		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
-
-		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
-
-		$this->atleastoneratenotnull=0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
-			$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
-			{
-				// Nothing to do
-			}
-			else
-			{
-				//Local tax 1 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-	      		//}
-				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-
-							}
-						}
-					}
-				//}
-				// VAT
-				foreach($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey > 0)    // On affiche pas taux 0
-					{
-						$this->atleastoneratenotnull++;
-
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-						$tvacompl='';
-						if (preg_match('/\*/',$tvakey))
-						{
-							$tvakey=str_replace('*','',$tvakey);
-							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-						}
-						$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
-						$totalvat.=vatrate($tvakey,1).$tvacompl;
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-					}
-				}
-
-				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey != 0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-	      		//}
-				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-						    // retrieve global local tax
-							if ($tvakey != 0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
-
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					//}
-				}
-
-				// Revenue stamp
-				if (price2num($object->revenuestamp) != 0)
-				{
-					$index++;
-					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
-
-					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
-				}
-
-				// Total TTC
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->SetFillColor(224,224,224);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
-
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
-			}
-		}
-
-		$pdf->SetTextColor(0,0,0);
-
-		$creditnoteamount=$object->getSumCreditNotesUsed();
-		$depositsamount=$object->getSumDepositsUsed();
-		//print "x".$creditnoteamount."-".$depositsamount;exit;
-		$resteapayer = price2num($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if ($object->paye) $resteapayer=0;
-
-		if ($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0)
-		{
-			// Already paid + Deposits
-			$index++;
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
-
-			// Credit note
-			if ($creditnoteamount)
-			{
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("CreditNotes"), 0, 'L', 0);
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
-			}
-
-			// Escompte
-			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
-			{
-				$index++;
-				$pdf->SetFillColor(255,255,255);
-
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOffered"), $useborder, 'L', 1);
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
-
-				$resteapayer=0;
-			}
-
-			$index++;
-			$pdf->SetTextColor(0,0,60);
-			$pdf->SetFillColor(224,224,224);
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
-
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetTextColor(0,0,0);
-		}
-
-		$index++;
-		return ($tab2_top + ($tab2_hl * $index));
-	}
-
-	/**
-	 *	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	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
-	 */
-	function _tableau_tot_situation(&$pdf, $object, $deja_regle, $posy, $outputlangs)
-	{
-		global $conf,$mysoc;
-
-		$pdf->Line($this->posxdesc-1, $posy-2, $this->page_largeur-$this->marge_droite, $posy-2);
-
-        $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$tab2_top = $posy;
-		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// Tableau total
-		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$col2x-=20;
-		}
-		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
-
-		$useborder=0;
-		$index = 0;
-
-		// Total HT
-		$pdf->SetFillColor(255,255,255);
-		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
-		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
-
-		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
-
-		$this->atleastoneratenotnull=0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
-			$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
-			{
-				// Nothing to do
-			}
-			else
-			{
-				//Local tax 1 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-	      		//}
-				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-
-							}
-						}
-					}
-				//}
-				// VAT
-				foreach($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey > 0)    // On affiche pas taux 0
-					{
-						$this->atleastoneratenotnull++;
-
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-						$tvacompl='';
-						if (preg_match('/\*/',$tvakey))
-						{
-							$tvakey=str_replace('*','',$tvakey);
-							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-						}
-						$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
-						$totalvat.=vatrate($tvakey,1).$tvacompl;
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-					}
-				}
-
-				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-				//{
-					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-							if ($tvakey != 0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					}
-	      		//}
-				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-				//{
-					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
-					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
-
-						foreach( $localtax_rate as $tvakey => $tvaval )
-						{
-						    // retrieve global local tax
-							if ($tvakey != 0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
-
-								$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
-							}
-						}
-					//}
-				}
-
-				// Revenue stamp
-				if (price2num($object->revenuestamp) != 0)
-				{
-					$index++;
-					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
-
-					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
-				}
-
-				// Total TTC
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->SetFillColor(224,224,224);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
-
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
-			}
-		}
-
-		$index++;
-		return ($tab2_top + ($tab2_hl * $index));
-	}
-
-
-	/**
-	 *   Show table for lines
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
-	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @return	void
-	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
-	{
-		global $conf;
-
-		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','', $default_font_size - 2);
-
-		if (empty($hidetop))
-		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
-			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
-			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
-
-			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
-		}
-
-		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// Output Rect
-		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
-
-		if (empty($hidetop))
-		{
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
-
-			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
-			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
-		}
-
-		if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
-		{
-			$pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
-				//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
-			}
-		}
-
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
-			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-				$pdf->SetXY($this->posxtva-3, $tab_top+1);
-				$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
-			}
-		}
-
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_UNITPRICE))
-		{
-			$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-				$pdf->SetXY($this->posxup-1, $tab_top+1);
-				$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
-			}
-		}
-		
-
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->posxqty-1, $tab_top+1);
-			if($conf->global->PRODUCT_USE_UNITS)
-			{
-				$pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-			}
-			else
-			{
-				$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-			}
-		}
-
-		if($conf->global->PRODUCT_USE_UNITS) {
-			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
-			if (empty($hidetop)) {
-				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
-				$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
-					'C');
-			}
-		}
-		
-		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
-				$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
-				$pdf->MultiCell($this->posxprogress-$this->posxdiscount,2, $outputlangs->transnoentities("ReductionShort"),'','C');
-			}
-		}
-		
-		if ($this->situationinvoice)
-		{
-			if ($this->atleastonediscount) $pdf->line($this->posxprogress - 2, $tab_top, $this->posxprogress - 2, $tab_top + $tab_height);
-			else $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-			
-			if (empty($hidetop)) {
-				$pdf->SetXY($this->posxprogress-1, $tab_top + 1);
-				if($conf->global->PRODUCT_USE_UNITS) 
-				{
-					$pdf->MultiCell(20, 2, $outputlangs->transnoentities("Progress"), '', 'C');
-				}
-				else
-				{
-					$pdf->MultiCell(20, 2, $outputlangs->transnoentities("Progress"), '', 'C');	
-				}
-			}
-		}
-		
-		if ($this->atleastonediscount)
-		{
-			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-		}
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->postotalht-1, $tab_top+1);
-			$pdf->MultiCell(22,2, $outputlangs->transnoentities("TotalHT"),'','C');
-		}
-	}
-
-	/**
-	 *  Show top header of page.
-	 *
-	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
-	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
-	{
-		global $conf,$langs;
-
-		$outputlangs->load("main");
-		$outputlangs->load("bills");
-		$outputlangs->load("propal");
-		$outputlangs->load("companies");
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
-
-		// Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
-        {
-		      pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
-        }
-
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
-
-		$w = 110;
-
-		$posy=$this->marge_haute;
-        $posx=$this->page_largeur-$this->marge_droite-$w;
-
-		$pdf->SetXY($this->marge_gauche,$posy);
-
-		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
-			    $height=pdf_getHeightForLogo($logo);
-				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			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
-		{
-			$text=$this->emetteur->name;
-			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-		}
-
-		$pdf->SetFont('','B', $default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$title=$outputlangs->transnoentities("Invoice");
-		if ($object->type == 1) $title=$outputlangs->transnoentities("InvoiceReplacement");
-		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
-		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
-		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProFormat");
-		$pdf->MultiCell($w, 3, $title, '', 'R');
-		
-		$pdf->SetFont('','B',$default_font_size);
-
-		$posy+=5;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
-
-		$posy+=1;
-		$pdf->SetFont('','', $default_font_size - 2);
-
-		if ($object->ref_client)
-		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
-		}
-
-		$objectidnext=$object->getIdReplacingInvoice('validated');
-		if ($object->type == 0 && $objectidnext)
-		{
-			$objectreplacing=new Facture($this->db);
-			$objectreplacing->fetch($objectidnext);
-
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
-		}
-		if ($object->type == 1)
-		{
-			$objectreplaced=new Facture($this->db);
-			$objectreplaced->fetch($object->fk_facture_source);
-
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
-		}
-		if ($object->type == 2)
-		{
-			$objectreplaced=new Facture($this->db);
-			$objectreplaced->fetch($object->fk_facture_source);
-
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
-		}
-
-
-		if ($this->situationinvoice)
-		{
-			$posy+=4;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("PDFCrevetteSituationNumber", $object->situation_counter), '', 'R');
-		}
-
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : " . dol_print_date($object->date,"day",false,$outputlangs), '', 'R');
-
-		if ($object->type != 2)
-		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
-		}
-
-		if ($object->thirdparty->code_client)
-		{
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
-		}
-
-		$posy+=1;
-
-		// Show list of linked objects
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
-
-		if ($showaddress)
-		{
-			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client);
-
-			// Show sender
-			$posy=42;
-			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
-
-			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
-
-			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
-
-			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-
-
-
-			// If BILLING contact defined on invoice, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','BILLING');
-			if (count($arrayidcontact) > 0)
-			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
-			}
-
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
-				$thirdparty = $object->contact;
-			} else {
-				$thirdparty = $object->client;
-			}
-
-			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
-
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
-
-			// Show recipient
-			$widthrecbox=100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
-
-			// Show recipient frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx+2,$posy-5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":",0,'L');
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
-
-			// Show recipient name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
-
-			$posy = $pdf->getY();
-
-			// Show recipient information
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
-		}
-
-		$pdf->SetTextColor(0,0,0);
-	}
-
-	/**
-	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	int								Return height of bottom margin including footer text
-	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
-	{
-		$showdetails=0;
-		return pdf_pagefoot($pdf,$outputlangs,'FACTURE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
-	}
-
-}
-

From c1c8ead49f515bef95ff3593b0d2373d2213e42b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 00:58:51 +0100
Subject: [PATCH 182/421] Debug multicurrency module

---
 htdocs/compta/facture.php    | 18 ++++++++++--------
 htdocs/langs/en_US/main.lang |  3 +++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 88be9bab0ba..ad555a8f605 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2346,7 +2346,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).'</label></td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td colspan="2" class="maxwidthonsmartphone">';
         print $form->select_incoterms((!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), (!empty($objectsrc->location_incoterms)?$objectsrc->location_incoterms:''));
 		print '</td></tr>';
 	}
@@ -2361,7 +2361,7 @@ if ($action == 'create')
 
 	// Template to use by default
 	print '<tr><td>' . $langs->trans('Model') . '</td>';
-	print '<td>';
+	print '<td colspan="2">';
 	include_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php';
 	$liste = ModelePDFFactures::liste_modeles($db);
 	print $form->selectarray('model', $liste, $conf->global->FACTURE_ADDON_PDF);
@@ -2372,7 +2372,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td colspan="2" class="maxwidthonsmartphone">';
 	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
 		print '</td></tr>';
 	}
@@ -3074,7 +3074,9 @@ else if ($id > 0 || ! empty($ref))
 		$nbrows ++;
 	if ($selleruserevenustamp)
 		$nbrows ++;
-
+	if (! empty($conf->multicurrency->enabled)) $nbrows+=5;
+	if (! empty($conf->incoterm->enabled)) $nbrows+=1;
+        
 	print '<td rowspan="' . $nbrows . '" colspan="2" valign="top">';
 
 	if ($object->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
@@ -3443,14 +3445,14 @@ else if ($id > 0 || ! empty($ref))
 	{
 		// Multicurrency code
 		print '<tr>';
-		print '<td width="25%">';
+		print '<td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print fieldLabel('Currency','multicurrency_code');
 		print '</td>';
 		if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
 			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
 		print '</tr></table>';
-		print '</td><td colspan="5">';
+		print '</td><td colspan="3">';
 		if ($action == 'editmulticurrencycode') {
 			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
 		} else {
@@ -3460,14 +3462,14 @@ else if ($id > 0 || ! empty($ref))
 	
 		// Multicurrency rate
 		print '<tr>';
-		print '<td width="25%">';
+		print '<td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print fieldLabel('Rate','multicurrency_tx');
 		print '</td>';
 		if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
 			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
 		print '</tr></table>';
-		print '</td><td colspan="5">';
+		print '</td><td colspan="3">';
 		if ($action == 'editmulticurrencyrate') {
 			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
 		} else {
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 040f483c3f8..2f12874fbb5 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -322,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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

From 051b412c1702cdf47d53dc534a754a61d12313ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 01:16:01 +0100
Subject: [PATCH 183/421] Remove security fix

---
 htdocs/filefunc.inc.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 3638da31a76..b97721f2108 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -81,12 +81,6 @@ if (! empty($_GET['conf']))
 	$conffile = 'conf/'.$confname.'.php';
 }
 */
-if (!empty($_GET['conf'])) {
-    setcookie('dolconf', $_GET['conf']);
-    $conffile = 'conf/' . $_GET['conf'] . '.php';
-} else {
-    $conffile = 'conf/' . (!empty($_COOKIE['dolconf']) ? $_COOKIE['dolconf'] : 'conf') . '.php';
-}
 
 // Include configuration
 $result=@include_once $conffile;	// Keep @ because with some error reporting this break the redirect

From d0b657f6e7320fa3bf170396876ec960d92d7948 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 02:15:29 +0100
Subject: [PATCH 184/421] Fix filter on products with spcific prices on
 thirdrty tab "customer prices"

---
 htdocs/societe/price.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index dce99d532c5..f9b924c9240 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -42,6 +42,7 @@ $langs->load("companies");
 $langs->load("bills");
 
 $action = GETPOST('action', 'alpha');
+$search_prod = GETPOST('search_prod');
 
 // Security check
 $socid = GETPOST('socid', 'int')?GETPOST('socid', 'int'):GETPOST('id', 'int');
@@ -66,6 +67,11 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+    {
+        $search_prod = '';
+    }
+    
     if ($action == 'add_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
     
     	$update_child_soc = GETPOST('updatechildprice');
@@ -212,7 +218,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		't.fk_soc' => $object->id
 	);
 
-	$search_prod = GETPOST('search_prod');
 	if (! empty($search_prod)) {
 		$filter ['prod.ref'] = $search_prod;
 	}
@@ -501,9 +506,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
         print '<td>&nbsp;</td>';
         print '</tr>';
         
-        if (count($prodcustprice->lines) > 0)
+        if (count($prodcustprice->lines) > 0 || $search_prod)
         {
-            
             print '<tr class="liste_titre">';
 			print '<td><input type="text" class="flat" name="search_prod" value="' . $search_prod . '" size="20"></td>';
             print '<td colspan="8">&nbsp;</td>';
@@ -513,7 +517,10 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
             print $searchpitco;
             print '</td>';
             print '</tr>';
-            
+        }
+        
+        if (count($prodcustprice->lines) > 0)
+        {
             $var = False;
             
             foreach ($prodcustprice->lines as $line)
@@ -540,7 +547,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
                 print $userstatic->getLoginUrl(1);
                 print '</td>';
                 
-                // Todo Edit or delete button
                 // Action
                 if ($user->rights->produit->creer || $user->rights->service->creer)
                 {
@@ -561,9 +567,12 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
                 
                 print "</tr>\n";
             }
-        } else
+        }
+        else
         {
-            print '<tr ' . $bc[false] . '><td colspan="10">' . $langs->trans('NoPriceSpecificToCustomer') . '</td></tr>';
+            $colspan=9;
+            if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan+=1;            
+            print '<tr ' . $bc[false] . '><td colspan="'.$colspan.'">' . $langs->trans('None') . '</td></tr>';
         }
         
         print "</table>";

From d4057c3febe9e1254adfa65263585bd39cd86bea Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Mon, 15 Feb 2016 06:56:51 +0100
Subject: [PATCH 185/421] Fixed: Correct problem of rights beetween tax and
 salaries module

---
 htdocs/compta/charges/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 45b10f2363c..6e136be1b25 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2014 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2011-2014 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  *
@@ -86,7 +86,7 @@ if (GETPOST("mode") != 'sconly')
 }
 
 // Payment Salary
-if ($conf->salaries->enabled)
+if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
 {
 	if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
 	{
@@ -167,7 +167,7 @@ if ($conf->salaries->enabled)
 }
 
 
-if ($conf->tax->enabled)
+if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 {
 	// Social contributions only
 	if (GETPOST("mode") != 'sconly')
@@ -278,7 +278,7 @@ if ($conf->tax->enabled)
 }
 
 // VAT
-if ($conf->tax->enabled)
+if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 {
 	if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
 	{

From a138c1503a53bf2aaf6f832984c97a88feaaf88c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 07:04:07 +0100
Subject: [PATCH 186/421] Little cleaning on how options ar shown

---
 htdocs/admin/workflow.php | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index bdd84a50a7f..28feb8ab23e 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -69,21 +69,16 @@ print "<br>";
 // List of workflow we can enable
 
 print '<table class="noborder" width="100%">'."\n";
-print '<tr class="liste_titre">'."\n";
-print '  <td>'.$langs->trans("Description").'</td>';
-print '  <td align="center">'.$langs->trans("Status").'</td>';
-print "</tr>\n";
 
 clearstatcache();
 
 $workflowcodes=array(
-	'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array('enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order'),
-	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order','warning'=>'WarningCloseAlways'),
-	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array('enabled'=>'! empty($conf->commande->enabled) && ! empty($conf->facture->enabled)', 'picto'=>'bill'),
+	'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array('family'=>'create', 'position'=>10, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order'),
+	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array('family'=>'create', 'position'=>20, 'enabled'=>'! empty($conf->commande->enabled) && ! empty($conf->facture->enabled)', 'picto'=>'bill'),
+	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('family'=>'classify', 'position'=>30, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order','warning'=>'WarningCloseAlways'),
 	// For the following 2 options, if module invoice is disabled, they does not exists, so "Classify billed" for order must be done manually from order card.
-	'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>'WarningCloseAlways'),
-	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array('enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>'WarningCloseAlways'),
-
+	'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('family'=>'classify', 'position'=>40, 'enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>'WarningCloseAlways'),
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array('family'=>'classify', 'position'=>50, 'enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>'WarningCloseAlways'),
 );
 
 if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow']))
@@ -94,16 +89,30 @@ if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['
 	}
 }
 
+// TODO We must sort on position here
+
 $nbqualified=0;
+$oldfamily='';
 
 foreach($workflowcodes as $key => $params)
 {
 	$picto=$params['picto'];
 	$enabled=$params['enabled'];
+	$family=$params['family'];
    	if (! verifCond($enabled)) continue;
 
    	$nbqualified++;
-	$var = !$var;
+
+   	if ($oldfamily != $family)
+   	{
+	   	print '<tr class="liste_titre">'."\n";
+		print '  <td>'.$langs->trans("Description").'</td>';
+		print '  <td align="center">'.$langs->trans("Status").'</td>';
+		print "</tr>\n";
+		$oldfamily = $family;
+   	}   	
+   	
+   	$var = !$var;
    	print "<tr ".$bc[$var].">\n";
    	print "<td>".img_object('', $picto).$langs->trans('desc'.$key);
    	if (! empty($params['warning']))

From 353fa7c2fc445234c906cf4ae43074f612b3291f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 07:04:07 +0100
Subject: [PATCH 187/421] Little cleaning on how options ar shown

---
 htdocs/admin/workflow.php | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index bdd84a50a7f..28feb8ab23e 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -69,21 +69,16 @@ print "<br>";
 // List of workflow we can enable
 
 print '<table class="noborder" width="100%">'."\n";
-print '<tr class="liste_titre">'."\n";
-print '  <td>'.$langs->trans("Description").'</td>';
-print '  <td align="center">'.$langs->trans("Status").'</td>';
-print "</tr>\n";
 
 clearstatcache();
 
 $workflowcodes=array(
-	'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array('enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order'),
-	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order','warning'=>'WarningCloseAlways'),
-	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array('enabled'=>'! empty($conf->commande->enabled) && ! empty($conf->facture->enabled)', 'picto'=>'bill'),
+	'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array('family'=>'create', 'position'=>10, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order'),
+	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array('family'=>'create', 'position'=>20, 'enabled'=>'! empty($conf->commande->enabled) && ! empty($conf->facture->enabled)', 'picto'=>'bill'),
+	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('family'=>'classify', 'position'=>30, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order','warning'=>'WarningCloseAlways'),
 	// For the following 2 options, if module invoice is disabled, they does not exists, so "Classify billed" for order must be done manually from order card.
-	'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>'WarningCloseAlways'),
-	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array('enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>'WarningCloseAlways'),
-
+	'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('family'=>'classify', 'position'=>40, 'enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>'WarningCloseAlways'),
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array('family'=>'classify', 'position'=>50, 'enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>'WarningCloseAlways'),
 );
 
 if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow']))
@@ -94,16 +89,30 @@ if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['
 	}
 }
 
+// TODO We must sort on position here
+
 $nbqualified=0;
+$oldfamily='';
 
 foreach($workflowcodes as $key => $params)
 {
 	$picto=$params['picto'];
 	$enabled=$params['enabled'];
+	$family=$params['family'];
    	if (! verifCond($enabled)) continue;
 
    	$nbqualified++;
-	$var = !$var;
+
+   	if ($oldfamily != $family)
+   	{
+	   	print '<tr class="liste_titre">'."\n";
+		print '  <td>'.$langs->trans("Description").'</td>';
+		print '  <td align="center">'.$langs->trans("Status").'</td>';
+		print "</tr>\n";
+		$oldfamily = $family;
+   	}   	
+   	
+   	$var = !$var;
    	print "<tr ".$bc[$var].">\n";
    	print "<td>".img_object('', $picto).$langs->trans('desc'.$key);
    	if (! empty($params['warning']))

From d4c325838596406ecf70b13a057accaadb298887 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 07:36:45 +0100
Subject: [PATCH 188/421] Fix missing field Fix bad value for default value of
 next date

---
 htdocs/compta/facture/fiche-rec.php            | 10 +++++-----
 htdocs/contrat/list.php                        |  8 +++++++-
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql |  6 ++++++
 htdocs/install/mysql/tables/llx_contratdet.sql |  8 +++++++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 0d462d25066..dbaec026b68 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -218,7 +218,7 @@ if ($action == 'create')
 		dol_fiche_head();
 
 		$rowspan=4;
-		if (! empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++;
+		if (! empty($conf->projet->enabled)) $rowspan++;
 		if ($object->fk_account > 0) $rowspan++;
 
 		print '<table class="border" width="100%">';
@@ -255,7 +255,7 @@ if ($action == 'create')
 		print "</td></tr>";
 
 		// Project
-		if (! empty($conf->projet->enabled) && $object->fk_project > 0)
+		if (! empty($conf->projet->enabled))
 		{
 			print "<tr><td>".$langs->trans("Project")."</td><td>";
 			if ($object->fk_project > 0)
@@ -267,7 +267,7 @@ if ($action == 'create')
 			print "</td></tr>";
 		}
 
-		// Project
+		// Bank account
 		if ($object->fk_account > 0)
 		{
 			print "<tr><td>".$langs->trans('BankAccount')."</td><td>";
@@ -280,7 +280,7 @@ if ($action == 'create')
 		print '<br>';
 
 		
-		// Recurrence
+		// Autogeneration
 		$title = $langs->trans("Recurrence");
 		print load_fiche_titre($title);
 		
@@ -293,7 +293,7 @@ if ($action == 'create')
 		
 		// First date of execution for cron
 		print "<tr><td>".$langs->trans('NextDateToExecution')."</td><td>";
-		$date_next_execution = isset($date_next_execution) ? $date_next_execution : dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
 		print $form->select_date($date_next_execution, '', 0, 0, '', "add", 1, 1, 1);
 		print "</td></tr>";
 		
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index b374e7d59b9..df6e0007023 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -291,8 +291,14 @@ if ($resql)
         print '<td>';
         if($obj->socid)
         {
-        	$socstatic->fetch($obj->socid);
+        	$result=$socstatic->fetch($obj->socid);
+        	if ($result < 0)
+        	{
+        		dol_print_error($db);
+        		exit;
+        	}
         	$listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
+        	if ($listsalesrepresentatives < 0) dol_print_error($db);
         	$nbofsalesrepresentative=count($listsalesrepresentatives);
         	if ($nbofsalesrepresentative > 3)   // We print only number
         	{
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 482a21470a6..86bb4fdb238 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -232,3 +232,9 @@ ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_total_ht double(24,8) DE
 ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
 ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
 
+ALTER TABLE llx_contratdet ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_contratdet ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_contratdet ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_contratdet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_contratdet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_contratdet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql
index b4e13fb99c2..a8d4fdff6ba 100644
--- a/htdocs/install/mysql/tables/llx_contratdet.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet.sql
@@ -62,6 +62,12 @@ create table llx_contratdet
   fk_user_ouverture     integer,
   fk_user_cloture       integer,
   commentaire           text,
-  fk_unit               integer       DEFAULT NULL
+  fk_unit               integer       DEFAULT NULL,
 
+  fk_multicurrency		integer,
+  multicurrency_code			varchar(255),
+  multicurrency_subprice		double(24,8) DEFAULT 0,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0  
 )ENGINE=innodb;

From 79b79e2accf0e92e1bb519bae4f76b1fb4a13354 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 15 Feb 2016 09:21:21 +0100
Subject: [PATCH 189/421] Update card.php

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 99e803e649c..5e51383f42b 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2237,7 +2237,7 @@ else
 			print '<td colspan="3">';
 			$cate_arbo = $form->select_all_categories( Categorie::TYPE_CONTACT, null, null, null, null, 1 );
 			$c = new Categorie( $db );
-			$cats = $c->containing( $object->id, Categorie::TYPE_CONTACT );
+			$cats = $c->containing( $object->id, 'user' );
 			foreach ($cats as $cat) {
 				$arrayselected[] = $cat->id;
 			}

From 30a6b546b1c70ba31ff66bc17c5cf08b8f68d933 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 15 Feb 2016 09:23:36 +0100
Subject: [PATCH 190/421] containing function prefer use text values instead
 numeric

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

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index bd9a4b781f5..32c0c1156b7 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -918,7 +918,7 @@ else
 				print '<td colspan="3">';
 				$cate_arbo = $form->select_all_categories( Categorie::TYPE_CONTACT, null, null, null, null, 1 );
 				$c = new Categorie( $db );
-				$cats = $c->containing( $object->id, Categorie::TYPE_CONTACT );
+				$cats = $c->containing( $object->id, 'contact' );
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}

From f1f5c48337fb5d031d3dd911f783a5625ed81490 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 14:27:35 +0100
Subject: [PATCH 191/421] Uniformize code

---
 htdocs/compta/facture/fiche-rec.php | 64 ++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index dbaec026b68..342971556ae 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -533,13 +533,30 @@ else
 		$head[$h][1] = $langs->trans("CardBill");
 		$head[$h][2] = 'card';
 
-		dol_fiche_head($head, 'card', $langs->trans("PredefinedInvoices"),0,'bill');	// Add a div
+		dol_fiche_head($head, 'card', $langs->trans("RepeatableInvoice"),0,'bill');	// Add a div
 
 		print '<table class="border" width="100%">';
 
-		print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
-		print '<td colspan="4">'.$object->titre.'</td>';
-
+		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/fiche-rec.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		
+		// Ref
+		print '<tr><td width="20%">' . $langs->trans('Ref') . '</td>';
+		print '<td colspan="5">';
+		$morehtmlref = '';
+		/*
+		require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
+        $discount = new DiscountAbsolute($db);
+		$result = $discount->fetch(0, $object->id);
+		if ($result > 0) {
+		    $morehtmlref = ' (' . $langs->trans("CreditNoteConvertedIntoDiscount", $discount->getNomUrl(1, 'discount')) . ')';
+		}
+		if ($result < 0) {
+		    dol_print_error('', $discount->error);
+		}*/
+		print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref);
+		print '</td></tr>';
+		
+		
 		print '<tr><td>'.$langs->trans("Customer").'</td>';
 		print '<td colspan="3">'.$object->thirdparty->getNomUrl(1,'customer').'</td></tr>';
 
@@ -651,26 +668,25 @@ else
 
 		print "</table>";
 
-		print '</div>';
+		print '<br>';
 
 		/*
 		 * Recurrence
 		 */
 		$title = $langs->trans("Recurrence");
-		print load_fiche_titre($title);
+		print load_fiche_titre($title, '', 'calendar');
 		
-		print '<div class="tabBar">';
 		print '<table class="border" width="100%">';
 
 		// if "frequency" is empty or = 0, the reccurence is disabled
-		print '<tr><td>';
+		print '<tr><td width="20%">';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Frequency');
 		print '</td>';
 		if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer)
 			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
 		print '</tr></table>';
-		print '</td><td colspan="3">';
+		print '</td><td colspan="5">';
 		if ($action == 'editfrequency')
 		{
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"] . '?facid=' . $object->id.'">';
@@ -685,7 +701,10 @@ else
 		}
 		else 
 		{
-			print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
+		    if ($object->frequency > 0)
+		    {
+                print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
+		    }
 		}
 		print '</td></tr>';
 		
@@ -702,11 +721,13 @@ else
 		print '<tr><td>';
 		print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
 		print '</td><td colspan="5">';
-		print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+		if ($object->nb_gen_max > 0) print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
 		print '</td>';
 		print '</tr>';
-		print '<tr><td width="25%">'.$langs->trans("RestPeriodNumber").'</td>';
-		print '<td>'.($object->nb_gen_max-$object->nb_gen_done).'</td>';
+		print '<tr><td>'.$langs->trans("RestPeriodNumber").'</td>';
+		print '<td>';
+		print ($object->nb_gen_max-$object->nb_gen_done);
+		print '</td>';
 		
 		// Auto validate
 		print '<tr><td>';
@@ -718,22 +739,14 @@ else
 		print '</tr>';
 		
 		print '</table>';
-		print '</div>';
-		print '<br />';
+		
+		print '<br>';
 
 		/*
 		 * Lines
 		 */
 
-		$title = $langs->trans("ProductsAndServices");
-		if (empty($conf->service->enabled))
-			$title = $langs->trans("Products");
-		else if (empty($conf->product->enabled))
-			$title = $langs->trans("Services");
-
-		print load_fiche_titre($title);
-
-		print '<table class="noborder" width="100%">';
+		print '<table class="noborder noshadow" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">'.$langs->trans("Price").'</td>';
@@ -818,7 +831,8 @@ else
 		}
 		print '</table>';
 
-
+		dol_fiche_end();
+		
 
 		/**
 		 * Barre d'actions

From 23afb80c822e2dc0c57b4dfe52da576604d2e8be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 14:42:05 +0100
Subject: [PATCH 192/421] Can remove status recurring or not of template
 invoice

---
 .../facture/class/facture-rec.class.php       | 16 ++---
 htdocs/compta/facture/fiche-rec.php           | 65 ++++++++++---------
 htdocs/langs/en_US/bills.lang                 |  2 +
 3 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 16dcedc3035..9fb103aa6c5 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -707,7 +707,7 @@ class FactureRec extends Facture
 	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
      *	@return		int						<0 if KO, >0 if OK
      */
-    function setFrequencyAndUnit($frequency=0,$unit='')
+    function setFrequencyAndUnit($frequency,$unit)
     {
         if (! $this->table_element)
         {
@@ -715,26 +715,24 @@ class FactureRec extends Facture
             return -1;
         }
 
-		if (empty($frequency) && empty($unit))
+		if (!empty($frequency) && empty($unit))
         {
-            dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with params frequency and unit not defined",LOG_ERR);
+            dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined",LOG_ERR);
             return -2;
         }
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        if (!empty($frequency)) $sql.= ' SET frequency = '.$frequency;
+        $sql.= ' SET frequency = '.($frequency?$this->db->escape($frequency):'null');
         if (!empty($unit)) 
         {
-        	if (!empty($frequency)) $sql .= ',';
-			else $sql .= ' SET';
-        	$sql.= ' unit_frequency = "'.$this->db->escape($unit).'"';
+        	$sql.= ', unit_frequency = "'.$this->db->escape($unit).'"';
 		}
         $sql.= ' WHERE rowid = '.$this->id;
-
+        
         dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
         if ($this->db->query($sql))
         {
-            if (!empty($frequency)) $this->frequency = $frequency;
+            $this->frequency = $frequency;
 			if (!empty($unit)) $this->unit_frequency = $unit;
             return 1;
         }
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 342971556ae..5224c825003 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -705,38 +705,45 @@ else
 		    {
                 print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
 		    }
+		    else
+		    {
+		        print $langs->trans("NotARecurringInvoiceTemplate");
+		    }
 		}
 		print '</td></tr>';
 		
-		// Date when
-		print '<tr><td>';
-		print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer);
-		print '</td><td colspan="5">';
-		print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'datepicker');
-		print '</td>';
-		print '</tr>';
-		
-		
-		// Max period / Rest period
-		print '<tr><td>';
-		print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-		print '</td><td colspan="5">';
-		if ($object->nb_gen_max > 0) print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-		print '</td>';
-		print '</tr>';
-		print '<tr><td>'.$langs->trans("RestPeriodNumber").'</td>';
-		print '<td>';
-		print ($object->nb_gen_max-$object->nb_gen_done);
-		print '</td>';
-		
-		// Auto validate
-		print '<tr><td>';
-		print $form->editfieldkey($langs->trans("InvoiceAutoValidate"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
-		print '</td><td colspan="5">';
-		$select = 'select;0:'.$langs->trans('No').',1:'.$langs->trans('Yes');
-		print $form->editfieldval($langs->trans("InvoiceAutoValidate"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
-		print '</td>';
-		print '</tr>';
+		//if (! empty($object->frequency))    // If no frequency defined, it is not a recurring template invoice
+		//{
+    		// Date when
+    		print '<tr><td>';
+    		print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer);
+    		print '</td><td colspan="5">';
+    		print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'datepicker');
+    		print '</td>';
+    		print '</tr>';
+    		
+    		
+    		// Max period / Rest period
+    		print '<tr><td>';
+    		print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+    		print '</td><td colspan="5">';
+    		if ($object->nb_gen_max > 0) print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+    		print '</td>';
+    		print '</tr>';
+    		print '<tr><td>'.$langs->trans("RestPeriodNumber").'</td>';
+    		print '<td>';
+    		print ($object->nb_gen_max-$object->nb_gen_done);
+    		print '</td>';
+    		
+    		// Auto validate
+    		print '<tr><td>';
+    		print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
+    		print '</td><td colspan="5">';
+    		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
+    		print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
+    		print '</td>';
+    		print '</tr>';
+		//}
 		
 		print '</table>';
 		
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 2b5c5e3d241..88805ece9e6 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -106,6 +106,7 @@ 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=Paid or converted into discount
@@ -139,6 +140,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
 LastBills=Last %s invoices
 LastCustomersBills=Last %s customers invoices

From 38f7ac29d7705294d842dbaf74465e20b064d491 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 14:49:06 +0100
Subject: [PATCH 193/421] Show vat of lines on template invoices

---
 htdocs/compta/facture/fiche-rec.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 5224c825003..47f24fdebe5 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -756,9 +756,10 @@ else
 		print '<table class="noborder noshadow" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Description").'</td>';
-		print '<td align="right">'.$langs->trans("Price").'</td>';
-		print '<td align="center">'.$langs->trans("ReductionShort").'</td>';
+		print '<td align="right">'.$langs->trans("VAT").'</td>';
+		print '<td align="right">'.$langs->trans("PriceUHT").'</td>';
 		print '<td align="center">'.$langs->trans("Qty").'</td>';
+		print '<td align="center">'.$langs->trans("ReductionShort").'</td>';
 		if ($conf->global->PRODUCT_USE_UNITS) {
 			print '<td align="left">'.$langs->trans("Unit").'</td>';
 		}
@@ -827,9 +828,10 @@ else
 
 				print '</td>';
 			}
+			print '<td align="right">'.vatrate($object->lines[$i]->tva_tx, 1).'</td>';
 			print '<td align="right">'.price($object->lines[$i]->price).'</td>';
-			print '<td align="center">'.$object->lines[$i]->remise_percent.' %</td>';
 			print '<td align="center">'.$object->lines[$i]->qty.'</td>';
+			print '<td align="center">'.$object->lines[$i]->remise_percent.' %</td>';
 			if ($conf->global->PRODUCT_USE_UNITS) {
 				print "<td align=\"left\">".$object->lines[$i]->getLabelOfUnit()."</td>";
 			}

From d715345c825843b55c0a210bab73735f9f0450c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 15:07:57 +0100
Subject: [PATCH 194/421] Debug

---
 .../facture/class/facture-rec.class.php       |  5 ++--
 htdocs/compta/facture/fiche-rec.php           | 29 ++++++++++---------
 htdocs/core/class/html.form.class.php         |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 9fb103aa6c5..b0a7bab2899 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -757,9 +757,8 @@ class FactureRec extends Facture
             dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined",LOG_ERR);
             return -1;
         }
-		$date = $this->db->idate($date);
         $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql.= ' SET date_when = "'.$date.'"';
+        $sql.= ' SET date_when = "'.$this->db->idate($date).'"';
         if ($increment_nb_gen_done>0) $sql.= ', nb_gen_done = nb_gen_done + 1';
         $sql.= ' WHERE rowid = '.$this->id;
 
@@ -790,6 +789,8 @@ class FactureRec extends Facture
             return -1;
         }
 		
+        if (empty($nb)) $nb=0;
+        
         $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
         $sql.= ' SET nb_gen_max = '.$nb;
         $sql.= ' WHERE rowid = '.$this->id;
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 47f24fdebe5..42c82a1642d 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -86,7 +86,10 @@ if ($action == 'add')
 	$reyear=GETPOST('reyear');
 	$remonth=GETPOST('remonth');
 	$reday=GETPOST('reday');
+	$rehour=GETPOST('rehour');
+	$remin=GETPOST('remin');
 	$nb_gen_max=GETPOST('nb_gen_max', 'int');
+	if (empty($nb_gen_max)) $nb_gen_max =0;
 	
 	if (GETPOST('frequency'))
 	{
@@ -96,7 +99,7 @@ if ($action == 'add')
 			$action = "create";
 			$error++;	
 		}
-		if (empty($nb_gen_max))
+		if ($nb_gen_max == '')
 		{
 			setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("MaxPeriodNumber")), null, 'errors');
 			$action = "create";
@@ -115,7 +118,7 @@ if ($action == 'add')
 		$object->nb_gen_max = $nb_gen_max;
 		$object->auto_validate = GETPOST('auto_validate', 'int');
 		
-		$date_next_execution = dol_mktime(12, 0, 0, $remonth, $reday, $reyear);
+		$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
 		$object->date_when = $date_next_execution;
 		
 		if ($object->create($user, $id) > 0)
@@ -171,7 +174,7 @@ elseif ($action == 'setfrequency' && $user->rights->facture->creer)
 // Set next date of execution
 elseif ($action == 'setdate_when' && $user->rights->facture->creer)
 {
-	$date = dol_mktime(12, 0, 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
+	$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
@@ -238,7 +241,7 @@ if ($action == 'create')
 
 		// Note
 		print '<td rowspan="'.$rowspan.'" valign="top">';
-		print '<textarea class="flat" name="note_private" wrap="soft" cols="60" rows="'.ROWS_4.'"></textarea>';
+		print '<textarea class="flat centpercent" name="note_private" wrap="soft" rows="'.ROWS_4.'"></textarea>';
 		print '</td></tr>';
 
 		// Author
@@ -262,7 +265,7 @@ if ($action == 'create')
 			{
 				$project = new Project($db);
 				$project->fetch($object->fk_project);
-				print $project->title;
+				print $project->getNomUrl(1);
 			}
 			print "</td></tr>";
 		}
@@ -277,12 +280,12 @@ if ($action == 'create')
 
 		print "</table>";
 
-		print '<br>';
+		print '<br><br>';
 
 		
 		// Autogeneration
 		$title = $langs->trans("Recurrence");
-		print load_fiche_titre($title);
+		print load_fiche_titre($title, '', 'calendar');
 		
 		print '<table class="border" width="100%">';
 		
@@ -294,7 +297,7 @@ if ($action == 'create')
 		// First date of execution for cron
 		print "<tr><td>".$langs->trans('NextDateToExecution')."</td><td>";
 		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
-		print $form->select_date($date_next_execution, '', 0, 0, '', "add", 1, 1, 1);
+		print $form->select_date($date_next_execution, '', 1, 1, '', "add", 1, 1, 1);
 		print "</td></tr>";
 		
 		// Number max of generation
@@ -309,7 +312,7 @@ if ($action == 'create')
 
 		print "</table>";
 
-		print '<br>';
+		print '<br><br>';
 
 		$title = $langs->trans("ProductsAndServices");
 		if (empty($conf->service->enabled))
@@ -317,7 +320,7 @@ if ($action == 'create')
 		else if (empty($conf->product->enabled))
 			$title = $langs->trans("Services");
 
-		print load_fiche_titre($title);
+		print load_fiche_titre($title, '', '');
 
 		/*
 		 * Invoice lines
@@ -716,9 +719,9 @@ else
 		//{
     		// Date when
     		print '<tr><td>';
-    		print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer);
+    		print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'dayhour');
     		print '</td><td colspan="5">';
-    		print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'datepicker');
+    		print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'dayhour');
     		print '</td>';
     		print '</tr>';
     		
@@ -727,7 +730,7 @@ else
     		print '<tr><td>';
     		print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
     		print '</td><td colspan="5">';
-    		if ($object->nb_gen_max > 0) print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+    		print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
     		print '</td>';
     		print '</tr>';
     		print '<tr><td>'.$langs->trans("RestPeriodNumber").'</td>';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 17a3601a660..4480fe7dd9a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -122,7 +122,7 @@ class Form
      * @param	string	$value			Value to show/edit
      * @param	object	$object			Object
      * @param	boolean	$perm			Permission to allow button to edit parameter
-     * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select:xxx'...)
+     * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'day' or 'datepicker', 'dayhour' or 'datepickerhour', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select:xxx'...)
      * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of value). Use '' to use same than $value
      * @param	object	$extObject		External object
      * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')

From 9cbbf073511926dfba4c58b87c1b959a5257a061 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Feb 2016 16:13:33 +0100
Subject: [PATCH 195/421] Add fields to link recurring invoice lines with
 contract origin when it comes from this.

---
 htdocs/compta/facture/fiche-rec.php           | 63 +++++++++++++++----
 .../install/mysql/migration/3.9.0-4.0.0.sql   |  3 +-
 .../install/mysql/tables/llx_facturedet.sql   |  1 +
 .../mysql/tables/llx_facturedet_rec.sql       |  7 ++-
 htdocs/langs/en_US/bills.lang                 |  1 +
 5 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 42c82a1642d..350682ec619 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -306,8 +306,9 @@ if ($action == 'create')
 		print "</td></tr>";
 
 		// Auto validate the invoice
-		print "<tr><td>".$langs->trans("InvoiceAutoValidate")."</td><td>";
-		print $form->selectyesno('auto_validate', 0, 1);
+		print "<tr><td>".$langs->trans("StatusOfGeneratedInvoices")."</td><td>";
+        $select = array('0'=>$langs->trans('BillStatusDraft'),'1'=>$langs->trans('BillStatusValidated'));
+        print $form->selectarray('auto_validate', $select, GETPOST('auto_validate'));
 		print "</td></tr>";
 
 		print "</table>";
@@ -719,31 +720,65 @@ else
 		//{
     		// Date when
     		print '<tr><td>';
-    		print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'dayhour');
+    		if ($action == 'date_when' || $object->frequency > 0)
+    		{
+    		    print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'dayhour');
+    		}
+    		else
+    		{
+    		    print $langs->trans("NextDateToExecution");
+    		}
     		print '</td><td colspan="5">';
-    		print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'dayhour');
+    		if ($action == 'date_when' || $object->frequency > 0)
+    		{
+    		    print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'dayhour');
+    		}
     		print '</td>';
     		print '</tr>';
     		
     		
     		// Max period / Rest period
     		print '<tr><td>';
-    		print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+    		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
+    		{
+    		    print $langs->trans("MaxPeriodNumber");
+    		}
     		print '</td><td colspan="5">';
-    		print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+    		if ($action == 'nb_gen_max' || $object->frequency > 0)
+    		{
+    		      print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+    		}
+    		else
+    		{
+    		    print '';
+    		}
     		print '</td>';
     		print '</tr>';
+    		
     		print '<tr><td>'.$langs->trans("RestPeriodNumber").'</td>';
     		print '<td>';
-    		print ($object->nb_gen_max-$object->nb_gen_done);
+    		if ($object->frequency > 0)
+    		{
+    		  print ($object->nb_gen_max-$object->nb_gen_done);
+    		}
     		print '</td>';
     		
-    		// Auto validate
+    		// Status of generated invoices
     		print '<tr><td>';
-    		print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
+    		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");
     		print '</td><td colspan="5">';
-    		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
-    		print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
+        	$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
+    		if ($action == 'auto_validate' || $object->frequency > 0)
+    		{
+        		print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
+    		}
     		print '</td>';
     		print '</tr>';
 		//}
@@ -869,7 +904,7 @@ else
 		/*
 		 *  List mode
 		 */
-		$sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, f.total, f.tva as total_vat, f.total_ttc";
+		$sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, f.total, f.tva as total_vat, f.total_ttc, f.frequency";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
 		$sql.= " WHERE f.fk_soc = s.rowid";
 		$sql.= " AND f.entity = ".$conf->entity;
@@ -894,6 +929,7 @@ else
 			print_liste_field_titre($langs->trans("AmountHT"),'','','','','align="right"');
 			print_liste_field_titre($langs->trans("AmountVAT"),'','','','','align="right"');
 			print_liste_field_titre($langs->trans("AmountTTC"),'','','','','align="right"');
+			print_liste_field_titre($langs->trans("RecurringInvoiceTemplate"),'','','','','align="center"');
 			print_liste_field_titre('');		// Field may contains ling text
 			print "</tr>\n";
 
@@ -917,7 +953,8 @@ else
 					print '<td align="right">'.price($objp->total).'</td>'."\n";
 					print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
 					print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
-
+					print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
+						
 					print '<td align="center">';
 					if ($user->rights->facture->creer)
 					{
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 86bb4fdb238..e7ad861b4c8 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -41,7 +41,8 @@ ALTER TABLE llx_facture ADD INDEX idx_facture_fk_statut (fk_statut);
 
 UPDATE llx_projet as p set p.opp_percent = (SELECT percent FROM llx_c_lead_status as cls WHERE cls.rowid = p.fk_opp_status)  WHERE p.opp_percent IS NULL AND p.fk_opp_status IS NOT NULL;
  
- 
+ALTER TABLE llx_facturedet ADD COLUMN fk_contract_line  integer NULL AFTER rang;
+ALTER TABLE llx_facturedet_rec ADD COLUMN import_key varchar(14);
 
 CREATE TABLE llx_website
 (
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
index 81074f299e0..d314cae3727 100644
--- a/htdocs/install/mysql/tables/llx_facturedet.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet.sql
@@ -57,6 +57,7 @@ create table llx_facturedet
   fk_code_ventilation			integer    DEFAULT 0 NOT NULL,
   special_code					integer    DEFAULT 0,			    -- code pour les lignes speciales
   rang							integer    DEFAULT 0,				-- position of line
+  fk_contract_line  integer NULL,									-- id of contract line when invoice comes from contract lines
   import_key					varchar(14),
 
   situation_percent real,   -- % progression of lines invoicing
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
index e0e7358af0c..cea176b2aa8 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
@@ -47,9 +47,10 @@ create table llx_facturedet_rec
   info_bits			integer DEFAULT 0,				-- TVA NPR ou non
   special_code		integer UNSIGNED DEFAULT 0,	-- code pour les lignes speciales
   rang				integer DEFAULT 0,				-- ordre d'affichage
-  fk_contract_line  integer NULL,					-- id of contract line when predefined invoice comes from contract lines
-  fk_unit         integer    DEFAULT NULL,
-  
+  fk_contract_line  integer NULL,					-- id of contract line when template invoice comes from contract lines
+  fk_unit           integer    DEFAULT NULL,
+  import_key		varchar(14),
+    
   fk_multicurrency          integer,
   multicurrency_code        varchar(255),
   multicurrency_subprice    double(24,8) DEFAULT 0,
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 88805ece9e6..06f4309acf0 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -140,6 +140,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Recurring invoice
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
 LastBills=Last %s invoices

From c78997ed235cc37c9fa9178f869a094b04206635 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 00:31:05 +0100
Subject: [PATCH 196/421] Tons of fixes and enhancement on recurring invoice
 generation

---
 .../facture/class/facture-rec.class.php       | 123 +++++++---
 htdocs/compta/facture/class/facture.class.php |  79 ++----
 htdocs/compta/facture/fiche-rec.php           | 229 +++++++++++-------
 htdocs/compta/facture/list.php                |  18 +-
 htdocs/core/class/commonobject.class.php      |   4 +-
 htdocs/core/lib/date.lib.php                  |   2 +-
 htdocs/core/modules/modFacture.class.php      |   2 +-
 htdocs/cron/card.php                          |  45 ++--
 htdocs/cron/class/cronjob.class.php           |  19 +-
 htdocs/cron/list.php                          |  42 ++--
 htdocs/langs/en_US/bills.lang                 |  11 +-
 htdocs/langs/en_US/cron.lang                  |   4 +-
 12 files changed, 343 insertions(+), 235 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index b0a7bab2899..14ec77600c7 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -52,6 +52,11 @@ class FactureRec extends Facture
 	var $db_table;
 	var $propalid;
 
+	var $date_last_gen;
+	var $next_gen;
+	var $nb_gen_done;
+	var $nb_gen_max;
+	
 	var $rang;
 	var $special_code;
 
@@ -214,17 +219,17 @@ class FactureRec extends Facture
 
 
 	/**
-	 *	Recupere l'objet facture et ses lignes de factures
+	 *	Load object and lines
 	 *
 	 *	@param      int		$rowid       	Id of object to load
-	 * 	@param		string	$ref			Reference of invoice
+	 * 	@param		string	$ref			Reference of recurring invoice
 	 * 	@param		string	$ref_ext		External reference of invoice
 	 * 	@param		int		$ref_int		Internal reference of other object
 	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
 	 */
 	function fetch($rowid, $ref='', $ref_ext='', $ref_int='')
 	{
-		$sql = 'SELECT f.titre,f.fk_soc,f.amount,f.tva,f.total,f.total_ttc,f.remise_percent,f.remise_absolue,f.remise';
+		$sql = 'SELECT f.rowid, f.titre, f.fk_soc, f.amount, f.tva, f.total, f.total_ttc, f.remise_percent, f.remise_absolue, f.remise';
 		$sql.= ', f.date_lim_reglement as dlr';
 		$sql.= ', f.note_private, f.note_public, f.fk_user_author';
 		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet';
@@ -232,19 +237,18 @@ class FactureRec extends Facture
 		$sql.= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.usenewprice, f.auto_validate';
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
-		$sql.= ', el.fk_source';
+		//$sql.= ', el.fk_source';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_rec as f';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
-		$sql.= ' WHERE f.rowid='.$rowid;
-		if ($ref)     $sql.= " AND f.titre='".$this->db->escape($ref)."'";
+		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
+		if ($rowid) $sql.= ' WHERE f.rowid='.$rowid;
+		elseif ($ref) $sql.= " WHERE f.titre='".$this->db->escape($ref)."'";
 		/* This field are not used for template invoice
 		if ($ref_ext) $sql.= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
 		if ($ref_int) $sql.= " AND f.ref_int='".$this->db->escape($ref_int)."'";
 		*/
 		
-        dol_syslog(get_class($this)."::fetch rowid=".$rowid, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -252,7 +256,7 @@ class FactureRec extends Facture
 			{
 				$obj = $this->db->fetch_object($result);
 
-				$this->id                     = $rowid;
+				$this->id                     = $obj->rowid;
 				$this->titre                  = $obj->titre;
 				$this->ref                    = $obj->titre;
 				$this->ref_client             = $obj->ref_client;
@@ -290,8 +294,8 @@ class FactureRec extends Facture
 				$this->special_code			  = $obj->special_code;
 				$this->frequency			  = $obj->frequency;
 				$this->unit_frequency		  = $obj->unit_frequency;
-				$this->date_when			  = $obj->date_when;
-				$this->date_last_gen		  = $obj->date_last_gen;
+				$this->date_when			  = $this->db->jdate($obj->date_when);
+				$this->date_last_gen		  = $this->db->jdate($obj->date_last_gen);
 				$this->nb_gen_done			  = $obj->nb_gen_done;
 				$this->nb_gen_max			  = $obj->nb_gen_max;
 				$this->usenewprice			  = $obj->usenewprice;
@@ -305,14 +309,14 @@ class FactureRec extends Facture
 				$result=$this->fetch_lines();
 				if ($result < 0)
 				{
-					$this->error=$this->db->error();
+					$this->error=$this->db->lasterror();
 					return -3;
 				}
 				return 1;
 			}
 			else
 			{
-				$this->error='Bill with id '.$rowid.' not found sql='.$sql;
+				$this->error='Bill with id '.$rowid.' or ref '.$ref.' not found sql='.$sql;
 				dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
@@ -336,7 +340,7 @@ class FactureRec extends Facture
 		$sql.= ' l.remise, l.remise_percent, l.subprice,';
 		$sql.= ' l.total_ht, l.total_tva, l.total_ttc,';
 		$sql.= ' l.rang, l.special_code,';
-		$sql.= ' l.fk_unit,';
+		$sql.= ' l.fk_unit, l.fk_contract_line,';
 		$sql.= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet_rec as l';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
@@ -380,7 +384,8 @@ class FactureRec extends Facture
 				$line->rang 			= $objp->rang;
 				$line->special_code 	= $objp->special_code;
 				$line->fk_unit          = $objp->fk_unit;
-
+                $line->fk_contract_line = $objp->fk_contract_line;
+                
 				// Ne plus utiliser
 				$line->price            = $objp->price;
 				$line->remise           = $objp->remise;
@@ -578,53 +583,101 @@ class FactureRec extends Facture
 	function getNextDate()
 	{
 		if (empty($this->date_when)) return false;
-		return dol_time_plus_duree(strtotime($this->date_when), $this->frequency, $this->unit_frequency);
+		return dol_time_plus_duree($this->date_when, $this->frequency, $this->unit_frequency);
 	}
 	
 	/**
-	 *  Create all recurrents invoices 
+	 *  Create all recurrents invoices.
+	 *  A result may also be provided into this->output
 	 * 
-	 *  @return		int		number of created invoices
+	 *  @return	int						0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK) 
 	 */
 	function createRecurringInvoices()
 	{
-		global $db,$user;
+		global $langs, $db, $user;
+		
+		$langs->load("bills");
 		
 		$nb_create=0;
 		
-		$today = date('Y-m-d 23:59:59');
+		$now = dol_now();
+		$tmparray=dol_getdate($now);
+		$today = dol_mktime(23,59,59,$tmparray['mon'],$tmparray['mday'],$tmparray['year']);   // Today is last second of current day
 		
+		dol_syslog("createRecurringInvoices");
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_rec';
-		$sql.= ' WHERE date_when IS NOT NULL AND frequency > 0';
-		$sql.= ' AND date_when <= "'.$db->escape($today).'"';
-		$sql.= ' AND nb_gen_done < nb_gen_max';
+		$sql.= ' WHERE frequency > 0';      // A recurring invoice is an invoice with a frequency
+		$sql.= " AND (date_when IS NULL OR date_when <= '".$db->idate($today)."')";
+		$sql.= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
+		//print $sql;exit;
 		
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			while ($line = $db->fetch_object($resql))
+		    $i=0;
+		    $num = $db->num_rows($resql);
+		    
+		    if ($num) $this->output.=$langs->trans("FoundXQualifiedRecurringInvoiceTemplate", $num)."\n";
+		    else $this->output.=$langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
+		    
+		    while ($i < $num)
 			{
+			    $line = $db->fetch_object($resql);
+
+			    $db->begin();
+			    
 				$facturerec = new FactureRec($db);
 				$facturerec->fetch($line->rowid);
 			
-				$facture = new Facture($db);
-				$result = $facture->createFromRec($user, $facturerec);
-				
-				// >0 create and validate if auto_validate
-				// =0 create but not validate if auto_validate
-				// <0 broken
-				if ($result >= 0)
+				dol_syslog("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
+
+			    $error=0;
+
+			    $facture = new Facture($db);
+				$facture->fac_rec = $facturerec->id;    // We will create $facture from this recurring invoice
+			    $facture->type = self::TYPE_STANDARD;
+			    $facture->brouillon = 1;
+			    $facture->date = $now;
+			    $facture->socid = $facturerec->socid;
+			    
+			    $invoiceidgenerated = $facture->create($user);       // This will also update fields of recurring invoice
+			    if ($invoiceidgenerated <= 0)
+			    {
+			        $this->errors = $facture->errors;
+			        $this->error = $facture->error;
+			        $error++;
+			    }
+			    if (! $error && $facturerec->auto_validate)
+			    {
+			        $result = $facture->validate($user);
+			        if ($result <= 0)
+			        {
+    			        $this->errors = $facture->errors;
+    			        $this->error = $facture->error;
+			            $error++;
+			        }
+			    }
+
+				if (! $error && $invoiceidgenerated >= 0)
 				{
-					$next_date = $facturerec->getNextDate();
-					$facturerec->setNextDate($next_date,1);
-					
+					$db->commit();
+					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
+				{
+				    $db->rollback();
 				}
 
+				$i++;
 			}
 		}
+		else dol_print_error($db);
 		
-		return $nb_create;
+		$this->output=trim($this->output);
+		
+		return $error?$error:0;
 	}
 	
 	/**
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index dd1d9b6ca8c..8b3f43fd26e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -217,6 +217,7 @@ class Facture extends CommonInvoice
 	/**
 	 *	Create invoice in database
 	 *  Note: this->ref can be set or empty. If empty, we will use "(PROV)"
+	 *  Note: this->fac_rec must be set to create from recurring invoice
 	 *
 	 *	@param	User	$user      		Object user that create
 	 *	@param  int		$notrigger		1=Does not execute triggers, 0 otherwise
@@ -270,16 +271,17 @@ class Facture extends CommonInvoice
 
 		$this->db->begin();
 
-		// Create invoice from a predefined invoice
+		// Create invoice from a template invoice
 		if ($this->fac_rec > 0)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 			$_facrec = new FactureRec($this->db);
 			$result=$_facrec->fetch($this->fac_rec);
 
+			$this->socid 		     = $_facrec->socid;
+			
 			$this->fk_project        = $_facrec->fk_project;
 			$this->fk_account        = $_facrec->fk_account;
-			$this->note_private      = $_facrec->note_private;
 			$this->cond_reglement_id = $_facrec->cond_reglement_id;
 			$this->mode_reglement_id = $_facrec->mode_reglement_id;
 			$this->remise_absolue    = $_facrec->remise_absolue;
@@ -287,14 +289,31 @@ class Facture extends CommonInvoice
 			$this->fk_incoterms		 = $_facrec->fk_incoterms;
 			$this->location_incoterms= $_facrec->location_incoterms;
 
+			$this->note_public       = $_facrec->note_public;
+			$this->note_private      = $_facrec->note_private;
+			
 			// Clean parameters
 			if (! $this->type) $this->type = self::TYPE_STANDARD;
 			$this->ref_client=trim($this->ref_client);
-			$this->note_private=trim($this->note_private);
 			$this->note_public=trim($this->note_public);
+			$this->note_private=trim($this->note_private);
+		    $this->note_private=dol_concatdesc($facture->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
+		    
 			//if (! $this->remise) $this->remise = 0;
 			if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
 			$this->brouillon = 1;
+		
+			$forceduedate = $this->calculate_date_lim_reglement();
+			
+			// Update date and number of last generation of recurring template invoice, before inserting new invoice
+			if ($_facrec->frequency > 0)
+			{
+                $_facrec->nb_gen_done++;
+                $next_date = $_facrec->getNextDate();   // Calculate next date
+                $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date');
+                $_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);
+                $_facrec->setNextDate($next_date,1);
+			}
 		}
 
 		// Define due date if not already defined
@@ -919,60 +938,6 @@ class Facture extends CommonInvoice
 		else return -1;
 	}
 
-	/**
-	 *	Create a new invoice in database from facturerec
-	 *
-	 *	@param      User		$user    		Object user that ask creation
-	 *	@param      FactureRec	$facturerec    	Object facturerec source
-	 *	@return		int							<0 if KO, 0 if not validate, >0 if OK
-	 */
-	function createFromRec($user, $facturerec)
-	{
-
-		// Clean parameters
-		$this->type = self::TYPE_STANDARD;
-		$this->brouillon = 1;
-		
-		// Charge facture source
-		$facture=new Facture($facturerec->db);
-
-		$facture->socid 		    = $facturerec->socid;
-		$facture->date              = dol_mktime(12, 0, 0, date('m'), date('d'), date('Y'));
-		$facture->note_public       = $facturerec->note_public;
-		$facture->note_private      = $facturerec->note_private;
-		$facture->fk_project        = $facturerec->fk_project;
-		$facture->fk_account        = $facturerec->fk_account;
-		$facture->cond_reglement_id = $facturerec->cond_reglement_id;
-		$facture->mode_reglement_id = $facturerec->mode_reglement_id;
-		
-		$new_date_lim_reglement = $facture->calculate_date_lim_reglement();
-		$facture->date_lim_reglement = $new_date_lim_reglement;
-		
-		$facture->remise_absolue    = $facturerec->remise_absolue;
-		$facture->remise_percent    = $facturerec->remise_percent;
-
-		$facture->lines		    	= $facturerec->lines;	// Tableau des lignes de factures
-
-		// Loop on each line of new invoice
-		foreach($facture->lines as $i => $line)
-		{
-			$facture->lines[$i]->fk_prev_id = $facturerec->lines[$i]->rowid;
-		}
-
-		dol_syslog(get_class($this)."::createFromRec socid=".$this->socid." nboflines=".count($facture->lines));
-
-		$facid = $facture->create($user);
-		if ($facid <= 0) return -1;
-
-		if ($facturerec->auto_validate)
-		{
-			$result = $facture->validate($user);
-			if ($result<=0) return 0;
-		}
-			
-		return $facid;
-	}
-
 	/**
 	 *      Return clicable link of object (with eventually picto)
 	 *
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 350682ec619..adcdeb64744 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -38,6 +38,7 @@ $langs->load('compta');
 
 // Security check
 $id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
+$ref=GETPOST('ref','alpha');
 $action=GETPOST('action', 'alpha');
 if ($user->societe_id) $socid=$user->societe_id;
 $objecttype = 'facture_rec';
@@ -58,9 +59,9 @@ if ($sortfield == "")
 $sortfield="f.datef";
 
 $object = new FactureRec($db);
-if ($id > 0 && $action != 'create' && $action != 'add')
+if (($id > 0 || $ref) && $action != 'create' && $action != 'add')
 {
-	$ret = $object->fetch($id);
+	$ret = $object->fetch($id, $ref);
 	if (!$ret)
 	{
 		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
@@ -192,6 +193,7 @@ $permissionnote=$user->rights->facture->creer;	// Used by the include of actions
 include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
 
 
+
 /*
  *	View
  */
@@ -201,6 +203,11 @@ llxHeader('',$langs->trans("RepeatableInvoices"),'ch-facture.html#s-fac-facture-
 $form = new Form($db);
 $companystatic = new Societe($db);
 
+$now = dol_now();
+$tmparray=dol_getdate($now);
+$today = dol_mktime(23,59,59,$tmparray['mon'],$tmparray['mday'],$tmparray['year']);   // Today is last second of current day
+	  
+
 /*
  * Create mode
  */
@@ -211,7 +218,7 @@ if ($action == 'create')
 	$object = new Facture($db);   // Source invoice
 	$product_static = new Product($db);
 
-	if ($object->fetch($id) > 0)
+	if ($object->fetch($id, $ref) > 0)
 	{
 		print '<form action="fiche-rec.php" method="post">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -542,7 +549,7 @@ else
 		print '<table class="border" width="100%">';
 
 		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/fiche-rec.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-		
+
 		// Ref
 		print '<tr><td width="20%">' . $langs->trans('Ref') . '</td>';
 		print '<td colspan="5">';
@@ -557,7 +564,7 @@ else
 		if ($result < 0) {
 		    dol_print_error('', $discount->error);
 		}*/
-		print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref);
+		print $form->showrefnav($object, 'ref', $linkback, 1, 'titre', 'titre', $morehtmlref);
 		print '</td></tr>';
 		
 		
@@ -669,7 +676,6 @@ else
 		print "</td>";
 		print '</tr>';
 
-
 		print "</table>";
 
 		print '<br>';
@@ -716,77 +722,90 @@ else
 		}
 		print '</td></tr>';
 		
-		//if (! empty($object->frequency))    // If no frequency defined, it is not a recurring template invoice
-		//{
-    		// Date when
-    		print '<tr><td>';
-    		if ($action == 'date_when' || $object->frequency > 0)
-    		{
-    		    print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'dayhour');
-    		}
-    		else
-    		{
-    		    print $langs->trans("NextDateToExecution");
-    		}
-    		print '</td><td colspan="5">';
-    		if ($action == 'date_when' || $object->frequency > 0)
-    		{
-    		    print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'dayhour');
-    		}
-    		print '</td>';
-    		print '</tr>';
-    		
-    		
-    		// Max period / Rest period
-    		print '<tr><td>';
-    		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
-    		{
-    		    print $langs->trans("MaxPeriodNumber");
-    		}
-    		print '</td><td colspan="5">';
-    		if ($action == 'nb_gen_max' || $object->frequency > 0)
-    		{
-    		      print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-    		}
-    		else
-    		{
-    		    print '';
-    		}
-    		print '</td>';
-    		print '</tr>';
-    		
-    		print '<tr><td>'.$langs->trans("RestPeriodNumber").'</td>';
-    		print '<td>';
-    		if ($object->frequency > 0)
-    		{
-    		  print ($object->nb_gen_max-$object->nb_gen_done);
-    		}
-    		print '</td>';
-    		
-    		// Status of generated invoices
-    		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");
-    		print '</td><td colspan="5">';
-        	$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
-    		if ($action == 'auto_validate' || $object->frequency > 0)
-    		{
-        		print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
-    		}
-    		print '</td>';
-    		print '</tr>';
-		//}
+		// Date when
+		print '<tr><td>';
+		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
+		{
+		    print $langs->trans("NextDateToExecution");
+		}
+		print '</td><td colspan="5">';
+		if ($action == 'date_when' || $object->frequency > 0)
+		{
+		    print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
+		}
+		print '</td>';
+		print '</tr>';
+				
+		// Max period / Rest period
+		print '<tr><td>';
+		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
+		{
+		    print $langs->trans("MaxPeriodNumber");
+		}
+		print '</td><td colspan="5">';
+		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 '';
+		}
+		print '</td>';
+		print '</tr>';
+		
+		// Status of generated invoices
+		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");
+		print '</td><td colspan="5">';
+    	$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
+		if ($action == 'auto_validate' || $object->frequency > 0)
+		{
+    		print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
+		}
+		print '</td>';
+		print '</tr>';
 		
 		print '</table>';
 		
-		print '<br>';
-
+    	print '<br>';
+		
+		if ($object->frequency > 0)
+		{
+    		
+    		print '<table class="border" width="100%">';
+    		
+    		// Nb of generation already done
+    		print '<tr><td width="20%">'.$langs->trans("NbOfGenerationDone").'</td>';
+    		print '<td>';
+    		print $object->nb_gen_done?$object->nb_gen_done:'';
+    		print '</td>';
+    		print '</tr>';
+    		
+    		// Date last
+    		print '<tr><td>';
+    		print $langs->trans("DateLastGeneration");
+    		print '</td><td colspan="5">';
+    		print dol_print_date($object->date_last_gen, 'dayhour');
+    		print '</td>';
+    		print '</tr>';
+    		
+    		print '</table>';
+    		
+    		print '<br>';
+		}		
+		
 		/*
 		 * Lines
 		 */
@@ -886,9 +905,23 @@ else
 		 */
 		print '<div class="tabsAction">';
 
-		if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->creer)
+		if ($object->statut == Facture::STATUS_DRAFT)
 		{
-		    	echo '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$object->thirdparty->id.'&amp;fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
+		    if ($user->rights->facture->creer)
+		    {
+    		    if (empty($object->frequency) || $object->date_when <= $today)
+    		    {
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$object->thirdparty->id.'&amp;fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
+    		    }
+    		    else
+    		    {
+    		        print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
+    		    }
+		    }
+		    else
+    	    {
+    		    print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("CreateBill").'</a></div>';
+    		}
 		}
 
 		if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
@@ -904,20 +937,39 @@ else
 		/*
 		 *  List mode
 		 */
-		$sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, f.total, f.tva as total_vat, f.total_ttc, f.frequency";
+		$sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, f.total, f.tva as total_vat, f.total_ttc, f.frequency,";
+		$sql.= " f.date_last_gen, f.date_when";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
 		$sql.= " WHERE f.fk_soc = s.rowid";
 		$sql.= " AND f.entity = ".$conf->entity;
 		if ($socid)	$sql .= " AND s.rowid = ".$socid;
 
-		//$sql .= " ORDER BY $sortfield $sortorder, rowid DESC ";
-		//	$sql .= $db->plimit($limit + 1,$offset);
-
+        $nbtotalofrecords = 0;
+        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+        {
+        	$result = $db->query($sql);
+        	$nbtotalofrecords = $db->num_rows($result);
+        }
+        
+        $sql.= $db->plimit($limit+1,$offset);
+		
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],"&socid=$socid",$sortfield,$sortorder,'',$num,'','title_accountancy.png');
+			
+			$param='&socid='.$socid;
+			if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+				
+            print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+            if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+        	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        	print '<input type="hidden" name="action" value="list">';
+        	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+        	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+            
+	       print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecord,'title_accountancy.png',0,'','',$limit);
 
 			print $langs->trans("ToCreateAPredefinedInvoice").'<br><br>';
 
@@ -930,6 +982,8 @@ else
 			print_liste_field_titre($langs->trans("AmountVAT"),'','','','','align="right"');
 			print_liste_field_titre($langs->trans("AmountTTC"),'','','','','align="right"');
 			print_liste_field_titre($langs->trans("RecurringInvoiceTemplate"),'','','','','align="center"');
+			print_liste_field_titre($langs->trans("DateLastGeneration"),'','','','','align="center"');
+			print_liste_field_titre($langs->trans("NextDateToExecution"),'','','','','align="center"');
 			print_liste_field_titre('');		// Field may contains ling text
 			print "</tr>\n";
 
@@ -954,12 +1008,21 @@ else
 					print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
 					print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
 					print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
+					print '<td align="center">'.($objp->frequency ? dol_print_date($objp->date_last_gen,'day') : '').'</td>';
+					print '<td align="center">'.($objp->frequency ? dol_print_date($objp->date_when,'day') : '').'</td>';
 						
 					print '<td align="center">';
 					if ($user->rights->facture->creer)
 					{
-                        print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
-                        print $langs->trans("CreateBill").'</a>';
+				        if (empty($objp->frequency) || $objp->date_when <= $today)
+				        {
+                            print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
+                            print $langs->trans("CreateBill").'</a>';
+				        }
+				        else
+				        {
+				            print $langs->trans("DateIsNotEnough");
+				        }
 					}
 					else
 					{
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 38d1ce96f59..b6e6e9fa942 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -75,9 +75,9 @@ $search_paymentmode=GETPOST('search_paymentmode','int');
 $option = GETPOST('option');
 if ($option == 'late') $filter = 'paye:0';
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
 if ($page == -1) {
     $page = 0;
@@ -85,7 +85,6 @@ if ($page == -1) {
 $offset = $limit * $page;
 if (! $sortorder) $sortorder='DESC';
 if (! $sortfield) $sortfield='f.datef';
-
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -713,6 +712,13 @@ if ($resql)
     
     $i = 0;
     print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+    
 	print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$massactionbutton,$num,$nbtotalofrecords,'title_accountancy.png',0,'','',$limit);
 
 	if ($massaction == 'presend')
@@ -811,14 +817,6 @@ if ($resql)
         dol_fiche_end();
 	}
 	
-	
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
-
     if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 27a1b3c30d4..587a71d6563 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1185,7 +1185,7 @@ abstract class CommonObject
     }
 
     /**
-     *	Load value from specific field
+     *	Getter generic. Load value from a specific field
      *
      *	@param	string	$table		Table of element or element line
      *	@param	int		$id			Element id
@@ -1211,7 +1211,7 @@ abstract class CommonObject
     }
 
     /**
-     *	Update a specific field into database
+     *	Setter generic. Update a specific field into database
      *
      *	@param	string		$field		Field to update
      *	@param	mixed		$value		New value
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index b06baaa9288..562dcf9d223 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -112,7 +112,7 @@ function getServerTimeZoneInt($refgmtdate='now')
  *  @param      int			$duration_unit      Unit of added delay (d, m, y, w, h)
  *  @return     int      			        	New timestamp
  */
-function dol_time_plus_duree($time,$duration_value,$duration_unit)
+function dol_time_plus_duree($time, $duration_value, $duration_unit)
 {
 	if ($duration_value == 0)  return $time;
 	if ($duration_unit == 'h') return $time + (3600*$duration_value);
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index b642873c82d..0c1171bb174 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -107,7 +107,7 @@ class modFacture extends DolibarrModules
 
         // Cronjobs 
         $this->cronjobs = array(
-            0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'generateRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600*24), 
+            0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600*24), 
             // 1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>3600, 'unitfrequency'=>3600)
         ); 
         // List of cron jobs entries to add 
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 79b1cfa996c..90a5dd0f2ed 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -543,7 +543,8 @@ else
 	/*
 	 * view card
 	 */
-
+    $now = dol_now();
+    
 	dol_fiche_head($head, 'card', $langs->trans("CronTask"), 0, 'cron');
 
 	$linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>';
@@ -624,12 +625,12 @@ else
 	
 	print '<tr><td width="30%">';
 	print $langs->trans('CronDtStart')."</td><td>";
-	if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhourtext');}
+	if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhoursec');}
 	print "</td></tr>";
 	
 	print "<tr><td>";
 	print $langs->trans('CronDtEnd')."</td><td>";
-	if(!empty($object->dateend)) {print dol_print_date($object->dateend,'dayhourtext');}
+	if(!empty($object->dateend)) {print dol_print_date($object->dateend,'dayhoursec');}
 	print "</td></tr>";
 	
 	print "<tr><td>";
@@ -647,11 +648,16 @@ else
 	print "<td>".$object->nbrun;
 	print "</td></tr>";
 	
+	// Date next run (from)
 	print '<tr><td>';
 	print $langs->trans('CronDtNextLaunch');
 	print ' ('.$langs->trans('CronFrom').')';
 	print "</td><td>";
-	if(!empty($object->datenextrun)) {print dol_print_date($object->datenextrun,'dayhoursec');} else {print $langs->trans('CronNone');}
+	print '<strong>';
+	if (!empty($object->datenextrun)) {print dol_print_date($object->datenextrun,'dayhoursec');} else {print $langs->trans('CronNone');}
+	if ($object->maxnbrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("Finished"));
+	if ($object->datenextrun && $object->datenextrun < $now) print img_warning($langs->trans("Late"));
+	print '</strong>';
 	print "</td></tr>";
 	
 	print '</table>';
@@ -691,20 +697,7 @@ else
 	} else {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'">'.$langs->trans("Edit").'</a>';
 	}
-	if (! $user->rights->cron->delete) {
-		print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("Delete").'</a>';
-	} else {
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
-	}
-	if (! $user->rights->cron->create) {
-		print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
-	} else {
-		if (empty($object->status)) {
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
-		} else {
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
-		}
-	}
+
 	if ((empty($user->rights->cron->execute)))
 	{
 		print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronExecute").'</a>';
@@ -716,6 +709,22 @@ else
 	else {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.'">'.$langs->trans("CronExecute").'</a>';
 	}
+	
+	if (! $user->rights->cron->create) {
+	    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
+	} else {
+	    if (empty($object->status)) {
+	        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
+	    } else {
+	        print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
+	    }
+	}
+	
+	if (! $user->rights->cron->delete) {
+		print '<a class="butActionDeleteRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("Delete").'</a>';
+	} else {
+		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
+	}
 	print '</div>';
 
 	print '<br>';
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 5a3be50c738..99b17da3899 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -876,7 +876,6 @@ class Cronjob extends CommonObject
 
 		dol_syslog(get_class($this)."::run_jobs jobtype=".$this->jobtype." userlogin=".$userlogin, LOG_DEBUG);
 
-
 		// Increase limit of time. Works only if we are not in safe mode
 		$ExecTimeLimit=600;
 		if (!empty($ExecTimeLimit))
@@ -892,13 +891,12 @@ class Cronjob extends CommonObject
 			@ini_set('memory_limit', $MemoryLimit);
 		}
 
-
-		// Update last run date (to track running jobs)
+		// Update last run date start (to track running jobs)
 		$this->datelastrun=$now;
 		$this->lastoutput='';
 		$this->lastresult='';
 		$this->nbrun=$this->nbrun + 1;
-		$result = $this->update($user);
+		$result = $this->update($user);       // This include begin/commit
 		if ($result<0) {
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 			return -1;
@@ -953,7 +951,7 @@ class Cronjob extends CommonObject
 			
 			if (! $error)
 			{
-				dol_syslog(get_class($this)."::run_jobs ".$this->objectname."->".$this->methodename."(".$this->params.");", LOG_DEBUG);
+				dol_syslog(get_class($this)."::run_jobs START ".$this->objectname."->".$this->methodename."(".$this->params.");", LOG_DEBUG);
 	
 				// Create Object for the call module
 				$object = new $this->objectname($this->db);
@@ -971,16 +969,17 @@ class Cronjob extends CommonObject
 				if ($result===false || $result != 0)
 				{
 				    $langs->load("errors");
-					dol_syslog(get_class($this)."::run_jobs result=".$result." error=".$object->error, LOG_ERR);
-					$this->error = $object->error?$object->error:$langs->trans('ErrorUnknown');
-					$this->lastoutput = $this->error;
+					dol_syslog(get_class($this)."::run_jobs END result=".$result." error=".$object->error, LOG_ERR);
+				    $this->error = $object->error?$object->error:$langs->trans('ErrorUnknown');
+					$this->lastoutput = ($object->output?$object->output."\n":"").$this->error;
 					$this->lastresult = is_numeric($result)?$result:-1;
 		            $retval = $this->lastresult;
 		            $error++;
 				}
 				else
 				{
-					$this->lastoutput=$object->output;
+					dol_syslog(get_class($this)."::run_jobs END");
+				    $this->lastoutput=$object->output;
 					$this->lastresult=var_export($result,true);
 					$retval = $this->lastresult;
 				}
@@ -1093,7 +1092,7 @@ class Cronjob extends CommonObject
 		}
 		$this->lastresult=$retval;
 		$this->datelastresult=dol_now();
-		$result = $this->update($user);
+		$result = $this->update($user);       // This include begin/commit
 		if ($result < 0)
 		{
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index a42feafc437..24edb62aac8 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -39,9 +39,19 @@ $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $id=GETPOST('id','int');
 
-$sortorder=GETPOST('sortorder','alpha');
-$sortfield=GETPOST('sortfield','alpha');
-$page=GETPOST('page','int');
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) {
+    $page = 0;
+}
+$offset = $limit * $page;
+if (! $sortorder) $sortorder='ASC';
+if (! $sortfield) $sortfield='t.label';
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
 $status=GETPOST('status','int');
 if ($status == '') $status=-2;
 
@@ -55,11 +65,6 @@ if ($page == -1) {
     $page = 0 ;
 }
 
-$limit = $conf->global->MAIN_SIZE_LISTE_LIMIT;
-$offset = $limit * $page ;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
 
 /*
  * Actions
@@ -137,6 +142,7 @@ $pagetitle=$langs->trans("CronList");
 llxHeader('',$pagetitle);
 
 // list of jobs created
+// TODO Replace this with an embedded select.
 $object = new Cronjob($db);
 $result=$object->fetch_all($sortorder, $sortfield, $limit, $offset, $status, $filter);
 if ($result < 0)
@@ -148,12 +154,8 @@ $num=count($object->lines);
 
 $param='&page='.$page.'&status='.$status.'&search_label='.$search_label;
 
+$stringcurrentdate = $langs->trans("CurrentHour").': '.dol_print_date(dol_now(), 'dayhour');
 
-print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_setup');
-
-
-print $langs->trans('CronInfo');
-print "<br><br>";
 
 
 if ($action == 'delete')
@@ -171,6 +173,18 @@ if ($action == 'execute')
 
 print '<form method="GET" action="'.$url_form.'" name="search_form">'."\n";
 print '<input type="hidden" name="status" value="'.$status.'" >';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+
+print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $stringcurrentdate, $num, 0, 'title_setup', 0, '', '', $limit);
+
+print $langs->trans('CronInfo');
+print "<br><br>";
+
 
 print '<table width="100%" class="noborder">';
 print '<tr class="liste_titre">';
@@ -303,7 +317,7 @@ if ($num > 0)
 		print '</td>';
 
 		print '<td>';
-		if(!empty($line->lastoutput)) {print dol_trunc(nl2br($line->lastoutput),100);}
+		if(!empty($line->lastoutput)) {print dol_trunc(nl2br($line->lastoutput),50);}
 		print '</td>';
 
 		// Status
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 06f4309acf0..893627641bf 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -141,6 +141,8 @@ BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
 RecurringInvoiceTemplate=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=Last %s invoices
@@ -313,10 +315,15 @@ FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
 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=Next date to execution
-MaxPeriodNumber=Max period number
+NextDateToExecution=Date for next invoice generation
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
 RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 57e61b2f381..e90a2d33ee0 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -40,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -69,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>

From a4628e4bd147a24e53554732ea1751c58fb4e7d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 00:41:30 +0100
Subject: [PATCH 197/421] Clean deprecated files

---
 htdocs/cache.manifest          |   2 --
 htdocs/don/list.php            |   5 +++--
 htdocs/support/sparkangels.png | Bin 7800 -> 0 bytes
 3 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 htdocs/support/sparkangels.png

diff --git a/htdocs/cache.manifest b/htdocs/cache.manifest
index 617d40ed1e3..9119290941b 100644
--- a/htdocs/cache.manifest
+++ b/htdocs/cache.manifest
@@ -14,13 +14,11 @@ support/index.php
 support/online.php
 
 support/default.css
-support/headbg.jpg
 support/helpcenter.png
 support/internet.png
 support/mail.png
 support/pagemaster.png
 support/redstar.png
-support/sparkangels.png
 support/star.png
 support/who.png
 
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 372e60b5f96..071a927712c 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -165,6 +165,7 @@ if ($resql)
 	}
 	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"d.amount","", $param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.fk_statut","", $param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
 	print "</tr>\n";
 
     // Filters lines
@@ -188,7 +189,7 @@ if ($resql)
         print '</td>';
     }
     print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-
+    print '<td class="liste_titre" align="right"></td>';
     print '<td class="liste_titre" align="right">';
     $searchpitco=$form->showFilterAndCheckAddButtons(0);
     print $searchpitco;
@@ -226,7 +227,7 @@ if ($resql)
 		}
 		print '<td align="right">'.price($objp->amount).'</td>';
 		print '<td align="right">'.$donationstatic->LibStatut($objp->statut,5).'</td>';
-
+        print '<td></td>';
 		print "</tr>";
 		$i++;
 	}
diff --git a/htdocs/support/sparkangels.png b/htdocs/support/sparkangels.png
deleted file mode 100644
index 84ef5b3d6d7d13f67138198cfeb6df88c611b4f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7800
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
KMNUMnLSTZP*ar;&


From d55ac472c3d2ca1cfc85c43f9dafcf2c081d0cad Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 16 Feb 2016 11:27:58 +0100
Subject: [PATCH 198/421] Fix: issue when bank module is disabled Fix: missing
 entity filter for lines of payment

---
 .../core/modules/rapport/pdf_paiement.class.php   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 83bbb0a59b4..cc47c9570a6 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -146,10 +146,11 @@ class pdf_paiement
         $num=0;
         $lines=array();
 
-		// count number of ligne of payement
+		// count number of lines of payment
 		$sql = "SELECT p.rowid as prowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."paiement as p";
 		$sql.= " WHERE p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year,$month))."' AND '".$this->db->idate(dol_get_last_day($year,$month))."'";
+		$sql.= " AND p.entity = " . $conf->entity;
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -160,19 +161,23 @@ class pdf_paiement
 		$sql = "SELECT p.datep as dp, f.facnumber";
 		//$sql .= ", c.libelle as paiement_type, p.num_paiement";
 		$sql.= ", c.code as paiement_code, p.num_paiement";
-		$sql.= ", p.amount as paiement_amount, f.total_ttc as facture_amount ";
-		$sql.= ", pf.amount as pf_amount , ba.ref as bankaccount ";
+		$sql.= ", p.amount as paiement_amount, f.total_ttc as facture_amount";
+		$sql.= ", pf.amount as pf_amount";
+		if (! empty($conf->banque->enabled))
+			$sql.= ", ba.ref as bankaccount";
 		$sql.= ", p.rowid as prowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."facture as f,";
 		$sql.= " ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement_facture as pf,";
-		$sql.= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,";
+		if (! empty($conf->banque->enabled))
+			$sql.= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,";
 		$sql.= " ".MAIN_DB_PREFIX."societe as s";
 		if (! $user->rights->societe->client->voir && ! $socid)
 		{
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql.= " WHERE f.fk_soc = s.rowid AND pf.fk_facture = f.rowid AND pf.fk_paiement = p.rowid";
-		$sql.= " AND p.fk_bank = b.rowid AND b.fk_account = ba.rowid ";
+		if (! empty($conf->banque->enabled))
+			$sql.= " AND p.fk_bank = b.rowid AND b.fk_account = ba.rowid ";
 		$sql.= " AND f.entity = ".$conf->entity;
 		$sql.= " AND p.fk_paiement = c.id ";
 		$sql.= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year,$month))."' AND '".$this->db->idate(dol_get_last_day($year,$month))."'";

From 134c9d13bc521bd62a29c651fbce927097168c24 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Tue, 16 Feb 2016 12:45:18 +0100
Subject: [PATCH 199/421] FIX : check contrast of link when using background
 color for category

---
 htdocs/categories/class/categorie.class.php | 13 ++++++-----
 htdocs/categories/index.php                 |  8 ++++++-
 htdocs/theme/eldy/style.css.php             | 26 ++++++++++-----------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index a35fc566ea1..50a1a8d0e06 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -229,7 +229,7 @@ class Categorie extends CommonObject
 		$error=0;
 
 		dol_syslog(get_class($this).'::create', LOG_DEBUG);
-		
+
 		// Clean parameters
 		$this->label = trim($this->label);
 		$this->description = trim($this->description);
@@ -405,7 +405,7 @@ class Categorie extends CommonObject
             // End call triggers
 
 			$this->db->commit();
-			
+
 			return 1;
 		}
 		else
@@ -571,12 +571,12 @@ class Categorie extends CommonObject
 		if ($this->id == -1) return -2;
 
 		// For backward compatibility
-		if ($type == 'societe') 
+		if ($type == 'societe')
 		{
 			$type = 'customer';
 			dol_syslog(get_class($this) . "::add_type(): type 'societe' is deprecated, please use 'customer' instead",	LOG_WARNING);
 		}
-		elseif ($type == 'fournisseur') 
+		elseif ($type == 'fournisseur')
 		{
 			$type = 'supplier';
 			dol_syslog(get_class($this) . "::add_type(): type 'fournisseur' is deprecated, please use 'supplier' instead", LOG_WARNING);
@@ -1353,16 +1353,17 @@ class Categorie extends CommonObject
 	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param		string	$option			Sur quoi pointe le lien ('', 'xyz')
 	 * 	@param		int		$maxlength		Max length of text
+	 *  @param		string	$forced_color	Hexadecimal code to force link color
 	 *	@return		string					Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0,$option='',$maxlength=0)
+	function getNomUrl($withpicto=0,$option='',$maxlength=0, $forced_color='')
 	{
 		global $langs;
 
 		$result='';
 		$label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label);
 
-        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip"' . ( $forced_color ? ' style="color: #'.$forced_color.'"' : '' ) .'>';
 		$linkend='</a>';
 
 		$picto='category';
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index e57cd22d5fd..a01ea17e969 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -148,7 +148,13 @@ foreach($fulltree as $key => $val)
 	$categstatic->ref=$val['label'];
 	$categstatic->color=$val['color'];
 	$categstatic->type=$type;
-	$li=$categstatic->getNomUrl(1,'',60);
+	// Check contrast with background and correct text color
+	$color = colorArrayToHex(colorStringToArray($categstatic->color,array()),'');
+	$textcolor='000';
+	$tmpcolorweight=0;
+	foreach(colorStringToArray($color,array()) as $x) $tmpcolorweight+=$x;
+	if ($tmpcolorweight < 400) $textcolor='FFF';
+	$li=$categstatic->getNomUrl(1,'',60, $textcolor);
 	$desc=dol_htmlcleanlastbr($val['description']);
 
 	$data[] = array(
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 14154d01f51..a756e1f941c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -653,7 +653,7 @@ div.arearef {
 	margin-bottom: 10px;
 }
 div.heightref {
-	min-height: 80px; 
+	min-height: 80px;
 }
 div.divphotoref {
 	padding-right: 20px;
@@ -1177,8 +1177,8 @@ div.vmenu, td.vmenu {
 	width: 188px;
 }
 
-.menu_contenu { 
-	padding-top: 5px; 
+.menu_contenu {
+	padding-top: 5px;
 	padding-bottom: 2px;
 }
 #menu_contenu_logo { padding-right: 4px; }
@@ -1247,7 +1247,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmen
     -moz-box-shadow: 3px 3px 4px #DDD;
     -webkit-box-shadow: 3px 3px 4px #DDD;
     box-shadow: 3px 3px 4px #DDD;
-  */  
+  */
 }
 
 div.blockvmenusearch
@@ -2078,7 +2078,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-bottom-width: 1px;
 	border-bottom-color: #BBB;
 	border-bottom-style: solid;
-	
+
 	margin: 0px 0px 5px 0px;
 
 	-moz-box-shadow: 2px 2px 4px #CCC;
@@ -3661,10 +3661,10 @@ a span.select2-chosen
 	box-shadow: none;
 	-webkit-box-shadow: none !important;
     box-shadow: none !important;
-    color: #fff !important;
+    color: #fff;
 }
 span.noborderoncategories a, li.noborderoncategories a {
-	color: #fff !important;
+	color: #fff;
 	line-height: normal;
 	vertical-align: top;
 }
@@ -3772,10 +3772,10 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
 }
 select {
     /* display: inline-block; */	/* We can't set this. This disable ability to make */
-    /* TODO added by jmobile, replace jmobile with pure css*/ 
+    /* TODO added by jmobile, replace jmobile with pure css*/
     overflow:hidden;
     white-space: nowrap;
-    text-overflow: ellipsis; 
+    text-overflow: ellipsis;
 }
 .fiche .ui-controlgroup {
 	margin: 0px;
@@ -3953,11 +3953,11 @@ border-top-right-radius: 6px;
 @media only screen and (max-width: 767px)
 {
 	.imgopensurveywizard { width:95%; height: auto; }
-	
+
 	#tooltip {
 		position: absolute;
 		width: <?php print dol_size(350,'width'); ?>px;
-	}	
+	}
 
 }
 
@@ -3997,14 +3997,14 @@ border-top-right-radius: 6px;
 		top: 4px;
 		max-width: 82px;
 	}
-	
+
 	div.mainmenu {
     	min-width: 20px;
     }
 	.topmenuimage {
     	background-size: 20px auto;
     }
-    
+
 	#tooltip {
 		position: absolute;
 		width: <?php print dol_size(300,'width'); ?>px;

From 36b0cb5b237697bea246e1fa5f4d2292541a28b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 12:46:39 +0100
Subject: [PATCH 200/421] NEW Merge all admin tools (system and module admin
 tools) into same entry "Admin tools", so now things are clear: All features
 restricted to an admin user is inside "setup" (for setup) or "admin tools"
 (for action tools) instead of 3 different entries.

---
 htdocs/admin/tools/index.php                  |  2 +-
 htdocs/barcode/codeinit.php                   |  2 +-
 htdocs/core/class/menubase.class.php          |  4 +-
 htdocs/core/menus/init_menu_auguria.sql       | 16 ++++---
 htdocs/core/menus/standard/eldy.lib.php       | 44 ++++++++-----------
 htdocs/core/modules/modBarcode.class.php      |  6 +--
 htdocs/core/modules/modCron.class.php         |  4 +-
 .../core/modules/modExpenseReport.class.php   |  2 +-
 htdocs/core/modules/modOauth.class.php        |  4 +-
 htdocs/core/modules/modPrinting.class.php     |  4 +-
 htdocs/core/modules/modProduct.class.php      |  6 +--
 .../core/modules/modReceiptPrinter.class.php  |  4 +-
 htdocs/core/modules/modService.class.php      |  6 +--
 htdocs/install/upgrade2.php                   | 11 +++--
 htdocs/langs/en_US/main.lang                  |  1 +
 test/awbot/awbot.test.conf                    |  2 +-
 16 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index 6d7082728f3..9b08054beac 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -38,7 +38,7 @@ if (! $user->admin)
 $form = new Form($db);
 
 $title=$langs->trans("SystemToolsArea");
-if (GETPOST('leftmenu') == 'modulesadmintools') $title=$langs->trans("ModulesSystemTools");
+if (GETPOST('leftmenu') == 'admintools') $title=$langs->trans("ModulesSystemTools");
 
 llxHeader(array(),$title);
 
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index e421c17a470..d47e5aaecd3 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -191,7 +191,7 @@ $form=new Form($db);
 
 llxHeader('',$langs->trans("MassBarcodeInit"));
 
-print load_fiche_titre($langs->trans("MassBarcodeInit"));
+print load_fiche_titre($langs->trans("MassBarcodeInit"), '', 'title_setup.png');
 print '<br>';
 
 print $langs->trans("MassBarcodeInitDesc").'<br>';
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index cb370e31d96..2e58a686f8f 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -445,7 +445,7 @@ class Menubase
 
         		if (empty($val['fk_leftmenu']))
         		{
-        			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu']);	// TODO Add position
+        			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
         			//var_dump($this->newmenu->liste);
         		}
         		else
@@ -474,7 +474,7 @@ class Menubase
         				}
         			}
         			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
-        			if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu']);
+        			if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
         		}
         	}
         }
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 6c0f30c6b6c..48463ee99eb 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -19,8 +19,11 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('adherent', '$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 110, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('hrm|holiday|deplacement|expensereport', '$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled', 15__+MAX_llx_menu__, __HANDLER__, 'top', 'hrm', '', 0, '/compta/hrm.php?mainmenu=hrm&amp;leftmenu=', 'HRM', -1, 'holiday', '$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire', '', 0, 80, __ENTITY__);
 
+-- Home - Dashboard
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', __HANDLER__, 'left', 90__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/index.php', 'Dashboard', 0, '', '', '', 2, 0, __ENTITY__);
+
 -- Home - Setup
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', 'setup', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', 'setup', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 115__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=setup', 'Fiscalyear', 1, 'admin', '', '', 2, 4, __ENTITY__);
@@ -37,8 +40,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'SMS', 1, 'admin', '', '', 2, 12, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'Dictionary', 1, 'admin', '', '', 2, 13, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 14, __ENTITY__);
--- Home - Sytem info
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 300__+MAX_llx_menu__, 'home', 'admintools', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2, __ENTITY__);
+-- Home - Admin tools
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 300__+MAX_llx_menu__, 'home', 'admintools', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=admintools', 'AdminTools', 0, 'admin', '', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=admintools', 'InfoDolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/modules.php?leftmenu=admintools', 'Modules', 2, 'admin', '', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 203__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/triggers.php?leftmenu=admintools', 'Triggers', 2, 'admin', '', '', 2, 3, __ENTITY__);
@@ -57,10 +60,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 309__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 12, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 310__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/support/index.php?leftmenu=admintools', 'HelpCenter', 1, 'help', '', '_blank', 2, 13, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'About', 1, 'admin', '', '', 2, 14, __ENTITY__);
--- Home - Module Tools
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 700__+MAX_llx_menu__, 'home', 'modulesadmintools', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=modulesadmintools', 'ModulesSystemTools', 0, 'admin', '', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="modulesadmintools"', __HANDLER__, 'left', 701__+MAX_llx_menu__, 'home', '', 700__+MAX_llx_menu__, '/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=modulesadmintools', 'ProductVatMassChange', 1, 'products', '', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled || $leftmenu=="modulesadmintools"', __HANDLER__, 'left', 702__+MAX_llx_menu__, 'home', '', 700__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=home&amp;leftmenu=modulesadmintools', 'InitAccountancy', 1, 'accountancy', '', '', 2, 0, __ENTITY__);
+
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 320__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools', 'ProductVatMassChange', 1, 'products', '', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled || $leftmenu=="admintools"', __HANDLER__, 'left', 321__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=home&amp;leftmenu=admintools', 'InitAccountancy', 1, 'accountancy', '', '', 2, 0, __ENTITY__);
 -- Home - Menu users and groups
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', __HANDLER__, 'left', 400__+MAX_llx_menu__, 'home', 'users', 1__+MAX_llx_menu__, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 401__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/index.php?leftmenu=users', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 65b35014376..6a6e0304e7e 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -231,8 +231,8 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0)
 
 
 	// Tools
-	$tmpentry=array('enabled'=>(! empty($conf->barcode->enabled) || ! empty($conf->mailing->enabled) || ! empty($conf->export->enabled) || ! empty($conf->import->enabled) || ! empty($conf->opensurvey->enabled)  || ! empty($conf->resource->enabled)),
-	'perms'=>(! empty($conf->barcode->enabled) || ! empty($user->rights->mailing->lire) || ! empty($user->rights->export->lire) || ! empty($user->rights->import->run) || ! empty($user->rights->opensurvey->read) || ! empty($user->rights->resource->read)),
+	$tmpentry=array('enabled'=>(! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS) || ! empty($conf->barcode->enabled) || ! empty($conf->mailing->enabled) || ! empty($conf->export->enabled) || ! empty($conf->import->enabled) || ! empty($conf->opensurvey->enabled)  || ! empty($conf->resource->enabled)),
+	'perms'=>(! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS) || ! empty($conf->barcode->enabled) || ! empty($user->rights->mailing->lire) || ! empty($user->rights->export->lire) || ! empty($user->rights->import->run) || ! empty($user->rights->opensurvey->read) || ! empty($user->rights->resource->read)),
 	'module'=>'mailing|export|import|opensurvey|resource');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
@@ -531,7 +531,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 
 			// System tools
-			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("SystemTools"), 0, $user->admin, '', $mainmenu, 'admintools');
+			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools');
 			if (empty($leftmenu) || preg_match('/^admintools/',$leftmenu))
 			{
 				$langs->load("admin");
@@ -556,29 +556,20 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/admin/tools/listevents.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Audit"),1);
 				$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"),1);
 				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('About'), 1);
-				$newmenu->add("/support/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp');
-			}
 
-			// Modules system tools
-			if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->barcode->enabled)	// TODO We should enabled module system tools entry without hardcoded test, but when at least one modules bringing such entries are on
-				|| ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS))	// Some external modules may need to force to have this entry on.
-			{
-				if (empty($user->societe_id))
+				if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) 
 				{
-					$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, $user->admin, '', $mainmenu, 'modulesadmintools');
-					// Special case: This entry can't be embedded into modules because we need it for both module service and products and we don't want duplicate lines.
-					if ((empty($leftmenu) || $leftmenu=="modulesadmintools") && $user->admin)
-					{
-						$langs->load("products");
-						$newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=modulesadmintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
-
-						if (! empty($conf->accounting->enabled))
-						{
-							$langs->load("accountancy");
-							$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=home&amp;leftmenu=modulesadmintools", $langs->trans("InitAccountancy"), 1, $user->admin);
-						}
-					}
+					$langs->load("products");
+				    $newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
 				}
+
+				if (! empty($conf->accounting->enabled))
+				{
+					$langs->load("accountancy");
+					$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InitAccountancy"), 1, $user->admin);
+				}
+			
+				$newmenu->add("/support/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp');
 			}
 
 			$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users');
@@ -1251,7 +1242,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		 */
 		if ($mainmenu == 'tools')
 		{
-
 			if (! empty($conf->mailing->enabled))
 			{
 				$langs->load("mails");
@@ -1325,9 +1315,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		}
 
 		// Add personalized menus and modules menus
+		//var_dump($newmenu->liste);    //
 		$menuArbo = new Menubase($db,'eldy');
 		$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,(empty($user->societe_id)?0:1),'eldy',$tabMenu);
-
+		//var_dump($newmenu->liste);    //
+		
 		// We update newmenu for special dynamic menus
 		if (!empty($user->rights->banque->lire) && $mainmenu == 'bank')	// Entry for each bank account
 		{
@@ -1447,7 +1439,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			$url=preg_replace('/__LOGIN__/',$user->login,$url);
 			$url=preg_replace('/__USERID__/',$user->id,$url);
 
-			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].' -->'."\n";
+			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";
 
 			// Menu niveau 0
 			if ($menu_array[$i]['level'] == 0)
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index f28e6307e91..6803b462e5e 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -107,13 +107,13 @@ class modBarcode extends DolibarrModules
 						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',			                // This is a Left menu entry
 								'titre'=>'MassBarcodeInit',
-								'url'=>'/barcode/codeinit.php?mainmenu=home&leftmenu=modulesadmintools',
+								'url'=>'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools',
 								'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>300,
-								'enabled'=>'$conf->barcode->enabled && $leftmenu=="modulesadmintools"',   // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+								'enabled'=>'$conf->barcode->enabled && $leftmenu=="admintools"',   // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 								'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 								'target'=>'',
 								'user'=>0);				                // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 33491ea9a5a..10f2fa69948 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -132,13 +132,13 @@ class modCron extends DolibarrModules
 
         // Main menu entries
         $r=0;
-        $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 						        'type'=>'left',			                // This is a Left menu entry
 						        'titre'=>'CronList',
 						        'url'=>'/cron/list.php?status=-2',
 						        'langs'=>'cron',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 						        'position'=>200,
-						        'enabled'=>'$leftmenu==\'modulesadmintools\'',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+						        'enabled'=>'$leftmenu==\'admintools\'',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 						        'perms'=>'$user->rights->cron->read',			    // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 						        'target'=>'',
 						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index a4dae0bab07..c02d7942b5b 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -219,7 +219,7 @@ class modExpenseReport extends DolibarrModules
 		$this->menu = array();			// List of menus to add
 		$r=0;
 
-		// Example to declare a Left Menu entry: fk_mainmenu=home,fk_leftmenu=modulesadmintools
+		// Example to declare a Left Menu entry: fk_mainmenu=home,fk_leftmenu=admintools
 		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=hrm',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
 									'type'=>'left',			// This is a Left menu entry
 									'titre'=>'TripsAndExpenses',
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index dc19839011b..38ed6a37fde 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -105,14 +105,14 @@ class modOauth extends DolibarrModules
         $r=0;
 
         // This is to declare the Top Menu entry:
-        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',               // Put 0 if this is a top menu
+        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
         //                        'type'=>'left',                 // This is a Top menu entry
         //                        'titre'=>'MenuOauth',
         //                        'mainmenu'=>'oauth',
         //                        'url'=>'/oauth/index.php',
         //                        'langs'=>'oauth',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
         //                        'position'=>300,
-        //                        'enabled'=>'$conf->oauth->enabled && $leftmenu==\'modulesadmintools\'',
+        //                        'enabled'=>'$conf->oauth->enabled && $leftmenu==\'admintools\'',
         //                        'perms'=>'$user->rights->oauth->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
         //                        'target'=>'',
         //                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index d28aafc3050..0e5965b8793 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -105,14 +105,14 @@ class modPrinting extends DolibarrModules
         $r=0;
 
         // This is to declare the Top Menu entry:
-        $this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',               // Put 0 if this is a top menu
+        $this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
                                 'type'=>'left',                 // This is a Top menu entry
                                 'titre'=>'MenuDirectPrinting',
                                 'mainmenu'=>'printing',
                                 'url'=>'/printing/index.php',
                                 'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
                                 'position'=>300,
-                                'enabled'=>'$conf->printing->enabled && $leftmenu==\'modulesadmintools\'',
+                                'enabled'=>'$conf->printing->enabled && $leftmenu==\'admintools\'',
                                 'perms'=>'$user->rights->printing->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
                                 'target'=>'',
                                 'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 7616e6a36dd..e402aa62786 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -126,13 +126,13 @@ class modProduct extends DolibarrModules
 
 		/* We can't enable this here because it must be enabled in both product and service module and this create duplicate insert
 		$r=0;
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',			                // This is a Left menu entry
 								'titre'=>'ProductVatMassChange',
-								'url'=>'/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools',
+								'url'=>'/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools',
 								'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>300,
-								'enabled'=>'$conf->product->enabled && $leftmenu=="modulesadmintools"',   // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+								'enabled'=>'$conf->product->enabled && $leftmenu=="admintools"',   // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 								'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 								'target'=>'',
 								'user'=>0);				                // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index cd0d563099a..121722125f2 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -105,14 +105,14 @@ class modReceiptPrinter extends DolibarrModules
         $r=0;
 
         // This is to declare the Top Menu entry:
-        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',               // Put 0 if this is a top menu
+        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
         //                        'type'=>'left',                 // This is a Top menu entry
         //                        'titre'=>'MenuDirectPrinting',
         //                        'mainmenu'=>'printing',
         //                        'url'=>'/printing/index.php',
         //                        'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
         //                        'position'=>300,
-        //                        'enabled'=>'$conf->printing->enabled && $leftmenu==\'modulesadmintools\'',
+        //                        'enabled'=>'$conf->printing->enabled && $leftmenu==\'admintools\'',
         //                        'perms'=>'$user->rights->printing->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
         //                        'target'=>'',
         //                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 92d54acc275..eb0f51e5c4f 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -116,13 +116,13 @@ class modService extends DolibarrModules
 
 		/* We can't enable this here because it must be enabled in both product and service module and this create duplicate insert
 		$r=0;
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',			                // This is a Left menu entry
 								'titre'=>'ProductVatMassChange',
-								'url'=>'/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools',
+								'url'=>'/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools',
 								'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>300,
-								'enabled'=>'$conf->product->enabled && $leftmenu=="modulesadmintools"',   // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+								'enabled'=>'$conf->product->enabled && $leftmenu=="admintools"',   // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 								'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 								'target'=>'',
 								'user'=>0);				                // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 01e58299fc5..c9fa2ba39a6 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -403,7 +403,10 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         {
         	// Reload modules (this must be always and only into last targeted version)
         	$listofmodule=array(
-        			'MAIN_MODULE_FACTURE'=>'newboxdefonly',
+        	    'MAIN_MODULE_BARCODE'=>'newboxdefonly',
+        	    'MAIN_MODULE_CRON'=>'newboxdefonly',
+        	    'MAIN_MODULE_FACTURE'=>'newboxdefonly',
+        	    'MAIN_MODULE_PRINTING'=>'newboxdefonly',
         	);
         	migrate_reload_modules($db,$langs,$conf,$listofmodule);
         
@@ -4014,14 +4017,14 @@ function migrate_reload_menu($db,$langs,$conf,$versionto)
         $listofmenuhandler['auguria']=1;   // We set here only dynamic menu handlers
     }
 
-    // Migration required when target version is between 
+    // Migration required when target version is between
     $afterversionarray=explode('.','3.7.9');
-    $beforeversionarray=explode('.','3.8.9');
+    $beforeversionarray=explode('.','4.0.9');
     if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
     {
         $listofmenuhandler['auguria']=1;   // We set here only dynamic menu handlers
     }
-
+    
     foreach ($listofmenuhandler as $key => $val)
     {
         print '<tr><td colspan="4">';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2f12874fbb5..219ab597f38 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -700,6 +700,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
diff --git a/test/awbot/awbot.test.conf b/test/awbot/awbot.test.conf
index 401ab71803a..d01e356c245 100644
--- a/test/awbot/awbot.test.conf
+++ b/test/awbot/awbot.test.conf
@@ -126,7 +126,7 @@ POST "http://$SERVER/dolibarr_new/index.php?username=admin&password=admin"
 CHECKYES "Dolibarr - Home area"
 GET "http://$SERVER/dolibarr_new/societe/index.php?mainmenu=companies&leftmenu="
 CHECKYES "Third parties area"
-GET "http://$SERVER/dolibarr_new/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools"
+GET "http://$SERVER/dolibarr_new/admin/tools/index.php?mainmenu=home&leftmenu=admintools"
 </ACTIONS>
 
 

From fad09357f48ee96bd69cf3cc62ea252693bf1452 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 12:54:42 +0100
Subject: [PATCH 201/421] NEW Show total number of modules into the module list

---
 htdocs/admin/modules.php      | 4 ++--
 htdocs/langs/en_US/admin.lang | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 3fbaddd0a3f..c4269d159c7 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2004-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
@@ -223,7 +223,7 @@ asort($orders);
 //var_dump($modules);
 
 $nbofactivatedmodules=count($conf->modules);
-$moreinfo=$langs->trans("TotalNumberOfActivatedModules",($nbofactivatedmodules-1));
+$moreinfo=$langs->trans("TotalNumberOfActivatedModules",($nbofactivatedmodules-1), count($modules));
 if ($nbofactivatedmodules <= 1) $moreinfo .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
 print load_fiche_titre($langs->trans("ModulesSetup"),$moreinfo,'title_setup');
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5920ad01141..a24b608a955 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1091,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen). 
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation. 
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer

From 841145678d13a24ac0f3e01aa4375109948f5b0c Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Tue, 16 Feb 2016 12:56:57 +0100
Subject: [PATCH 202/421] Always check links color when background color is set
 onto category

---
 htdocs/categories/class/categorie.class.php | 10 ++++++++--
 htdocs/categories/index.php                 |  8 +-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 50a1a8d0e06..fb74a29a9f5 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1353,16 +1353,22 @@ class Categorie extends CommonObject
 	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param		string	$option			Sur quoi pointe le lien ('', 'xyz')
 	 * 	@param		int		$maxlength		Max length of text
-	 *  @param		string	$forced_color	Hexadecimal code to force link color
 	 *	@return		string					Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0,$option='',$maxlength=0, $forced_color='')
+	function getNomUrl($withpicto=0,$option='',$maxlength=0)
 	{
 		global $langs;
 
 		$result='';
 		$label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label);
 
+		// Check contrast with background and correct text color
+		$color = colorArrayToHex(colorStringToArray($this->color,array()),'');
+		$forced_color='000';
+		$tmpcolorweight=0;
+		foreach(colorStringToArray($color,array()) as $x) $tmpcolorweight+=$x;
+		if ($tmpcolorweight < 400) $forced_color='FFF';
+
         $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip"' . ( $forced_color ? ' style="color: #'.$forced_color.'"' : '' ) .'>';
 		$linkend='</a>';
 
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index a01ea17e969..e57cd22d5fd 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -148,13 +148,7 @@ foreach($fulltree as $key => $val)
 	$categstatic->ref=$val['label'];
 	$categstatic->color=$val['color'];
 	$categstatic->type=$type;
-	// Check contrast with background and correct text color
-	$color = colorArrayToHex(colorStringToArray($categstatic->color,array()),'');
-	$textcolor='000';
-	$tmpcolorweight=0;
-	foreach(colorStringToArray($color,array()) as $x) $tmpcolorweight+=$x;
-	if ($tmpcolorweight < 400) $textcolor='FFF';
-	$li=$categstatic->getNomUrl(1,'',60, $textcolor);
+	$li=$categstatic->getNomUrl(1,'',60);
 	$desc=dol_htmlcleanlastbr($val['description']);
 
 	$data[] = array(

From d8e173af032827ae070f00dc5452ca78032dfe64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 15:01:28 +0100
Subject: [PATCH 203/421] Fix regression (class not found, css on hover broken)
 with try to manage contrast on categories.

---
 htdocs/categories/class/categorie.class.php | 18 +++++++++++------
 htdocs/core/class/html.formother.class.php  | 17 +++++++++++-----
 htdocs/theme/eldy/style.css.php             | 13 ++++++++++--
 htdocs/theme/md/style.css.php               | 22 ++++++++++++++++++---
 4 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index fb74a29a9f5..03a66adab74 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1349,6 +1349,7 @@ class Categorie extends CommonObject
 
 	/**
 	 *	Return name and link of category (with picto)
+	 *  Use ->id, ->ref, ->label, ->color
 	 *
 	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param		string	$option			Sur quoi pointe le lien ('', 'xyz')
@@ -1363,13 +1364,18 @@ class Categorie extends CommonObject
 		$label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label);
 
 		// Check contrast with background and correct text color
-		$color = colorArrayToHex(colorStringToArray($this->color,array()),'');
-		$forced_color='000';
-		$tmpcolorweight=0;
-		foreach(colorStringToArray($color,array()) as $x) $tmpcolorweight+=$x;
-		if ($tmpcolorweight < 400) $forced_color='FFF';
+		$forced_color='categtextwhite';
+		if ($this->color)
+		{
+    		$hex=$this->color;
+    		$r = hexdec($hex[0].$hex[1]);
+    		$g = hexdec($hex[2].$hex[3]);
+    		$b = hexdec($hex[4].$hex[5]);
+    		$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
+    		if ($bright > 0.6) $forced_color='categtextblack';        // Higher than 60%
+		}		
 
-        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip"' . ( $forced_color ? ' style="color: #'.$forced_color.'"' : '' ) .'>';
+        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color .'">';
 		$linkend='</a>';
 
 		$picto='category';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 1727db5f227..078dc01d96f 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -595,13 +595,20 @@ class FormOther
      */
     static function showColor($color, $textifnotdefined='')
     {
+    	$textcolor='FFF';
+    	if ($color)
+    	{
+        	$hex=$color;
+        	$r = hexdec($hex[0].$hex[1]);
+        	$g = hexdec($hex[2].$hex[3]);
+        	$b = hexdec($hex[4].$hex[5]);
+        	$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
+            if ($bright > 0.6) $textcolor='000';     	   
+    	}
+    	
     	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
     	$color = colorArrayToHex(colorStringToArray($color,array()),'');
-    	$textcolor='000';
-    	$tmpcolorweight=0;
-    	foreach(colorStringToArray($color,array()) as $x) $tmpcolorweight+=$x;
-    	if ($tmpcolorweight < 400) $textcolor='FFF';
+    	
 		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
 		else print $textifnotdefined;
     }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a756e1f941c..1aa5b41ac3f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3655,22 +3655,31 @@ a span.select2-chosen
   overflow: hidden;
 }
 
+
+/* ============================================================================== */
+/*  For categories                                                                */
+/* ============================================================================== */
+
 .noborderoncategories {
 	border: none !important;
 	border-radius: 5px !important;
 	box-shadow: none;
 	-webkit-box-shadow: none !important;
     box-shadow: none !important;
-    color: #fff;
 }
 span.noborderoncategories a, li.noborderoncategories a {
-	color: #fff;
 	line-height: normal;
 	vertical-align: top;
 }
 span.noborderoncategories {
 	padding: 3px 5px 0px 5px;
 }
+.categtextwhite, .treeview .categtextwhite.hover {
+	color: #fff !important;
+}
+.categtextblack {
+	color: #000 !important;
+}
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index fe1e161dfc8..e08512b9ca4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2789,6 +2789,14 @@ table.dp {
 	color: rgb(<?php print $colortextlink; ?>);
 }
 
+.categtextwhite, .treeview .categtextwhite.hover {
+	color: #fff !important;
+}
+.categtextblack {
+	color: #000 !important;
+}
+
+
 /* ============================================================================== */
 /*  Afficher/cacher                                                               */
 /* ============================================================================== */
@@ -3498,22 +3506,30 @@ a span.select2-chosen
   overflow: hidden;
 }
 
+
+/* ============================================================================== */
+/*  For categories                                                                */
+/* ============================================================================== */
+
 .noborderoncategories {
 	border: none !important;
 	border-radius: 5px !important;
 	box-shadow: none;
 	-webkit-box-shadow: none !important;
     box-shadow: none !important;
-    color: #fff !important;
 }
 span.noborderoncategories a, li.noborderoncategories a {
-	color: #fff !important;
 	line-height: normal;
 }
 span.noborderoncategories {
 	padding: 5px 5px 0px 5px;
 }
-
+.categtextwhite, .treeview .categtextwhite.hover {
+	color: #fff !important;
+}
+.categtextblack {
+	color: #000 !important;
+}
 
 
 /* ============================================================================== */

From f809800e013fd4e5c45c663bef2754b6281a03aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 15:36:54 +0100
Subject: [PATCH 204/421] Fix sql error

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

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a5b048d9719..0426da05862 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3272,7 +3272,7 @@ class PropaleLigne  extends CommonObjectLine
 	    $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit).',';
         $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
         $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-		$sql.= ", ".$this->fk_multicurrency;
+		$sql.= ", ".($this->fk_multicurrency > 0?$this->fk_multicurrency:'null');
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".$this->multicurrency_subprice;
 		$sql.= ", ".$this->multicurrency_total_ht;

From 060b59ac6ca6b9fe14d35d4f8455888ef679a413 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 15:38:24 +0100
Subject: [PATCH 205/421] Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not
 supported in output

---
 htdocs/core/tpl/objectline_view.tpl.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 3abc0fb14c0..c264bac205d 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -90,12 +90,14 @@ if (empty($usemargins)) $usemargins=0;
 	}
 	else
 	{
-		if ($line->fk_product > 0)
+		$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
+		
+	    if ($line->fk_product > 0)
 		{
 			echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
 			
 			// Show range
-			echo get_date_range($line->date_start, $line->date_end);
+			echo get_date_range($line->date_start, $line->date_end, $format);
 
 			// Add description in form
 			if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
@@ -119,7 +121,7 @@ if (empty($usemargins)) $usemargins=0;
 			}
 
 			// Show range
-			echo get_date_range($line->date_start,$line->date_end);
+			echo get_date_range($line->date_start,$line->date_end, $format);
 		}
 	}
 	?>

From 14fb2c914aa93123f95a624571b6c4de2dc5d266 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 15:38:24 +0100
Subject: [PATCH 206/421] Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not
 supported in output

---
 htdocs/core/tpl/objectline_view.tpl.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index f71b2b484d1..7162ac66cb9 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -90,12 +90,14 @@ if (empty($usemargins)) $usemargins=0;
 	}
 	else
 	{
-		if ($line->fk_product > 0)
+		$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
+		
+	    if ($line->fk_product > 0)
 		{
 			echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
 			
 			// Show range
-			echo get_date_range($line->date_start, $line->date_end);
+			echo get_date_range($line->date_start, $line->date_end, $format);
 
 			// Add description in form
 			if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
@@ -119,7 +121,7 @@ if (empty($usemargins)) $usemargins=0;
 			}
 
 			// Show range
-			echo get_date_range($line->date_start,$line->date_end);
+			echo get_date_range($line->date_start,$line->date_end, $format);
 		}
 	}
 	?>

From 5bb153877a4b4a2c4c4dee3c0d64e765c654ccc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Tue, 16 Feb 2016 16:05:30 +0100
Subject: [PATCH 207/421] [Qual] Replaced deprecated dol_clone calls

With proper clone calls.
---
 htdocs/user/card.php | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 2723fce2a67..17a42e4ab60 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1,17 +1,18 @@
 <?php
-/* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
- * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
- * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
- * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
- * Copyright (C) 2015      Charlie Benke  	<charlie@patas-monkey.com>
+/* Copyright (C) 2002-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003  Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2015  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005       Lionel Cousteix         <etm_ltd@tiscali.co.uk>
+ * Copyright (C) 2011       Herve Prot              <herve.prot@symeos.com>
+ * Copyright (C) 2012       Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2015       Ari Elbaz (elarifr)     <github@accedinfo.com>
+ * Copyright (C) 2015       Charlie Benke           <charlie@patas-monkey.com>
+ * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.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
@@ -324,7 +325,7 @@ if (empty($reshook)) {
             if (!$error) {
                 $db->begin();
 
-                $object->oldcopy = dol_clone($object);
+                $object->oldcopy = clone $object;
 
                 $object->lastname = GETPOST("lastname", 'alpha');
                 $object->firstname = GETPOST("firstname", 'alpha');
@@ -506,7 +507,7 @@ if (empty($reshook)) {
             {
                 $object->fetch($id);
 
-                $object->oldcopy = dol_clone($object);
+                $object->oldcopy = clone $object;
 
                 $ret = $object->setPassword($user, $_POST["password"]);
                 if ($ret < 0) 

From 03b9b65d933b02ea796c609b8538e04abf5320da Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 16 Feb 2016 16:45:19 +0100
Subject: [PATCH 208/421] [quality] : better help

---
 .../fourn/class/fournisseur.commande.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index a0184662065..2edbcb0f249 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2007		Franky Van Liedekerke	<franky.van.liedekerke@telenet.be>
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2010-2014	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2016	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
@@ -53,7 +53,7 @@ class CommandeFournisseur extends CommonOrder
     var $id;
 
 	/**
-	 * Supplier invoice reference
+	 * Supplier order reference
 	 * @var string
 	 */
     var $ref;
@@ -103,7 +103,7 @@ class CommandeFournisseur extends CommonOrder
     var $user_approve_id;
     var $user_approve_id2;	// Used when SUPPLIER_ORDER_DOUBLE_APPROVAL is set
 
-	//Incorterms
+	//Incoterms
 	var $fk_incoterms;
 	var $location_incoterms;
 	var $libelle_incoterms;  //Used into tooltip
@@ -114,7 +114,7 @@ class CommandeFournisseur extends CommonOrder
 	 * @var CommandeFournisseurLigne[]
 	 */
 	public $lines = array();
-	//Ajout pour supplier_proposal
+	//Add for supplier_proposal
 	var $origin;
     var $origin_id;
     var $linked_objects=array();
@@ -243,7 +243,7 @@ class CommandeFournisseur extends CommonOrder
 
             $this->db->free($resql);
 
-            // Retreive all extrafield
+            // Retrieve all extrafields
             // fetch optionals attributes and labels
             require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
             $extrafields=new ExtraFields($this->db);
@@ -390,7 +390,7 @@ class CommandeFournisseur extends CommonOrder
         {
             $this->db->begin();
 
-            // Definition du nom de modele de numerotation de commande
+            // Definition of supplier order numbering model name
             $soc = new Societe($this->db);
             $soc->fetch($this->fourn_id);
 
@@ -435,7 +435,7 @@ class CommandeFournisseur extends CommonOrder
                 // Rename directory if dir was a temporary ref
                 if (preg_match('/^[\(]?PROV/i', $this->ref))
                 {
-                    // On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref)
+                    // We rename directory ($this->ref = ancienne ref, $num = nouvelle ref)
                     // in order not to lose the attached files
                     $oldref = dol_sanitizeFileName($this->ref);
                     $newref = dol_sanitizeFileName($num);
@@ -618,8 +618,8 @@ class CommandeFournisseur extends CommonOrder
 
 
     /**
-     *  Renvoie la reference de commande suivante non utilisee en fonction du modele
-     *                  de numerotation actif defini dans COMMANDE_SUPPLIER_ADDON_NUMBER
+     *  Returns the following order reference not used depending on the numbering model activated
+     *                  defined within COMMANDE_SUPPLIER_ADDON_NUMBER
      *
      *  @param	    Societe		$soc  		objet societe
      *  @return     string                  reference libre pour la facture

From 9796b1b26888d2069c40fdda390b03e93e70ee83 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 17:43:05 +0100
Subject: [PATCH 209/421] Can select number of records into lists

---
 htdocs/compta/charges/index.php     | 60 +++++++++++++++++++----------
 htdocs/compta/facture/list.php      |  1 +
 htdocs/compta/salaries/index.php    | 21 ++++++----
 htdocs/compta/sociales/index.php    | 31 +++++++++------
 htdocs/compta/tva/index.php         |  7 ++--
 htdocs/compta/tva/quadri_detail.php |  4 +-
 htdocs/compta/tva/reglement.php     | 22 +++++++----
 htdocs/fichinter/list.php           |  9 +++--
 htdocs/loan/index.php               |  9 +++--
 9 files changed, 106 insertions(+), 58 deletions(-)

diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index c263cc99696..3b38cb10e9c 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -40,18 +40,19 @@ $langs->load("bills");
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 
-$year=$_GET["year"];
-$filtre=$_GET["filtre"];
-if (! $year && $_GET["mode"] != 'sconly') { $year=date("Y", time()); }
-
-$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
-$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
-$page = $_GET["page"];
-if ($page < 0) $page = 0;
-
-//$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-//$offset = $limit * $page ;
+$mode=GETPOST("mode",'alpha');
+$year=GETPOST("year",'int');
+$filtre=GETPOST("filtre",'alpha');
+if (! $year && $mode != 'sconly') { $year=date("Y", time()); }
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 if (! $sortfield) $sortfield="cs.date_ech";
 if (! $sortorder) $sortorder="DESC";
 
@@ -68,18 +69,36 @@ $sal_static = new PaymentSalary($db);
 llxHeader('',$langs->trans("SpecialExpensesArea"));
 
 $title=$langs->trans("SpecialExpensesArea");
-if ($_GET["mode"] == 'sconly') $title=$langs->trans("SocialContributionsPayments");
+if ($mode == 'sconly') $title=$langs->trans("SocialContributionsPayments");
 
 $param='';
-if (GETPOST("mode") == 'sconly') $param='&mode=sconly';
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($mode == 'sconly') $param='&mode=sconly';
 if ($sortfield) $param.='&sortfield='.$sortfield;
 if ($sortorder) $param.='&sortorder='.$sortorder;
 
-print load_fiche_titre($title, ($year?"<a href='index.php?year=".($year-1).$param."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1).$param."'>".img_next()."</a>":""), 'title_accountancy.png');
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['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="mode" value="'.$mode.'">';
+
+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, 'title_accountancy', 0, '', '', $limit, 1);
+}
+else
+{
+    print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$center,$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit);
+}
 
 if ($year) $param.='&year='.$year;
 
-if (GETPOST("mode") != 'sconly')
+if ($mode != 'sconly')
 {
 	print $langs->trans("DescTaxAndDividendsArea").'<br>';
 	print "<br>";
@@ -89,7 +108,7 @@ if (GETPOST("mode") != 'sconly')
 if ($conf->tax->enabled)
 {
 	// Social contributions only
-	if (GETPOST("mode") != 'sconly')
+	if ($mode != 'sconly')
 	{
 		print load_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
 	}
@@ -140,7 +159,7 @@ if ($conf->tax->enabled)
 		$totalpaye = 0;
 		$var=true;
 
-		while ($i < $num)
+		while ($i < min($num, $limit))
 		{
 			$obj = $db->fetch_object($resql);
 			$var = !$var;
@@ -199,7 +218,7 @@ if ($conf->tax->enabled)
 // VAT
 if ($conf->tax->enabled)
 {
-	if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
+	if (! $mode || $mode != 'sconly')
 	{
 		print "<br>";
 
@@ -300,7 +319,7 @@ else
 
 while($j<$numlt)
 {
-	if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
+	if (! $mode || $mode != 'sconly')
 	{
 		print "<br>";
 
@@ -384,7 +403,7 @@ while($j<$numlt)
 // Payment Salary
 if ($conf->salaries->enabled)
 {
-    if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
+    if (! $mode || $mode != 'sconly')
     {
         $sal = new PaymentSalary($db);
 
@@ -463,6 +482,7 @@ if ($conf->salaries->enabled)
     }
 }
 
+print '</form>';
 
 
 llxFooter();
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index b6e6e9fa942..2bdc2f088b9 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -714,6 +714,7 @@ if ($resql)
     print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 18554f30de8..b0584d62850 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011-2014 Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015      Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2015-2016 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,7 @@ $socid = GETPOST("socid","int");
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'salaries', '', '', '');
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $search_ref = GETPOST('search_ref','int');
 $search_user = GETPOST('search_user','alpha');
 $search_label = GETPOST('search_label','alpha');
@@ -46,7 +47,6 @@ if ($page == -1) { $page = 0; }
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 if (! $sortfield) $sortfield="s.datep";
 if (! $sortorder) $sortorder="DESC";
 $optioncss = GETPOST('optioncss','alpha');
@@ -107,6 +107,8 @@ if ($filtre) {
 if ($typeid) {
     $sql .= " AND s.fk_typepayment=".$typeid;
 }
+$sql.= $db->order($sortfield,$sortorder);
+
 //$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, s.rowid, s.fk_user, s.amount, s.label, s.datev, s.fk_typepayment, s.num_payment, pst.code";
 $totalnboflines=0;
 $result=$db->query($sql);
@@ -114,7 +116,6 @@ if ($result)
 {
     $totalnboflines = $db->num_rows($result);
 }
-$sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1,$offset);
 
 $result = $db->query($sql);
@@ -126,15 +127,21 @@ if ($result)
 	$var=true;
 
 	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($typeid) $param.='&amp;typeid='.$typeid;
 	if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
 
-	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy.png');
-
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-    print '<table class="noborder" width="100%">';
+	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
+	
+	print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 2dbb3fd22d7..3133022b9e6 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -39,14 +39,15 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
 $search_ref = GETPOST('search_ref','int');
 $search_label = GETPOST('search_label','alpha');
 $search_amount = GETPOST('search_amount','alpha');
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 if (! $sortfield) $sortfield="cs.date_ech";
 if (! $sortorder) $sortorder="DESC";
 
@@ -100,8 +101,8 @@ $sql.= " AND cs.entity = ".$conf->entity;
 
 // Search criteria
 if ($search_ref)	$sql.=" AND cs.rowid=".$search_ref;
-if ($search_label) 	$sql.=" AND cs.libelle LIKE '%".$db->escape($search_label)."%'";
-if ($search_amount) $sql.=" AND cs.amount='".$db->escape(price2num(trim($search_amount)))."'";
+if ($search_label) 	$sql.=natural_search("cs.libelle", $search_label);
+if ($search_amount) $sql.=natural_search("cs.amount", price2num(trim($search_amount)), 1);
 if ($year > 0)
 {
     $sql .= " AND (";
@@ -119,16 +120,16 @@ if ($typeid) {
     $sql .= " AND cs.fk_type=".$typeid;
 }
 $sql.= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
+$sql.= $db->order($sortfield,$sortorder);
+
 $totalnboflines=0;
 $result=$db->query($sql);
 if ($result)
 {
     $totalnboflines = $db->num_rows($result);
 }
-$sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1,$offset);
 
-
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -137,16 +138,26 @@ if ($resql)
 	$var=true;
 
 	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($year)   $param.='&amp;year='.$year;
 	if ($typeid) $param.='&amp;typeid='.$typeid;
 
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+	
 	if ($year)
 	{
-		print load_fiche_titre($langs->trans("SocialContributions"),($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":""));
+	    $center=($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":"");
+		print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 	}
 	else
 	{
-		print_barre_liste($langs->trans("SocialContributions"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines);
+		print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 	}
 
 	if (empty($mysoc->country_id) && empty($mysoc->country_code))
@@ -160,7 +171,6 @@ if ($resql)
 	else
 	{
 
-		print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<table class="liste" width="100%">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder);
@@ -247,9 +257,8 @@ if ($resql)
 		}
 
 		print '</table>';
-
-		print '</form>';
 	}
+	print '</form>';
 }
 else
 {
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 4090f2904b7..dc2be67e44f 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -116,7 +116,8 @@ $tva = new Tva($db);
 $textprevyear="<a href=\"index.php?year=" . ($year_current-1) . "\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>";
 $textnextyear=" <a href=\"index.php?year=" . ($year_current+1) . "\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>";
 
-print load_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
+print $conf->dol_optimize_smallscreen;
+print load_fiche_titre($langs->trans("VAT"), $textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, 'title_accountancy.png');
 
 print $langs->trans("VATReportBuildWithOptionDefinedInModule").'<br>';
 print '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')<br>';
@@ -124,12 +125,12 @@ print '<br>';
 
 print '<table width="100%" class="notopnoleftnoright">';
 print '<tr><td class="notopnoleft" width="50%">';
-print load_fiche_titre($langs->trans("VATSummary"));
+print load_fiche_titre($langs->trans("VATSummary"), '', '');
 // The report mode is the one defined by defaut in tax module setup
 //print $modetax;
 //print '('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
 print '</td><td>';
-print load_fiche_titre($langs->trans("VATPaid"));
+print load_fiche_titre($langs->trans("VATPaid"), '', '');
 print '</td></tr>';
 
 print '<tr><td class="notopnoleft" width="50%" valign="top">';
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 00edf22ac3a..e04530a9dc7 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -416,7 +416,7 @@ else
 						print $langs->trans("NotUsedForGoods");
 					}
 					else {
-						print $fields['payment_amount'];
+						print price($fields['payment_amount']);
 						if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
 					}
 					print '</td>';
@@ -567,7 +567,7 @@ else
 					}
 					else
 					{
-						print $fields['payment_amount'];
+						print price($fields['payment_amount']);
 						if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
 					}
 					print '</td>';
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 3dee569b0ff..9615bec99f1 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -42,14 +42,15 @@ $search_label = GETPOST('search_label','alpha');
 $search_amount = GETPOST('search_amount','alpha');
 $month = GETPOST("month","int");
 $year = GETPOST("year","int");
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 if (! $sortfield) $sortfield="t.datev";
 if (! $sortorder) $sortorder="DESC";
 
@@ -115,13 +116,13 @@ if ($filtre) {
 if ($typeid) {
     $sql .= " AND t.fk_typepayment=".$typeid;
 }
+$sql.= $db->order($sortfield,$sortorder);
 $totalnboflines=0;
 $result=$db->query($sql);
 if ($result)
 {
     $totalnboflines = $db->num_rows($result);
 }
-$sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1,$offset);
 
 $result = $db->query($sql);
@@ -133,13 +134,20 @@ if ($result)
 	$var=true;
 
 	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($typeid) $param.='&amp;typeid='.$typeid;
 
-	print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines);
 
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-
-    print '<table class="noborder" width="100%">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['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_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit);
+	
+	print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index f919ad0d9d1..d86c2b86274 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -151,10 +151,11 @@ if ($result)
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 	print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit);
 	
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index 3d13c9c82fa..51f4e74e119 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -37,16 +37,16 @@ $socid = GETPOST('socid', 'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'loan', '', '', '');
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortfield) $sortfield="l.rowid";
 if (! $sortorder) $sortorder="DESC";
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 
 $search_ref=GETPOST('search_ref','int');
 $search_label=GETPOST('search_label','alpha');
@@ -103,7 +103,8 @@ if ($resql)
 	$i = 0;
 	$var=true;
 
-    $param="";
+    $param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
     if ($search_ref) $param.="&amp;search_ref=".$search_ref;
     if ($search_label) $param.="&amp;search_label=".$search_user;
     if ($search_amount) $param.="&amp;search_amount=".$search_amount_ht;
@@ -117,7 +118,7 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
     
-    print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
+    print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
 
     print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';

From 6d095fce9fe62d192dd9bae71cfd5352e244a559 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 16 Feb 2016 20:44:23 +0100
Subject: [PATCH 210/421] Fix replace dol_include_once() function by
 require_once for internal module

---
 htdocs/admin/multicurrency.php                | 6 +++---
 htdocs/comm/propal/class/propal.class.php     | 2 +-
 htdocs/commande/class/commande.class.php      | 8 ++++----
 htdocs/compta/facture/class/facture.class.php | 4 ++--
 htdocs/societe/class/societe.class.php        | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index c721f63a050..438a49fc0d8 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -27,9 +27,9 @@
 require '../main.inc.php';
 
 // Libraries
-dol_include_once('/core/lib/admin.lib.php');
-dol_include_once('/core/lib/multicurrency.lib.php');
-dol_include_once('/multicurrency/class/multicurrency.class.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 // Translations
 $langs->load("multicurrency");
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 0426da05862..5b5fe89fc7d 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php";
 require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
-dol_include_once('/multicurrency/class/multicurrency.class.php');
+require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
 
 /**
  *	Class to manage proposals
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 7f12328089e..ad7039e87f9 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -29,11 +29,11 @@
  *  \ingroup    commande
  *  \brief      Fichier des classes de commandes
  */
-include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
-require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php";
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT .'/core/class/commonorder.class.php';
+require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
+require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
-dol_include_once('/multicurrency/class/multicurrency.class.php');
+require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
 
 /**
  *  Class to manage customers orders
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index a647d71fd03..8fd43f3d5c8 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -36,11 +36,11 @@
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
-require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php";
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
-dol_include_once('/multicurrency/class/multicurrency.class.php');
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
  *	Class to manage invoices
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index b15ae3ff5d5..1541e5e6f6a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -33,7 +33,7 @@
  *	\brief      File for third party class
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-dol_include_once('/multicurrency/class/multicurrency.class.php');
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
  *	Class to manage third parties objects (customers, suppliers, prospects...)

From 6b9d7763fe49a95bc8de3cdaa2851a54ffcf8a32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 22:26:23 +0100
Subject: [PATCH 211/421] Clean code for adding a link to a related object

---
 htdocs/compta/facture.php     | 18 +++++++++++-------
 htdocs/fourn/facture/card.php | 15 ++++++++-------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 2ce51ad3afd..923ee04036a 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -74,6 +74,7 @@ $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $userid = GETPOST('userid', 'int');
 $search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
@@ -124,12 +125,22 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
+    if ($cancel) $action='';
+    
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
+	// Link invoice to order
+	if (GETPOST('linkedOrder') && empty($cancel) && $id > 0)
+	{
+	    $object->fetch($id);
+	    $object->fetch_thirdparty();
+	    $result = $object->add_object_linked('commande', GETPOST('linkedOrder'));
+	}
+	
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->facture->creer) {
 	//	if (1 == 0 && empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"])) {
@@ -1692,13 +1703,6 @@ if (empty($reshook))
 		exit();
 	}
 
-	// Link invoice to order
-	if (GETPOST('linkedOrder')) {
-		$object->fetch($id);
-		$object->fetch_thirdparty();
-		$result = $object->add_object_linked('commande', GETPOST('linkedOrder'));
-	}
-
 
 	/*
 	 * Send mail
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ac630989ba0..518f09b5316 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -110,6 +110,14 @@ if (empty($reshook))
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
+	// Link invoice to order
+	if (GETPOST('linkedOrder') && empty($cancel) && $id > 0)
+	{
+	    $object->fetch($id);
+	    $object->fetch_thirdparty();
+	    $result = $object->add_object_linked('order_supplier', GETPOST('linkedOrder'));
+	}
+	
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes')
 	{
@@ -894,13 +902,6 @@ if (empty($reshook))
 	    }
 	}
 
-	// Link invoice to order
-	if (GETPOST('linkedOrder')) {
-		$object->fetch($id);
-		$object->fetch_thirdparty();
-		$result = $object->add_object_linked('order_supplier', GETPOST('linkedOrder'));
-	}
-
 	// Add file in email form
 	if (GETPOST('addfile'))
 	{

From 1c6bef5a4c14ebf24830264404477cf009b8ed45 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 22:45:14 +0100
Subject: [PATCH 212/421] NEW Use ellipsis truncation on too large left menu
 text

---
 htdocs/theme/eldy/style.css.php | 4 +++-
 htdocs/theme/md/style.css.php   | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9f3ffa7e3a3..57f6497b681 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1199,6 +1199,8 @@ div.vmenu, td.vmenu {
 .menu_contenu { 
 	padding-top: 5px; 
 	padding-bottom: 2px;
+	overflow: hidden;
+    text-overflow: ellipsis;
 }
 #menu_contenu_logo { padding-right: 4px; }
 .companylogo { }
@@ -1210,7 +1212,7 @@ a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
 
 a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
 font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
-a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
+a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
 font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4ea0bcfc0fa..af2b770b1f4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1236,7 +1236,12 @@ div.vmenu, td.vmenu {
 	width: 202px;
 }
 
-.menu_contenu { padding-top: 4px; padding-bottom: 3px;}
+.menu_contenu { 
+	padding-top: 4px; 
+	padding-bottom: 3px;
+	overflow: hidden;
+    text-overflow: ellipsis;
+}
 #menu_contenu_logo { padding-right: 4px; }
 .companylogo { padding-top: 4px; }
 .searchform { padding-top: 8px; }
@@ -1247,7 +1252,7 @@ a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
 
 a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
 font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
-a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
+a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
 font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }

From 5268038e008889fe7eb80572d327f78e8a340582 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Feb 2016 22:58:24 +0100
Subject: [PATCH 213/421] Minor css enhancement

---
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/printing/index.php         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c8f389b28ed..3b25ffe3809 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3022,7 +3022,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
 
 	// Left
-	if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, '', $pictoisfullpath).'</td>';
+	if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
 	print '<td class="nobordernopadding"><div class="titre">'.$titre;
 	if (!empty($titre) && $savtotalnboflines > 0) print ' ('.$totalnboflines.')';
 	print '</div></td>';
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index 13e3883702d..f788b89bfdb 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -1,6 +1,5 @@
 <?php
-/*
- * Copyright (C) 2014-2015  Frederic France      <frederic.france@free.fr>
+/* Copyright (C) 2014-2015  Frederic 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
@@ -27,7 +26,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
 
 llxHeader("",$langs->trans("Printing"));
 
-print_barre_liste($langs->trans("Printing"), 0, $_SERVER["PHP_SELF"], '', '', '', '<a class="button" href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Refresh").'</a>', 0);
+print_barre_liste($langs->trans("Printing"), 0, $_SERVER["PHP_SELF"], '', '', '', '<a class="button" href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Refresh").'</a>', 0, 0, 'title_setup.png');
 
 print $langs->trans("DirectPrintingJobsDesc").'<br><br>';
 

From e24a35b90410bd8862f0c251a2aae17af580525b Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 16 Feb 2016 23:58:21 +0100
Subject: [PATCH 214/421] New add multicurrency on supplier proposal/order

---
 htdocs/admin/multicurrency.php                |   2 +-
 htdocs/commande/class/commande.class.php      |   8 +
 htdocs/core/class/commonobject.class.php      |   6 +
 htdocs/core/lib/multicurrency.lib.php         |   8 -
 .../class/fournisseur.commande.class.php      |  78 +++++++-
 htdocs/fourn/commande/card.php                | 100 +++++++++-
 .../install/mysql/migration/3.9.0-4.0.0.sql   |  16 ++
 .../mysql/tables/llx_supplier_proposal.sql    |   9 +-
 .../mysql/tables/llx_supplier_proposaldet.sql |   9 +-
 htdocs/supplier_proposal/card.php             |  83 ++++++++-
 .../class/supplier_proposal.class.php         | 171 ++++++++++++------
 11 files changed, 416 insertions(+), 74 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index c721f63a050..a3188fbd2c3 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -18,7 +18,7 @@
 
 /**
  * 	\file		admin/multicurrency.php
- * 	\ingroup	quickpriceupdate
+ * 	\ingroup	multicurrency
  * 	\brief		This file is an example module setup page
  * 				Put some comments here
  */
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 7f12328089e..b367fd71ea7 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3511,6 +3511,7 @@ class OrderLine extends CommonOrderLine
         $sql.= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
         $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
 	    $sql.= ' cd.fk_unit,';
+		$sql.= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
         $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
         $sql.= ' cd.date_start, cd.date_end';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
@@ -3561,6 +3562,13 @@ class OrderLine extends CommonOrderLine
             $this->date_start       = $this->db->jdate($objp->date_start);
             $this->date_end         = $this->db->jdate($objp->date_end);
 
+			$this->fk_multicurrency			= $objp->fk_multicurrency;
+			$this->multicurrency_code		= $objp->multicurrency_code;
+			$this->multicurrency_subprice	= $objp->multicurrency_subprice;
+			$this->multicurrency_total_ht	= $objp->multicurrency_total_ht;
+			$this->multicurrency_total_tva	= $objp->multicurrency_total_tva;
+			$this->multicurrency_total_ttc	= $objp->multicurrency_total_ttc;
+
             $this->db->free($result);
 
             return 1;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 587a71d6563..70a51d2f8fd 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1495,6 +1495,12 @@ abstract class CommonObject
 							case 'facture':
 								$this->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $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, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 								break;
+							case 'supplier_proposal':
+								$this->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options, $line->ref_fourn);
+								break;
+							case 'order_supplier':
+								$r = $this->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,  $line->product_type, false, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit);
+								break;
 							default:
 								dol_syslog(get_class($this).'::setMulticurrencyRate no updateline defined', LOG_DEBUG);
 								break;
diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php
index c3844309dd5..339ca2d01bc 100644
--- a/htdocs/core/lib/multicurrency.lib.php
+++ b/htdocs/core/lib/multicurrency.lib.php
@@ -40,14 +40,6 @@ function multicurrencyAdminPrepareHead()
     $head[$h][2] = 'settings';
     $h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //	'entity:+tabname:Title:@quickpriceupdate:/quickpriceupdate/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //	'entity:-tabname:Title:@quickpriceupdate:/quickpriceupdate/mypage.php?id=__ID__'
-    //); // to remove a tab
     complete_head_from_modules($conf, $langs, $object, $head, $h, 'multicurrency');
 
     return $head;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 2461acebfc2..273d947c6e7 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -32,7 +32,7 @@
 include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
  *	Class to manage predefined suppliers products
@@ -119,6 +119,14 @@ class CommandeFournisseur extends CommonOrder
     var $origin_id;
     var $linked_objects=array();
 
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_tx;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
+	
 	/**
      * 	Constructor
      *
@@ -167,6 +175,7 @@ class CommandeFournisseur extends CommonOrder
         $sql.= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
         $sql.= " c.fk_account,";
         $sql.= " c.note_private, c.note_public, c.model_pdf, c.extraparams, c.billed,";
+		$sql.= " c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc,";
         $sql.= " cm.libelle as methode_commande,";
         $sql.= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
         $sql.= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle";
@@ -239,6 +248,14 @@ class CommandeFournisseur extends CommonOrder
 			$this->location_incoterms = $obj->location_incoterms;
 			$this->libelle_incoterms = $obj->libelle_incoterms;
 
+			// Multicurrency
+			$this->fk_multicurrency 		= $obj->fk_multicurrency;
+			$this->multicurrency_code 		= $obj->multicurrency_code;
+			$this->multicurrency_tx 		= $obj->multicurrency_tx;
+			$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+			$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+			$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				
             $this->extraparams			= (array) json_decode($obj->extraparams, true);
 
             $this->db->free($resql);
@@ -261,7 +278,8 @@ class CommandeFournisseur extends CommonOrder
             $sql.= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
             $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
 	        $sql.= " l.fk_unit,";
-            $sql.= " l.date_start, l.date_end";
+            $sql.= " l.date_start, l.date_end,";
+			$sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
             $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
             $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
             $sql.= " WHERE l.fk_commande = ".$this->id;
@@ -312,7 +330,15 @@ class CommandeFournisseur extends CommonOrder
                     $line->date_start          = $this->db->jdate($objp->date_start);
                     $line->date_end            = $this->db->jdate($objp->date_end);
 	                $line->fk_unit             = $objp->fk_unit;
-
+					
+					// Multicurrency
+					$line->fk_multicurrency 		= $objp->fk_multicurrency;
+					$line->multicurrency_code 		= $objp->multicurrency_code;
+					$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+					$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+					$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+					$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+					
 	                $this->special_line        = $objp->special_line;
 	                $this->fk_parent_line      = $objp->fk_parent_line;
 
@@ -1028,6 +1054,16 @@ class CommandeFournisseur extends CommonOrder
         // Clean parameters
         if (empty($this->source)) $this->source = 0;
 
+		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = $conf->currency;
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
+		
         /* On positionne en mode brouillon la commande */
         $this->brouillon = 1;
 
@@ -1048,6 +1084,9 @@ class CommandeFournisseur extends CommonOrder
 		$sql.= ", fk_cond_reglement";
         $sql.= ", fk_account";
 		$sql.= ", fk_incoterms, location_incoterms";
+        $sql.= ", fk_multicurrency";
+        $sql.= ", multicurrency_code";
+        $sql.= ", multicurrency_tx";
         $sql.= ") ";
         $sql.= " VALUES (";
         $sql.= "''";
@@ -1067,6 +1106,9 @@ class CommandeFournisseur extends CommonOrder
         $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
         $sql.= ", ".(int) $this->fk_incoterms;
         $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", ".(int) $this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".(double) $this->multicurrency_tx;
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -1357,13 +1399,18 @@ class CommandeFournisseur extends CommonOrder
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc,$this->thirdparty);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
             
-            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
             $total_localtax1 = $tabprice[9];
             $total_localtax2 = $tabprice[10];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+			
             $localtax1_type=$localtaxes_type[0];
 			$localtax2_type=$localtaxes_type[2];
 
@@ -1373,7 +1420,8 @@ class CommandeFournisseur extends CommonOrder
             $sql.= " (fk_commande, label, description, date_start, date_end,";
             $sql.= " fk_product, product_type,";
             $sql.= " qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,";
-            $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit";
+            $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit,";
+			$sql.= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc";
             $sql.= ")";
             $sql.= " VALUES (".$this->id.", '" . $this->db->escape($label) . "','" . $this->db->escape($desc) . "',";
             $sql.= " ".($date_start?"'".$this->db->idate($date_start)."'":"null").",";
@@ -1393,6 +1441,12 @@ class CommandeFournisseur extends CommonOrder
             $sql.= "'".price2num($total_localtax2)."',";
             $sql.= "'".price2num($total_ttc)."',";
 	        $sql.= ($fk_unit ? "'".$this->db->escape($fk_unit)."'":"null");
+			$sql.= ", ".$this->fk_multicurrency;
+			$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+			$sql.= ", ".price2num($pu_ht * $this->multicurrency_tx);
+			$sql.= ", ".$multicurrency_total_ht;
+			$sql.= ", ".$multicurrency_total_tva;
+			$sql.= ", ".$multicurrency_total_ttc;
             $sql.= ")";
 
             dol_syslog(get_class($this)."::addline", LOG_DEBUG);
@@ -2116,13 +2170,18 @@ class CommandeFournisseur extends CommonOrder
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc, $this->thirdparty);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
             
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
+            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
             $total_localtax1 = $tabprice[9];
             $total_localtax2 = $tabprice[10];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+			
             $localtax1_type=$localtaxes_type[0];
 			$localtax2_type=$localtaxes_type[2];
 
@@ -2150,6 +2209,13 @@ class CommandeFournisseur extends CommonOrder
             $sql.= ",total_ttc='".price2num($total_ttc)."'";
             $sql.= ",product_type=".$type;
 			$sql.= ($fk_unit ? ",fk_unit='".$this->db->escape($fk_unit)."'":", fk_unit=null");
+			
+			// Multicurrency
+			$sql.= " , multicurrency_subprice=".price2num($subprice * $this->multicurrency_tx)."";
+		    $sql.= " , multicurrency_total_ht=".price2num($multicurrency_total_ht)."";
+		    $sql.= " , multicurrency_total_tva=".price2num($multicurrency_total_tva)."";
+		    $sql.= " , multicurrency_total_ttc=".price2num($multicurrency_total_ttc)."";
+			
             $sql.= " WHERE rowid = ".$rowid;
 
             dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index d7bd5d18696..200856acdc6 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -163,6 +163,16 @@ if (empty($reshook))
 	    $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
+	
+	// Multicurrency Code
+	else if ($action == 'setmulticurrencycode' && $user->rights->fournisseur->commande->creer) {
+		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
+	}
+
+	// Multicurrency rate
+	else if ($action == 'setmulticurrencyrate' && $user->rights->fournisseur->commande->creer) {
+		$result = $object->setMulticurrencyRate(GETPOST('multicurrency_tx', 'int'));
+	}
 
 	// bank account
 	if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer)
@@ -928,6 +938,8 @@ if (empty($reshook))
 			$object->date_livraison = $datelivraison;
 			$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 			$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
+			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+			$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
 
 			// Fill array 'array_options' with data from add form
 	       	if (! $error)
@@ -1492,6 +1504,12 @@ if ($action=='create')
 
 		$datedelivery = (! empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
 
+		if (!empty($conf->multicurrency->enabled))
+		{
+			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; 
+		}
+			
 		$note_private = $object->getDefaultCreateValueFor('note_private', (! empty($objectsrc->note_private) ? $objectsrc->note_private : null));
 		$note_public = $object->getDefaultCreateValueFor('note_public', (! empty($objectsrc->note_public) ? $objectsrc->note_public : null));
 
@@ -1503,7 +1521,9 @@ if ($action=='create')
 	{
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
-
+		
+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
+		
 		$note_private = $object->getDefaultCreateValueFor('note_private');
 		$note_public = $object->getDefaultCreateValueFor('note_public');
 	}
@@ -1515,7 +1535,8 @@ if ($action=='create')
 	print '<input type="hidden" name="remise_percent" value="' . $soc->remise_percent . '">';
 	print '<input type="hidden" name="origin" value="' . $origin . '">';
 	print '<input type="hidden" name="originid" value="' . $originid . '">';
-
+	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="' . $currency_tx . '">';
+	
 	dol_fiche_head('');
 
 	print '<table class="border" width="100%">';
@@ -1583,6 +1604,16 @@ if ($action=='create')
 		print '</td></tr>';
 	}
 
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		print '<tr>';
+		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+        print '<td colspan="3" class="maxwidthonsmartphone">';
+	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+		print '</td></tr>';
+	}
+	
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 	$doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
@@ -1624,6 +1655,13 @@ if ($action=='create')
 		}
 
 		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc) . "</td></tr>";
+		
+		if (!empty($conf->multicurrency->enabled))
+		{
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . '</td></tr>';	
+		}
 	}
 
 	// Other options
@@ -1648,7 +1686,7 @@ if ($action=='create')
 	if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) 
 	{
 		$title = $langs->trans('ProductsAndServices');
-		print load_fiche_titre($title,'','');
+		print load_fiche_titre($title);
 
 		print '<table class="noborder" width="100%">';
 
@@ -1915,6 +1953,44 @@ elseif (! empty($object->id))
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
 	}
 	print '</td></tr>';
+	
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		// Multicurrency code
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Currency','multicurrency_code');
+		print '</td>';
+		if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencycode') {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+		} else {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+		}
+		print '</td></tr>';
+	
+		// Multicurrency rate
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Rate','multicurrency_tx');
+		print '</td>';
+		if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencyrate') {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+		} else {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+		}
+		print '</td></tr>';
+	}
 
     // Bank Account
 	if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled))
@@ -2049,6 +2125,24 @@ elseif (! empty($object->id))
 	print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="2">'.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'</td>';
 	print '</tr>';
 
+	if (!empty($conf->multicurrency->enabled))
+	{
+		// Multicurrency Amount HT
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';
+		
+		// Multicurrency Amount VAT
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';
+		
+		// Multicurrency Amount TTC
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';	
+	}
+
 	print "</table><br>";
 
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 9d0c27cf2b3..2b38f915869 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -267,3 +267,19 @@ ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_amount doubl
 ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_ht double(24,8) NOT NULL;
 ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_tva double(24,8) DEFAULT 0 NOT NULL;
 ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_ttc double(24,8) DEFAULT 0 NOT NULL;
+
+
+
+ALTER TABLE llx_supplier_proposal ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposal ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
index e271d36ffe5..43f26ee0459 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
@@ -51,5 +51,12 @@ CREATE TABLE llx_supplier_proposal (
   date_livraison date DEFAULT NULL,
   fk_shipping_method integer DEFAULT NULL,
   import_key varchar(14) DEFAULT NULL,
-  extraparams varchar(255) DEFAULT NULL
+  extraparams varchar(255) DEFAULT NULL,
+  
+  fk_multicurrency        integer,
+  multicurrency_code      varchar(255),
+  multicurrency_tx        double(24,8) DEFAULT 1,
+  multicurrency_total_ht  double(24,8) DEFAULT 0,
+  multicurrency_total_tva double(24,8) DEFAULT 0,
+  multicurrency_total_ttc double(24,8) DEFAULT 0
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
index 81b6f2ef2cc..22467c63e26 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
@@ -44,5 +44,12 @@ CREATE TABLE llx_supplier_proposaldet (
   fk_product_fournisseur_price integer DEFAULT NULL,
   special_code integer DEFAULT 0,
   rang integer DEFAULT 0,
-  ref_fourn varchar(30) DEFAULT NULL
+  ref_fourn varchar(30) DEFAULT NULL,
+  
+  fk_multicurrency        integer,
+  multicurrency_code      varchar(255),
+  multicurrency_subprice  double(24,8) DEFAULT 0,
+  multicurrency_total_ht  double(24,8) DEFAULT 0,
+  multicurrency_total_tva double(24,8) DEFAULT 0,
+  multicurrency_total_ttc double(24,8) DEFAULT 0
 ) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index c03d3edadaa..e0ba1c18dd5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -270,6 +270,12 @@ if (empty($reshook))
 				$object->origin = GETPOST('origin');
 				$object->origin_id = GETPOST('originid');
 
+				// Multicurrency
+				if (!empty($conf->multicurrency->enabled))
+				{
+					$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+				}
+
 				for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++)
 				{
 					if ($_POST['idprod' . $i]) {
@@ -909,6 +915,16 @@ if (empty($reshook))
 	else if ($action == 'setmode' && $user->rights->supplier_proposal->creer) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 	}
+	
+	// Multicurrency Code
+	else if ($action == 'setmulticurrencycode' && $user->rights->supplier_proposal->creer) {
+		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
+	}
+
+	// Multicurrency rate
+	else if ($action == 'setmulticurrencyrate' && $user->rights->supplier_proposal->creer) {
+		$result = $object->setMulticurrencyRate(GETPOST('multicurrency_tx', 'int'));
+	}
 
 	/*
 	 * Ordonnancement des lignes
@@ -1133,7 +1149,17 @@ if ($action == 'create')
 		print '</td>';
 		print '</tr>';
 	}
-
+	
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		print '<tr>';
+		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+        print '<td colspan="3" class="maxwidthonsmartphone">';
+		$currency_code = (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : ($object->multicurrency_code ? $object->multicurrency_code : $conf->currency)); 
+	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+		print '</td></tr>';
+	}
 
 	// Other attributes
 	$parameters = array('colspan' => ' colspan="3"');
@@ -1468,6 +1494,43 @@ if ($action == 'create')
 		print '</tr>';
 	}
 
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		// Multicurrency code
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Currency','multicurrency_code');
+		print '</td>';
+		if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencycode') {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+		} else {
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+		}
+		print '</td></tr>';
+	
+		// Multicurrency rate
+		print '<tr>';
+		print '<td width="25%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('Rate','multicurrency_tx');
+		print '</td>';
+		if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="5">';
+		if ($action == 'editmulticurrencyrate') {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+		} else {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+		}
+		print '</td></tr>';
+	}
 
 	if ($soc->outstanding_limit)
 	{
@@ -1542,6 +1605,24 @@ if ($action == 'create')
 	print '<td align="right" class="nowrap">' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
 	print '<td></td></tr>';
 
+	if (!empty($conf->multicurrency->enabled))
+	{
+		// Multicurrency Amount HT
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';
+		
+		// Multicurrency Amount VAT
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';
+		
+		// Multicurrency Amount TTC
+		print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+		print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		print '</tr>';	
+	}
+
 	// Statut
 	print '<tr><td height="10">' . $langs->trans('Status') . '</td><td align="left" colspan="2">' . $object->getLibStatut(4) . '</td></tr>';
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 97f52526e66..abbaed6d5f4 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
+require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
 
 /**
  *	Class to manage price ask supplier
@@ -130,7 +131,14 @@ class SupplierProposal extends CommonObject
 
     var $specimen;
 
-
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_tx;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
+	
     /**
      *	Constructor
      *
@@ -371,13 +379,18 @@ class SupplierProposal extends CommonObject
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
             
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
+            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
             $total_localtax1 = $tabprice[9];
             $total_localtax2 = $tabprice[10];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+			
             // Rang to use
             $rangtouse = $rang;
             if ($rangtouse == -1)
@@ -436,6 +449,14 @@ class SupplierProposal extends CommonObject
 			}
 			$this->line->pa_ht = $pa_ht;
 
+			// Multicurrency
+			$this->line->fk_multicurrency			= $this->fk_multicurrency;
+			$this->line->multicurrency_code			= $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= price2num($pu_ht * $this->multicurrency_tx);
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			
             // Mise en option de la ligne
             if (empty($qty) && empty($special_code)) $this->line->special_code=3;
 
@@ -531,13 +552,18 @@ class SupplierProposal extends CommonObject
             $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
             $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
             
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
+            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
             $total_localtax1 = $tabprice[9];
             $total_localtax2 = $tabprice[10];
 
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+            $multicurrency_total_tva = $tabprice[17];
+            $multicurrency_total_ttc = $tabprice[18];
+			
             // Anciens indicateurs: $price, $remise (a ne plus utiliser)
             $price = $pu;
             if ($remise_percent > 0)
@@ -603,6 +629,12 @@ class SupplierProposal extends CommonObject
             if (is_array($array_option) && count($array_option)>0) {
             	$this->line->array_options=$array_option;
             }
+			
+			// Multicurrency
+			$this->line->multicurrency_subprice		= price2num($pu * $this->multicurrency_tx);
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
             $result=$this->line->update();
             if ($result > 0)
@@ -705,6 +737,15 @@ class SupplierProposal extends CommonObject
 			}
 		}
 
+		// Multicurrency
+		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = $conf->currency;
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
+
         $this->db->begin();
 
         // Insert into database
@@ -729,6 +770,9 @@ class SupplierProposal extends CommonObject
         $sql.= ", fk_shipping_method";
         $sql.= ", fk_projet";
         $sql.= ", entity";
+        $sql.= ", fk_multicurrency";
+        $sql.= ", multicurrency_code";
+        $sql.= ", multicurrency_tx";
         $sql.= ") ";
         $sql.= " VALUES (";
         $sql.= $this->socid;
@@ -751,6 +795,9 @@ class SupplierProposal extends CommonObject
         $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
         $sql.= ", ".($this->fk_project?$this->fk_project:"null");
         $sql.= ", ".$conf->entity;
+		$sql.= ", ".(int) $this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".(double) $this->multicurrency_tx;
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -1028,6 +1075,7 @@ class SupplierProposal extends CommonObject
         $sql.= ", p.fk_mode_reglement";
         $sql.= ', p.fk_account';
         $sql.= ", p.fk_shipping_method";
+		$sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
         $sql.= ", c.label as statut_label";
         $sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
         $sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
@@ -1090,6 +1138,14 @@ class SupplierProposal extends CommonObject
                 $this->user_valid_id  = $obj->fk_user_valid;
                 $this->user_close_id  = $obj->fk_user_cloture;
 
+				// Multicurrency
+				$this->fk_multicurrency 		= $obj->fk_multicurrency;
+				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->multicurrency_tx 		= $obj->multicurrency_tx;
+				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				
                 if ($obj->fk_statut == 0)
                 {
                     $this->brouillon = 1;
@@ -1113,6 +1169,7 @@ class SupplierProposal extends CommonObject
 				$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
                 $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
                 $sql.= ' d.ref_fourn as ref_produit_fourn';
+				$sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
                 $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
                 $sql.= " WHERE d.fk_supplier_proposal = ".$this->id;
@@ -1130,7 +1187,8 @@ class SupplierProposal extends CommonObject
 
                         $line                   = new SupplierProposalLine($this->db);
 
-                        $line->rowid			= $objp->rowid;
+                        $line->rowid			= $objp->rowid; // deprecated
+                        $line->id				= $objp->rowid;
                         $line->fk_supplier_proposal		= $objp->fk_supplier_proposal;
                         $line->fk_parent_line	= $objp->fk_parent_line;
                         $line->product_type     = $objp->product_type;
@@ -1170,6 +1228,14 @@ class SupplierProposal extends CommonObject
 
 						$line->ref_fourn		= $objp->ref_produit_fourn;
 
+						// Multicurrency
+						$line->fk_multicurrency 		= $objp->fk_multicurrency;
+						$line->multicurrency_code 		= $objp->multicurrency_code;
+						$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+						$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+						$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+						$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+						
                         $this->lines[$i]        = $line;
 
                         $i++;
@@ -2300,6 +2366,7 @@ class SupplierProposal extends CommonObject
         $sql.= ' pt.product_type, pt.rang, pt.fk_parent_line,';
         $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
         $sql.= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn';
+		$sql.= ' ,pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
         $sql.= ' WHERE pt.fk_supplier_proposal = '.$this->id;
@@ -2346,6 +2413,14 @@ class SupplierProposal extends CommonObject
                 $this->lines[$i]->rang				= $obj->rang;
 
                 $this->lines[$i]->ref_fourn				= $obj->ref_produit_fourn;
+				
+				// Multicurrency
+				$this->lines[$i]->fk_multicurrency 			= $obj->fk_multicurrency;
+				$this->lines[$i]->multicurrency_code 		= $obj->multicurrency_code;
+				$this->lines[$i]->multicurrency_subprice 	= $obj->multicurrency_subprice;
+				$this->lines[$i]->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->lines[$i]->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
                 $i++;
             }
@@ -2394,49 +2469,6 @@ class SupplierProposal extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
-
-	function printOriginLinesList()
-    {
-        global $langs, $hookmanager;
-
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->trans('Ref').'</td>';
-        print '<td>'.$langs->trans('Description').'</td>';
-        print '<td align="right">'.$langs->trans('VAT').'</td>';
-        print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
-        print '<td align="right">'.$langs->trans('Qty').'</td>';
-        print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';
-
-        $num = count($this->lines);
-        $var = true;
-        $i	 = 0;
-
-        foreach ($this->lines as $line)
-        {
-        	if (empty($line->subprice) || $line->qty <= 0)
-				continue;
-
-            $var=!$var;
-
-            if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-            {
-                if (empty($line->fk_parent_line))
-                {
-                    $parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
-                    $action='';
-                    $reshook=$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                }
-            }
-            else
-            {
-                $this->printOriginLine($line,$var);
-            }
-
-            $i++;
-        }
-    }
-
-
 }
 
 
@@ -2455,7 +2487,8 @@ class SupplierProposalLine  extends CommonObject
     var $oldline;
 
     // From llx_supplier_proposaldet
-    var $rowid;
+    var $rowid; // deprecated
+    var $id;
     var $fk_supplier_proposal;
     var $fk_parent_line;
     var $desc;          	// Description ligne
@@ -2546,6 +2579,14 @@ class SupplierProposalLine  extends CommonObject
     var $skip_update_total; // Skip update price total for special lines
 
 	var $ref_fourn;
+	
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_subprice;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
 
     /**
      * 	Class line Contructor
@@ -2570,7 +2611,8 @@ class SupplierProposalLine  extends CommonObject
 		$sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
 		$sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
 		$sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
-		$sql.= ' pd.product_type, pd.ref_fourn as ref_produit_fourn';
+		$sql.= ' pd.product_type, pd.ref_fourn as ref_produit_fourn,';
+		$sql.= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
 		$sql.= ' WHERE pd.rowid = '.$rowid;
@@ -2580,7 +2622,8 @@ class SupplierProposalLine  extends CommonObject
 		{
 			$objp = $this->db->fetch_object($result);
 
-			$this->rowid			= $objp->rowid;
+			$this->rowid			= $objp->rowid; // deprecated
+			$this->id				= $objp->rowid;
 			$this->fk_supplier_proposal		= $objp->fk_supplier_proposal;
 			$this->fk_parent_line	= $objp->fk_parent_line;
 			$this->label			= $objp->custom_label;
@@ -2617,6 +2660,14 @@ class SupplierProposalLine  extends CommonObject
 			$this->product_desc		= $objp->product_desc;
 
 			$this->ref_fourn		= $objp->ref_produit_forun;
+			
+			// Multicurrency
+			$this->fk_multicurrency 		= $objp->fk_multicurrency;
+			$this->multicurrency_code 		= $objp->multicurrency_code;
+			$this->multicurrency_subprice 	= $objp->multicurrency_subprice;
+			$this->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+			$this->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+			$this->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
 
 			$this->db->free($result);
 		}
@@ -2683,7 +2734,8 @@ class SupplierProposalLine  extends CommonObject
         $sql.= ' subprice, remise_percent, ';
         $sql.= ' info_bits, ';
         $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
-        $sql.= ' ref_fourn)';
+        $sql.= ' ref_fourn';
+		$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc)';
         $sql.= " VALUES (".$this->fk_supplier_proposal.",";
         $sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").",";
         $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
@@ -2710,6 +2762,12 @@ class SupplierProposalLine  extends CommonObject
         $sql.= ' '.$this->special_code.',';
         $sql.= ' '.$this->rang.',';
         $sql.= " '".$this->db->escape($this->ref_fourn)."'";
+		$sql.= ", ".($this->fk_multicurrency > 0?$this->fk_multicurrency:'null');
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".$this->multicurrency_subprice;
+		$sql.= ", ".$this->multicurrency_total_ht;
+		$sql.= ", ".$this->multicurrency_total_tva;
+		$sql.= ", ".$this->multicurrency_total_ttc;
         $sql.= ')';
 
         dol_syslog(get_class($this).'::insert', LOG_DEBUG);
@@ -2717,10 +2775,10 @@ class SupplierProposalLine  extends CommonObject
         if ($resql)
         {
             $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
-
+			$this->id=$this->rowid;
+			
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-            	$this->id=$this->rowid;
             	$result=$this->insertExtraFields();
             	if ($result < 0)
             	{
@@ -2878,6 +2936,13 @@ class SupplierProposalLine  extends CommonObject
         $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
         if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
         $sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
+		
+		// Multicurrency
+		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		
         $sql.= " WHERE rowid = ".$this->rowid;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);

From 633de3bcb454908cdbe9ee2bdd62d16cbf2dffb2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 Feb 2016 22:33:02 +0100
Subject: [PATCH 215/421] Fix list of object referers should not be set to
 invoice by default (may be module is disabed). I replace with a message to
 choose list.

---
 htdocs/core/lib/product.lib.php  | 16 ++++++++++++----
 htdocs/langs/en_US/main.lang     |  1 +
 htdocs/langs/en_US/products.lang |  1 +
 htdocs/product/stats/facture.php | 15 ++++++++++-----
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 6deaf7eae08..7bdb6cd5756 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -101,7 +101,7 @@ function product_prepare_head($object)
 	$head[$h][2] = 'stats';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$object->id;
+	$head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id;
 	$head[$h][1] = $langs->trans('Referers');
 	$head[$h][2] = 'referers';
 	$h++;
@@ -201,22 +201,25 @@ function product_admin_prepare_head()
  *
  * @param	Product		$product	Product object
  * @param 	int			$socid		Thirdparty id
- * @return	integer
+ * @return	integer					NB of lines shown into array
  */
 function show_stats_for_company($product,$socid)
 {
 	global $conf,$langs,$user,$db;
 
+	$nblines = 0;
+	
 	print '<tr>';
 	print '<td align="left" width="25%" valign="top">'.$langs->trans("Referers").'</td>';
 	print '<td align="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("NbOfReferers").'</td>';
+	print '<td align="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';
 	print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
 	print '</tr>';
 
 	// Propals
 	if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 	{
+		$nblines++;
 		$ret=$product->load_stats_propale($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("propal");
@@ -234,6 +237,7 @@ function show_stats_for_company($product,$socid)
 	// Commandes clients
 	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
+		$nblines++;
 		$ret=$product->load_stats_commande($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("orders");
@@ -251,6 +255,7 @@ function show_stats_for_company($product,$socid)
 	// Commandes fournisseurs
 	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
 	{
+		$nblines++;
 		$ret=$product->load_stats_commande_fournisseur($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("orders");
@@ -268,6 +273,7 @@ function show_stats_for_company($product,$socid)
 	// Contrats
 	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	{
+		$nblines++;
 		$ret=$product->load_stats_contrat($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("contracts");
@@ -285,6 +291,7 @@ function show_stats_for_company($product,$socid)
 	// Factures clients
 	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
+		$nblines++;
 		$ret=$product->load_stats_facture($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("bills");
@@ -302,6 +309,7 @@ function show_stats_for_company($product,$socid)
 	// Factures fournisseurs
 	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
 	{
+		$nblines++;
 		$ret=$product->load_stats_facture_fournisseur($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("bills");
@@ -317,7 +325,7 @@ function show_stats_for_company($product,$socid)
 		print '</tr>';
 	}
 
-	return 0;
+	return $nblines++;
 }
 
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index eebec1e7f88..834611558a2 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -537,6 +537,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index b8a7d377904..ea480222aa7 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -313,3 +313,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 590830702bb..57c426dc3a1 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
@@ -48,7 +48,7 @@ $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','',
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('productstatsinvoice'));
 
-$mesg = '';
+$showmessage=GETPOST('showmessage');
 
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -67,6 +67,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) {
 	$search_year='';
 }
 
+
+
 /*
  * View
  */
@@ -107,7 +109,7 @@ if ($id > 0 || ! empty($ref))
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
-		show_stats_for_company($product,$socid);
+		$nboflines = show_stats_for_company($product,$socid);
 
 		print "</table>";
 
@@ -116,8 +118,11 @@ if ($id > 0 || ! empty($ref))
 		
 		dol_fiche_end();
 
-
-        if ($user->rights->facture->lire) 
+		if ($showmessage && $nboflines > 1)
+		{
+			print $langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers"));
+		}
+        elseif ($user->rights->facture->lire) 
         {
             $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
             $sql.= " f.facnumber, f.datef, f.paye, f.fk_statut as statut, f.rowid as facid,";

From 5d2c189e0e9b41ad4757d8dfbf047de5626c2b61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 Feb 2016 23:45:25 +0100
Subject: [PATCH 216/421] Fix bad place of table

---
 htdocs/core/class/html.form.class.php           | 5 +++--
 htdocs/expedition/tpl/linkedobjectblock.tpl.php | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5078b5932c9..73b401025e9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5084,17 +5084,18 @@ class Form
 					print '<tr ' . $bc [$var] . '>';
 					print '<td aling="left">';
 					print '<input type="radio" name="linkedOrder" value=' . $objp->rowid . '>';
+					print '</td>';
 					print '<td align="center">' . $objp->ref . '</td>';
 					print '<td>' . $objp->ref_client . '</td>';
 					print '<td>' . price($objp->total_ht) . '</td>';
 					print '<td>' . $objp->name . '</td>';
-					print '</td>';
 					print '</tr>';
 
 					$i ++;
 				}
 				print '</table>';
 				print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('ToLink') . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></div>';
+				
 				print '</form>';
 				$this->db->free($resqlorderlist);
 			} else {
@@ -5150,11 +5151,11 @@ class Form
 					print '<tr ' . $bc [$var] . '>';
 					print '<td aling="left">';
 					print '<input type="radio" name="linkedOrder" value=' . $objp->rowid . '>';
+					print '</td>';
 					print '<td align="center">' . $objp->ref . '</td>';
 					print '<td>' . $objp->ref_supplier . '</td>';
 					print '<td>' . price($objp->total_ht) . '</td>';
 					print '<td>' . $objp->name . '</td>';
-					print '</td>';
 					print '</tr>';
 
 					$i ++;
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index f18ed1ea80f..aea4127b50a 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -74,7 +74,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 	<td></td>
 	<td></td>
 </tr>
+-->
 </table>
- -->
- 
+
 <!-- END PHP TEMPLATE -->

From 7ba6754a5525523956cb11381a4757cc324c7e40 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 Feb 2016 00:27:35 +0100
Subject: [PATCH 217/421] Fix the missing button to record reception

---
 htdocs/fourn/commande/card.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index a8ea9f1201d..50df02b1bff 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2761,6 +2761,18 @@ elseif (! empty($object->id))
 					}
 				}
 
+				// Ship
+				if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+				{
+					if (in_array($object->statut, array(3,4))) {
+						if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->receptionner) {
+							print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fourn/commande/dispatch.php?id=' . $object->id . '">' . $langs->trans('OrderDispatch') . '</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('OrderDispatch') . '</a></div>';
+						}
+					}
+				}
+
 				// Create bill
 				if (! empty($conf->facture->enabled))
 				{

From 7939169ae8611565570bdaa4383a0fbd1db91690 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 18 Feb 2016 11:54:48 +0100
Subject: [PATCH 218/421] Change projets title Area

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

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 5a27777d993..0e4dfe82b9c 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress

From d889a1d91f4bda5cc8448419b7e1086c1cf42d6a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 18 Feb 2016 11:56:32 +0100
Subject: [PATCH 219/421] Change title page 'projects' to "project Area"

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

diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 07734373af7..00de0dfc596 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -59,8 +59,8 @@ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$min
 
 llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos");
 
-$text=$langs->trans("Projects");
-if ($mine) $text=$langs->trans("MyProjects");
+$text=$langs->trans("ProjectsArea");
+if ($mine) $text=$langs->trans("MyProjectsArea");
 
 print load_fiche_titre($text,'','title_project.png');
 

From dfe7c6f06f1ef5d399c776297b3df939b666e0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Feb 2016 12:21:11 +0100
Subject: [PATCH 220/421] Fix #4649 Wrong parameters order

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 73064859297..c06158ae2ff 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1256,7 +1256,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		// Count total nb of records
 		$nbtotalofrecords = 0;
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-			$nbtotalofrecords = $prodcustprice->fetch_all($sortfield, $sortorder, 0, 0, $filter);
+			$nbtotalofrecords = $prodcustprice->fetch_all($sortorder, $sortfield, 0, 0, $filter);
 		}
 
 		$result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);

From 9fd22722ffccd8678ea09042f003e1d9d887f358 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 18 Feb 2016 15:18:47 +0100
Subject: [PATCH 221/421] left a space between clone and $object

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

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index bd9a4b781f5..813eb826f72 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -343,7 +343,7 @@ if (empty($reshook))
                 }
             }
 
-			$object->oldcopy = clone$object;
+			$object->oldcopy = clone $object;
 
             $object->old_lastname	= GETPOST("old_lastname");
             $object->old_firstname	= GETPOST("old_firstname");

From bc4c964b891af67f41492a9e0c0f0a37362716eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 Feb 2016 23:21:02 +0100
Subject: [PATCH 222/421] Several fixes in stock management (label, and bad
 action when lot module is on)

---
 htdocs/core/menus/init_menu_auguria.sql       |   2 +-
 htdocs/core/menus/standard/eldy.lib.php       |   2 +-
 htdocs/langs/en_US/stocks.lang                |   3 +-
 htdocs/product/stock/massstockmove.php        |   2 +-
 htdocs/product/stock/mouvement.php            | 216 ++++++++++++++++--
 htdocs/product/stock/product.php              |   4 +-
 .../product/stock/tpl/stockcorrection.tpl.php |  13 +-
 .../product/stock/tpl/stocktransfer.tpl.php   |  38 +--
 8 files changed, 235 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 0d95d94c721..86b8a58e68f 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -110,7 +110,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/list.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->creer', '', 2, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'MassStockTransferShort', 1, 'stocks', '$user->rights->stock->mouvement->creer', '', 2, 5, __ENTITY__);
 
 -- Product - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 816d6d9cd8b..eff98bba3a6 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1133,7 +1133,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
 				$newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
                 if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
-                $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->creer);
+                $newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
 			}
 
 			// Expeditions
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 943e988b2f7..e6b9f82730c 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock movement
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
 LabelMovement=Movement label
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 652ec947a37..7d62699b425 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -325,7 +325,7 @@ $title = $langs->trans('MassMovement');
 
 llxHeader('', $title);
 
-print load_fiche_titre($langs->trans("MassStockMovement"));
+print load_fiche_titre($langs->trans("MassStockTransferShort"));
 
 $titletoadd=$langs->trans("Select");
 $titletoaddnoent=$langs->transnoentitiesnoconv("Select");
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 32edd0b4e9d..190bf676c8a 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -54,16 +54,18 @@ $search_warehouse = trim(GETPOST("search_warehouse"));
 $search_inventorycode = trim(GETPOST("search_inventorycode"));
 $search_user = trim(GETPOST("search_user"));
 $search_batch = trim(GETPOST("search_batch"));
+
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 if ($page < 0) $page = 0;
 $offset = $limit * $page;
-
 if (! $sortfield) $sortfield="m.datem";
 if (! $sortorder) $sortorder="DESC";
 
+$pdluoid=GETPOST('pdluoid','int');
+
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
     $year='';
@@ -152,6 +154,171 @@ if ($action == "correct_stock")
     if (! $error) $action='';
 }
 
+// Transfer stock from a warehouse to another warehouse
+if ($action == "transfert_stock" && ! $cancel)
+{
+	$product = new Product($db);
+	if (! empty($product_id)) $result=$product->fetch($product_id);
+    
+    if (! (GETPOST("id_entrepot_destination",'int') > 0))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+        $error++;
+        $action='transfert';
+    }
+	if (empty($product_id))
+	{
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
+		$action='transfert';
+	}
+    if (! GETPOST("nbpiece",'int'))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
+        $error++;
+        $action='transfert';
+    }
+    if ($id == GETPOST("id_entrepot_destination",'int'))
+    {
+        setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors');
+        $error++;
+        $action='transfert';
+    }
+
+    if (! empty($conf->productbatch->enabled))
+    {
+        $product = new Product($db);
+        $result=$product->fetch($product_id);
+
+        if ($product->hasbatch() && ! GETPOST("batch_number"))
+        {
+            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
+            $error++;
+            $action='transfert';
+        }
+    }
+
+    if (! $error)
+    {
+        if ($id)
+        {
+            $object = new Entrepot($db);
+            $result=$object->fetch($id);
+
+            $db->begin();
+
+            $product->load_stock();	// Load array product->stock_warehouse
+
+            // Define value of products moved
+            $pricesrc=0;
+            //if (isset($product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp)) $pricesrc=$product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp;
+            if (isset($product->pmp)) $pricesrc=$product->pmp;
+            $pricedest=$pricesrc;
+            
+            if ($product->hasbatch())
+            {
+                $pdluo = new Productbatch($db);
+
+                if ($pdluoid > 0)
+                {
+                    $result=$pdluo->fetch($pdluoid);
+                    if ($result)
+                    {
+                        $srcwarehouseid=$pdluo->warehouseid;
+                        $batch=$pdluo->batch;
+                        $eatby=$pdluo->eatby;
+                        $sellby=$pdluo->sellby;
+                    }
+                    else
+                    {
+                        setEventMessages($pdluo->error, $pdluo->errors, 'errors');
+                        $error++;
+                    }
+                }
+                else
+                {
+                    $srcwarehouseid=$id;
+                    $batch=GETPOST('batch_number');
+                    $eatby=$d_eatby;
+                    $sellby=$d_sellby;
+                }
+
+                if (! $error)
+                {
+                    // Remove stock
+                    $result1=$product->correct_stock_batch(
+                        $user,
+                        $srcwarehouseid,
+                        GETPOST("nbpiece",'int'),
+                        1,
+                        GETPOST("label",'san_alpha'),
+                        $pricesrc,
+                        $eatby,$sellby,$batch,
+                        GETPOST('inventorycode')
+                        );
+                    // Add stock
+                    $result2=$product->correct_stock_batch(
+                        $user,
+                        GETPOST("id_entrepot_destination",'int'),
+                        GETPOST("nbpiece",'int'),
+                        0,
+                        GETPOST("label",'san_alpha'),
+                        $pricedest,
+                        $eatby,$sellby,$batch,
+                        GETPOST('inventorycode')
+                        );
+                }
+            }
+            else
+            {
+                // Remove stock
+                $result1=$product->correct_stock(
+                    $user,
+                    $id,
+                    GETPOST("nbpiece"),
+                    1,
+                    GETPOST("label"),
+                    $pricesrc,
+                    GETPOST('inventorycode')
+                    );
+
+                // Add stock
+                $result2=$product->correct_stock(
+                    $user,
+                    GETPOST("id_entrepot_destination"),
+                    GETPOST("nbpiece"),
+                    0,
+                    GETPOST("label"),
+                    $pricedest,
+                    GETPOST('inventorycode')
+                    );
+            }
+            if (! $error && $result1 >= 0 && $result2 >= 0)
+            {
+                $db->commit();
+
+                if ($backtopage)
+                {
+                    header("Location: ".$backtopage);
+                    exit;
+                }
+                else
+                {
+                    header("Location: mouvement.php?id=".$object->id);
+                    exit;
+                }
+            }
+            else
+            {
+                setEventMessages($product->error, $product->errors, 'errors');
+                $db->rollback();
+                $action='transfert';
+            }
+        }
+    }
+}
+
+
 
 /*
  * View
@@ -451,7 +618,7 @@ if ($resql)
     /*                                                                            */
     /* ************************************************************************** */
 
-    if (empty($action) && $id)
+    if (empty($action) && $id > 0)
     {
         print "<div class=\"tabsAction\">\n";
 
@@ -460,16 +627,17 @@ if ($resql)
             print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("StockCorrection").'</a>';
         }
 
-        /*if ($user->rights->stock->mouvement->creer)
+        if ($user->rights->stock->mouvement->creer)
         {
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("StockMovement").'</a>';
-        }*/
+            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("StockTransfer").'</a>';
+        }
+        
         print '</div><br>';
     }
 
 
     $param='';
-    if ($id) $param.='&id='.$id;
+    if ($id > 0) $param.='&id='.$id;
     if ($search_movement)   $param.='&search_movement='.urlencode($search_movement);
     if ($search_inventorycode)   $param.='&search_inventorycode='.urlencode($search_inventorycode);
     if ($search_product_ref) $param.='&search_product_ref='.urlencode($search_product_ref);
@@ -479,11 +647,11 @@ if ($resql)
     if (!empty($snom)) $param.='&snom='.urlencode($snom); // FIXME $snom is not defined
     if ($search_user)    $param.='&search_user='.urlencode($search_user);
     if ($idproduct > 0)  $param.='&idproduct='.$idproduct;
-    if ($id) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $nbtotalofrecords,'');
+    if ($id > 0) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $nbtotalofrecords,'');
     else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $nbtotalofrecords);
 
     print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($id) print '<input type="hidden" name="id" value="'.$id.'">';
+    if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
 
     print '<table class="noborder" width="100%">';
     print "<tr class=\"liste_titre\">";
@@ -498,7 +666,7 @@ if ($resql)
 		print_liste_field_titre($langs->trans("l_eatby"),$_SERVER["PHP_SELF"],'m.eatby','',$param,'align="center"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("l_sellby"),$_SERVER["PHP_SELF"],'m.sellby','',$param,'align="center"',$sortfield,$sortorder);
 	}
-    print_liste_field_titre($langs->trans("Warehouse"),$_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder);	// We are on a specific warehouse card, no filter on other should be possible
+    if (! $id > 0) print_liste_field_titre($langs->trans("Warehouse"),$_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder);	// We are on a specific warehouse card, no filter on other should be possible
     print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"], "m.fk_user_author","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("InventoryCodeShort"),$_SERVER["PHP_SELF"], "m.inventorycode","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("LabelMovement"),$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder);
@@ -532,9 +700,12 @@ if ($resql)
 		print '<td></td>';
 	}
     // Warehouse
-    print '<td class="liste_titre" align="left">';
-    print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
-    print '</td>';
+    if (! $id > 0) 
+    {
+        print '<td class="liste_titre" align="left">';
+        print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
+        print '</td>';
+    }
     // Author
     print '<td class="liste_titre" align="left">';
     print '<input class="flat" type="text" size="6" name="search_user" value="'.($search_user).'">';
@@ -598,17 +769,20 @@ if ($resql)
         // Batch
     	if (! empty($conf->productbatch->enabled))
 		{
-	    		print '<td align="center">'.$objp->batch.'</td>';
-	            print '<td align="center">'. dol_print_date($objp->eatby,'day') .'</td>';
-	            print '<td align="center">'. dol_print_date($objp->sellby,'day') .'</td>';
+	    	print '<td align="center">'.$objp->batch.'</td>';
+	        print '<td align="center">'. dol_print_date($objp->eatby,'day') .'</td>';
+	        print '<td align="center">'. dol_print_date($objp->sellby,'day') .'</td>';
 		}
         // Warehouse
-        print '<td>';
-        $warehousestatic->id=$objp->entrepot_id;
-        $warehousestatic->libelle=$objp->stock;
-        $warehousestatic->lieu=$objp->lieu;
-        print $warehousestatic->getNomUrl(1);
-        print "</td>\n";
+		if (! $id > 0)
+		{
+            print '<td>';
+            $warehousestatic->id=$objp->entrepot_id;
+            $warehousestatic->libelle=$objp->stock;
+            $warehousestatic->lieu=$objp->lieu;
+            print $warehousestatic->getNomUrl(1);
+            print "</td>\n";
+		}
         // Author
         print '<td>';
         $userstatic->id=$objp->fk_user_author;
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index ba083cc1527..5b26f215adb 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -648,7 +648,7 @@ if (empty($action) && $object->id)
     //if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch())
     if ($user->rights->stock->mouvement->creer)
 	{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("StockMovement").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("StockTransfer").'</a>';
 	}
 
 	print '</div>';
@@ -753,7 +753,7 @@ if ($resql)
 				{
                     print "\n".'<tr><td align="right">';
                     print img_picto($langs->trans("Tranfer"),'uparrow','class="hideonsmartphone"').' ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">'.$langs->trans("StockMovement").'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">'.$langs->trans("StockTransfer").'</a>';
 					// Disabled, because edition of stock content must use the "Correct stock menu".
 					// Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ...
                     //print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=editline&amp;lineid='.$pdluo->id.'#'.$pdluo->id.'">';
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 90a7468a351..d9f02781fd5 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -15,13 +15,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * $object must be defined
- * $product can be defined
  */
 ?>
 
 <!-- BEGIN PHP TEMPLATE STOCKCORRECTION.TPL.PHP -->
 <?php
-        if (! is_object($product)) $product=$object;
+        $productref = '';
+        if ($object->element == 'product') $productref = $object->ref;
 
         $langs->load("productbatch");
 
@@ -81,10 +81,13 @@
 		print '</tr>';
 
 		// Serial / Eat-by date
-		if ((! empty($conf->productbatch->enabled)) && is_object($product) && $product->hasbatch())
+		if (! empty($conf->productbatch->enabled) && 
+		    (($object->element == 'product' && $object->hasbatch())
+		    || ($object->element == 'stock'))
+		)
 		{
 			print '<tr>';
-			print '<td colspan="2" class="fieldrequired">'.$langs->trans("batch_number").'</td><td colspan="4">';
+			print '<td colspan="2"'.($object->element == 'stock'?'': ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="4">';
 			print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
 			print '</td>';
 			print '</tr><tr>';
@@ -101,7 +104,7 @@
 		}
 
 		// Label of mouvement of id of inventory
-		$valformovementlabel=((GETPOST("label") && (GETPOST('label') != $langs->trans("MovementCorrectStock",''))) ? GETPOST("label") : $langs->trans("MovementCorrectStock", $product->ref));
+		$valformovementlabel=((GETPOST("label") && (GETPOST('label') != $langs->trans("MovementCorrectStock",''))) ? GETPOST("label") : $langs->trans("MovementCorrectStock", $productref));
 		print '<tr>';
 		print '<td width="20%" colspan="2">'.$langs->trans("MovementLabel").'</td>';
 		print '<td colspan="2">';
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 0f13a5452da..1c0448192f1 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -14,17 +14,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $product must be defined
+ * $object must be defined
  * $backtopage
  */
 ?>
 
 <!-- BEGIN PHP TEMPLATE STOCKCORRECTION.TPL.PHP -->
 <?php
-        if (! is_object($product)) $product=$object;
+        $productref='';
+        if ($object->element == 'product') $productref = $object->ref;
 
         $langs->load("productbatch");
         
+        if (empty($id)) $id = $object->id;
+        
         $pdluoid=GETPOST('pdluoid','int');
 
 	    $pdluo = new Productbatch($db);
@@ -44,7 +47,7 @@
 
 		print load_fiche_titre($langs->trans("StockTransfer"),'','title_generic.png');
 
-		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$product->id.'" method="post">'."\n";
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">'."\n";
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="transfert_stock">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
@@ -54,28 +57,37 @@
 		}
 		print '<table class="border" width="100%">';
 
+		// Source warehouse or product
 		print '<tr>';
-		print '<td width="15%" class="fieldrequired">'.$langs->trans("WarehouseSource").'</td><td width="15%">';
-		if ($pdluoid > 0)
+		if ($object->element == 'product')
 		{
-		    print $formproduct->selectWarehouses($pdluo->warehouseid,'id_entrepot_source','',1,1);
+		    print '<td width="15%" class="fieldrequired">'.$langs->trans("WarehouseSource").'</td>';
+		    print '<td width="15%">';
+		    print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot')?GETPOST('id_entrepot','int'):'ifone')),'id_entrepot','',1);
+		    print '</td>';
 		}
-		else
+		if ($object->element == 'stock')
 		{
-            print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot_source')?GETPOST('id_entrepot_source','int'):'ifone')),'id_entrepot_source','',1);
+		    print '<td width="15%" class="fieldrequired">'.$langs->trans("Product").'</td>';
+		    print '<td width="15%">';
+		    print $form->select_produits(GETPOST('product_id'),'product_id',(empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''));
+		    print '</td>';
 		}
-		print '</td>';
+		
 		print '<td width="15%" class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td width="15%">';
 		print $formproduct->selectWarehouses(GETPOST('id_entrepot_destination'),'id_entrepot_destination','',1);
 		print '</td>';
 		print '<td width="15%" class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td width="15%"><input type="text" class="flat" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
 		print '</tr>';
 
-		// Eat-by date
-		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch())
+		// Serial / Eat-by date
+		if (! empty($conf->productbatch->enabled) && 
+		    (($object->element == 'product' && $object->hasbatch())
+		    || ($object->element == 'stock'))
+		)
 		{
 			print '<tr>';
-			print '<td class="fieldrequired">'.$langs->trans("batch_number").'</td><td colspan="5">';
+			print '<td'.($object->element == 'stock'?'': ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="5">';
 			print '<input type="text" name="batch_number" size="40"'.($pdluoid > 0 ? ' disabled':'').' value="'.(GETPOST('batch_number')?GETPOST('batch_number'):$pdluo->batch).'">';			// If form was opened for a specific pdluoid, field is disabled
 			print '</td>';
 			print '</tr><tr>';
@@ -90,7 +102,7 @@
 		}
 
 		// Label
-		$valformovementlabel=(GETPOST("label")?GETPOST("label"):$langs->trans("MovementTransferStock", $product->ref));
+		$valformovementlabel=(GETPOST("label")?GETPOST("label"):$langs->trans("MovementTransferStock", $productref));
 		print '<tr>';
 		print '<td width="15%">'.$langs->trans("MovementLabel").'</td>';
 		print '<td colspan="3">';

From bd80249580e2dbdd85e43c087cd83edaca915241 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 01:45:52 +0100
Subject: [PATCH 223/421] Fix code comment

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

diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 03eb651e4db..dd33ab0c5c2 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -47,7 +47,7 @@
  *		@param	int		$info_bits					Miscellaneous informations on line
  *		@param	int		$type						0/1=Product/service
  *		@param  Societe	$seller						Thirdparty seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
- *		@param  array	$localtaxes_array			Array with localtaxes info (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
+ *		@param  array	$localtaxes_array			Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
  *		@param  integer	$progress                   Situation invoices progress (value from 0 to 100, 100 by default)
  *		@return result[ 0=total_ht,
  *						 1=total_vat, (main vat only)
@@ -113,7 +113,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 loade with getLocalTaxesFromRate
+	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
 	{
 		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";

From 3b5ce32cb058f22a5ee099e633aba0b90b74f17e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 01:47:00 +0100
Subject: [PATCH 224/421] Code comment

---
 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 9f5742af1bc..138a3054333 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3318,7 +3318,7 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
  *	Return localtax rate for a particular vat, when selling a product with vat $vatrate, from a $thirdparty_buyer to a $thirdparty_seller
  *  Note: This function applies same rules than get_default_tva
  *
- * 	@param	float		$vatrate		        Vat rate
+ * 	@param	float		$vatrate		        Vat rate. Can be '8.5' or '8.5 (8.5NPR)' for example
  * 	@param  int			$local		         	Local tax to search and return (1 or 2 return only tax rate 1 or tax rate 2)
  *  @param  Societe		$thirdparty_buyer    	Object of buying third party
  *  @param	Societe		$thirdparty_seller		Object of selling third party
@@ -3509,7 +3509,7 @@ function get_localtax_by_third($local)
  *  Instead this function must be called when adding a line to get the array of localtax and type, and then
  *  provide it to the function calcul_price_total.
  *
- *  @param	float	$vatrate			VAT Rate
+ *  @param	float	$vatrate			VAT Rate. Value can be '8.5' or '8.5 (8.5NPR)'.
  *  @param	int		$local              Number of localtax (1 or 2, or 0 to return 1 & 2)
  *  @param	Societe	$buyer         		Company object
  *  @param	Societe	$seller        		Company object
@@ -3660,7 +3660,7 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 			}
 			else dol_print_error($db);
 		}
-		else $ret=$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+		else $ret=$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails
 	}
 
 	dol_syslog("get_product_vat_for_country: ret=".$ret);

From 4d0b9946f5941e81fa99a99346bfb25988ecfe3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 02:41:00 +0100
Subject: [PATCH 225/421] FIX Maxi serious problem when updating prices and vat
 of a product. All mode (one price, price per level, ...) were impacted.
 Localtax setup were lost.

---
 .../install/mysql/migration/3.8.0-3.9.0.sql   |  10 +
 htdocs/install/mysql/tables/llx_product.sql   |   6 +-
 .../tables/llx_product_customer_price.sql     |   2 +
 .../tables/llx_product_customer_price_log.sql |   4 +-
 .../mysql/tables/llx_product_price.sql        |   2 +
 htdocs/product/class/product.class.php        |  67 ++++--
 .../class/productcustomerprice.class.php      |  12 +
 htdocs/product/price.php                      | 206 +++++++++++++++---
 8 files changed, 256 insertions(+), 53 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 41166b0de06..46bd098e888 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -26,6 +26,16 @@
 ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL DEFAULT 0 after country;
 
 
+ALTER TABLE llx_product ADD COLUMN localtax1_type varchar(10)  NOT NULL DEFAULT '0' after localtax1_tx; 
+ALTER TABLE llx_product ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
+ALTER TABLE llx_product_price ADD COLUMN localtax1_type varchar(10)  NOT NULL DEFAULT '0' after localtax1_tx; 
+ALTER TABLE llx_product_price ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
+ALTER TABLE llx_product_customer_price ADD COLUMN localtax1_type varchar(10)  NOT NULL DEFAULT '0' after localtax1_tx; 
+ALTER TABLE llx_product_customer_price ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
+ALTER TABLE llx_product_customer_price_log ADD COLUMN localtax1_type varchar(10)  NOT NULL DEFAULT '0' after localtax1_tx; 
+ALTER TABLE llx_product_customer_price_log ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
+
+
 UPDATE llx_user set api_key = null where api_key = '';
 
 
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index f42f18b8e46..1f7b7da3c0d 100755
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -46,8 +46,10 @@ create table llx_product
   cost_price			    double(24,8) DEFAULT NULL,      -- Cost price without tax. Can be used for margin calculation.
   tva_tx					double(6,3),					-- Default VAT rate of product
   recuperableonly           integer NOT NULL DEFAULT '0',   -- French NPR VAT
-  localtax1_tx				double(6,3)  DEFAULT 0,         -- Spanish local VAT 1
-  localtax2_tx				double(6,3)  DEFAULT 0,         -- Spanish local VAT 2
+  localtax1_tx				double(6,3)  DEFAULT 0,         -- 
+  localtax1_type			varchar(10)  NOT NULL DEFAULT '0',         -- 
+  localtax2_tx				double(6,3)  DEFAULT 0,         -- 
+  localtax2_type			varchar(10)  NOT NULL DEFAULT '0',         -- 
   fk_user_author			integer DEFAULT NULL,			  -- user making creation
   fk_user_modif             integer,                         -- user making last change
   tosell					tinyint      DEFAULT 1,	          -- Product you sell
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price.sql b/htdocs/install/mysql/tables/llx_product_customer_price.sql
index 0dd37358682..8098ae5f028 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price.sql
@@ -36,7 +36,9 @@ create table llx_product_customer_price
   tva_tx					double(6,3),
   recuperableonly           integer NOT NULL DEFAULT '0',   -- Other NPR VAT
   localtax1_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 1 
+  localtax1_type            varchar(10)  NOT NULL DEFAULT '0',
   localtax2_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 2
+  localtax2_type            varchar(10)  NOT NULL DEFAULT '0',
   fk_user				integer,
   import_key			varchar(14)                  -- Import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price_log.sql b/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
index b25bd982aab..699060cdc98 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
@@ -21,7 +21,7 @@
 create table llx_product_customer_price_log
 (
   rowid                       integer AUTO_INCREMENT PRIMARY KEY,
- entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
+  entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec                       datetime,
   fk_product			integer NOT NULL,
   fk_soc				integer NOT NULL,	   
@@ -33,7 +33,9 @@ create table llx_product_customer_price_log
   tva_tx					double(6,3),
   recuperableonly           integer NOT NULL DEFAULT '0',   -- Other NPR VAT
   localtax1_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 1 
+  localtax1_type            varchar(10)  NOT NULL DEFAULT '0',
   localtax2_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 2
+  localtax2_type            varchar(10)  NOT NULL DEFAULT '0',
   fk_user				integer,
  import_key			varchar(14)                  -- Import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
index 1341c49dcaa..a0797b8bd33 100755
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -34,7 +34,9 @@ create table llx_product_price
   tva_tx			double(6,3) NOT NULL,
   recuperableonly	integer NOT NULL DEFAULT '0',  
   localtax1_tx		double(6,3) DEFAULT 0,
+  localtax1_type    varchar(10)  NOT NULL DEFAULT '0',
   localtax2_tx		double(6,3) DEFAULT 0,
+  localtax2_type    varchar(10)  NOT NULL DEFAULT '0',
   fk_user_author	integer,
   tosell			tinyint DEFAULT 1,
   price_by_qty		integer NOT NULL DEFAULT 0,
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8278f244941..90b7f3cd994 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -101,10 +101,12 @@ class Product extends CommonObject
 	var $tva_tx;
 	//! French VAT NPR (0 or 1)
     var $tva_npr=0;
-	//! Spanish local taxes
+	//! Other local taxes
 	var $localtax1_tx;
 	var $localtax2_tx;
-
+	var $localtax1_type;
+	var $localtax2_type;
+	
 	//! Stock
 	var $stock_reel;
 	//! Average price value for product entry into stock (PMP)
@@ -294,7 +296,9 @@ class Product extends CommonObject
 		//Local taxes
 		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
 		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-
+		if (empty($this->localtax1_type)) $this->localtax1_type = '0';
+		if (empty($this->localtax2_type)) $this->localtax2_type = '0';
+		
 		if (empty($this->price))     	$this->price = 0;
 		if (empty($this->price_min)) 	$this->price_min = 0;
 
@@ -631,6 +635,8 @@ class Product extends CommonObject
 		if (empty($this->tva_npr))    			$this->tva_npr = 0;
 		if (empty($this->localtax1_tx))			$this->localtax1_tx = 0;
 		if (empty($this->localtax2_tx))			$this->localtax2_tx = 0;
+		if (empty($this->localtax1_type))		$this->localtax1_type = '0';
+		if (empty($this->localtax2_type))		$this->localtax2_type = '0';
 		if (empty($this->status))				$this->status = 0;
 		if (empty($this->status_buy))			$this->status_buy = 0;
 
@@ -698,7 +704,9 @@ class Product extends CommonObject
 			$sql.= ", recuperableonly = " . $this->tva_npr;
 			$sql.= ", localtax1_tx = " . $this->localtax1_tx;
 			$sql.= ", localtax2_tx = " . $this->localtax2_tx;
-
+			$sql.= ", localtax1_type = " . ($this->localtax1_type!=''?"'".$this->localtax1_type."'":"'0'");
+			$sql.= ", localtax2_type = " . ($this->localtax2_type!=''?"'".$this->localtax2_type."'":"'0'");
+				
 			$sql.= ", barcode = ". (empty($this->barcode)?"null":"'".$this->db->escape($this->barcode)."'");
 			$sql.= ", fk_barcode_type = ". (empty($this->barcode_type)?"null":$this->db->escape($this->barcode_type));
 
@@ -1216,10 +1224,10 @@ class Product extends CommonObject
 		if (empty($this->price_by_qty)) $this->price_by_qty=0;
 
 		// Add new price
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,tosell,tva_tx,recuperableonly,";
-		$sql.= " localtax1_tx, localtax2_tx, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,tosell, tva_tx, recuperableonly,";
+		$sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
 		$sql.= " VALUES(".($level?$level:1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx.",".$this->tva_npr.",";
-		$sql.= " ".$this->localtax1_tx.",".$this->localtax2_tx.",".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0?$this->fk_price_expression:'null');
+		$sql.= " ".$this->localtax1_tx.", ".$this->localtax2_tx.", '".$this->localtax1_type."', '".$this->localtax2_type."', ".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0?$this->fk_price_expression:'null');
 		$sql.= ")";
 
 		dol_syslog(get_class($this)."::_log_price", LOG_DEBUG);
@@ -1371,15 +1379,16 @@ class Product extends CommonObject
 	 *	@param  	double	$newprice		New price
 	 *	@param  	string	$newpricebase	HT or TTC
 	 *	@param  	User	$user        	Object user that make change
-	 *	@param  	double	$newvat			New VAT Rate
+	 *	@param  	double	$newvat			New VAT Rate (For example 8.5. Should not be a string)
 	 *  @param		double	$newminprice	New price min
 	 *  @param		int		$level			0=standard, >0 = level if multilevel prices
 	 *  @param     	int		$newnpr         0=Standard vat rate, 1=Special vat rate for French NPR VAT
 	 *  @param     	int		$newpsq         1 if it has price by quantity
 	 *  @param 		int 	$ignore_autogen Used to avoid infinite loops
-	 * 	@return		int						<0 if KO, >0 if OK
+     *	@param      array	$localtaxes_array	Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
+	 * 	@return		int						    <0 if KO, >0 if OK
 	 */
-	function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpsq=0, $ignore_autogen=0)
+	function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpsq=0, $ignore_autogen=0, $localtaxes_array=array())
 	{
 		global $conf,$langs;
 
@@ -1448,13 +1457,23 @@ class Product extends CommonObject
 			}
 			//print 'x'.$id.'-'.$newprice.'-'.$newpricebase.'-'.$price.'-'.$price_ttc.'-'.$price_min.'-'.$price_min_ttc;
 
-
-			//Local taxes
-			$localtax1=get_localtax($newvat,1);
-			$localtax2=get_localtax($newvat,2);
+			if (count($localtaxes_array) > 0)
+			{
+			    $localtaxtype1=$localtaxes_array['0'];
+			    $localtax1=$localtaxes_array['1'];
+			    $localtaxtype2=$localtaxes_array['2'];
+			    $localtax2=$localtaxes_array['3'];
+			}
+			else     // old method. deprecated because ot can't retreive type
+			{
+	       		$localtaxtype1='0';
+			    $localtax1=get_localtax($newvat,1);
+	       		$localtaxtype2='0';
+			    $localtax2=get_localtax($newvat,2);
+			}
 			if (empty($localtax1)) $localtax1=0;	// If = '' then = 0
 			if (empty($localtax2)) $localtax2=0;	// If = '' then = 0
-
+			
 			$this->db->begin();
 
 			// Ne pas mettre de quote sur les numeriques decimaux.
@@ -1467,6 +1486,8 @@ class Product extends CommonObject
 			$sql.= " price_min_ttc=".$price_min_ttc.",";
 			$sql.= " localtax1_tx=".($localtax1>=0?$localtax1:'NULL').",";
 			$sql.= " localtax2_tx=".($localtax2>=0?$localtax2:'NULL').",";
+			$sql.= " localtax1_type=".($localtaxtype1!=''?"'".$localtaxtype1."'":"'0'").",";
+			$sql.= " localtax2_type=".($localtaxtype2!=''?"'".$localtaxtype2."'":"'0'").",";
 			$sql.= " tva_tx='".price2num($newvat)."',";
             $sql.= " recuperableonly='".$newnpr."'";
 			$sql.= " WHERE rowid = ".$id;
@@ -1493,7 +1514,9 @@ class Product extends CommonObject
 				//Local taxes
 				$this->localtax1_tx = $localtax1;
 				$this->localtax2_tx = $localtax2;
-
+				$this->localtax1_type = $localtaxtype1;
+				$this->localtax2_type = $localtaxtype2;
+				
 				// Price by quantity
 				$this->price_by_qty = $newpsq;
 
@@ -1564,12 +1587,12 @@ class Product extends CommonObject
 		}
 
 		$sql = "SELECT rowid, ref, ref_ext, label, description, url, note, customcode, fk_country, price, price_ttc,";
-		$sql.= " price_min, price_min_ttc, price_base_type, cost_price, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, tosell,";
+		$sql.= " price_min, price_min_ttc, price_base_type, cost_price, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, tosell,";
 		$sql.= " tobuy, fk_product_type, duration, seuil_stock_alerte, canvas,";
 		$sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
 		$sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,";
-		$sql.= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit";
-		$sql.= " , fk_price_expression, price_autogen";
+		$sql.= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit,";
+		$sql.= " fk_price_expression, price_autogen";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
 		if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id);
 		else
@@ -1611,10 +1634,12 @@ class Product extends CommonObject
 				$this->tva_tx					= $obj->tva_tx;
 				//! French VAT NPR
 				$this->tva_npr					= $obj->tva_npr;
-				//! Spanish local taxes
+				//! Local taxes
 				$this->localtax1_tx				= $obj->localtax1_tx;
 				$this->localtax2_tx				= $obj->localtax2_tx;
-
+				$this->localtax1_type			= $obj->localtax1_type;
+				$this->localtax2_type			= $obj->localtax2_type;
+				
 				$this->finished					= $obj->finished;
 				$this->duration					= $obj->duration;
 				$this->duration_value			= substr($obj->duration,0,dol_strlen($obj->duration)-1);
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index c92f09ffbaf..08727d44161 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -42,7 +42,9 @@ class Productcustomerprice extends CommonObject
 	var $price_base_type;
 	var $tva_tx;
 	var $recuperableonly;
+	var $localtax1_type;
 	var $localtax1_tx;
+	var $localtax2_type;
 	var $localtax2_tx;
 	var $fk_user;
 	var $lines = array ();
@@ -150,7 +152,9 @@ class Productcustomerprice extends CommonObject
 		$sql .= "price_base_type,";
 		$sql .= "tva_tx,";
 		$sql .= "recuperableonly,";
+		$sql .= "localtax1_type,";
 		$sql .= "localtax1_tx,";
+		$sql .= "localtax2_type,";
 		$sql .= "localtax2_tx,";
 		$sql .= "fk_user,";
 		$sql .= "import_key";
@@ -168,7 +172,9 @@ class Productcustomerprice extends CommonObject
 		$sql .= " " . (! isset($this->price_base_type) ? 'NULL' : "'" . $this->db->escape($this->price_base_type) . "'") . ",";
 		$sql .= " " . (! isset($this->tva_tx) ? 'NULL' : "'" . $this->tva_tx . "'") . ",";
 		$sql .= " " . (! isset($this->recuperableonly) ? 'NULL' : "'" . $this->recuperableonly . "'") . ",";
+		$sql .= " " . (empty($this->localtax1_type) ? "'0'" : "'" . $this->localtax1_type . "'") . ",";
 		$sql .= " " . (! isset($this->localtax1_tx) ? 'NULL' : "'" . $this->localtax1_tx . "'") . ",";
+		$sql .= " " . (empty($this->localtax2_type) ? "'0'" : "'" . $this->localtax2_type . "'") . ",";
 		$sql .= " " . (! isset($this->localtax2_tx) ? 'NULL' : "'" . $this->localtax2_tx . "'") . ",";
 		$sql .= " " . $user->id . ",";
 		$sql .= " " . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . "";
@@ -595,6 +601,8 @@ class Productcustomerprice extends CommonObject
 		$sql .= "recuperableonly,";
 		$sql .= "localtax1_tx,";
 		$sql .= "localtax2_tx,";
+		$sql .= "localtax1_type,";
+		$sql .= "localtax2_type,";
 		$sql .= "fk_user,";
 		$sql .= "import_key";
 
@@ -614,6 +622,8 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.recuperableonly,";
 		$sql .= " t.localtax1_tx,";
 		$sql .= " t.localtax2_tx,";
+		$sql .= " t.localtax1_type,";
+		$sql .= " t.localtax2_type,";
 		$sql .= " t.fk_user,";
 		$sql .= " t.import_key";
 
@@ -645,6 +655,8 @@ class Productcustomerprice extends CommonObject
 		$sql .= " recuperableonly=" . (isset($this->recuperableonly) ? $this->recuperableonly : "null") . ",";
 		$sql .= " localtax1_tx=" . (isset($this->localtax1_tx) ? $this->localtax1_tx : "null") . ",";
 		$sql .= " localtax2_tx=" . (isset($this->localtax2_tx) ? $this->localtax2_tx : "null") . ",";
+		$sql .= " localtax1_type=" . (! empty($this->localtax1_type) ? "'".$this->localtax1_type."'": "'0'") . ",";
+		$sql .= " localtax2_type=" . (! empty($this->localtax2_type) ? "'".$this->localtax2_type."'": "'0'") . ",";
 		$sql .= " fk_user=" . $user->id . ",";
 		$sql .= " import_key=" . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null") . "";
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index bd72c916103..7c8e18b213b 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -94,7 +94,43 @@ if (empty($reshook))
     
 	if (($action == 'update_vat') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
-	    $object->tva_tx = GETPOST('tva_tx');
+	    $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5
+	    
+	    $tva_tx_txt; 
+
+	    // We must define tva_tx, npr and local taxes
+	    $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
+	    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+	    $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+	    // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+	    {
+	        // We look into database using code
+	        $vatratecode=$reg[1];
+	        // Get record from code
+	        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+	        $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+	        $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
+	        $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+	        $sql.= " AND t.code ='".$vatratecode."'";
+	        $resql=$db->query($sql);
+	        if ($resql)
+	        {
+	            $obj = $db->fetch_object($resql);
+	            $npr = $obj->recuperableonly;
+	            $localtax1 = $obj->localtax1;
+	            $localtax2 = $obj->localtax2;
+	            $localtax1_type = $obj->localtax1_type;
+	            $localtax2_type = $obj->localtax2_type;
+	        }
+	    }
+	    
+	    $object->tva_tx = $tva_tx;
+	    $object->tva_npr = $npr;
+	    $object->localtax1_tx = $localtax1;
+	    $object->localtax2_tx = $localtax2;
+	    $object->localtax1_type = $localtax1_type;
+	    $object->localtax2_type = $localtax2_type;
 	    
 	    $db->begin();
 	    
@@ -106,7 +142,7 @@ if (empty($reshook))
 	    
 	    if ($error)
 	    {
-	       $object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq);
+	       $object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq);    // FIXME Bug $newvat and $newnpr not defined
 	    }
 	    
 	    if (! $error)
@@ -145,31 +181,41 @@ if (empty($reshook))
 		}
 
 		// Multiprices
-		if (!$error && !empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (! $error && ! empty($conf->global->PRODUIT_MULTIPRICES)) {
 
 			$newprice = GETPOST('price', 'array');
 			$newprice_min = GETPOST('price_min', 'array');
 			$newpricebase = GETPOST('multiprices_base_type', 'array');
 			$newvattx = GETPOST('tva_tx', 'array');
+			$newvatnpr = GETPOST('tva_npr', 'array');
+			$newlocaltax1_tx = GETPOST('localtax1_tx', 'array');
+			$newlocaltax1_type = GETPOST('localtax1_type', 'array');
+			$newlocaltax2_tx = GETPOST('localtax2_tx', 'array');
+			$newlocaltax2_type = GETPOST('localtax2_type', 'array');
 
 			//Shall we generate prices using price rules?
 			$object->price_autogen = GETPOST('usePriceRules') == 'on' ? true : false;
 
-			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) {
-
+			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) 
+			{
 				if (!isset($newprice[$i])) {
 					continue;
 				}
 
-				$newnpr = (preg_match('/\*/', $newvattx[$i] ? 1 : 0));
-				$newvat = str_replace('*', '', $newvattx[$i]);
-
+				$tva_tx_txt = $newvattx[$i];
+                $npr = $newvatnpr[$i];
+				$localtax1 = $newlocaltax1_tx[$i];
+				$localtax1_type = $newlocaltax1_type[$i];
+				$localtax2 = $newlocaltax2_tx[$i];
+				$localtax2_type = $newlocaltax2_type[$i];
+				        
 				$pricestoupdate[$i] = array(
 					'price' => $newprice[$i],
 					'price_min' => $newprice_min[$i],
 					'price_base_type' => $newpricebase[$i],
-					'vat_tx' => $newvat,
-					'npr' => $newnpr
+					'vat_tx' => $tva_tx,
+					'npr' => $npr,
+				    'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)
 				);
 
 				//If autogeneration is enabled, then we only set the first level
@@ -178,12 +224,41 @@ if (empty($reshook))
 				}
 			}
 		} else {
+		    $tva_tx_txt = GETPOST('tva_tx', 'alpha');     // tva_tx can be '8.5' , '8.5*', '8.5 (8.5NPR) *' for example.
+
+		    // We must define tva_tx, npr and local taxes
+		    $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
+		    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+		    $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+		    // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+		    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+		    {
+		        // We look into database using code
+		        $vatratecode=$reg[1];
+		        // Get record from code
+		        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+		        $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+		        $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
+		        $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+		        $sql.= " AND t.code ='".$vatratecode."'";
+		        $resql=$db->query($sql);
+		        if ($resql)
+		        {
+		            $obj = $db->fetch_object($resql);
+		            $npr = $obj->recuperableonly;
+		            $localtax1 = $obj->localtax1;
+		            $localtax2 = $obj->localtax2;
+		            $localtax1_type = $obj->localtax1_type;
+		            $localtax2_type = $obj->localtax2_type;
+		        }
+		    }
 			$pricestoupdate[0] = array(
-				'price' => $_POST ["price"],
-				'price_min' => $_POST ["price_min"],
-				'price_base_type' => $_POST ["price_base_type"],
-				'vat_tx' => str_replace('*', '', $_POST ["tva_tx"]),
-				'npr' => preg_match('/\*/', $_POST ["tva_tx"]) ? 1 : 0
+				'price' => $_POST["price"],
+				'price_min' => $_POST["price_min"],
+				'price_base_type' => $_POST["price_base_type"],
+				'vat_tx' => $tva_tx,
+				'npr' => $npr,
+			    'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)
 			);
 		}
 
@@ -207,7 +282,7 @@ if (empty($reshook))
 					break;
 				}
 
-				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq);
+				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array']);
 
 				if ($res < 0) {
 					$error ++;
@@ -344,9 +419,43 @@ if (empty($reshook))
 		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
 		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
 		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-		$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
-		$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
 
+		$tva_tx_txt = GETPOST("tva_tx");
+		
+		// We must define tva_tx, npr and local taxes
+		$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
+		$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+		$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+		{
+		    // We look into database using code
+		    $vatratecode=$reg[1];
+		    // Get record from code
+		    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+		    $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+		    $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
+		    $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+		    $sql.= " AND t.code ='".$vatratecode."'";
+		    $resql=$db->query($sql);
+		    if ($resql)
+		    {
+		        $obj = $db->fetch_object($resql);
+		        $npr = $obj->recuperableonly;
+		        $localtax1 = $obj->localtax1;
+		        $localtax2 = $obj->localtax2;
+		        $localtax1_type = $obj->localtax1_type;
+		        $localtax2_type = $obj->localtax2_type;
+		    }
+		}		
+		
+		$prodcustprice->tva_tx = $tva_tx;
+		$prodcustprice->recuperableonly = $npr;
+		$prodcustprice->localtax1_tx = $localtax1;
+		$prodcustprice->localtax2_tx = $localtax2;
+		$prodcustprice->localtax1_type = $localtax1_type;
+		$prodcustprice->localtax2_type = $localtax2_type;
+		
 		if (! ($prodcustprice->fk_soc > 0))
 		{
 		    $langs->load("errors");
@@ -383,9 +492,9 @@ if (empty($reshook))
 		$result = $prodcustprice->delete($user);
 
 		if ($result < 0) {
-			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 		} else {
-			setEventMessages($langs->trans('RecordDeleted'), null, 'errors');
+			setEventMessages($langs->trans('RecordDeleted'), null, 'mesgs');
 		}
 		$action = '';
 	}
@@ -402,9 +511,43 @@ if (empty($reshook))
 		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
 		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
 		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-		$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
-		$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
-
+		
+		$tva_tx_txt = GETPOST("tva_tx");
+		
+		// We must define tva_tx, npr and local taxes
+		$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
+		$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+		$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+		{
+		    // We look into database using code
+		    $vatratecode=$reg[1];
+		    // Get record from code
+		    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+		    $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+		    $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
+		    $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+		    $sql.= " AND t.code ='".$vatratecode."'";
+		    $resql=$db->query($sql);
+		    if ($resql)
+		    {
+		        $obj = $db->fetch_object($resql);
+		        $npr = $obj->recuperableonly;
+		        $localtax1 = $obj->localtax1;
+		        $localtax2 = $obj->localtax2;
+		        $localtax1_type = $obj->localtax1_type;
+		        $localtax2_type = $obj->localtax2_type;
+		    }
+		}
+		
+		$prodcustprice->tva_tx = $tva_tx;
+		$prodcustprice->recuperableonly = $npr;
+		$prodcustprice->localtax1_tx = $localtax1;
+		$prodcustprice->localtax2_tx = $localtax2;
+		$prodcustprice->localtax1_type = $localtax1_type;
+		$prodcustprice->localtax2_type = $localtax2_type;
+		
 		if ($prodcustprice->price_min<$maxpricesupplier && !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
 		{
 			setEventMessages($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')), null, 'errors');
@@ -792,7 +935,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
 
 	// VAT
 	print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
-	print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr);
+	print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1);
 	print '</td></tr>';
 
 	print '</table>';
@@ -825,7 +968,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 		// VAT
 		print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">';
-		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr);
+		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1);
 		print '</td></tr>';
 
 		// Price base
@@ -981,11 +1124,16 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 			// VAT
 			if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
-				print '<input type="hidden" name="tva_tx[' . $i . ']" value="' . $object->tva_tx . '">';
+			    print '<input type="hidden" name="tva_tx[' . $i . ']" value="' . $object->tva_tx . '">';
+			    print '<input type="hidden" name="tva_npr[' . $i . ']" value="' . $object->tva_npr . '">';
+			    print '<input type="hidden" name="localtax1_tx[' . $i . ']" value="' . $object->localtax1_tx . '">';
+			    print '<input type="hidden" name="localtax1_type[' . $i . ']" value="' . $object->localtax1_type . '">';
+			    print '<input type="hidden" name="localtax2_tx[' . $i . ']" value="' . $object->localtax2_tx . '">';
+			    print '<input type="hidden" name="localtax2_tx[' . $i . ']" value="' . $object->localtax2_type . '">';
 			} else {
 				// This option is kept for backward compatibility but has no sense
 				print '<td style="text-align: center">';
-				print $form->load_tva("tva_tx[" . $i.']', $object->multiprices_tva_tx[$i], $mysoc, '', $object->id);
+				print $form->load_tva("tva_tx[" . $i.']', $object->multiprices_tva_tx[$i], $mysoc, '', $object->id, false, $object->type, false, 1);
 				print '</td>';
 			}
 
@@ -1205,7 +1353,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		// VAT
 		print '<tr><td class="fieldrequired">' . $langs->trans("VATRate") . '</td><td>';
-		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr);
+		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1);
 		print '</td></tr>';
 
 		// Price base
@@ -1289,7 +1437,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		// VAT
 		print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">';
-		print $form->load_tva("tva_tx", $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly);
+		print $form->load_tva("tva_tx", $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly, $object->type, false, 1);
 		print '</td></tr>';
 
 		// Price base

From 16c44af690211fffb04a4205784a51d9cbb90689 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 02:44:56 +0100
Subject: [PATCH 226/421] Fix bad example of setup to use

---
 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 cc5a97a1ca7..e873655bcdc 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1662,7 +1662,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do. 
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong> 
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title

From 9e11fd988dd720906c3c6b5b2effe2b8a447e3cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 03:32:02 +0100
Subject: [PATCH 227/421] Fix: color of category when showing full path must
 use color of last element of path

---
 htdocs/categories/class/categorie.class.php | 42 +++++++++++++++++----
 htdocs/categories/viewcat.php               |  2 +-
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 03a66adab74..befbaf34c25 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1131,29 +1131,57 @@ class Categorie extends CommonObject
 	 * Retourne les chemin de la categorie, avec les noms des categories
 	 * separes par $sep (" >> " par defaut)
 	 *
-	 * @param	string	$sep	Separator
-	 * @param	string	$url	Url
+	 * @param	string	$sep	     Separator
+	 * @param	string	$url	     Url
+	 * @param   int     $nocolor     0
 	 * @return	array
 	 */
-	function print_all_ways($sep = " &gt;&gt; ", $url='')
+	function print_all_ways($sep = " &gt;&gt; ", $url='', $nocolor=0)
 	{
 		$ways = array();
 
-		foreach ($this->get_all_ways() as $way)
+		$allways = $this->get_all_ways(); // Load array of categories
+		foreach ($allways as $way)
 		{
 			$w = array();
+			$i = 0;
 			foreach ($way as $cat)
 			{
+			    $i++;
+
+			    if (empty($nocolor))
+			    {
+    			    $forced_color='toreplace';
+    			    if ($i == count($way))
+    			    {
+    			        // Check contrast with background and correct text color
+    			        $forced_color='categtextwhite';
+    			        if ($cat->color)
+    			        {
+    			            $hex=$cat->color;
+    			            $r = hexdec($hex[0].$hex[1]);
+    			            $g = hexdec($hex[2].$hex[3]);
+    			            $b = hexdec($hex[4].$hex[5]);
+    			            $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
+    			            if ($bright >= 0.5) $forced_color='categtextblack';        // Higher than 60%
+    			        }
+    			    }
+			    }
+			    
 				if ($url == '')
 				{
-					$w[] = "<a href='".DOL_URL_ROOT."/categories/viewcat.php?id=".$cat->id."&amp;type=".$cat->type."'>".$cat->label."</a>";
+			        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color .'">';
+			        $linkend='</a>';
+				    $w[] = $link.$cat->label.$linkend;
 				}
 				else
 				{
 					$w[] = "<a href='".DOL_URL_ROOT."/$url?catid=".$cat->id."'>".$cat->label."</a>";
 				}
 			}
-			$ways[] = implode($sep, $w);
+			$newcategwithpath = preg_replace('/toreplace/', $forced_color, implode($sep, $w));
+			
+			$ways[] = $newcategwithpath;
 		}
 
 		return $ways;
@@ -1372,7 +1400,7 @@ class Categorie extends CommonObject
     		$g = hexdec($hex[2].$hex[3]);
     		$b = hexdec($hex[4].$hex[5]);
     		$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
-    		if ($bright > 0.6) $forced_color='categtextblack';        // Higher than 60%
+    		if ($bright >= 0.5) $forced_color='categtextblack';        // Higher than 60%
 		}		
 
         $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color .'">';
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 3b5d0b64a86..a1486ff344f 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -189,7 +189,7 @@ print '<table border="0" width="100%" class="border">';
 
 // Path of category
 print '<tr><td width="20%" class="notopnoleft">';
-$ways = $object->print_all_ways();
+$ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 print $langs->trans("Ref").'</td><td>';
 print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 foreach ($ways as $way)

From b70f2f329c65e92e5b0e6fa2421d5f6aa138f54e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 03:59:22 +0100
Subject: [PATCH 228/421] Fix bad position of form

---
 htdocs/comm/multiprix.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index fbaf00e53db..7510c0a5b96 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -84,12 +84,12 @@ if ($_socid > 0)
 	if ($objsoc->client == 1) $tabchoice='customer';
 	if ($objsoc->client == 2) $tabchoice='prospect';
 
-	dol_fiche_head($head, $tabchoice, $langs->trans("ThirdParty"), 0, 'company');
-
-
 	print '<form method="POST" action="multiprix.php?id='.$objsoc->id.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="setpricelevel">';
+	
+	dol_fiche_head($head, $tabchoice, $langs->trans("ThirdParty"), 0, 'company');
+
 	print '<table width="100%" border="0">';
 	print '<tr><td valign="top">';
 	print '<table class="border" width="100%">';
@@ -121,12 +121,14 @@ if ($_socid > 0)
 	print "</td></tr>";
 	print "</table>";
 
-	print '<div align="center"><br><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+	dol_fiche_end();
+	
+	print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
 
 	print "</form>";
 
-	print "</div>\n";
-	print '<br>';
+	
+	print '<br><br>';
 
 
 	/*

From 3864bd35c9258cec647873d536db7c8788a7a77d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 03:59:43 +0100
Subject: [PATCH 229/421] Fix NPR Vat is working correctly with multiprice too

---
 htdocs/product/price.php                 | 2 +-
 htdocs/product/stock/replenish.php       | 4 +++-
 htdocs/product/stock/replenishorders.php | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 7c8e18b213b..b6cf03fc837 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1129,7 +1129,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 			    print '<input type="hidden" name="localtax1_tx[' . $i . ']" value="' . $object->localtax1_tx . '">';
 			    print '<input type="hidden" name="localtax1_type[' . $i . ']" value="' . $object->localtax1_type . '">';
 			    print '<input type="hidden" name="localtax2_tx[' . $i . ']" value="' . $object->localtax2_tx . '">';
-			    print '<input type="hidden" name="localtax2_tx[' . $i . ']" value="' . $object->localtax2_type . '">';
+			    print '<input type="hidden" name="localtax2_type[' . $i . ']" value="' . $object->localtax2_type . '">';
 			} else {
 				// This option is kept for backward compatibility but has no sense
 				print '<td style="text-align: center">';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 94629a3e821..8773d10ad4d 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -372,6 +372,8 @@ $head[1][1] = $langs->trans("ReplenishmentOrders");
 $head[1][2] = 'replenishorders';
 
 
+print load_fiche_titre($langs->trans('Replenishment'), '', 'title_generic.png');
+
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">'.
 	'<input type="hidden" name="token" value="' .$_SESSION['newtoken'] . '">'.
@@ -382,7 +384,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">'
 	'<input type="hidden" name="action" value="order">'.
 	'<input type="hidden" name="mode" value="' . $mode . '">';
 
-dol_fiche_head($head, 'replenish', $langs->trans('Replenishment'), 0, 'stock');
+dol_fiche_head($head, 'replenish', '', 0, '');
 
 print $langs->trans("ReplenishmentStatusDesc").'<br>'."\n";
 if ($usevirtualstock == 1)
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 303180c2cb7..785760ef511 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -52,6 +52,8 @@ $texte = $langs->trans('ReplenishmentOrders');
 
 llxHeader('', $texte, $helpurl, '');
 
+print load_fiche_titre($langs->trans('Replenishment'), '', 'title_generic.png');
+
 $head = array();
 $head[0][0] = DOL_URL_ROOT.'/product/stock/replenish.php';
 $head[0][1] = $langs->trans('Status');
@@ -60,7 +62,7 @@ $head[1][0] = DOL_URL_ROOT.'/product/stock/replenishorders.php';
 $head[1][1] = $texte;
 $head[1][2] = 'replenishorders';
 
-dol_fiche_head($head, 'replenishorders', $langs->trans('Replenishment'), 0, 'stock');
+dol_fiche_head($head, 'replenishorders', '', 0, '');
 
 $commandestatic = new CommandeFournisseur($db);
 $sref = GETPOST('search_ref', 'alpha');

From 79bc7cf08531b7a572dcc9ea7231184c2aa4b248 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 04:05:08 +0100
Subject: [PATCH 230/421] Fix showing description

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

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index be7756e5900..849916222dd 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -1013,14 +1013,14 @@ else
 		print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
 		if($conf->global->MAIN_INFO_LOCALTAX_CALC1==0)
 		{
-			print $langs->transcountry("CalcLocaltax1",$mysoc->country_code);
+			print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc");
 		}
 		else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==1)
 		{
-			print $langs->transcountry("CalcLocaltax2",$mysoc->country_code);
+			print $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc");
 		}
 		else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==2){
-			print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
+			print $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc");
 		}
 
 		print '</td></tr>';

From cc524c818095d3e78fe85868f8bb6134c7a75cd6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 04:41:29 +0100
Subject: [PATCH 231/421] Fix bad picto

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

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 253b55b4659..c107639e786 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -534,7 +534,7 @@ if (empty($action))
         $paramlist.=(! empty($search_amount)?"&search_amount='".$search_amount:"");
         if ($optioncss != '') $paramlist.='&optioncss='.$optioncss;
 
-        print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num);
+        print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num, 0, 'title_accountancy.png');
 
         print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
         if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

From d77a8bddcffe56645656f6be6a2a684d7bdcd136 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Fri, 19 Feb 2016 07:39:14 +0100
Subject: [PATCH 232/421] Fixed: Members - Problem of tab & missing language
 file

---
 htdocs/adherents/card_subscriptions.php | 4 ++--
 htdocs/core/lib/member.lib.php          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 38c6f254bda..998dc53d525 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
  * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2015       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2016  Alexandre Spangaro      <aspangaro.dolibarr@gmail.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,7 +40,7 @@ $langs->load("bills");
 $langs->load("members");
 $langs->load("users");
 $langs->load("mails");
-
+$langs->load('other');
 
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index a295d433b6f..8b5bbfcc542 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2015  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015       Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2016  Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -91,7 +91,7 @@ function member_prepare_head(Adherent $object)
     $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans('Documents');
     if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
-    $head[$h][2] = 'documents';
+    $head[$h][2] = 'document';
     $h++;
 
     $head[$h][0] = DOL_URL_ROOT.'/adherents/info.php?id='.$object->id;

From 8349446340f63c7e02390aa764f691cfada0e640 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 19 Feb 2016 10:59:50 +0100
Subject: [PATCH 233/421] No segment defined is not an error

This is a proposition of correction on all ODT file
If we don't define table of segment on odt we have an error
But in some case we don't want an table on ODT
---
 .../project/doc/doc_generic_project_odt.modules.php   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 6155e38b4ca..6061ec8f548 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
@@ -698,9 +698,14 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 				catch(OdfException $e)
 				{
-					$this->error=$e->getMessage();
-					dol_syslog($this->error, LOG_WARNING);
-					return -1;
+					$ExceptionTrace=$e->getTrace();
+					// no segment defined on ODT is not an error
+					if($ExceptionTrace[0]['function'] != 'setSegment')
+					{
+						$this->error=$e->getMessage();
+						dol_syslog($this->error, LOG_WARNING);
+						return -1;
+					}
 				}
 
 				// Replace tags of project files

From 1cd0efd8dbc599a5935f841165435ef92d4e8781 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 14:18:50 +0100
Subject: [PATCH 234/421] Fix picto

---
 htdocs/loan/calc.php | 3 ++-
 htdocs/loan/card.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php
index 681d0721f0a..5dee07411f8 100644
--- a/htdocs/loan/calc.php
+++ b/htdocs/loan/calc.php
@@ -123,7 +123,8 @@ if (! empty($errors)) {
 
 llxHeader();
 
-print load_fiche_titre($langs->trans("LoanCalc"));
+print load_fiche_titre($langs->trans("LoanCalc"), '', 'title_accountancy.png');
+
 print $langs->trans('LoanCalcDesc');
 
 print '<form method="GET" name="information" action="'.$_SERVER['PHP_SELF'].'">';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index b575536f950..ee799284ea7 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -183,7 +183,7 @@ if ($action == 'create')
 	//WYSIWYG Editor
     require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-    print load_fiche_titre($langs->trans("NewLoan"));
+    print load_fiche_titre($langs->trans("NewLoan"), '', 'title_accountancy.png');
 
     $datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
 

From e820f09912da58ed3c32cf3ee813afdae874efec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 15:28:43 +0100
Subject: [PATCH 235/421] Start to introduce native responsive design

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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 889dd32584d..a88265e3c79 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -605,7 +605,6 @@ div.fiche {
 	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'6')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 }
-
 div.fichecenter {
 	width: 100%;
 	clear: both;	/* This is to have div fichecenter that are true rectangles */
@@ -635,6 +634,45 @@ div.ficheaddleft {
 	<?php if ($conf->browser->layout != 'phone')   { print "padding-".$left.": 16px;\n"; }
 	else print "margin-top: 10px;\n"; ?>
 }
+/* Force values for small screen */
+@media only screen and (max-width: 850px)
+{
+    div.fiche {
+    	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'6':'20'):'24')); ?>px;
+    	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:6); ?>px;
+    	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
+    }
+    div.fichecenter {
+    	width: 100%;
+    	clear: both;	/* This is to have div fichecenter that are true rectangles */
+    }
+    div.fichecenterbis {
+    	margin-top: 8px;
+    }
+    div.fichethirdleft {
+    	float: none;
+    	width: auto;
+    	padding-bottom: 6px;
+    }
+    div.fichetwothirdright {
+    	float: none;
+    	width: auto;
+    	padding-bottom: 6px;
+    }
+    div.fichehalfleft {
+    	float: none;
+    	width: auto;
+    }
+    div.fichehalfright {
+    	float: none;
+    	width: auto;
+    }
+    div.ficheaddleft {
+    	<?php print "padding-".$left.": 0px;\n"; ?>
+    	margin-top: 10px;
+    }
+}
+
 .containercenter {
 	display : table;
 	margin : 0px auto;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f6e366f01d6..7939b15eae9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -648,7 +648,6 @@ div.fiche {
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 	margin-bottom: 15px;
 }
-
 div.fichecenter {
 	width: 100%;
 	clear: both;	/* This is to have div fichecenter that are true rectangles */
@@ -678,6 +677,46 @@ div.ficheaddleft {
 	<?php if ($conf->browser->layout != 'phone')   { print "padding-".$left.": 16px;\n"; }
 	else print "margin-top: 10px;\n"; ?>
 }
+/* Force values for small screen */
+@media only screen and (max-width: 850px)
+{
+    div.fiche {
+    	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px;
+    	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:16); ?>px;
+    	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
+    	margin-bottom: 15px;
+    }
+    div.fichecenter {
+    	width: 100%;
+    	clear: both;	/* This is to have div fichecenter that are true rectangles */
+    }
+    div.fichecenterbis {
+    	margin-top: 8px;
+    }
+    div.fichethirdleft {
+    	float: none;
+    	width: auto;
+    	padding-bottom: 6px;
+    }
+    div.fichetwothirdright {
+    	float: none;
+    	width: auto;
+    	padding-bottom: 6px;
+    }
+    div.fichehalfleft {
+    	float: none;
+    	width: auto;
+    }
+    div.fichehalfright {
+    	float: none;
+    	width: auto;
+    }
+    div.ficheaddleft {
+    	<?php print "padding-".$left.": 0px;\n"; ?>
+    	margin-top: 10px;
+    }
+}
+
 .containercenter {
 	display : table;
 	margin : 0px auto;

From 994715f8bb7bbb62fa4edc52e4db7da1dd5e689c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 15:47:00 +0100
Subject: [PATCH 236/421] Upgrade romania

---
 .../install/mysql/data/llx_10_c_regions.sql   |  94 +--
 .../mysql/data/llx_20_c_departements.sql      | 615 ++++++++++--------
 .../mysql/data/llx_c_forme_juridique.sql      |  19 +
 htdocs/install/mysql/data/llx_c_tva.sql       |   2 +-
 4 files changed, 399 insertions(+), 331 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index e736f7d993d..7ed40abce19 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -173,6 +173,9 @@ insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,102
 -- Region US (id country=11)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 11, 1101, '', 0, 'United-States', 1);
 
+-- Regions Algeria (id country=13)
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 13, 1301, '', 0, 'Algerie', 1);
+
 -- Region Canada (id country=14)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 14, 1401, '', 0, 'Canada', 1);
 
@@ -189,6 +192,20 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) va
 -- Regions Australia (id country=28)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 28, 2801, '', 0, 'Australia', 1);
 
+-- Regions Barbados (id country=46)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  46, 4601, '', 0, 'Barbados', 1);
+
+-- Regions Bolivia (id country=52)
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5201, '', 0, 'Chuquisaca', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5202, '', 0, 'La Paz', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5203, '', 0, 'Cochabamba', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5204, '', 0, 'Oruro', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5205, '', 0, 'Potosí', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5206, '', 0, 'Tarija', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5207, '', 0, 'Santa Cruz', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5208, '', 0, 'El Beni', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5209, '', 0, 'Pando', 1);
+
 -- Regions Brazil (id country=56)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 56, 5601, '', 0, 'Brasil', 1);
 
@@ -223,41 +240,7 @@ insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) va
 -- Regions India (id country=117)
 insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  117, 11701, '', 0, 'India', 1);
 
--- Regions Mauritius (id country=152)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15201, '', 0, 'Rivière Noire', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15202, '', 0, 'Flacq', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15203, '', 0, 'Grand Port', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15204, '', 0, 'Moka', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15205, '', 0, 'Pamplemousses', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15206, '', 0, 'Plaines Wilhems', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15207, '', 0, 'Port-Louis', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15208, '', 0, 'Rivière du Rempart', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15209, '', 0, 'Savanne', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15210, '', 0, 'Rodrigues', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15211, '', 0, 'Les îles Agaléga', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1);
-
--- Regions Mexique (id country=154)
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  154, 15401, '', 0, 'Mexique', 1);
-
--- Regions Barbados (id country=46)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  46, 4601, '', 0, 'Barbados', 1);
-
--- Regions Venezuela (id country=232)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23201, '', 0, 'Los Andes', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23202, '', 0, 'Capital', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23203, '', 0, 'Central', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23204, '', 0, 'Cento Occidental', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23205, '', 0, 'Guayana', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23206, '', 0, 'Insular', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23207, '', 0, 'Los Llanos', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23208, '', 0, 'Nor-Oriental', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23209, '', 0, 'Zuliana', 1);
-
--- Regions Algeria (id country=13)
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 13, 1301, '', 0, 'Algerie', 1);
-
--- Regions Maroc (id country=12)
+-- Regions Maroc - Moroco (id country=12)
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1201, '', 0, 'Tanger-Tétouan', 1);
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1202, '', 0, 'Gharb-Chrarda-Beni Hssen', 1);
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1203, '', 0, 'Taza-Al Hoceima-Taounate', 1);
@@ -275,13 +258,34 @@ INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) v
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1215, '', 0, 'Laâyoune-Boujdour-Sakia el Hamra', 1);
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1216, '', 0, 'Oued Ed-Dahab Lagouira', 1);
 
--- Regions Bolivia (id country=52)
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5201, '', 0, 'Chuquisaca', 1);
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5202, '', 0, 'La Paz', 1);
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5203, '', 0, 'Cochabamba', 1);
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5204, '', 0, 'Oruro', 1);
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5205, '', 0, 'Potosí', 1);
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5206, '', 0, 'Tarija', 1);
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5207, '', 0, 'Santa Cruz', 1);
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5208, '', 0, 'El Beni', 1);
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 52, 5209, '', 0, 'Pando', 1);
\ No newline at end of file
+-- Regions Mauritius (id country=152)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15201, '', 0, 'Rivière Noire', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15202, '', 0, 'Flacq', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15203, '', 0, 'Grand Port', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15204, '', 0, 'Moka', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15205, '', 0, 'Pamplemousses', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15206, '', 0, 'Plaines Wilhems', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15207, '', 0, 'Port-Louis', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15208, '', 0, 'Rivière du Rempart', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15209, '', 0, 'Savanne', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15210, '', 0, 'Rodrigues', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15211, '', 0, 'Les îles Agaléga', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1);
+
+-- Regions Mexique (id country=154)
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  154, 15401, '', 0, 'Mexique', 1);
+
+-- Regions Romania (id country=188) 
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  188, 18801, '', 0, 'Romania', 1);
+
+-- Regions Venezuela (id country=232)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23201, '', 0, 'Los Andes', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23202, '', 0, 'Capital', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23203, '', 0, 'Central', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23204, '', 0, 'Cento Occidental', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23205, '', 0, 'Guayana', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23206, '', 0, 'Insular', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23207, '', 0, 'Los Llanos', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23208, '', 0, 'Nor-Oriental', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23209, '', 0, 'Zuliana', 1);
+
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 765f96f1da7..ff6f22768a3 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -275,6 +275,280 @@ insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom
 insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VI',320,NULL,NULL,NULL,'VICENZA');
 insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VT',307,NULL,NULL,NULL,'VITERBO');
 
+-- Provinces Algeria (id country=13)
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL01', 1301, '', 0, '', 'Wilaya d''Adrar', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL02', 1301, '', 0, '', 'Wilaya de Chlef', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL03', 1301, '', 0, '', 'Wilaya de Laghouat', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL04', 1301, '', 0, '', 'Wilaya d''Oum El Bouaghi', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL05', 1301, '', 0, '', 'Wilaya de Batna', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL06', 1301, '', 0, '', 'Wilaya de Béjaïa', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL07', 1301, '', 0, '', 'Wilaya de Biskra', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL08', 1301, '', 0, '', 'Wilaya de Béchar', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL09', 1301, '', 0, '', 'Wilaya de Blida', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL11', 1301, '', 0, '', 'Wilaya de Bouira', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL12', 1301, '', 0, '', 'Wilaya de Tamanrasset', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL13', 1301, '', 0, '', 'Wilaya de Tébessa', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL14', 1301, '', 0, '', 'Wilaya de Tlemcen', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL15', 1301, '', 0, '', 'Wilaya de Tiaret', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL16', 1301, '', 0, '', 'Wilaya de Tizi Ouzou', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL17', 1301, '', 0, '', 'Wilaya d''Alger', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL18', 1301, '', 0, '', 'Wilaya de Djelfa', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL19', 1301, '', 0, '', 'Wilaya de Jijel', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL20', 1301, '', 0, '', 'Wilaya de Sétif	', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL21', 1301, '', 0, '', 'Wilaya de Saïda', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL22', 1301, '', 0, '', 'Wilaya de Skikda', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL23', 1301, '', 0, '', 'Wilaya de Sidi Bel Abbès', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL24', 1301, '', 0, '', 'Wilaya d''Annaba', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL25', 1301, '', 0, '', 'Wilaya de Guelma', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL26', 1301, '', 0, '', 'Wilaya de Constantine', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL27', 1301, '', 0, '', 'Wilaya de Médéa', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL28', 1301, '', 0, '', 'Wilaya de Mostaganem', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL29', 1301, '', 0, '', 'Wilaya de M''Sila', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL30', 1301, '', 0, '', 'Wilaya de Mascara', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL31', 1301, '', 0, '', 'Wilaya d''Ouargla', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL32', 1301, '', 0, '', 'Wilaya d''Oran', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL33', 1301, '', 0, '', 'Wilaya d''El Bayadh', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL34', 1301, '', 0, '', 'Wilaya d''Illizi', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL35', 1301, '', 0, '', 'Wilaya de Bordj Bou Arreridj', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL36', 1301, '', 0, '', 'Wilaya de Boumerdès', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL37', 1301, '', 0, '', 'Wilaya d''El Tarf', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL38', 1301, '', 0, '', 'Wilaya de Tindouf', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL39', 1301, '', 0, '', 'Wilaya de Tissemsilt', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL40', 1301, '', 0, '', 'Wilaya d''El Oued', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL41', 1301, '', 0, '', 'Wilaya de Khenchela', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL42', 1301, '', 0, '', 'Wilaya de Souk Ahras', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL43', 1301, '', 0, '', 'Wilaya de Tipaza', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL44', 1301, '', 0, '', 'Wilaya de Mila', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL45', 1301, '', 0, '', 'Wilaya d''Aïn Defla', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL46', 1301, '', 0, '', 'Wilaya de Naâma', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL47', 1301, '', 0, '', 'Wilaya d''Aïn Témouchent', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL48', 1301, '', 0, '', 'Wilaya de Ghardaia', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL49', 1301, '', 0, '', 'Wilaya de Relizane', 1);
+
+-- Provinces Maroc - Moroco (id country=12)
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA', 1209, '', 0, '', 'Province de Benslimane', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA1', 1209, '', 0, '', 'Province de Berrechid', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA2', 1209, '', 0, '', 'Province de Khouribga', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA3', 1209, '', 0, '', 'Province de Settat', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA4', 1210, '', 0, '', 'Province d''El Jadida', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA5', 1210, '', 0, '', 'Province de Safi', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA6', 1210, '', 0, '', 'Province de Sidi Bennour', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA7', 1210, '', 0, '', 'Province de Youssoufia', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA6B', 1205, '', 0, '', 'Préfecture de Fès', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA7B', 1205, '', 0, '', 'Province de Boulemane', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA8', 1205, '', 0, '', 'Province de Moulay Yacoub', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA9', 1205, '', 0, '', 'Province de Sefrou', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA8A', 1202, '', 0, '', 'Province de Kénitra', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA9A', 1202, '', 0, '', 'Province de Sidi Kacem', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA10', 1202, '', 0, '', 'Province de Sidi Slimane', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA11', 1208, '', 0, '', 'Préfecture de Casablanca', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA12', 1208, '', 0, '', 'Préfecture de Mohammédia', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA13', 1208, '', 0, '', 'Province de Médiouna', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA14', 1208, '', 0, '', 'Province de Nouaceur', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA15', 1214, '', 0, '', 'Province d''Assa-Zag', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA16', 1214, '', 0, '', 'Province d''Es-Semara', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA17A', 1214, '', 0, '', 'Province de Guelmim', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA18', 1214, '', 0, '', 'Province de Tata', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19', 1214, '', 0, '', 'Province de Tan-Tan', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA15', 1215, '', 0, '', 'Province de Boujdour', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA16', 1215, '', 0, '', 'Province de Lâayoune', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA17', 1215, '', 0, '', 'Province de Tarfaya', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA18', 1211, '', 0, '', 'Préfecture de Marrakech', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19', 1211, '', 0, '', 'Province d''Al Haouz', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA20', 1211, '', 0, '', 'Province de Chichaoua', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA21', 1211, '', 0, '', 'Province d''El Kelâa des Sraghna', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA22', 1211, '', 0, '', 'Province d''Essaouira', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA23', 1211, '', 0, '', 'Province de Rehamna', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA24', 1206, '', 0, '', 'Préfecture de Meknès', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA25', 1206, '', 0, '', 'Province d’El Hajeb', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA26', 1206, '', 0, '', 'Province d''Errachidia', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA27', 1206, '', 0, '', 'Province d’Ifrane', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA28', 1206, '', 0, '', 'Province de Khénifra', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA29', 1206, '', 0, '', 'Province de Midelt', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA30', 1204, '', 0, '', 'Préfecture d''Oujda-Angad', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA31', 1204, '', 0, '', 'Province de Berkane', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA32', 1204, '', 0, '', 'Province de Driouch', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA33', 1204, '', 0, '', 'Province de Figuig', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA34', 1204, '', 0, '', 'Province de Jerada', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA35', 1204, '', 0, '', 'Province de Nadorgg', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA36', 1204, '', 0, '', 'Province de Taourirt', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA37', 1216, '', 0, '', 'Province d''Aousserd', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA38', 1216, '', 0, '', 'Province d''Oued Ed-Dahab', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA39', 1207, '', 0, '', 'Préfecture de Rabat', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA40', 1207, '', 0, '', 'Préfecture de Skhirat-Témara', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA41', 1207, '', 0, '', 'Préfecture de Salé', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA42', 1207, '', 0, '', 'Province de Khémisset', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA43', 1213, '', 0, '', 'Préfecture d''Agadir Ida-Outanane', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA44', 1213, '', 0, '', 'Préfecture d''Inezgane-Aït Melloul', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA45', 1213, '', 0, '', 'Province de Chtouka-Aït Baha', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA46', 1213, '', 0, '', 'Province d''Ouarzazate', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA47', 1213, '', 0, '', 'Province de Sidi Ifni', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA48', 1213, '', 0, '', 'Province de Taroudant', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA49', 1213, '', 0, '', 'Province de Tinghir', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA50', 1213, '', 0, '', 'Province de Tiznit', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA51', 1213, '', 0, '', 'Province de Zagora', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA52', 1212, '', 0, '', 'Province d''Azilal', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA53', 1212, '', 0, '', 'Province de Beni Mellal', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA54', 1212, '', 0, '', 'Province de Fquih Ben Salah', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA55', 1201, '', 0, '', 'Préfecture de M''diq-Fnideq', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA56', 1201, '', 0, '', 'Préfecture de Tanger-Asilah', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA57', 1201, '', 0, '', 'Province de Chefchaouen', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA58', 1201, '', 0, '', 'Province de Fahs-Anjra', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA59', 1201, '', 0, '', 'Province de Larache', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA60', 1201, '', 0, '', 'Province d''Ouezzane', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA61', 1201, '', 0, '', 'Province de Tétouan', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA62', 1203, '', 0, '', 'Province de Guercif', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA63', 1203, '', 0, '', 'Province d''Al Hoceïma', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA64', 1203, '', 0, '', 'Province de Taounate', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA65', 1203, '', 0, '', 'Province de Taza', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA6A', 1205, '', 0, '', 'Préfecture de Fès', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA7A', 1205, '', 0, '', 'Province de Boulemane', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA15A', 1214, '', 0, '', 'Province d''Assa-Zag', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA16A', 1214, '', 0, '', 'Province d''Es-Semara', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA18A', 1211, '', 0, '', 'Préfecture de Marrakech', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19A', 1214, '', 0, '', 'Province de Tan-Tan', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19B', 1214, '', 0, '', 'Province de Tan-Tan', 1);
+
+-- Provinces Tunisia (id country=10)
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN01', 1001, '', 0, '', 'Ariana', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN02', 1001, '', 0, '', 'Béja', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN03', 1001, '', 0, '', 'Ben Arous', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN04', 1001, '', 0, '', 'Bizerte', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN05', 1001, '', 0, '', 'Gabès', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN06', 1001, '', 0, '', 'Gafsa', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN07', 1001, '', 0, '', 'Jendouba', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN08', 1001, '', 0, '', 'Kairouan', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN09', 1001, '', 0, '', 'Kasserine', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN10', 1001, '', 0, '', 'Kébili', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN11', 1001, '', 0, '', 'La Manouba', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN12', 1001, '', 0, '', 'Le Kef', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN13', 1001, '', 0, '', 'Mahdia', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN14', 1001, '', 0, '', 'Médenine', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN15', 1001, '', 0, '', 'Monastir', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN16', 1001, '', 0, '', 'Nabeul', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN17', 1001, '', 0, '', 'Sfax', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN18', 1001, '', 0, '', 'Sidi Bouzid', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN19', 1001, '', 0, '', 'Siliana', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN20', 1001, '', 0, '', 'Sousse', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN21', 1001, '', 0, '', 'Tataouine', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN22', 1001, '', 0, '', 'Tozeur', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN23', 1001, '', 0, '', 'Tunis', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN24', 1001, '', 0, '', 'Zaghouan', 1);
+
+-- Provinces Bolivia (id country=52)
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('001', 5201, '', 0, '', 'Belisario Boeto', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('002', 5201, '', 0, '', 'Hernando Siles', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('003', 5201, '', 0, '', 'Jaime Zudáñez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('004', 5201, '', 0, '', 'Juana Azurduy de Padilla', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('005', 5201, '', 0, '', 'Luis Calvo', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('006', 5201, '', 0, '', 'Nor Cinti', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('007', 5201, '', 0, '', 'Oropeza', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('008', 5201, '', 0, '', 'Sud Cinti', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('009', 5201, '', 0, '', 'Tomina', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('010', 5201, '', 0, '', 'Yamparáez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('011', 5202, '', 0, '', 'Abel Iturralde', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('012', 5202, '', 0, '', 'Aroma', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('013', 5202, '', 0, '', 'Bautista Saavedra', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('014', 5202, '', 0, '', 'Caranavi', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('015', 5202, '', 0, '', 'Eliodoro Camacho', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('016', 5202, '', 0, '', 'Franz Tamayo', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('017', 5202, '', 0, '', 'Gualberto Villarroel', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('018', 5202, '', 0, '', 'Ingaví', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('019', 5202, '', 0, '', 'Inquisivi', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('020', 5202, '', 0, '', 'José Ramón Loayza', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('021', 5202, '', 0, '', 'Larecaja', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('022', 5202, '', 0, '', 'Los Andes (Bolivia)', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('023', 5202, '', 0, '', 'Manco Kapac', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('024', 5202, '', 0, '', 'Muñecas', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('025', 5202, '', 0, '', 'Nor Yungas', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('026', 5202, '', 0, '', 'Omasuyos', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('027', 5202, '', 0, '', 'Pacajes', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('028', 5202, '', 0, '', 'Pedro Domingo Murillo', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('029', 5202, '', 0, '', 'Sud Yungas', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('030', 5202, '', 0, '', 'General José Manuel Pando', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('031', 5203, '', 0, '', 'Arani', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('032', 5203, '', 0, '', 'Arque', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('033', 5203, '', 0, '', 'Ayopaya', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('034', 5203, '', 0, '', 'Bolívar (Bolivia)', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('035', 5203, '', 0, '', 'Campero', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('036', 5203, '', 0, '', 'Capinota', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('037', 5203, '', 0, '', 'Cercado (Cochabamba)', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('038', 5203, '', 0, '', 'Esteban Arze', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('039', 5203, '', 0, '', 'Germán Jordán', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('040', 5203, '', 0, '', 'José Carrasco', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('041', 5203, '', 0, '', 'Mizque', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('042', 5203, '', 0, '', 'Punata', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('043', 5203, '', 0, '', 'Quillacollo', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('044', 5203, '', 0, '', 'Tapacarí', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('045', 5203, '', 0, '', 'Tiraque', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('046', 5203, '', 0, '', 'Chapare', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('047', 5204, '', 0, '', 'Carangas', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('048', 5204, '', 0, '', 'Cercado (Oruro)', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('049', 5204, '', 0, '', 'Eduardo Avaroa', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('050', 5204, '', 0, '', 'Ladislao Cabrera', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('051', 5204, '', 0, '', 'Litoral de Atacama', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('052', 5204, '', 0, '', 'Mejillones', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('053', 5204, '', 0, '', 'Nor Carangas', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('054', 5204, '', 0, '', 'Pantaleón Dalence', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('055', 5204, '', 0, '', 'Poopó', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('056', 5204, '', 0, '', 'Sabaya', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('057', 5204, '', 0, '', 'Sajama', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('058', 5204, '', 0, '', 'San Pedro de Totora', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('059', 5204, '', 0, '', 'Saucarí', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('060', 5204, '', 0, '', 'Sebastián Pagador', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('061', 5204, '', 0, '', 'Sud Carangas', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('062', 5204, '', 0, '', 'Tomás Barrón', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('063', 5205, '', 0, '', 'Alonso de Ibáñez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('064', 5205, '', 0, '', 'Antonio Quijarro', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('065', 5205, '', 0, '', 'Bernardino Bilbao', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('066', 5205, '', 0, '', 'Charcas (Potosí)', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('067', 5205, '', 0, '', 'Chayanta', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('068', 5205, '', 0, '', 'Cornelio Saavedra', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('069', 5205, '', 0, '', 'Daniel Campos', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('070', 5205, '', 0, '', 'Enrique Baldivieso', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('071', 5205, '', 0, '', 'José María Linares', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('072', 5205, '', 0, '', 'Modesto Omiste', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('073', 5205, '', 0, '', 'Nor Chichas', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('074', 5205, '', 0, '', 'Nor Lípez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('075', 5205, '', 0, '', 'Rafael Bustillo', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('076', 5205, '', 0, '', 'Sud Chichas', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('077', 5205, '', 0, '', 'Sud Lípez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('078', 5205, '', 0, '', 'Tomás Frías', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('079', 5206, '', 0, '', 'Aniceto Arce', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('080', 5206, '', 0, '', 'Burdet O''Connor', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('081', 5206, '', 0, '', 'Cercado (Tarija)', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('082', 5206, '', 0, '', 'Eustaquio Méndez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('083', 5206, '', 0, '', 'José María Avilés', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('084', 5206, '', 0, '', 'Gran Chaco', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('085', 5207, '', 0, '', 'Andrés Ibáñez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('086', 5207, '', 0, '', 'Caballero', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('087', 5207, '', 0, '', 'Chiquitos', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('088', 5207, '', 0, '', 'Cordillera (Bolivia)', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('089', 5207, '', 0, '', 'Florida', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('090', 5207, '', 0, '', 'Germán Busch', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('091', 5207, '', 0, '', 'Guarayos', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('092', 5207, '', 0, '', 'Ichilo', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('093', 5207, '', 0, '', 'Obispo Santistevan', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('094', 5207, '', 0, '', 'Sara', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('095', 5207, '', 0, '', 'Vallegrande', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('096', 5207, '', 0, '', 'Velasco', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('097', 5207, '', 0, '', 'Warnes', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('098', 5207, '', 0, '', 'Ángel Sandóval', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('099', 5207, '', 0, '', 'Ñuflo de Chaves', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('100', 5208, '', 0, '', 'Cercado (Beni)', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('101', 5208, '', 0, '', 'Iténez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('102', 5208, '', 0, '', 'Mamoré', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('103', 5208, '', 0, '', 'Marbán', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('104', 5208, '', 0, '', 'Moxos', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('105', 5208, '', 0, '', 'Vaca Díez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('106', 5208, '', 0, '', 'Yacuma', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('107', 5208, '', 0, '', 'General José Ballivián Segurola', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('108', 5209, '', 0, '', 'Abuná', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('109', 5209, '', 0, '', 'Madre de Dios', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('110', 5209, '', 0, '', 'Manuripi', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('111', 5209, '', 0, '', 'Nicolás Suárez', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('112', 5209, '', 0, '', 'General Federico Román', 1);
+
 -- Provinces Australia (id country=28)
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NSW','',1,'','New South Wales');
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'VIC','',1,'','Victoria');
@@ -697,6 +971,19 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2324', 2305, '', 0, 'ISLAS MALVINAS', 'Islas Malvinas', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2325', 2305, '', 0, 'ANTARTIDA', 'Antártida', 1);
 
+-- Parish Barbados (id country=46)
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CC', 4601, 'Oistins', 0, 'CC', 'Christ Church', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SA', 4601, 'Greenland', 0, 'SA', 'Saint Andrew', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SG', 4601, 'Bulkeley', 0, 'SG', 'Saint George', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('JA', 4601, 'Holetown', 0, 'JA', 'Saint James', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SJ', 4601, 'Four Roads', 0, 'SJ', 'Saint John', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SB', 4601, 'Bathsheba', 0, 'SB', 'Saint Joseph', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SL', 4601, 'Crab Hill', 0, 'SL', 'Saint Lucy', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SM', 4601, 'Bridgetown', 0, 'SM', 'Saint Michael', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SP', 4601, 'Speightstown', 0, 'SP', 'Saint Peter', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SC', 4601, 'Crane', 0, 'SC', 'Saint Philip', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ST', 4601, 'Hillaby', 0, 'ST', 'Saint Thomas', 1);
+
 -- Provinces Brazil (id country=56)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AC', 5601, 'ACRE', 0, 'AC', 'Acre', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AL', 5601, 'ALAGOAS', 0, 'AL', 'Alagoas', 1);
@@ -911,18 +1198,49 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('YO', 11401, '', 0, 'YO', 'Yoro', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('DC', 11401, '', 0, 'DC', 'Distrito Central', 1);
 
--- Parish Barbados (id country=46)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CC', 4601, 'Oistins', 0, 'CC', 'Christ Church', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SA', 4601, 'Greenland', 0, 'SA', 'Saint Andrew', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SG', 4601, 'Bulkeley', 0, 'SG', 'Saint George', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('JA', 4601, 'Holetown', 0, 'JA', 'Saint James', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SJ', 4601, 'Four Roads', 0, 'SJ', 'Saint John', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SB', 4601, 'Bathsheba', 0, 'SB', 'Saint Joseph', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SL', 4601, 'Crab Hill', 0, 'SL', 'Saint Lucy', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SM', 4601, 'Bridgetown', 0, 'SM', 'Saint Michael', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SP', 4601, 'Speightstown', 0, 'SP', 'Saint Peter', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SC', 4601, 'Crane', 0, 'SC', 'Saint Philip', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ST', 4601, 'Hillaby', 0, 'ST', 'Saint Thomas', 1);
+-- Provinces Romania (id country=188)
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AB', 18801, '', 0, '', 'Alba', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AR', 18801, '', 0, '', 'Arad', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AG', 18801, '', 0, '', 'Argeș', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BC', 18801, '', 0, '', 'Bacău', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BH', 18801, '', 0, '', 'Bihor', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BN', 18801, '', 0, '', 'Bistrița-Năsăud', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BT', 18801, '', 0, '', 'Botoșani', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BV', 18801, '', 0, '', 'Brașov', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BR', 18801, '', 0, '', 'Brăila', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BZ', 18801, '', 0, '', 'Buzău', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CL', 18801, '', 0, '', 'Călărași', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CS', 18801, '', 0, '', 'Caraș-Severin', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CJ', 18801, '', 0, '', 'Cluj', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CT', 18801, '', 0, '', 'Constanța', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CV', 18801, '', 0, '', 'Covasna', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('DB', 18801, '', 0, '', 'Dâmbovița', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('DJ', 18801, '', 0, '', 'Dolj', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('GL', 18801, '', 0, '', 'Galați', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('GR', 18801, '', 0, '', 'Giurgiu', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('GJ', 18801, '', 0, '', 'Gorj', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HR', 18801, '', 0, '', 'Harghita', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HD', 18801, '', 0, '', 'Hunedoara', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('IL', 18801, '', 0, '', 'Ialomița', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('IS', 18801, '', 0, '', 'Iași', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('IF', 18801, '', 0, '', 'Ilfov', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('MM', 18801, '', 0, '', 'Maramureș', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('MH', 18801, '', 0, '', 'Mehedinți', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('MS', 18801, '', 0, '', 'Mureș', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('NT', 18801, '', 0, '', 'Neamț', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OT', 18801, '', 0, '', 'Olt', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PH', 18801, '', 0, '', 'Prahova', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SM', 18801, '', 0, '', 'Satu Mare', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SJ', 18801, '', 0, '', 'Sălaj', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SB', 18801, '', 0, '', 'Sibiu', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SV', 18801, '', 0, '', 'Suceava', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('TR', 18801, '', 0, '', 'Teleorman', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('TM', 18801, '', 0, '', 'Timiș', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('TL', 18801, '', 0, '', 'Tulcea', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VS', 18801, '', 0, '', 'Vaslui', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VL', 18801, '', 0, '', 'Vâlcea', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VN', 18801, '', 0, '', 'Vrancea', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BU', 18801, '', 0, '', 'Bucuresti', 1);
 
 -- Provinces Venezuela (id country=232)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VE-L', 23201, '', 0, 'VE-L', 'Mérida', 1);
@@ -951,276 +1269,3 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VE-V', 23209, '', 0, 'VE-V', 'Zulia', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VE-S', 23209, '', 0, 'VE-S', 'Táchira', 1);
 
--- Provinces Algeria (id country=13)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL01', 1301, '', 0, '', 'Wilaya d''Adrar', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL02', 1301, '', 0, '', 'Wilaya de Chlef', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL03', 1301, '', 0, '', 'Wilaya de Laghouat', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL04', 1301, '', 0, '', 'Wilaya d''Oum El Bouaghi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL05', 1301, '', 0, '', 'Wilaya de Batna', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL06', 1301, '', 0, '', 'Wilaya de Béjaïa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL07', 1301, '', 0, '', 'Wilaya de Biskra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL08', 1301, '', 0, '', 'Wilaya de Béchar', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL09', 1301, '', 0, '', 'Wilaya de Blida', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL11', 1301, '', 0, '', 'Wilaya de Bouira', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL12', 1301, '', 0, '', 'Wilaya de Tamanrasset', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL13', 1301, '', 0, '', 'Wilaya de Tébessa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL14', 1301, '', 0, '', 'Wilaya de Tlemcen', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL15', 1301, '', 0, '', 'Wilaya de Tiaret', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL16', 1301, '', 0, '', 'Wilaya de Tizi Ouzou', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL17', 1301, '', 0, '', 'Wilaya d''Alger', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL18', 1301, '', 0, '', 'Wilaya de Djelfa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL19', 1301, '', 0, '', 'Wilaya de Jijel', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL20', 1301, '', 0, '', 'Wilaya de Sétif	', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL21', 1301, '', 0, '', 'Wilaya de Saïda', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL22', 1301, '', 0, '', 'Wilaya de Skikda', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL23', 1301, '', 0, '', 'Wilaya de Sidi Bel Abbès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL24', 1301, '', 0, '', 'Wilaya d''Annaba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL25', 1301, '', 0, '', 'Wilaya de Guelma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL26', 1301, '', 0, '', 'Wilaya de Constantine', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL27', 1301, '', 0, '', 'Wilaya de Médéa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL28', 1301, '', 0, '', 'Wilaya de Mostaganem', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL29', 1301, '', 0, '', 'Wilaya de M''Sila', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL30', 1301, '', 0, '', 'Wilaya de Mascara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL31', 1301, '', 0, '', 'Wilaya d''Ouargla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL32', 1301, '', 0, '', 'Wilaya d''Oran', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL33', 1301, '', 0, '', 'Wilaya d''El Bayadh', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL34', 1301, '', 0, '', 'Wilaya d''Illizi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL35', 1301, '', 0, '', 'Wilaya de Bordj Bou Arreridj', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL36', 1301, '', 0, '', 'Wilaya de Boumerdès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL37', 1301, '', 0, '', 'Wilaya d''El Tarf', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL38', 1301, '', 0, '', 'Wilaya de Tindouf', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL39', 1301, '', 0, '', 'Wilaya de Tissemsilt', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL40', 1301, '', 0, '', 'Wilaya d''El Oued', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL41', 1301, '', 0, '', 'Wilaya de Khenchela', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL42', 1301, '', 0, '', 'Wilaya de Souk Ahras', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL43', 1301, '', 0, '', 'Wilaya de Tipaza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL44', 1301, '', 0, '', 'Wilaya de Mila', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL45', 1301, '', 0, '', 'Wilaya d''Aïn Defla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL46', 1301, '', 0, '', 'Wilaya de Naâma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL47', 1301, '', 0, '', 'Wilaya d''Aïn Témouchent', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL48', 1301, '', 0, '', 'Wilaya de Ghardaia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('AL49', 1301, '', 0, '', 'Wilaya de Relizane', 1);
-
--- Provinces Maroc (id country=12)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA', 1209, '', 0, '', 'Province de Benslimane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA1', 1209, '', 0, '', 'Province de Berrechid', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA2', 1209, '', 0, '', 'Province de Khouribga', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA3', 1209, '', 0, '', 'Province de Settat', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA4', 1210, '', 0, '', 'Province d''El Jadida', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA5', 1210, '', 0, '', 'Province de Safi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA6', 1210, '', 0, '', 'Province de Sidi Bennour', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA7', 1210, '', 0, '', 'Province de Youssoufia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA6B', 1205, '', 0, '', 'Préfecture de Fès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA7B', 1205, '', 0, '', 'Province de Boulemane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA8', 1205, '', 0, '', 'Province de Moulay Yacoub', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA9', 1205, '', 0, '', 'Province de Sefrou', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA8A', 1202, '', 0, '', 'Province de Kénitra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA9A', 1202, '', 0, '', 'Province de Sidi Kacem', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA10', 1202, '', 0, '', 'Province de Sidi Slimane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA11', 1208, '', 0, '', 'Préfecture de Casablanca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA12', 1208, '', 0, '', 'Préfecture de Mohammédia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA13', 1208, '', 0, '', 'Province de Médiouna', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA14', 1208, '', 0, '', 'Province de Nouaceur', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA15', 1214, '', 0, '', 'Province d''Assa-Zag', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA16', 1214, '', 0, '', 'Province d''Es-Semara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA17A', 1214, '', 0, '', 'Province de Guelmim', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA18', 1214, '', 0, '', 'Province de Tata', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19', 1214, '', 0, '', 'Province de Tan-Tan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA15', 1215, '', 0, '', 'Province de Boujdour', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA16', 1215, '', 0, '', 'Province de Lâayoune', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA17', 1215, '', 0, '', 'Province de Tarfaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA18', 1211, '', 0, '', 'Préfecture de Marrakech', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19', 1211, '', 0, '', 'Province d''Al Haouz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA20', 1211, '', 0, '', 'Province de Chichaoua', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA21', 1211, '', 0, '', 'Province d''El Kelâa des Sraghna', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA22', 1211, '', 0, '', 'Province d''Essaouira', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA23', 1211, '', 0, '', 'Province de Rehamna', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA24', 1206, '', 0, '', 'Préfecture de Meknès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA25', 1206, '', 0, '', 'Province d’El Hajeb', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA26', 1206, '', 0, '', 'Province d''Errachidia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA27', 1206, '', 0, '', 'Province d’Ifrane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA28', 1206, '', 0, '', 'Province de Khénifra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA29', 1206, '', 0, '', 'Province de Midelt', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA30', 1204, '', 0, '', 'Préfecture d''Oujda-Angad', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA31', 1204, '', 0, '', 'Province de Berkane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA32', 1204, '', 0, '', 'Province de Driouch', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA33', 1204, '', 0, '', 'Province de Figuig', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA34', 1204, '', 0, '', 'Province de Jerada', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA35', 1204, '', 0, '', 'Province de Nadorgg', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA36', 1204, '', 0, '', 'Province de Taourirt', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA37', 1216, '', 0, '', 'Province d''Aousserd', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA38', 1216, '', 0, '', 'Province d''Oued Ed-Dahab', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA39', 1207, '', 0, '', 'Préfecture de Rabat', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA40', 1207, '', 0, '', 'Préfecture de Skhirat-Témara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA41', 1207, '', 0, '', 'Préfecture de Salé', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA42', 1207, '', 0, '', 'Province de Khémisset', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA43', 1213, '', 0, '', 'Préfecture d''Agadir Ida-Outanane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA44', 1213, '', 0, '', 'Préfecture d''Inezgane-Aït Melloul', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA45', 1213, '', 0, '', 'Province de Chtouka-Aït Baha', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA46', 1213, '', 0, '', 'Province d''Ouarzazate', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA47', 1213, '', 0, '', 'Province de Sidi Ifni', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA48', 1213, '', 0, '', 'Province de Taroudant', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA49', 1213, '', 0, '', 'Province de Tinghir', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA50', 1213, '', 0, '', 'Province de Tiznit', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA51', 1213, '', 0, '', 'Province de Zagora', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA52', 1212, '', 0, '', 'Province d''Azilal', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA53', 1212, '', 0, '', 'Province de Beni Mellal', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA54', 1212, '', 0, '', 'Province de Fquih Ben Salah', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA55', 1201, '', 0, '', 'Préfecture de M''diq-Fnideq', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA56', 1201, '', 0, '', 'Préfecture de Tanger-Asilah', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA57', 1201, '', 0, '', 'Province de Chefchaouen', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA58', 1201, '', 0, '', 'Province de Fahs-Anjra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA59', 1201, '', 0, '', 'Province de Larache', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA60', 1201, '', 0, '', 'Province d''Ouezzane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA61', 1201, '', 0, '', 'Province de Tétouan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA62', 1203, '', 0, '', 'Province de Guercif', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA63', 1203, '', 0, '', 'Province d''Al Hoceïma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA64', 1203, '', 0, '', 'Province de Taounate', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA65', 1203, '', 0, '', 'Province de Taza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA6A', 1205, '', 0, '', 'Préfecture de Fès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA7A', 1205, '', 0, '', 'Province de Boulemane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA15A', 1214, '', 0, '', 'Province d''Assa-Zag', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA16A', 1214, '', 0, '', 'Province d''Es-Semara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA18A', 1211, '', 0, '', 'Préfecture de Marrakech', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19A', 1214, '', 0, '', 'Province de Tan-Tan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19B', 1214, '', 0, '', 'Province de Tan-Tan', 1);
-
--- Provinces Tunisia (id country=10)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN01', 1001, '', 0, '', 'Ariana', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN02', 1001, '', 0, '', 'Béja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN03', 1001, '', 0, '', 'Ben Arous', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN04', 1001, '', 0, '', 'Bizerte', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN05', 1001, '', 0, '', 'Gabès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN06', 1001, '', 0, '', 'Gafsa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN07', 1001, '', 0, '', 'Jendouba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN08', 1001, '', 0, '', 'Kairouan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN09', 1001, '', 0, '', 'Kasserine', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN10', 1001, '', 0, '', 'Kébili', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN11', 1001, '', 0, '', 'La Manouba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN12', 1001, '', 0, '', 'Le Kef', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN13', 1001, '', 0, '', 'Mahdia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN14', 1001, '', 0, '', 'Médenine', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN15', 1001, '', 0, '', 'Monastir', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN16', 1001, '', 0, '', 'Nabeul', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN17', 1001, '', 0, '', 'Sfax', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN18', 1001, '', 0, '', 'Sidi Bouzid', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN19', 1001, '', 0, '', 'Siliana', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN20', 1001, '', 0, '', 'Sousse', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN21', 1001, '', 0, '', 'Tataouine', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN22', 1001, '', 0, '', 'Tozeur', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN23', 1001, '', 0, '', 'Tunis', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN24', 1001, '', 0, '', 'Zaghouan', 1);
-
--- Provinces Bolivia (id country=52)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('001', 5201, '', 0, '', 'Belisario Boeto', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('002', 5201, '', 0, '', 'Hernando Siles', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('003', 5201, '', 0, '', 'Jaime Zudáñez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('004', 5201, '', 0, '', 'Juana Azurduy de Padilla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('005', 5201, '', 0, '', 'Luis Calvo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('006', 5201, '', 0, '', 'Nor Cinti', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('007', 5201, '', 0, '', 'Oropeza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('008', 5201, '', 0, '', 'Sud Cinti', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('009', 5201, '', 0, '', 'Tomina', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('010', 5201, '', 0, '', 'Yamparáez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('011', 5202, '', 0, '', 'Abel Iturralde', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('012', 5202, '', 0, '', 'Aroma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('013', 5202, '', 0, '', 'Bautista Saavedra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('014', 5202, '', 0, '', 'Caranavi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('015', 5202, '', 0, '', 'Eliodoro Camacho', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('016', 5202, '', 0, '', 'Franz Tamayo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('017', 5202, '', 0, '', 'Gualberto Villarroel', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('018', 5202, '', 0, '', 'Ingaví', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('019', 5202, '', 0, '', 'Inquisivi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('020', 5202, '', 0, '', 'José Ramón Loayza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('021', 5202, '', 0, '', 'Larecaja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('022', 5202, '', 0, '', 'Los Andes (Bolivia)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('023', 5202, '', 0, '', 'Manco Kapac', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('024', 5202, '', 0, '', 'Muñecas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('025', 5202, '', 0, '', 'Nor Yungas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('026', 5202, '', 0, '', 'Omasuyos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('027', 5202, '', 0, '', 'Pacajes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('028', 5202, '', 0, '', 'Pedro Domingo Murillo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('029', 5202, '', 0, '', 'Sud Yungas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('030', 5202, '', 0, '', 'General José Manuel Pando', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('031', 5203, '', 0, '', 'Arani', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('032', 5203, '', 0, '', 'Arque', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('033', 5203, '', 0, '', 'Ayopaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('034', 5203, '', 0, '', 'Bolívar (Bolivia)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('035', 5203, '', 0, '', 'Campero', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('036', 5203, '', 0, '', 'Capinota', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('037', 5203, '', 0, '', 'Cercado (Cochabamba)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('038', 5203, '', 0, '', 'Esteban Arze', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('039', 5203, '', 0, '', 'Germán Jordán', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('040', 5203, '', 0, '', 'José Carrasco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('041', 5203, '', 0, '', 'Mizque', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('042', 5203, '', 0, '', 'Punata', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('043', 5203, '', 0, '', 'Quillacollo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('044', 5203, '', 0, '', 'Tapacarí', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('045', 5203, '', 0, '', 'Tiraque', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('046', 5203, '', 0, '', 'Chapare', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('047', 5204, '', 0, '', 'Carangas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('048', 5204, '', 0, '', 'Cercado (Oruro)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('049', 5204, '', 0, '', 'Eduardo Avaroa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('050', 5204, '', 0, '', 'Ladislao Cabrera', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('051', 5204, '', 0, '', 'Litoral de Atacama', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('052', 5204, '', 0, '', 'Mejillones', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('053', 5204, '', 0, '', 'Nor Carangas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('054', 5204, '', 0, '', 'Pantaleón Dalence', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('055', 5204, '', 0, '', 'Poopó', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('056', 5204, '', 0, '', 'Sabaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('057', 5204, '', 0, '', 'Sajama', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('058', 5204, '', 0, '', 'San Pedro de Totora', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('059', 5204, '', 0, '', 'Saucarí', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('060', 5204, '', 0, '', 'Sebastián Pagador', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('061', 5204, '', 0, '', 'Sud Carangas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('062', 5204, '', 0, '', 'Tomás Barrón', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('063', 5205, '', 0, '', 'Alonso de Ibáñez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('064', 5205, '', 0, '', 'Antonio Quijarro', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('065', 5205, '', 0, '', 'Bernardino Bilbao', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('066', 5205, '', 0, '', 'Charcas (Potosí)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('067', 5205, '', 0, '', 'Chayanta', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('068', 5205, '', 0, '', 'Cornelio Saavedra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('069', 5205, '', 0, '', 'Daniel Campos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('070', 5205, '', 0, '', 'Enrique Baldivieso', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('071', 5205, '', 0, '', 'José María Linares', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('072', 5205, '', 0, '', 'Modesto Omiste', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('073', 5205, '', 0, '', 'Nor Chichas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('074', 5205, '', 0, '', 'Nor Lípez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('075', 5205, '', 0, '', 'Rafael Bustillo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('076', 5205, '', 0, '', 'Sud Chichas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('077', 5205, '', 0, '', 'Sud Lípez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('078', 5205, '', 0, '', 'Tomás Frías', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('079', 5206, '', 0, '', 'Aniceto Arce', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('080', 5206, '', 0, '', 'Burdet O''Connor', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('081', 5206, '', 0, '', 'Cercado (Tarija)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('082', 5206, '', 0, '', 'Eustaquio Méndez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('083', 5206, '', 0, '', 'José María Avilés', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('084', 5206, '', 0, '', 'Gran Chaco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('085', 5207, '', 0, '', 'Andrés Ibáñez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('086', 5207, '', 0, '', 'Caballero', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('087', 5207, '', 0, '', 'Chiquitos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('088', 5207, '', 0, '', 'Cordillera (Bolivia)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('089', 5207, '', 0, '', 'Florida', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('090', 5207, '', 0, '', 'Germán Busch', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('091', 5207, '', 0, '', 'Guarayos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('092', 5207, '', 0, '', 'Ichilo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('093', 5207, '', 0, '', 'Obispo Santistevan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('094', 5207, '', 0, '', 'Sara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('095', 5207, '', 0, '', 'Vallegrande', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('096', 5207, '', 0, '', 'Velasco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('097', 5207, '', 0, '', 'Warnes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('098', 5207, '', 0, '', 'Ángel Sandóval', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('099', 5207, '', 0, '', 'Ñuflo de Chaves', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('100', 5208, '', 0, '', 'Cercado (Beni)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('101', 5208, '', 0, '', 'Iténez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('102', 5208, '', 0, '', 'Mamoré', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('103', 5208, '', 0, '', 'Marbán', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('104', 5208, '', 0, '', 'Moxos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('105', 5208, '', 0, '', 'Vaca Díez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('106', 5208, '', 0, '', 'Yacuma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('107', 5208, '', 0, '', 'General José Ballivián Segurola', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('108', 5209, '', 0, '', 'Abuná', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('109', 5209, '', 0, '', 'Madre de Dios', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('110', 5209, '', 0, '', 'Manuripi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('111', 5209, '', 0, '', 'Nicolás Suárez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('112', 5209, '', 0, '', 'General Federico Román', 1);
\ No newline at end of file
diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index 52d488d3706..ad1fe728ed3 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -278,3 +278,22 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154,
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', 'Sociedad anónima', 1);
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', 'Sociedad en comandita por acciones', 1);
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', 'Sociedad cooperativa', 1);
+
+-- Romania
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18801', 'AFJ - Alte forme juridice', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18802', 'ASF - Asociatie familialã', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18803', 'CON - Concesiune', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18804', 'CRL - Soc civilã profesionala cu pers. juridica si rãspundere limitata (SPRL)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18805', 'INC - Închiriere', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18806', 'LOC - Locaţie de gestiune', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18807', 'OC1 - Organizaţie cooperatistã meşteşugãreascã', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18808', 'OC2 - Organizaţie cooperatistã de consum', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18809', 'OC3 - Organizaţie cooperatistã de credit', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18810', 'PFA - Persoanã fizicã independentã', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18811', 'RA - Regie autonomã', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18812', 'SA - Societate comercialã pe acţiuni', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18813', 'SCS - Societate comercialã în comanditã simplã', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18814', 'SNC - Societate comercialã în nume colectiv', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18815', 'SPI - Societate profesionala practicieni in insolventa (SPPI)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18816', 'SRL - Societate comercialã cu rãspundere limitatã', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (188, '18817', 'URL - Intreprindere profesionala unipersonala cu rãspundere limitata (IPURL)', 1);
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 6192c4c674f..7c44f09620f 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -207,7 +207,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (25
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (254, 25,   '6','0','VAT reduced rate',1); 
 
 -- ROMANIA (id country=188)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1881,188,  '24','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1881,188,  '20','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1882,188,   '9','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1884,188,   '5','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1883,188,   '0','0','VAT Rate 0', 1);

From 8f866254acd80c2fdece7b25458d7aa3be68392e Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 19 Feb 2016 15:47:37 +0100
Subject: [PATCH 237/421] add   model_pdf	fields for edition feature

---
 htdocs/install/mysql/tables/llx_product.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 1f7b7da3c0d..e2ed0a49627 100755
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -81,6 +81,7 @@ create table llx_product
   finished					tinyint      DEFAULT NULL,		-- 1=manufactured product, 0=matiere premiere
   hidden					tinyint      DEFAULT 0,			-- Not used. Deprecated.
   import_key				varchar(14),					-- Import key
+  model_pdf				varchar(255),           -- model save dodument used
   fk_price_expression integer,                     -- Link to the rule for dynamic price calculation
   desiredstock              integer      DEFAULT 0,
   fk_unit					integer      DEFAULT NULL,

From d96c89afa1e96b85f49097a87f791fdaaf7a69cb Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 19 Feb 2016 15:55:59 +0100
Subject: [PATCH 238/421] Update 3.9.0-4.0.0.sql

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

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 2b38f915869..8268d0a0773 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -21,7 +21,7 @@
 -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
-
+ALTER TABLE llx_product ADD COLUMN  model_pdf	varchar(255) default '';
 
 CREATE TABLE llx_categorie_user 
 (

From 6ab8ba1cb1f830081a903d373786ae23e02165d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 16:10:14 +0100
Subject: [PATCH 239/421] Fix sql error

---
 htdocs/install/mysql/tables/llx_societe_remise_except.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
index 3fa57f98624..b02ea94c1f2 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
@@ -35,5 +35,5 @@ create table llx_societe_remise_except
   description			text NOT NULL
   multicurrency_amount_ht	double(24,8) NOT NULL,
   multicurrency_amount_tva	double(24,8) DEFAULT 0 NOT NULL,
-  multicurrency_amount_ttc	double(24,8) DEFAULT 0 NOT NULL,
+  multicurrency_amount_ttc	double(24,8) DEFAULT 0 NOT NULL
 )ENGINE=innodb;

From f8956f785da240bb5d1dcd950bd68cc20fd7f237 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 16:12:39 +0100
Subject: [PATCH 240/421] Fix syntax error

---
 htdocs/install/mysql/tables/llx_societe_remise_except.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
index b02ea94c1f2..ef84e0081d6 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
@@ -32,7 +32,7 @@ create table llx_societe_remise_except
   fk_facture_line		integer,
   fk_facture			integer,
   fk_facture_source		integer,
-  description			text NOT NULL
+  description			text NOT NULL,
   multicurrency_amount_ht	double(24,8) NOT NULL,
   multicurrency_amount_tva	double(24,8) DEFAULT 0 NOT NULL,
   multicurrency_amount_ttc	double(24,8) DEFAULT 0 NOT NULL

From 2177235e29d88e1b6333259ad18a31792d3ee4df Mon Sep 17 00:00:00 2001
From: abcnet-lu <abosserelle.pub+github-abcnet-lu@gmail.com>
Date: Fri, 19 Feb 2016 17:01:51 +0100
Subject: [PATCH 241/421] [Close] [#4657]  BUG: Luxembourg correct professional
 ID "RCS" to display on invoices

---
 htdocs/langs/de_DE/companies.lang | 2 +-
 htdocs/langs/en_US/companies.lang | 2 +-
 htdocs/langs/fr_FR/companies.lang | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 7efd00d61ff..451f4103b57 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Niederlassungsgenehmigung)
 ProfId3LU=-
 ProfId4LU=-
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 588867b1f2f..05348d7d26a 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 7c64149b5bf..0d896a1e048 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Id. prof. 3 (SRVC TAX)
 ProfId4IN=Id. prof. 4
 ProfId5IN=Id. prof. 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Autorisation d'établissement)
 ProfId3LU=-
 ProfId4LU=-

From c07bb2dd5c5406b32265b6a3d2910d326b0a8e5c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 18:51:31 +0100
Subject: [PATCH 242/421] Add translation file for website module

---
 .tx/config                          | 6 +++---
 dev/skeletons/modMyModule.class.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.tx/config b/.tx/config
index b2bc84b5071..c4ec45cd3b2 100644
--- a/.tx/config
+++ b/.tx/config
@@ -356,9 +356,9 @@ source_file = htdocs/langs/en_US/withdrawals.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.websites]
-file_filter = htdocs/langs/<lang>/withdrawals.lang
-source_file = htdocs/langs/en_US/withdrawals.lang
+[dolibarr.website]
+file_filter = htdocs/langs/<lang>/website.lang
+source_file = htdocs/langs/en_US/website.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 3cb86055d0e..36cb8c624a4 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -144,15 +144,15 @@ class modMyModule extends DolibarrModules
 		// 'user'             to add a tab in user view
         $this->tabs = array();
 
-        // Dictionaries
-	    if (! isset($conf->mymodule->enabled))
+		if (! isset($conf->mymodule) || ! isset($conf->mymodule->enabled))
         {
         	$conf->mymodule=new stdClass();
         	$conf->mymodule->enabled=0;
         }
+        
+        // Dictionaries
 		$this->dictionaries=array();
         /* Example:
-        if (! isset($conf->mymodule->enabled)) $conf->mymodule->enabled=0;	// This is to avoid warnings
         $this->dictionaries=array(
             'langs'=>'mylangfile@mymodule',
             'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor

From dbb84601803b743eb28d64cf1df19f8d73820534 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 19:11:31 +0100
Subject: [PATCH 243/421] Fix avoid false warning

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index c4269d159c7..21458e410ae 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -140,7 +140,7 @@ foreach ($modulesdir as $dir)
 				                $objMod = new $modName($db);
 								$modNameLoaded[$modName]=$dir;
 
-    		    		        if (! $objMod->numero > 0)
+    		    		        if (! $objMod->numero > 0 && $modName != 'modUser')
     		            		{
     		         		    	dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
     		            		}

From 00657d3bbec0f21d2e96c3c3030c5edf70850bb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 19:11:54 +0100
Subject: [PATCH 244/421] Fix sql forging error

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

diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 609eabdbc7a..579df4762a0 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -83,7 +83,7 @@ class box_goodcustomers extends ModeleBoxes
 		{
 			
 			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
-			$sql.= " count(*) as nbfact, sum(". $db->if('f.paye=1','1','0').") as nbfactpaye";
+			$sql.= " count(*) as nbfact, sum(". $db->ifsql('f.paye=1','1','0').") as nbfactpaye";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
 			$sql.= ' WHERE s.entity IN ('.getEntity('societe', 1).')';
 			$sql.= ' AND s.rowid = f.fk_soc';

From da284cda8c285a9a81688a7e07ededbb5d9a4381 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 19:20:21 +0100
Subject: [PATCH 245/421] Add category Supplier Relationship Manager

---
 htdocs/admin/modules.php                          | 3 ++-
 htdocs/core/modules/modFournisseur.class.php      | 4 +++-
 htdocs/core/modules/modIncoterm.class.php         | 2 +-
 htdocs/core/modules/modSupplierProposal.class.php | 2 +-
 htdocs/langs/en_US/admin.lang                     | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 21458e410ae..4bb41747ea9 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -47,7 +47,8 @@ $specialtostring=array(0=>'common', 1=>'interfaces', 2=>'other', 3=>'functional'
 $familyinfo=array(
 	'hr'=>array('position'=>'001', 'label'=>$langs->trans("ModuleFamilyHr")),
 	'crm'=>array('position'=>'006', 'label'=>$langs->trans("ModuleFamilyCrm")),
-	'financial'=>array('position'=>'009', 'label'=>$langs->trans("ModuleFamilyFinancial")),
+	'srm'=>array('position'=>'007', 'label'=>$langs->trans("ModuleFamilySrm")),
+    'financial'=>array('position'=>'009', 'label'=>$langs->trans("ModuleFamilyFinancial")),
 	'products'=>array('position'=>'012', 'label'=>$langs->trans("ModuleFamilyProducts")),
 	'projects'=>array('position'=>'015', 'label'=>$langs->trans("ModuleFamilyProjects")),
 	'ecm'=>array('position'=>'018', 'label'=>$langs->trans("ModuleFamilyECM")),
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 1ef3a2bb573..3cf63b6cfb9 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -47,7 +47,9 @@ class modFournisseur extends DolibarrModules
 		$this->db = $db;
 		$this->numero = 40;
 
-		$this->family = "products";
+		// Family can be 'crm','financial','hr','projects','product','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "srm";
 		$this->module_position = 10;
 		// 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));
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index cae4f9ec28f..d7cf118e890 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -51,7 +51,7 @@ class modIncoterm extends DolibarrModules
 		$this->rights_class = 'incoterm';
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		$this->family = "products";
+		$this->family = "srm";
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		$this->description = "Incoterm management";
 		$this->version = 'dolibarr';
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index f38ce9b7f7e..9c249da4dc6 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -49,7 +49,7 @@ class modSupplierProposal extends DolibarrModules
 		$this->db = $db;
 		$this->numero = 1120;
 
-		$this->family = "products";
+		$this->family = "srm";
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		$this->description = "supplier_proposalDESC";
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d7ba4a29678..814279635e8 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work

From 0faebc25ba63c46d8c9f9ae7f09b07ca23e44b33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 19:33:31 +0100
Subject: [PATCH 246/421] Update translations

---
 htdocs/langs/ar_SA/accountancy.lang       |   9 +-
 htdocs/langs/ar_SA/admin.lang             |   8 +-
 htdocs/langs/ar_SA/bills.lang             |  21 +-
 htdocs/langs/ar_SA/boxes.lang             |   4 +-
 htdocs/langs/ar_SA/companies.lang         |   6 +
 htdocs/langs/ar_SA/compta.lang            |   1 +
 htdocs/langs/ar_SA/cron.lang              |   7 +-
 htdocs/langs/ar_SA/languages.lang         |   1 +
 htdocs/langs/ar_SA/mails.lang             |   1 +
 htdocs/langs/ar_SA/main.lang              |  11 +-
 htdocs/langs/ar_SA/products.lang          |   5 +
 htdocs/langs/ar_SA/projects.lang          |   7 +-
 htdocs/langs/ar_SA/receiptprinter.lang    |   2 +
 htdocs/langs/ar_SA/stocks.lang            |   3 +-
 htdocs/langs/ar_SA/supplier_proposal.lang |   1 +
 htdocs/langs/ar_SA/users.lang             |   1 +
 htdocs/langs/bg_BG/accountancy.lang       |   9 +-
 htdocs/langs/bg_BG/admin.lang             |   8 +-
 htdocs/langs/bg_BG/bills.lang             |  21 +-
 htdocs/langs/bg_BG/boxes.lang             |   4 +-
 htdocs/langs/bg_BG/companies.lang         |   6 +
 htdocs/langs/bg_BG/compta.lang            |   1 +
 htdocs/langs/bg_BG/cron.lang              |   7 +-
 htdocs/langs/bg_BG/languages.lang         |   1 +
 htdocs/langs/bg_BG/mails.lang             |   1 +
 htdocs/langs/bg_BG/main.lang              |  11 +-
 htdocs/langs/bg_BG/products.lang          |   5 +
 htdocs/langs/bg_BG/projects.lang          |   7 +-
 htdocs/langs/bg_BG/receiptprinter.lang    |   2 +
 htdocs/langs/bg_BG/stocks.lang            |  31 +-
 htdocs/langs/bg_BG/supplier_proposal.lang |   1 +
 htdocs/langs/bg_BG/users.lang             |   1 +
 htdocs/langs/bn_BD/accountancy.lang       |   9 +-
 htdocs/langs/bn_BD/admin.lang             |   8 +-
 htdocs/langs/bn_BD/bills.lang             |  21 +-
 htdocs/langs/bn_BD/boxes.lang             |   4 +-
 htdocs/langs/bn_BD/companies.lang         |   6 +
 htdocs/langs/bn_BD/compta.lang            |   1 +
 htdocs/langs/bn_BD/cron.lang              |   7 +-
 htdocs/langs/bn_BD/languages.lang         |   1 +
 htdocs/langs/bn_BD/mails.lang             |   1 +
 htdocs/langs/bn_BD/main.lang              |  11 +-
 htdocs/langs/bn_BD/products.lang          |   5 +
 htdocs/langs/bn_BD/projects.lang          |   7 +-
 htdocs/langs/bn_BD/receiptprinter.lang    |   2 +
 htdocs/langs/bn_BD/stocks.lang            |  19 +-
 htdocs/langs/bn_BD/supplier_proposal.lang |   1 +
 htdocs/langs/bn_BD/users.lang             |   1 +
 htdocs/langs/bs_BA/accountancy.lang       |   9 +-
 htdocs/langs/bs_BA/admin.lang             |   8 +-
 htdocs/langs/bs_BA/bills.lang             |  21 +-
 htdocs/langs/bs_BA/boxes.lang             |   4 +-
 htdocs/langs/bs_BA/companies.lang         |   6 +
 htdocs/langs/bs_BA/compta.lang            |   1 +
 htdocs/langs/bs_BA/cron.lang              |   7 +-
 htdocs/langs/bs_BA/languages.lang         |   1 +
 htdocs/langs/bs_BA/mails.lang             |   1 +
 htdocs/langs/bs_BA/main.lang              |  11 +-
 htdocs/langs/bs_BA/products.lang          |   5 +
 htdocs/langs/bs_BA/projects.lang          |   7 +-
 htdocs/langs/bs_BA/receiptprinter.lang    |   2 +
 htdocs/langs/bs_BA/stocks.lang            |  19 +-
 htdocs/langs/bs_BA/supplier_proposal.lang |   1 +
 htdocs/langs/bs_BA/users.lang             |   1 +
 htdocs/langs/ca_ES/accountancy.lang       |  25 +-
 htdocs/langs/ca_ES/admin.lang             |  96 ++++---
 htdocs/langs/ca_ES/agenda.lang            |   4 +-
 htdocs/langs/ca_ES/banks.lang             |   6 +-
 htdocs/langs/ca_ES/bills.lang             |  93 +++---
 htdocs/langs/ca_ES/bookmarks.lang         |   2 +-
 htdocs/langs/ca_ES/boxes.lang             |  54 ++--
 htdocs/langs/ca_ES/categories.lang        |   2 +-
 htdocs/langs/ca_ES/commercial.lang        |   4 +-
 htdocs/langs/ca_ES/companies.lang         | 104 +++----
 htdocs/langs/ca_ES/compta.lang            |  15 +-
 htdocs/langs/ca_ES/contracts.lang         |   8 +-
 htdocs/langs/ca_ES/cron.lang              |  27 +-
 htdocs/langs/ca_ES/deliveries.lang        |   8 +-
 htdocs/langs/ca_ES/errors.lang            |   8 +-
 htdocs/langs/ca_ES/externalsite.lang      |   2 +-
 htdocs/langs/ca_ES/ftp.lang               |   4 +-
 htdocs/langs/ca_ES/holiday.lang           |  14 +-
 htdocs/langs/ca_ES/hrm.lang               |   2 +-
 htdocs/langs/ca_ES/install.lang           |  10 +-
 htdocs/langs/ca_ES/interventions.lang     |   8 +-
 htdocs/langs/ca_ES/languages.lang         |   3 +-
 htdocs/langs/ca_ES/ldap.lang              |   6 +-
 htdocs/langs/ca_ES/mails.lang             |  11 +-
 htdocs/langs/ca_ES/main.lang              |  51 ++--
 htdocs/langs/ca_ES/margins.lang           |   8 +-
 htdocs/langs/ca_ES/members.lang           |  14 +-
 htdocs/langs/ca_ES/oauth.lang             |   2 +-
 htdocs/langs/ca_ES/orders.lang            |  12 +-
 htdocs/langs/ca_ES/other.lang             |  22 +-
 htdocs/langs/ca_ES/paypal.lang            |   2 +-
 htdocs/langs/ca_ES/productbatch.lang      |   2 +-
 htdocs/langs/ca_ES/products.lang          |  43 +--
 htdocs/langs/ca_ES/projects.lang          |  25 +-
 htdocs/langs/ca_ES/propal.lang            |  18 +-
 htdocs/langs/ca_ES/receiptprinter.lang    |   6 +-
 htdocs/langs/ca_ES/resource.lang          |   2 +-
 htdocs/langs/ca_ES/sendings.lang          |   8 +-
 htdocs/langs/ca_ES/sms.lang               |   2 +-
 htdocs/langs/ca_ES/stocks.lang            |  23 +-
 htdocs/langs/ca_ES/supplier_proposal.lang |   9 +-
 htdocs/langs/ca_ES/trips.lang             |   4 +-
 htdocs/langs/ca_ES/users.lang             |   7 +-
 htdocs/langs/ca_ES/withdrawals.lang       |  14 +-
 htdocs/langs/cs_CZ/accountancy.lang       |   9 +-
 htdocs/langs/cs_CZ/admin.lang             |   8 +-
 htdocs/langs/cs_CZ/bills.lang             |  21 +-
 htdocs/langs/cs_CZ/boxes.lang             |   4 +-
 htdocs/langs/cs_CZ/companies.lang         |   6 +
 htdocs/langs/cs_CZ/compta.lang            |   1 +
 htdocs/langs/cs_CZ/cron.lang              |   7 +-
 htdocs/langs/cs_CZ/install.lang           |   4 +-
 htdocs/langs/cs_CZ/languages.lang         |   1 +
 htdocs/langs/cs_CZ/mails.lang             |   1 +
 htdocs/langs/cs_CZ/main.lang              |  11 +-
 htdocs/langs/cs_CZ/products.lang          |   5 +
 htdocs/langs/cs_CZ/projects.lang          |   7 +-
 htdocs/langs/cs_CZ/receiptprinter.lang    |   2 +
 htdocs/langs/cs_CZ/stocks.lang            |  19 +-
 htdocs/langs/cs_CZ/supplier_proposal.lang |   1 +
 htdocs/langs/cs_CZ/users.lang             |   1 +
 htdocs/langs/da_DK/accountancy.lang       |   9 +-
 htdocs/langs/da_DK/admin.lang             |   8 +-
 htdocs/langs/da_DK/bills.lang             |  21 +-
 htdocs/langs/da_DK/boxes.lang             |   4 +-
 htdocs/langs/da_DK/companies.lang         |   6 +
 htdocs/langs/da_DK/compta.lang            |   1 +
 htdocs/langs/da_DK/cron.lang              |   7 +-
 htdocs/langs/da_DK/languages.lang         |   1 +
 htdocs/langs/da_DK/mails.lang             |   1 +
 htdocs/langs/da_DK/main.lang              |  11 +-
 htdocs/langs/da_DK/products.lang          |   5 +
 htdocs/langs/da_DK/projects.lang          |   7 +-
 htdocs/langs/da_DK/receiptprinter.lang    |   2 +
 htdocs/langs/da_DK/stocks.lang            |  19 +-
 htdocs/langs/da_DK/supplier_proposal.lang |   1 +
 htdocs/langs/da_DK/users.lang             |   1 +
 htdocs/langs/de_AT/accountancy.lang       |   2 +
 htdocs/langs/de_AT/companies.lang         |   1 +
 htdocs/langs/de_AT/margins.lang           |   3 +
 htdocs/langs/de_AT/projects.lang          |   1 +
 htdocs/langs/de_CH/accountancy.lang       |   2 +
 htdocs/langs/de_CH/admin.lang             |   1 -
 htdocs/langs/de_CH/bills.lang             |   1 +
 htdocs/langs/de_CH/companies.lang         |   1 +
 htdocs/langs/de_CH/languages.lang         |   1 -
 htdocs/langs/de_CH/main.lang              |   1 +
 htdocs/langs/de_CH/opensurvey.lang        |   4 +
 htdocs/langs/de_CH/projects.lang          |   1 +
 htdocs/langs/de_CH/stocks.lang            |   6 +
 htdocs/langs/de_DE/accountancy.lang       |  25 +-
 htdocs/langs/de_DE/admin.lang             |  20 +-
 htdocs/langs/de_DE/agenda.lang            |   4 +-
 htdocs/langs/de_DE/banks.lang             |  10 +-
 htdocs/langs/de_DE/bills.lang             |  61 ++--
 htdocs/langs/de_DE/boxes.lang             |   4 +-
 htdocs/langs/de_DE/categories.lang        |   2 +-
 htdocs/langs/de_DE/commercial.lang        |   6 +-
 htdocs/langs/de_DE/companies.lang         |   8 +-
 htdocs/langs/de_DE/compta.lang            |   3 +-
 htdocs/langs/de_DE/contracts.lang         |   4 +-
 htdocs/langs/de_DE/cron.lang              |  17 +-
 htdocs/langs/de_DE/deliveries.lang        |   6 +-
 htdocs/langs/de_DE/holiday.lang           |  10 +-
 htdocs/langs/de_DE/hrm.lang               |   2 +-
 htdocs/langs/de_DE/interventions.lang     |   6 +-
 htdocs/langs/de_DE/languages.lang         |   3 +-
 htdocs/langs/de_DE/mails.lang             |   3 +-
 htdocs/langs/de_DE/main.lang              |  25 +-
 htdocs/langs/de_DE/margins.lang           |   6 +-
 htdocs/langs/de_DE/oauth.lang             |   2 +-
 htdocs/langs/de_DE/orders.lang            |   2 +-
 htdocs/langs/de_DE/other.lang             |  10 +-
 htdocs/langs/de_DE/products.lang          |  11 +-
 htdocs/langs/de_DE/projects.lang          |  21 +-
 htdocs/langs/de_DE/propal.lang            |   8 +-
 htdocs/langs/de_DE/receiptprinter.lang    |   2 +
 htdocs/langs/de_DE/sendings.lang          |   2 +-
 htdocs/langs/de_DE/sms.lang               |   2 +-
 htdocs/langs/de_DE/stocks.lang            |   3 +-
 htdocs/langs/de_DE/supplier_proposal.lang |   7 +-
 htdocs/langs/de_DE/trips.lang             |   4 +-
 htdocs/langs/de_DE/users.lang             |   3 +-
 htdocs/langs/el_GR/accountancy.lang       |   9 +-
 htdocs/langs/el_GR/admin.lang             |   8 +-
 htdocs/langs/el_GR/bills.lang             |  21 +-
 htdocs/langs/el_GR/boxes.lang             |   4 +-
 htdocs/langs/el_GR/companies.lang         |   8 +-
 htdocs/langs/el_GR/compta.lang            |   1 +
 htdocs/langs/el_GR/cron.lang              |   7 +-
 htdocs/langs/el_GR/dict.lang              |   4 +-
 htdocs/langs/el_GR/install.lang           |   2 +-
 htdocs/langs/el_GR/languages.lang         |   1 +
 htdocs/langs/el_GR/mails.lang             |   1 +
 htdocs/langs/el_GR/main.lang              |  11 +-
 htdocs/langs/el_GR/other.lang             |   8 +-
 htdocs/langs/el_GR/products.lang          |  75 ++---
 htdocs/langs/el_GR/projects.lang          |   7 +-
 htdocs/langs/el_GR/receiptprinter.lang    |   2 +
 htdocs/langs/el_GR/stocks.lang            |  21 +-
 htdocs/langs/el_GR/supplier_proposal.lang |   1 +
 htdocs/langs/el_GR/users.lang             |   1 +
 htdocs/langs/en_AU/accountancy.lang       |   2 +-
 htdocs/langs/en_AU/admin.lang             |   1 +
 htdocs/langs/en_AU/cron.lang              |   3 +
 htdocs/langs/en_AU/projects.lang          |   1 +
 htdocs/langs/en_CA/accountancy.lang       |   2 +-
 htdocs/langs/en_CA/admin.lang             |   1 +
 htdocs/langs/en_CA/cron.lang              |   3 +
 htdocs/langs/en_CA/projects.lang          |   1 +
 htdocs/langs/en_GB/accountancy.lang       |   2 +-
 htdocs/langs/en_GB/admin.lang             |   1 +
 htdocs/langs/en_GB/cron.lang              |   3 +
 htdocs/langs/en_GB/projects.lang          |   1 +
 htdocs/langs/en_IN/accountancy.lang       |   2 +-
 htdocs/langs/en_IN/admin.lang             |   1 +
 htdocs/langs/en_IN/cron.lang              |   3 +
 htdocs/langs/en_IN/projects.lang          |   1 +
 htdocs/langs/es_AR/accountancy.lang       |   2 +
 htdocs/langs/es_AR/margins.lang           |   3 +
 htdocs/langs/es_AR/projects.lang          |   2 +
 htdocs/langs/es_AR/propal.lang            |   2 +
 htdocs/langs/es_BO/accountancy.lang       |   2 +
 htdocs/langs/es_BO/margins.lang           |   3 +
 htdocs/langs/es_BO/projects.lang          |   2 +
 htdocs/langs/es_BO/propal.lang            |   2 +
 htdocs/langs/es_CL/accountancy.lang       |   2 +
 htdocs/langs/es_CL/margins.lang           |   3 +
 htdocs/langs/es_CL/projects.lang          |   1 +
 htdocs/langs/es_CO/accountancy.lang       |   2 +
 htdocs/langs/es_CO/margins.lang           |   3 +
 htdocs/langs/es_CO/projects.lang          |   2 +
 htdocs/langs/es_CO/propal.lang            |   2 +
 htdocs/langs/es_DO/accountancy.lang       |   2 +
 htdocs/langs/es_DO/margins.lang           |   3 +
 htdocs/langs/es_DO/projects.lang          |   2 +
 htdocs/langs/es_DO/propal.lang            |   2 +
 htdocs/langs/es_ES/accountancy.lang       |  25 +-
 htdocs/langs/es_ES/admin.lang             |  20 +-
 htdocs/langs/es_ES/agenda.lang            |   4 +-
 htdocs/langs/es_ES/bills.lang             |  59 ++--
 htdocs/langs/es_ES/boxes.lang             |   4 +-
 htdocs/langs/es_ES/categories.lang        |   2 +-
 htdocs/langs/es_ES/companies.lang         |   6 +
 htdocs/langs/es_ES/compta.lang            |   3 +-
 htdocs/langs/es_ES/cron.lang              |  17 +-
 htdocs/langs/es_ES/deliveries.lang        |   6 +-
 htdocs/langs/es_ES/holiday.lang           |  10 +-
 htdocs/langs/es_ES/hrm.lang               |   2 +-
 htdocs/langs/es_ES/interventions.lang     |   6 +-
 htdocs/langs/es_ES/languages.lang         |   1 +
 htdocs/langs/es_ES/mails.lang             |   3 +-
 htdocs/langs/es_ES/main.lang              |  23 +-
 htdocs/langs/es_ES/margins.lang           |   6 +-
 htdocs/langs/es_ES/oauth.lang             |   2 +-
 htdocs/langs/es_ES/orders.lang            |   2 +-
 htdocs/langs/es_ES/other.lang             |  10 +-
 htdocs/langs/es_ES/paypal.lang            |   2 +-
 htdocs/langs/es_ES/products.lang          |  11 +-
 htdocs/langs/es_ES/projects.lang          |  21 +-
 htdocs/langs/es_ES/propal.lang            |   8 +-
 htdocs/langs/es_ES/receiptprinter.lang    |   2 +
 htdocs/langs/es_ES/sendings.lang          |   2 +-
 htdocs/langs/es_ES/sms.lang               |   2 +-
 htdocs/langs/es_ES/stocks.lang            |   3 +-
 htdocs/langs/es_ES/supplier_proposal.lang |   7 +-
 htdocs/langs/es_ES/trips.lang             |   4 +-
 htdocs/langs/es_ES/users.lang             |   3 +-
 htdocs/langs/es_MX/accountancy.lang       |   2 +-
 htdocs/langs/es_MX/projects.lang          |   1 +
 htdocs/langs/es_PE/accountancy.lang       |   2 +
 htdocs/langs/es_PE/margins.lang           |   3 +
 htdocs/langs/es_PE/projects.lang          |   2 +
 htdocs/langs/es_PY/accountancy.lang       |   2 +
 htdocs/langs/es_PY/margins.lang           |   3 +
 htdocs/langs/es_PY/projects.lang          |   2 +
 htdocs/langs/es_PY/propal.lang            |   2 +
 htdocs/langs/es_VE/accountancy.lang       |   2 +
 htdocs/langs/es_VE/projects.lang          |   1 +
 htdocs/langs/et_EE/accountancy.lang       |   9 +-
 htdocs/langs/et_EE/admin.lang             |   8 +-
 htdocs/langs/et_EE/bills.lang             |  21 +-
 htdocs/langs/et_EE/boxes.lang             |   4 +-
 htdocs/langs/et_EE/companies.lang         |   6 +
 htdocs/langs/et_EE/compta.lang            |   1 +
 htdocs/langs/et_EE/cron.lang              |   7 +-
 htdocs/langs/et_EE/languages.lang         |   1 +
 htdocs/langs/et_EE/mails.lang             |   1 +
 htdocs/langs/et_EE/main.lang              |  11 +-
 htdocs/langs/et_EE/products.lang          |   5 +
 htdocs/langs/et_EE/projects.lang          |   7 +-
 htdocs/langs/et_EE/receiptprinter.lang    |   2 +
 htdocs/langs/et_EE/stocks.lang            |  19 +-
 htdocs/langs/et_EE/supplier_proposal.lang |   1 +
 htdocs/langs/et_EE/users.lang             |   1 +
 htdocs/langs/eu_ES/accountancy.lang       |   9 +-
 htdocs/langs/eu_ES/admin.lang             |   8 +-
 htdocs/langs/eu_ES/bills.lang             |  21 +-
 htdocs/langs/eu_ES/boxes.lang             |   4 +-
 htdocs/langs/eu_ES/companies.lang         |   6 +
 htdocs/langs/eu_ES/compta.lang            |   1 +
 htdocs/langs/eu_ES/cron.lang              |   7 +-
 htdocs/langs/eu_ES/languages.lang         |   1 +
 htdocs/langs/eu_ES/mails.lang             |   1 +
 htdocs/langs/eu_ES/main.lang              |  11 +-
 htdocs/langs/eu_ES/products.lang          |   5 +
 htdocs/langs/eu_ES/projects.lang          |   7 +-
 htdocs/langs/eu_ES/receiptprinter.lang    |   2 +
 htdocs/langs/eu_ES/stocks.lang            |  19 +-
 htdocs/langs/eu_ES/supplier_proposal.lang |   1 +
 htdocs/langs/eu_ES/users.lang             |   1 +
 htdocs/langs/fa_IR/accountancy.lang       |   9 +-
 htdocs/langs/fa_IR/admin.lang             |   8 +-
 htdocs/langs/fa_IR/bills.lang             |  21 +-
 htdocs/langs/fa_IR/boxes.lang             |   4 +-
 htdocs/langs/fa_IR/companies.lang         |   6 +
 htdocs/langs/fa_IR/compta.lang            |   1 +
 htdocs/langs/fa_IR/cron.lang              |   7 +-
 htdocs/langs/fa_IR/languages.lang         |   1 +
 htdocs/langs/fa_IR/mails.lang             |   1 +
 htdocs/langs/fa_IR/main.lang              |  11 +-
 htdocs/langs/fa_IR/products.lang          |   5 +
 htdocs/langs/fa_IR/projects.lang          |   7 +-
 htdocs/langs/fa_IR/receiptprinter.lang    |   2 +
 htdocs/langs/fa_IR/stocks.lang            |  19 +-
 htdocs/langs/fa_IR/supplier_proposal.lang |   1 +
 htdocs/langs/fa_IR/users.lang             |   1 +
 htdocs/langs/fi_FI/accountancy.lang       |   9 +-
 htdocs/langs/fi_FI/admin.lang             |   8 +-
 htdocs/langs/fi_FI/bills.lang             |  21 +-
 htdocs/langs/fi_FI/boxes.lang             |   4 +-
 htdocs/langs/fi_FI/companies.lang         |   6 +
 htdocs/langs/fi_FI/compta.lang            |   1 +
 htdocs/langs/fi_FI/cron.lang              |   7 +-
 htdocs/langs/fi_FI/languages.lang         |   1 +
 htdocs/langs/fi_FI/mails.lang             |   1 +
 htdocs/langs/fi_FI/main.lang              |  11 +-
 htdocs/langs/fi_FI/products.lang          |   5 +
 htdocs/langs/fi_FI/projects.lang          |   7 +-
 htdocs/langs/fi_FI/receiptprinter.lang    |   2 +
 htdocs/langs/fi_FI/stocks.lang            |  19 +-
 htdocs/langs/fi_FI/supplier_proposal.lang |   1 +
 htdocs/langs/fi_FI/users.lang             |   1 +
 htdocs/langs/fr_BE/accountancy.lang       |   1 +
 htdocs/langs/fr_BE/admin.lang             |   1 +
 htdocs/langs/fr_BE/projects.lang          |   1 +
 htdocs/langs/fr_BE/propal.lang            |   2 +
 htdocs/langs/fr_CA/accountancy.lang       |   2 +
 htdocs/langs/fr_CA/admin.lang             |   1 +
 htdocs/langs/fr_CA/bills.lang             |   1 +
 htdocs/langs/fr_CA/main.lang              |   1 +
 htdocs/langs/fr_CA/projects.lang          |   1 +
 htdocs/langs/fr_CA/propal.lang            |   2 +
 htdocs/langs/fr_CH/accountancy.lang       |   2 +
 htdocs/langs/fr_CH/admin.lang             |   1 +
 htdocs/langs/fr_CH/projects.lang          |   1 +
 htdocs/langs/fr_CH/propal.lang            |   2 +
 htdocs/langs/fr_FR/accountancy.lang       |   9 +-
 htdocs/langs/fr_FR/admin.lang             |  18 +-
 htdocs/langs/fr_FR/bills.lang             |  28 +-
 htdocs/langs/fr_FR/boxes.lang             |   4 +-
 htdocs/langs/fr_FR/companies.lang         |   6 +
 htdocs/langs/fr_FR/compta.lang            |   1 +
 htdocs/langs/fr_FR/cron.lang              |   7 +-
 htdocs/langs/fr_FR/deliveries.lang        |   6 +-
 htdocs/langs/fr_FR/hrm.lang               |   2 +-
 htdocs/langs/fr_FR/interventions.lang     |   6 +-
 htdocs/langs/fr_FR/languages.lang         |   1 +
 htdocs/langs/fr_FR/mails.lang             |   3 +-
 htdocs/langs/fr_FR/main.lang              |  23 +-
 htdocs/langs/fr_FR/orders.lang            |   2 +-
 htdocs/langs/fr_FR/paypal.lang            |   8 +-
 htdocs/langs/fr_FR/printing.lang          |   2 +-
 htdocs/langs/fr_FR/products.lang          |  25 +-
 htdocs/langs/fr_FR/projects.lang          |   7 +-
 htdocs/langs/fr_FR/propal.lang            |   8 +-
 htdocs/langs/fr_FR/receiptprinter.lang    |   2 +
 htdocs/langs/fr_FR/sendings.lang          |   2 +-
 htdocs/langs/fr_FR/sms.lang               |   2 +-
 htdocs/langs/fr_FR/stocks.lang            |   3 +-
 htdocs/langs/fr_FR/supplier_proposal.lang |   7 +-
 htdocs/langs/fr_FR/users.lang             |   1 +
 htdocs/langs/he_IL/accountancy.lang       |   9 +-
 htdocs/langs/he_IL/admin.lang             |   8 +-
 htdocs/langs/he_IL/bills.lang             |  21 +-
 htdocs/langs/he_IL/boxes.lang             |   4 +-
 htdocs/langs/he_IL/companies.lang         |   6 +
 htdocs/langs/he_IL/compta.lang            |   1 +
 htdocs/langs/he_IL/cron.lang              |   7 +-
 htdocs/langs/he_IL/languages.lang         |   1 +
 htdocs/langs/he_IL/mails.lang             |   1 +
 htdocs/langs/he_IL/main.lang              |  11 +-
 htdocs/langs/he_IL/products.lang          |   5 +
 htdocs/langs/he_IL/projects.lang          |   7 +-
 htdocs/langs/he_IL/receiptprinter.lang    |   2 +
 htdocs/langs/he_IL/stocks.lang            |  19 +-
 htdocs/langs/he_IL/supplier_proposal.lang |   1 +
 htdocs/langs/he_IL/users.lang             |   1 +
 htdocs/langs/hr_HR/accountancy.lang       |   9 +-
 htdocs/langs/hr_HR/admin.lang             |   8 +-
 htdocs/langs/hr_HR/bills.lang             |  21 +-
 htdocs/langs/hr_HR/boxes.lang             |   4 +-
 htdocs/langs/hr_HR/companies.lang         |   6 +
 htdocs/langs/hr_HR/compta.lang            |   1 +
 htdocs/langs/hr_HR/cron.lang              |   7 +-
 htdocs/langs/hr_HR/languages.lang         |   1 +
 htdocs/langs/hr_HR/mails.lang             |   1 +
 htdocs/langs/hr_HR/main.lang              |  11 +-
 htdocs/langs/hr_HR/products.lang          |   5 +
 htdocs/langs/hr_HR/projects.lang          |   7 +-
 htdocs/langs/hr_HR/receiptprinter.lang    |   2 +
 htdocs/langs/hr_HR/stocks.lang            |  19 +-
 htdocs/langs/hr_HR/supplier_proposal.lang |   1 +
 htdocs/langs/hr_HR/users.lang             |   1 +
 htdocs/langs/hu_HU/accountancy.lang       |   9 +-
 htdocs/langs/hu_HU/admin.lang             |  18 +-
 htdocs/langs/hu_HU/bills.lang             |  23 +-
 htdocs/langs/hu_HU/boxes.lang             |   4 +-
 htdocs/langs/hu_HU/companies.lang         |   6 +
 htdocs/langs/hu_HU/compta.lang            |   1 +
 htdocs/langs/hu_HU/cron.lang              |   7 +-
 htdocs/langs/hu_HU/languages.lang         |   1 +
 htdocs/langs/hu_HU/mails.lang             |   1 +
 htdocs/langs/hu_HU/main.lang              |  35 ++-
 htdocs/langs/hu_HU/printing.lang          |  14 +-
 htdocs/langs/hu_HU/products.lang          |   7 +-
 htdocs/langs/hu_HU/projects.lang          |   7 +-
 htdocs/langs/hu_HU/receiptprinter.lang    |   2 +
 htdocs/langs/hu_HU/stocks.lang            |  23 +-
 htdocs/langs/hu_HU/supplier_proposal.lang |   1 +
 htdocs/langs/hu_HU/users.lang             |   1 +
 htdocs/langs/id_ID/accountancy.lang       |   9 +-
 htdocs/langs/id_ID/admin.lang             |   8 +-
 htdocs/langs/id_ID/bills.lang             |  21 +-
 htdocs/langs/id_ID/boxes.lang             |   4 +-
 htdocs/langs/id_ID/companies.lang         |   6 +
 htdocs/langs/id_ID/compta.lang            |   1 +
 htdocs/langs/id_ID/cron.lang              |   7 +-
 htdocs/langs/id_ID/languages.lang         |   1 +
 htdocs/langs/id_ID/mails.lang             |   1 +
 htdocs/langs/id_ID/main.lang              |  11 +-
 htdocs/langs/id_ID/products.lang          |   5 +
 htdocs/langs/id_ID/projects.lang          |   7 +-
 htdocs/langs/id_ID/receiptprinter.lang    |   2 +
 htdocs/langs/id_ID/stocks.lang            |  19 +-
 htdocs/langs/id_ID/supplier_proposal.lang |   1 +
 htdocs/langs/id_ID/users.lang             |   1 +
 htdocs/langs/is_IS/accountancy.lang       |   9 +-
 htdocs/langs/is_IS/admin.lang             |   8 +-
 htdocs/langs/is_IS/bills.lang             |  21 +-
 htdocs/langs/is_IS/boxes.lang             |   4 +-
 htdocs/langs/is_IS/companies.lang         |   6 +
 htdocs/langs/is_IS/compta.lang            |   1 +
 htdocs/langs/is_IS/cron.lang              |   7 +-
 htdocs/langs/is_IS/languages.lang         |   1 +
 htdocs/langs/is_IS/mails.lang             |   1 +
 htdocs/langs/is_IS/main.lang              |  11 +-
 htdocs/langs/is_IS/products.lang          |   5 +
 htdocs/langs/is_IS/projects.lang          |   7 +-
 htdocs/langs/is_IS/receiptprinter.lang    |   2 +
 htdocs/langs/is_IS/stocks.lang            |  19 +-
 htdocs/langs/is_IS/supplier_proposal.lang |   1 +
 htdocs/langs/is_IS/users.lang             |   1 +
 htdocs/langs/it_IT/accountancy.lang       |   9 +-
 htdocs/langs/it_IT/admin.lang             |   8 +-
 htdocs/langs/it_IT/bills.lang             |  21 +-
 htdocs/langs/it_IT/boxes.lang             |   4 +-
 htdocs/langs/it_IT/companies.lang         |   6 +
 htdocs/langs/it_IT/compta.lang            |   1 +
 htdocs/langs/it_IT/cron.lang              |   7 +-
 htdocs/langs/it_IT/languages.lang         |   1 +
 htdocs/langs/it_IT/mails.lang             |   1 +
 htdocs/langs/it_IT/main.lang              |  11 +-
 htdocs/langs/it_IT/products.lang          |   5 +
 htdocs/langs/it_IT/projects.lang          |   7 +-
 htdocs/langs/it_IT/receiptprinter.lang    |   2 +
 htdocs/langs/it_IT/stocks.lang            |   3 +-
 htdocs/langs/it_IT/supplier_proposal.lang |   1 +
 htdocs/langs/it_IT/users.lang             |   1 +
 htdocs/langs/ja_JP/accountancy.lang       |   9 +-
 htdocs/langs/ja_JP/admin.lang             |   8 +-
 htdocs/langs/ja_JP/bills.lang             |  21 +-
 htdocs/langs/ja_JP/boxes.lang             |   4 +-
 htdocs/langs/ja_JP/companies.lang         |   6 +
 htdocs/langs/ja_JP/compta.lang            |   1 +
 htdocs/langs/ja_JP/cron.lang              |   7 +-
 htdocs/langs/ja_JP/languages.lang         |   1 +
 htdocs/langs/ja_JP/mails.lang             |   1 +
 htdocs/langs/ja_JP/main.lang              |  11 +-
 htdocs/langs/ja_JP/products.lang          |   5 +
 htdocs/langs/ja_JP/projects.lang          |   7 +-
 htdocs/langs/ja_JP/receiptprinter.lang    |   2 +
 htdocs/langs/ja_JP/stocks.lang            |  19 +-
 htdocs/langs/ja_JP/supplier_proposal.lang |   1 +
 htdocs/langs/ja_JP/users.lang             |   1 +
 htdocs/langs/ka_GE/accountancy.lang       |   9 +-
 htdocs/langs/ka_GE/admin.lang             |   8 +-
 htdocs/langs/ka_GE/bills.lang             |  21 +-
 htdocs/langs/ka_GE/boxes.lang             |   4 +-
 htdocs/langs/ka_GE/companies.lang         |   6 +
 htdocs/langs/ka_GE/compta.lang            |   1 +
 htdocs/langs/ka_GE/cron.lang              |   7 +-
 htdocs/langs/ka_GE/languages.lang         |   1 +
 htdocs/langs/ka_GE/mails.lang             |   1 +
 htdocs/langs/ka_GE/main.lang              |  11 +-
 htdocs/langs/ka_GE/products.lang          |   5 +
 htdocs/langs/ka_GE/projects.lang          |   7 +-
 htdocs/langs/ka_GE/receiptprinter.lang    |   2 +
 htdocs/langs/ka_GE/stocks.lang            |  19 +-
 htdocs/langs/ka_GE/supplier_proposal.lang |   1 +
 htdocs/langs/ka_GE/users.lang             |   1 +
 htdocs/langs/kn_IN/accountancy.lang       |   9 +-
 htdocs/langs/kn_IN/admin.lang             |   8 +-
 htdocs/langs/kn_IN/bills.lang             |  21 +-
 htdocs/langs/kn_IN/boxes.lang             |   4 +-
 htdocs/langs/kn_IN/companies.lang         |   6 +
 htdocs/langs/kn_IN/compta.lang            |   1 +
 htdocs/langs/kn_IN/cron.lang              |   7 +-
 htdocs/langs/kn_IN/languages.lang         |   1 +
 htdocs/langs/kn_IN/mails.lang             |   1 +
 htdocs/langs/kn_IN/main.lang              |  11 +-
 htdocs/langs/kn_IN/products.lang          |   5 +
 htdocs/langs/kn_IN/projects.lang          |   7 +-
 htdocs/langs/kn_IN/receiptprinter.lang    |   2 +
 htdocs/langs/kn_IN/stocks.lang            |  19 +-
 htdocs/langs/kn_IN/supplier_proposal.lang |   1 +
 htdocs/langs/kn_IN/users.lang             |   1 +
 htdocs/langs/ko_KR/accountancy.lang       |   9 +-
 htdocs/langs/ko_KR/admin.lang             |   8 +-
 htdocs/langs/ko_KR/bills.lang             |  21 +-
 htdocs/langs/ko_KR/boxes.lang             |   4 +-
 htdocs/langs/ko_KR/companies.lang         |   6 +
 htdocs/langs/ko_KR/compta.lang            |   1 +
 htdocs/langs/ko_KR/cron.lang              |   7 +-
 htdocs/langs/ko_KR/languages.lang         |   1 +
 htdocs/langs/ko_KR/mails.lang             |   1 +
 htdocs/langs/ko_KR/main.lang              |  11 +-
 htdocs/langs/ko_KR/products.lang          |   5 +
 htdocs/langs/ko_KR/projects.lang          |   7 +-
 htdocs/langs/ko_KR/receiptprinter.lang    |   2 +
 htdocs/langs/ko_KR/stocks.lang            |  19 +-
 htdocs/langs/ko_KR/supplier_proposal.lang |   1 +
 htdocs/langs/ko_KR/users.lang             |   1 +
 htdocs/langs/lo_LA/accountancy.lang       |   9 +-
 htdocs/langs/lo_LA/admin.lang             |   8 +-
 htdocs/langs/lo_LA/bills.lang             |  21 +-
 htdocs/langs/lo_LA/boxes.lang             |   4 +-
 htdocs/langs/lo_LA/companies.lang         |   6 +
 htdocs/langs/lo_LA/compta.lang            |   1 +
 htdocs/langs/lo_LA/cron.lang              |   7 +-
 htdocs/langs/lo_LA/languages.lang         |   1 +
 htdocs/langs/lo_LA/mails.lang             |   1 +
 htdocs/langs/lo_LA/main.lang              |  11 +-
 htdocs/langs/lo_LA/products.lang          |   5 +
 htdocs/langs/lo_LA/projects.lang          |   7 +-
 htdocs/langs/lo_LA/receiptprinter.lang    |   2 +
 htdocs/langs/lo_LA/stocks.lang            |  19 +-
 htdocs/langs/lo_LA/supplier_proposal.lang |   1 +
 htdocs/langs/lo_LA/users.lang             |   1 +
 htdocs/langs/lt_LT/accountancy.lang       |   9 +-
 htdocs/langs/lt_LT/admin.lang             |   8 +-
 htdocs/langs/lt_LT/bills.lang             |  21 +-
 htdocs/langs/lt_LT/boxes.lang             |   4 +-
 htdocs/langs/lt_LT/companies.lang         |   6 +
 htdocs/langs/lt_LT/compta.lang            |   1 +
 htdocs/langs/lt_LT/cron.lang              |   7 +-
 htdocs/langs/lt_LT/languages.lang         |   1 +
 htdocs/langs/lt_LT/mails.lang             |   1 +
 htdocs/langs/lt_LT/main.lang              |  11 +-
 htdocs/langs/lt_LT/products.lang          |   5 +
 htdocs/langs/lt_LT/projects.lang          |   7 +-
 htdocs/langs/lt_LT/receiptprinter.lang    |   2 +
 htdocs/langs/lt_LT/stocks.lang            |  19 +-
 htdocs/langs/lt_LT/supplier_proposal.lang |   1 +
 htdocs/langs/lt_LT/users.lang             |   1 +
 htdocs/langs/lv_LV/accountancy.lang       |   9 +-
 htdocs/langs/lv_LV/admin.lang             |   8 +-
 htdocs/langs/lv_LV/bills.lang             |  21 +-
 htdocs/langs/lv_LV/boxes.lang             |   4 +-
 htdocs/langs/lv_LV/companies.lang         |   6 +
 htdocs/langs/lv_LV/compta.lang            |   1 +
 htdocs/langs/lv_LV/cron.lang              |   7 +-
 htdocs/langs/lv_LV/languages.lang         |   1 +
 htdocs/langs/lv_LV/mails.lang             |   1 +
 htdocs/langs/lv_LV/main.lang              |  11 +-
 htdocs/langs/lv_LV/products.lang          |   5 +
 htdocs/langs/lv_LV/projects.lang          |   7 +-
 htdocs/langs/lv_LV/receiptprinter.lang    |   2 +
 htdocs/langs/lv_LV/stocks.lang            |   3 +-
 htdocs/langs/lv_LV/supplier_proposal.lang |   1 +
 htdocs/langs/lv_LV/users.lang             |   1 +
 htdocs/langs/mk_MK/accountancy.lang       |   9 +-
 htdocs/langs/mk_MK/admin.lang             |   8 +-
 htdocs/langs/mk_MK/bills.lang             |  21 +-
 htdocs/langs/mk_MK/boxes.lang             |   4 +-
 htdocs/langs/mk_MK/companies.lang         |   6 +
 htdocs/langs/mk_MK/compta.lang            |   1 +
 htdocs/langs/mk_MK/cron.lang              |   7 +-
 htdocs/langs/mk_MK/languages.lang         |   1 +
 htdocs/langs/mk_MK/mails.lang             |   1 +
 htdocs/langs/mk_MK/main.lang              |  11 +-
 htdocs/langs/mk_MK/products.lang          |   5 +
 htdocs/langs/mk_MK/projects.lang          |   7 +-
 htdocs/langs/mk_MK/receiptprinter.lang    |   2 +
 htdocs/langs/mk_MK/stocks.lang            |  19 +-
 htdocs/langs/mk_MK/supplier_proposal.lang |   1 +
 htdocs/langs/mk_MK/users.lang             |   1 +
 htdocs/langs/nb_NO/accountancy.lang       |  17 +-
 htdocs/langs/nb_NO/admin.lang             |  20 +-
 htdocs/langs/nb_NO/agenda.lang            |   4 +-
 htdocs/langs/nb_NO/bills.lang             |  53 ++--
 htdocs/langs/nb_NO/boxes.lang             |   4 +-
 htdocs/langs/nb_NO/categories.lang        |   2 +-
 htdocs/langs/nb_NO/companies.lang         |  82 +++---
 htdocs/langs/nb_NO/compta.lang            |   3 +-
 htdocs/langs/nb_NO/cron.lang              |  17 +-
 htdocs/langs/nb_NO/deliveries.lang        |   6 +-
 htdocs/langs/nb_NO/holiday.lang           |  10 +-
 htdocs/langs/nb_NO/hrm.lang               |   2 +-
 htdocs/langs/nb_NO/interventions.lang     |   6 +-
 htdocs/langs/nb_NO/languages.lang         |   3 +-
 htdocs/langs/nb_NO/mails.lang             |   3 +-
 htdocs/langs/nb_NO/main.lang              |  23 +-
 htdocs/langs/nb_NO/margins.lang           |   6 +-
 htdocs/langs/nb_NO/oauth.lang             |   2 +-
 htdocs/langs/nb_NO/orders.lang            |   2 +-
 htdocs/langs/nb_NO/other.lang             |  10 +-
 htdocs/langs/nb_NO/paypal.lang            |   2 +-
 htdocs/langs/nb_NO/products.lang          |  11 +-
 htdocs/langs/nb_NO/projects.lang          |  21 +-
 htdocs/langs/nb_NO/propal.lang            |   8 +-
 htdocs/langs/nb_NO/receiptprinter.lang    |   2 +
 htdocs/langs/nb_NO/sendings.lang          |   2 +-
 htdocs/langs/nb_NO/sms.lang               |   2 +-
 htdocs/langs/nb_NO/stocks.lang            |   3 +-
 htdocs/langs/nb_NO/supplier_proposal.lang |   7 +-
 htdocs/langs/nb_NO/trips.lang             |   4 +-
 htdocs/langs/nb_NO/users.lang             |   3 +-
 htdocs/langs/nl_BE/accountancy.lang       |  54 ++++
 htdocs/langs/nl_BE/banks.lang             |   3 +
 htdocs/langs/nl_BE/bills.lang             |   8 +
 htdocs/langs/nl_BE/boxes.lang             |   2 +
 htdocs/langs/nl_BE/cashdesk.lang          |   2 +
 htdocs/langs/nl_BE/categories.lang        |   2 +
 htdocs/langs/nl_BE/companies.lang         |   7 +
 htdocs/langs/nl_BE/compta.lang            |   6 +
 htdocs/langs/nl_BE/contracts.lang         |   3 +
 htdocs/langs/nl_BE/cron.lang              |   6 +
 htdocs/langs/nl_BE/deliveries.lang        |   5 +
 htdocs/langs/nl_BE/errors.lang            |   6 +
 htdocs/langs/nl_BE/exports.lang           |   3 +
 htdocs/langs/nl_BE/ftp.lang               |   3 +
 htdocs/langs/nl_BE/holiday.lang           |   6 +
 htdocs/langs/nl_BE/hrm.lang               |  17 ++
 htdocs/langs/nl_BE/install.lang           |   2 +
 htdocs/langs/nl_BE/interventions.lang     |  14 +
 htdocs/langs/nl_BE/languages.lang         |   2 +
 htdocs/langs/nl_BE/link.lang              |   2 +
 htdocs/langs/nl_BE/mails.lang             |   7 +
 htdocs/langs/nl_BE/main.lang              |  22 ++
 htdocs/langs/nl_BE/margins.lang           |   5 +
 htdocs/langs/nl_BE/orders.lang            |   4 +
 htdocs/langs/nl_BE/other.lang             |   4 +
 htdocs/langs/nl_BE/sms.lang               |   2 +
 htdocs/langs/nl_BE/supplier_proposal.lang |   6 +
 htdocs/langs/nl_NL/accountancy.lang       |   9 +-
 htdocs/langs/nl_NL/admin.lang             |   8 +-
 htdocs/langs/nl_NL/bills.lang             |  21 +-
 htdocs/langs/nl_NL/boxes.lang             |   4 +-
 htdocs/langs/nl_NL/companies.lang         |   6 +
 htdocs/langs/nl_NL/compta.lang            |   1 +
 htdocs/langs/nl_NL/cron.lang              |   7 +-
 htdocs/langs/nl_NL/languages.lang         |   1 +
 htdocs/langs/nl_NL/mails.lang             |   1 +
 htdocs/langs/nl_NL/main.lang              |  11 +-
 htdocs/langs/nl_NL/products.lang          |   5 +
 htdocs/langs/nl_NL/projects.lang          |   7 +-
 htdocs/langs/nl_NL/receiptprinter.lang    |   2 +
 htdocs/langs/nl_NL/stocks.lang            |  19 +-
 htdocs/langs/nl_NL/supplier_proposal.lang |   1 +
 htdocs/langs/nl_NL/users.lang             |   1 +
 htdocs/langs/pl_PL/accountancy.lang       |   9 +-
 htdocs/langs/pl_PL/admin.lang             |  14 +-
 htdocs/langs/pl_PL/bills.lang             |  21 +-
 htdocs/langs/pl_PL/boxes.lang             |   6 +-
 htdocs/langs/pl_PL/companies.lang         |   6 +
 htdocs/langs/pl_PL/compta.lang            |   1 +
 htdocs/langs/pl_PL/cron.lang              |   7 +-
 htdocs/langs/pl_PL/deliveries.lang        |   2 +-
 htdocs/langs/pl_PL/languages.lang         |   1 +
 htdocs/langs/pl_PL/mails.lang             |   1 +
 htdocs/langs/pl_PL/main.lang              |  11 +-
 htdocs/langs/pl_PL/products.lang          |   5 +
 htdocs/langs/pl_PL/projects.lang          |   7 +-
 htdocs/langs/pl_PL/receiptprinter.lang    |   2 +
 htdocs/langs/pl_PL/stocks.lang            |   3 +-
 htdocs/langs/pl_PL/supplier_proposal.lang |   1 +
 htdocs/langs/pl_PL/users.lang             |   1 +
 htdocs/langs/pt_BR/accountancy.lang       |   1 -
 htdocs/langs/pt_BR/admin.lang             |   1 -
 htdocs/langs/pt_BR/cron.lang              |   2 -
 htdocs/langs/pt_BR/languages.lang         |   2 -
 htdocs/langs/pt_BR/stocks.lang            |   7 -
 htdocs/langs/pt_PT/accountancy.lang       |   9 +-
 htdocs/langs/pt_PT/admin.lang             |   8 +-
 htdocs/langs/pt_PT/bills.lang             |  21 +-
 htdocs/langs/pt_PT/boxes.lang             |   4 +-
 htdocs/langs/pt_PT/companies.lang         |   6 +
 htdocs/langs/pt_PT/compta.lang            |   1 +
 htdocs/langs/pt_PT/cron.lang              |   7 +-
 htdocs/langs/pt_PT/languages.lang         |  11 +-
 htdocs/langs/pt_PT/mails.lang             |   1 +
 htdocs/langs/pt_PT/main.lang              |  11 +-
 htdocs/langs/pt_PT/products.lang          |   5 +
 htdocs/langs/pt_PT/projects.lang          |   7 +-
 htdocs/langs/pt_PT/receiptprinter.lang    |   2 +
 htdocs/langs/pt_PT/stocks.lang            |  27 +-
 htdocs/langs/pt_PT/supplier_proposal.lang |   1 +
 htdocs/langs/pt_PT/users.lang             |   1 +
 htdocs/langs/ro_RO/accountancy.lang       |   9 +-
 htdocs/langs/ro_RO/admin.lang             |   8 +-
 htdocs/langs/ro_RO/bills.lang             |  21 +-
 htdocs/langs/ro_RO/boxes.lang             |   4 +-
 htdocs/langs/ro_RO/companies.lang         |  42 +--
 htdocs/langs/ro_RO/compta.lang            |   1 +
 htdocs/langs/ro_RO/contracts.lang         |   2 +-
 htdocs/langs/ro_RO/cron.lang              |   7 +-
 htdocs/langs/ro_RO/languages.lang         |   1 +
 htdocs/langs/ro_RO/mails.lang             |   1 +
 htdocs/langs/ro_RO/main.lang              |  11 +-
 htdocs/langs/ro_RO/orders.lang            |  10 +-
 htdocs/langs/ro_RO/products.lang          |   5 +
 htdocs/langs/ro_RO/projects.lang          |   7 +-
 htdocs/langs/ro_RO/receiptprinter.lang    |   2 +
 htdocs/langs/ro_RO/stocks.lang            |   3 +-
 htdocs/langs/ro_RO/supplier_proposal.lang |   1 +
 htdocs/langs/ro_RO/users.lang             |   1 +
 htdocs/langs/ru_RU/accountancy.lang       |   9 +-
 htdocs/langs/ru_RU/admin.lang             |   8 +-
 htdocs/langs/ru_RU/bills.lang             |  21 +-
 htdocs/langs/ru_RU/boxes.lang             |   4 +-
 htdocs/langs/ru_RU/companies.lang         |   6 +
 htdocs/langs/ru_RU/compta.lang            |   1 +
 htdocs/langs/ru_RU/cron.lang              |   7 +-
 htdocs/langs/ru_RU/languages.lang         |   1 +
 htdocs/langs/ru_RU/mails.lang             |   1 +
 htdocs/langs/ru_RU/main.lang              |  11 +-
 htdocs/langs/ru_RU/products.lang          |   5 +
 htdocs/langs/ru_RU/projects.lang          |   7 +-
 htdocs/langs/ru_RU/receiptprinter.lang    |   2 +
 htdocs/langs/ru_RU/stocks.lang            |  19 +-
 htdocs/langs/ru_RU/supplier_proposal.lang |   1 +
 htdocs/langs/ru_RU/users.lang             |   1 +
 htdocs/langs/sk_SK/accountancy.lang       |   9 +-
 htdocs/langs/sk_SK/admin.lang             |   8 +-
 htdocs/langs/sk_SK/bills.lang             |  21 +-
 htdocs/langs/sk_SK/boxes.lang             |   4 +-
 htdocs/langs/sk_SK/companies.lang         |   6 +
 htdocs/langs/sk_SK/compta.lang            |   1 +
 htdocs/langs/sk_SK/cron.lang              |   7 +-
 htdocs/langs/sk_SK/languages.lang         |   1 +
 htdocs/langs/sk_SK/mails.lang             |   1 +
 htdocs/langs/sk_SK/main.lang              |  11 +-
 htdocs/langs/sk_SK/products.lang          |   5 +
 htdocs/langs/sk_SK/projects.lang          |   7 +-
 htdocs/langs/sk_SK/receiptprinter.lang    |   2 +
 htdocs/langs/sk_SK/stocks.lang            |  19 +-
 htdocs/langs/sk_SK/supplier_proposal.lang |   1 +
 htdocs/langs/sk_SK/users.lang             |   1 +
 htdocs/langs/sl_SI/accountancy.lang       |   9 +-
 htdocs/langs/sl_SI/admin.lang             |   8 +-
 htdocs/langs/sl_SI/bills.lang             |  21 +-
 htdocs/langs/sl_SI/boxes.lang             |   4 +-
 htdocs/langs/sl_SI/companies.lang         |   6 +
 htdocs/langs/sl_SI/compta.lang            |   1 +
 htdocs/langs/sl_SI/cron.lang              |   7 +-
 htdocs/langs/sl_SI/languages.lang         |   1 +
 htdocs/langs/sl_SI/mails.lang             |   1 +
 htdocs/langs/sl_SI/main.lang              |  11 +-
 htdocs/langs/sl_SI/products.lang          |   5 +
 htdocs/langs/sl_SI/projects.lang          |   7 +-
 htdocs/langs/sl_SI/receiptprinter.lang    |   2 +
 htdocs/langs/sl_SI/stocks.lang            |  19 +-
 htdocs/langs/sl_SI/supplier_proposal.lang |   1 +
 htdocs/langs/sl_SI/users.lang             |   1 +
 htdocs/langs/sq_AL/accountancy.lang       |   9 +-
 htdocs/langs/sq_AL/admin.lang             |   8 +-
 htdocs/langs/sq_AL/bills.lang             |  21 +-
 htdocs/langs/sq_AL/boxes.lang             |   4 +-
 htdocs/langs/sq_AL/companies.lang         |   6 +
 htdocs/langs/sq_AL/compta.lang            |   1 +
 htdocs/langs/sq_AL/cron.lang              |   7 +-
 htdocs/langs/sq_AL/languages.lang         |   1 +
 htdocs/langs/sq_AL/mails.lang             |   1 +
 htdocs/langs/sq_AL/main.lang              |  11 +-
 htdocs/langs/sq_AL/products.lang          |   5 +
 htdocs/langs/sq_AL/projects.lang          |   7 +-
 htdocs/langs/sq_AL/receiptprinter.lang    |   2 +
 htdocs/langs/sq_AL/stocks.lang            |  19 +-
 htdocs/langs/sq_AL/supplier_proposal.lang |   1 +
 htdocs/langs/sq_AL/users.lang             |   1 +
 htdocs/langs/sr_RS/accountancy.lang       | 147 +++++-----
 htdocs/langs/sr_RS/admin.lang             |  32 ++-
 htdocs/langs/sr_RS/agenda.lang            |  94 +++---
 htdocs/langs/sr_RS/banks.lang             | 334 +++++++++++-----------
 htdocs/langs/sr_RS/bills.lang             |  21 +-
 htdocs/langs/sr_RS/boxes.lang             | 196 ++++++-------
 htdocs/langs/sr_RS/cashdesk.lang          |  78 ++---
 htdocs/langs/sr_RS/categories.lang        | 222 +++++++-------
 htdocs/langs/sr_RS/commercial.lang        | 180 ++++++------
 htdocs/langs/sr_RS/companies.lang         |  18 +-
 htdocs/langs/sr_RS/compta.lang            |   3 +-
 htdocs/langs/sr_RS/cron.lang              |  17 +-
 htdocs/langs/sr_RS/deliveries.lang        |   6 +-
 htdocs/langs/sr_RS/exports.lang           |   8 +-
 htdocs/langs/sr_RS/help.lang              |  54 ++--
 htdocs/langs/sr_RS/holiday.lang           |   4 +-
 htdocs/langs/sr_RS/interventions.lang     |   6 +-
 htdocs/langs/sr_RS/languages.lang         | 147 +++++-----
 htdocs/langs/sr_RS/mails.lang             |   3 +-
 htdocs/langs/sr_RS/main.lang              |  23 +-
 htdocs/langs/sr_RS/margins.lang           |   6 +-
 htdocs/langs/sr_RS/orders.lang            |   2 +-
 htdocs/langs/sr_RS/other.lang             |  10 +-
 htdocs/langs/sr_RS/products.lang          |  11 +-
 htdocs/langs/sr_RS/projects.lang          |  21 +-
 htdocs/langs/sr_RS/propal.lang            |   8 +-
 htdocs/langs/sr_RS/sendings.lang          |   2 +-
 htdocs/langs/sr_RS/sms.lang               |   2 +-
 htdocs/langs/sr_RS/stocks.lang            |   3 +-
 htdocs/langs/sr_RS/trips.lang             |   4 +-
 htdocs/langs/sr_RS/users.lang             |   3 +-
 htdocs/langs/sv_SE/accountancy.lang       |   9 +-
 htdocs/langs/sv_SE/admin.lang             |   8 +-
 htdocs/langs/sv_SE/bills.lang             |  21 +-
 htdocs/langs/sv_SE/boxes.lang             |   4 +-
 htdocs/langs/sv_SE/companies.lang         |   6 +
 htdocs/langs/sv_SE/compta.lang            |   1 +
 htdocs/langs/sv_SE/cron.lang              |   7 +-
 htdocs/langs/sv_SE/languages.lang         |   1 +
 htdocs/langs/sv_SE/mails.lang             |   1 +
 htdocs/langs/sv_SE/main.lang              |  11 +-
 htdocs/langs/sv_SE/products.lang          |   5 +
 htdocs/langs/sv_SE/projects.lang          |   7 +-
 htdocs/langs/sv_SE/receiptprinter.lang    |   2 +
 htdocs/langs/sv_SE/stocks.lang            |  19 +-
 htdocs/langs/sv_SE/supplier_proposal.lang |   1 +
 htdocs/langs/sv_SE/users.lang             |   1 +
 htdocs/langs/sw_SW/accountancy.lang       |   9 +-
 htdocs/langs/sw_SW/admin.lang             |   8 +-
 htdocs/langs/sw_SW/bills.lang             |  21 +-
 htdocs/langs/sw_SW/boxes.lang             |   4 +-
 htdocs/langs/sw_SW/companies.lang         |   6 +
 htdocs/langs/sw_SW/compta.lang            |   1 +
 htdocs/langs/sw_SW/cron.lang              |   7 +-
 htdocs/langs/sw_SW/languages.lang         |   1 +
 htdocs/langs/sw_SW/mails.lang             |   1 +
 htdocs/langs/sw_SW/main.lang              |  11 +-
 htdocs/langs/sw_SW/products.lang          |   5 +
 htdocs/langs/sw_SW/projects.lang          |   7 +-
 htdocs/langs/sw_SW/stocks.lang            |  19 +-
 htdocs/langs/sw_SW/users.lang             |   1 +
 htdocs/langs/th_TH/accountancy.lang       |   9 +-
 htdocs/langs/th_TH/admin.lang             |   8 +-
 htdocs/langs/th_TH/bills.lang             |  21 +-
 htdocs/langs/th_TH/boxes.lang             |   4 +-
 htdocs/langs/th_TH/companies.lang         |   6 +
 htdocs/langs/th_TH/compta.lang            |   1 +
 htdocs/langs/th_TH/cron.lang              |   7 +-
 htdocs/langs/th_TH/languages.lang         |   1 +
 htdocs/langs/th_TH/mails.lang             |   1 +
 htdocs/langs/th_TH/main.lang              |  11 +-
 htdocs/langs/th_TH/products.lang          |   5 +
 htdocs/langs/th_TH/projects.lang          |   7 +-
 htdocs/langs/th_TH/receiptprinter.lang    |   2 +
 htdocs/langs/th_TH/stocks.lang            |  19 +-
 htdocs/langs/th_TH/supplier_proposal.lang |   1 +
 htdocs/langs/th_TH/users.lang             |   1 +
 htdocs/langs/tr_TR/accountancy.lang       |  25 +-
 htdocs/langs/tr_TR/admin.lang             |  20 +-
 htdocs/langs/tr_TR/agenda.lang            |   4 +-
 htdocs/langs/tr_TR/bills.lang             |  59 ++--
 htdocs/langs/tr_TR/boxes.lang             |   4 +-
 htdocs/langs/tr_TR/categories.lang        |  10 +-
 htdocs/langs/tr_TR/companies.lang         |   6 +
 htdocs/langs/tr_TR/compta.lang            |   3 +-
 htdocs/langs/tr_TR/cron.lang              |  17 +-
 htdocs/langs/tr_TR/deliveries.lang        |   6 +-
 htdocs/langs/tr_TR/holiday.lang           |  10 +-
 htdocs/langs/tr_TR/hrm.lang               |   2 +-
 htdocs/langs/tr_TR/interventions.lang     |   6 +-
 htdocs/langs/tr_TR/languages.lang         |   3 +-
 htdocs/langs/tr_TR/mails.lang             |   3 +-
 htdocs/langs/tr_TR/main.lang              |  23 +-
 htdocs/langs/tr_TR/margins.lang           |   6 +-
 htdocs/langs/tr_TR/oauth.lang             |   2 +-
 htdocs/langs/tr_TR/orders.lang            |   2 +-
 htdocs/langs/tr_TR/other.lang             |  10 +-
 htdocs/langs/tr_TR/paypal.lang            |   2 +-
 htdocs/langs/tr_TR/products.lang          |  11 +-
 htdocs/langs/tr_TR/projects.lang          |  21 +-
 htdocs/langs/tr_TR/propal.lang            |   8 +-
 htdocs/langs/tr_TR/receiptprinter.lang    |   2 +
 htdocs/langs/tr_TR/sendings.lang          |   2 +-
 htdocs/langs/tr_TR/sms.lang               |   2 +-
 htdocs/langs/tr_TR/stocks.lang            |   3 +-
 htdocs/langs/tr_TR/supplier_proposal.lang |   7 +-
 htdocs/langs/tr_TR/trips.lang             |   4 +-
 htdocs/langs/tr_TR/users.lang             |   3 +-
 htdocs/langs/uk_UA/accountancy.lang       |   9 +-
 htdocs/langs/uk_UA/admin.lang             |   8 +-
 htdocs/langs/uk_UA/bills.lang             |  21 +-
 htdocs/langs/uk_UA/boxes.lang             |   4 +-
 htdocs/langs/uk_UA/companies.lang         |   6 +
 htdocs/langs/uk_UA/compta.lang            |   1 +
 htdocs/langs/uk_UA/cron.lang              |   7 +-
 htdocs/langs/uk_UA/languages.lang         |   1 +
 htdocs/langs/uk_UA/mails.lang             |   1 +
 htdocs/langs/uk_UA/main.lang              |  11 +-
 htdocs/langs/uk_UA/products.lang          |   5 +
 htdocs/langs/uk_UA/projects.lang          |   7 +-
 htdocs/langs/uk_UA/receiptprinter.lang    |   2 +
 htdocs/langs/uk_UA/stocks.lang            |  19 +-
 htdocs/langs/uk_UA/supplier_proposal.lang |   1 +
 htdocs/langs/uk_UA/users.lang             |   1 +
 htdocs/langs/uz_UZ/accountancy.lang       |   9 +-
 htdocs/langs/uz_UZ/admin.lang             |   8 +-
 htdocs/langs/uz_UZ/bills.lang             |  21 +-
 htdocs/langs/uz_UZ/boxes.lang             |   4 +-
 htdocs/langs/uz_UZ/companies.lang         |   6 +
 htdocs/langs/uz_UZ/compta.lang            |   1 +
 htdocs/langs/uz_UZ/cron.lang              |   7 +-
 htdocs/langs/uz_UZ/languages.lang         |   1 +
 htdocs/langs/uz_UZ/mails.lang             |   1 +
 htdocs/langs/uz_UZ/main.lang              |  11 +-
 htdocs/langs/uz_UZ/products.lang          |   5 +
 htdocs/langs/uz_UZ/projects.lang          |   7 +-
 htdocs/langs/uz_UZ/stocks.lang            |  19 +-
 htdocs/langs/uz_UZ/users.lang             |   1 +
 htdocs/langs/vi_VN/accountancy.lang       |   9 +-
 htdocs/langs/vi_VN/admin.lang             |   8 +-
 htdocs/langs/vi_VN/bills.lang             |  21 +-
 htdocs/langs/vi_VN/boxes.lang             |   4 +-
 htdocs/langs/vi_VN/companies.lang         |   6 +
 htdocs/langs/vi_VN/compta.lang            |   1 +
 htdocs/langs/vi_VN/cron.lang              |   7 +-
 htdocs/langs/vi_VN/languages.lang         |   1 +
 htdocs/langs/vi_VN/mails.lang             |   1 +
 htdocs/langs/vi_VN/main.lang              |  11 +-
 htdocs/langs/vi_VN/products.lang          |   5 +
 htdocs/langs/vi_VN/projects.lang          |   7 +-
 htdocs/langs/vi_VN/receiptprinter.lang    |   2 +
 htdocs/langs/vi_VN/stocks.lang            |  19 +-
 htdocs/langs/vi_VN/supplier_proposal.lang |   1 +
 htdocs/langs/vi_VN/users.lang             |   1 +
 htdocs/langs/zh_CN/accountancy.lang       |   9 +-
 htdocs/langs/zh_CN/admin.lang             |  86 +++---
 htdocs/langs/zh_CN/agenda.lang            |   2 +-
 htdocs/langs/zh_CN/bills.lang             |  21 +-
 htdocs/langs/zh_CN/boxes.lang             |   8 +-
 htdocs/langs/zh_CN/cashdesk.lang          |   3 +-
 htdocs/langs/zh_CN/categories.lang        |   2 +-
 htdocs/langs/zh_CN/commercial.lang        |   2 +-
 htdocs/langs/zh_CN/companies.lang         |  52 ++--
 htdocs/langs/zh_CN/compta.lang            |   1 +
 htdocs/langs/zh_CN/cron.lang              |   7 +-
 htdocs/langs/zh_CN/holiday.lang           |   2 +-
 htdocs/langs/zh_CN/install.lang           | 130 ++++-----
 htdocs/langs/zh_CN/languages.lang         |   1 +
 htdocs/langs/zh_CN/loan.lang              |  84 +++---
 htdocs/langs/zh_CN/mails.lang             |   5 +-
 htdocs/langs/zh_CN/main.lang              |  21 +-
 htdocs/langs/zh_CN/members.lang           | 110 +++----
 htdocs/langs/zh_CN/other.lang             |   2 +-
 htdocs/langs/zh_CN/products.lang          |   5 +
 htdocs/langs/zh_CN/projects.lang          |   7 +-
 htdocs/langs/zh_CN/receiptprinter.lang    |   2 +
 htdocs/langs/zh_CN/stocks.lang            |   3 +-
 htdocs/langs/zh_CN/supplier_proposal.lang |   1 +
 htdocs/langs/zh_CN/trips.lang             |   4 +-
 htdocs/langs/zh_CN/users.lang             |   5 +-
 htdocs/langs/zh_TW/accountancy.lang       |   9 +-
 htdocs/langs/zh_TW/admin.lang             |   8 +-
 htdocs/langs/zh_TW/bills.lang             |  21 +-
 htdocs/langs/zh_TW/boxes.lang             |   4 +-
 htdocs/langs/zh_TW/companies.lang         |   6 +
 htdocs/langs/zh_TW/compta.lang            |   1 +
 htdocs/langs/zh_TW/cron.lang              |   7 +-
 htdocs/langs/zh_TW/languages.lang         |   1 +
 htdocs/langs/zh_TW/mails.lang             |   1 +
 htdocs/langs/zh_TW/main.lang              |  11 +-
 htdocs/langs/zh_TW/products.lang          |   5 +
 htdocs/langs/zh_TW/projects.lang          |   7 +-
 htdocs/langs/zh_TW/receiptprinter.lang    |   2 +
 htdocs/langs/zh_TW/stocks.lang            |  19 +-
 htdocs/langs/zh_TW/supplier_proposal.lang |   1 +
 htdocs/langs/zh_TW/users.lang             |   1 +
 1001 files changed, 6280 insertions(+), 2799 deletions(-)
 create mode 100644 htdocs/langs/de_AT/accountancy.lang
 create mode 100644 htdocs/langs/de_AT/margins.lang
 create mode 100644 htdocs/langs/de_CH/accountancy.lang
 create mode 100644 htdocs/langs/de_CH/opensurvey.lang
 create mode 100644 htdocs/langs/en_AU/cron.lang
 create mode 100644 htdocs/langs/en_CA/cron.lang
 create mode 100644 htdocs/langs/en_GB/cron.lang
 create mode 100644 htdocs/langs/en_IN/cron.lang
 create mode 100644 htdocs/langs/es_AR/accountancy.lang
 create mode 100644 htdocs/langs/es_AR/margins.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_BO/accountancy.lang
 create mode 100644 htdocs/langs/es_BO/margins.lang
 create mode 100644 htdocs/langs/es_BO/projects.lang
 create mode 100644 htdocs/langs/es_BO/propal.lang
 create mode 100644 htdocs/langs/es_CL/accountancy.lang
 create mode 100644 htdocs/langs/es_CL/margins.lang
 create mode 100644 htdocs/langs/es_CO/accountancy.lang
 create mode 100644 htdocs/langs/es_CO/margins.lang
 create mode 100644 htdocs/langs/es_CO/projects.lang
 create mode 100644 htdocs/langs/es_CO/propal.lang
 create mode 100644 htdocs/langs/es_DO/accountancy.lang
 create mode 100644 htdocs/langs/es_DO/margins.lang
 create mode 100644 htdocs/langs/es_DO/projects.lang
 create mode 100644 htdocs/langs/es_DO/propal.lang
 create mode 100644 htdocs/langs/es_PE/accountancy.lang
 create mode 100644 htdocs/langs/es_PE/margins.lang
 create mode 100644 htdocs/langs/es_PE/projects.lang
 create mode 100644 htdocs/langs/es_PY/accountancy.lang
 create mode 100644 htdocs/langs/es_PY/margins.lang
 create mode 100644 htdocs/langs/es_PY/projects.lang
 create mode 100644 htdocs/langs/es_PY/propal.lang
 create mode 100644 htdocs/langs/es_VE/accountancy.lang
 create mode 100644 htdocs/langs/fr_BE/propal.lang
 create mode 100644 htdocs/langs/fr_CA/accountancy.lang
 create mode 100644 htdocs/langs/fr_CA/propal.lang
 create mode 100644 htdocs/langs/fr_CH/accountancy.lang
 create mode 100644 htdocs/langs/fr_CH/propal.lang
 create mode 100644 htdocs/langs/nl_BE/accountancy.lang
 create mode 100644 htdocs/langs/nl_BE/banks.lang
 create mode 100644 htdocs/langs/nl_BE/boxes.lang
 create mode 100644 htdocs/langs/nl_BE/cashdesk.lang
 create mode 100644 htdocs/langs/nl_BE/categories.lang
 create mode 100644 htdocs/langs/nl_BE/contracts.lang
 create mode 100644 htdocs/langs/nl_BE/cron.lang
 create mode 100644 htdocs/langs/nl_BE/deliveries.lang
 create mode 100644 htdocs/langs/nl_BE/errors.lang
 create mode 100644 htdocs/langs/nl_BE/exports.lang
 create mode 100644 htdocs/langs/nl_BE/ftp.lang
 create mode 100644 htdocs/langs/nl_BE/holiday.lang
 create mode 100644 htdocs/langs/nl_BE/hrm.lang
 create mode 100644 htdocs/langs/nl_BE/interventions.lang
 create mode 100644 htdocs/langs/nl_BE/languages.lang
 create mode 100644 htdocs/langs/nl_BE/link.lang
 create mode 100644 htdocs/langs/nl_BE/margins.lang
 create mode 100644 htdocs/langs/nl_BE/sms.lang
 create mode 100644 htdocs/langs/nl_BE/supplier_proposal.lang

diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 35ceeb6d475..029b9915fe5 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=حساب محاسبي
 AccountAccountingSuggest=اقتراح حساب محاسبي
 Ventilation=تحليل
 
+MenuAccountancy=Accountancy
 CustomersVentilation=تصنيف العملاء
 SuppliersVentilation=تصنيف الموردين
 TradeMargin=هامش تجاري
@@ -46,7 +47,7 @@ UpdateAccount=تعديل الحساب المحاسبي
 UpdateMvts=تعديل حركة
 WriteBookKeeping=سجل الحسابات في دفتر الأستاذ العام
 Bookkeeping=دفتر الأستاذ العام
-AccountBalanceByMonth=رصيد الحساب خلال الشهر
+AccountBalance=Account balance
 
 AccountingVentilation=المحاسبة التحليلية 
 AccountingVentilationSupplier=المحاسبة التحليلية للمورد
@@ -103,6 +104,7 @@ Code_tiers=الطرف الثالث
 Labelcompte=حساب التسمية
 Sens=Sens
 Codejournal=دفتر اليومية
+NumPiece=Piece number
 
 DelBookKeeping=حذف السجلات من دفتر الأستاذ العام
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=الحركة غير متوازنة\nالدائن =%s\nا
 FicheVentilation=بطاقة الإحلال
 GeneralLedgerIsWritten=العمليات مسجلة في دفتر الاستاذ العام
 
+MvtNotCorrectlyBalanced=الحركة غير متوازنة\nالدائن =%s\nالمدين =%s
+
 ##Export Journal Feature
 ExportFormat=نسق التصدير
 Prefixname=بادئة تصدير الملف
@@ -163,7 +167,8 @@ Type=نوع الحقول
 Param=المعايير الإضافية
 EnabledProduct=في المنتج
 EnabledTiers=In third party
-EnabledVat=في ضريبة القيمة المضافة
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 1be8e2a5b51..d07d6aade76 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -154,6 +154,7 @@ Purge=أحذف
 PurgeAreaDesc=تسمح لك هذه الصفحة بحذف كل الملفات التي بنيت أو تم تخزينها بواسطة دوليبار (الملفات المؤقتة ، أو كافة الملفات في المجلد <b>%s</b>) استخدام هذه الميزة ليست ضرورية. هذه الخدمة مقدمة للمستخدمين الذين يستخدمون برنامج دوليبار على خادم لا يوفر لهم صلاحيات حذف الملفات التي أنشئت من قبل خادم الويب.
 PurgeDeleteLogFile=قم بحذف ملفات السجلات <b>%s</b> المعرفة لنموذج النظام (لا يوجد خطر على المعلومات)
 PurgeDeleteTemporaryFiles=قم بحذف جميع الملفات المؤقتة (لا يوجد خطر على البيانات)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=حذف كل الملفات في المجلد <b>%s</b> الملفات المؤقتة ، بل أيضا ملفات استرجاع قاعدة البيانات, الملفات الملحقة بعناصر (أطراف ثالثة أو خارجية ، فواتير...) وتم تحمليها في نموذج إي سي إم, سيتم حذفها
 PurgeRunNow=إحذف الآن
 PurgeNothingToDelete=لا يوجد دليل أو مجلد للحذف
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=ميزة لإرسال رسائل باستخدام
 TranslationSetup=التكوين دي لا TRADUCTION
 TranslationDesc=اختيار اللغة مرئية على الشاشة يمكن تعديلها: <br> * على الصعيد العالمي من القائمة <strong>الرئيسية - إعداد - عرض</strong> <br> * وبالنسبة للمستخدم فقط من <strong>عرض</strong> التبويب <strong>العضو</strong> من بطاقة المستخدم (اضغط على تسجيل الدخول على أعلى الشاشة).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=إجمالي عدد الوحدات ميزة <b>تنشيط: %s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=يجب على الأقل تمكين 1 وحدة
 ClassNotFoundIntoPathWarning=لم يتم العثور على  %s في مسار PHP
 YesInSummer=نعم في الصيف
@@ -1640,6 +1641,7 @@ CloseFiscalYear=السنة المالية وثيق
 DeleteFiscalYear=حذف السنة المالية
 ConfirmDeleteFiscalYear=هل أنت متأكد من حذف هذه السنة المالية؟
 AlwaysEditable=يمكن دائما أن تعدل
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=إجبار اسم المرئي من التطبيق (تحذير: وضع اسمك هنا قد كسر ميزة تسجيل الدخول التدوين الآلي عند استخدام تطبيقات الهاتف المتحرك DoliDroid)
 NbMajMin=الحد الأدنى لعدد الأحرف الكبيرة
 NbNumMin=الحد الأدنى لعدد الأحرف الرقمية
@@ -1664,7 +1666,7 @@ BackupDumpWizard=المعالج لبناء قاعدة بيانات النسخ ا
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
 SomethingMakeInstallFromWebNotPossible2=لهذا السبب، عملية لترقية وصفت هنا هو دليل على بعد خطوات قليلة يمكن للمستخدم متميز القيام به.
 InstallModuleFromWebHasBeenDisabledByFile=تثبيت وحدة خارجية من التطبيق قد تم تعطيلها من قبل المسؤول. يجب أن يطلب منه إزالة <strong>الملف٪ s</strong> للسماح هذه الميزة.
-ConfFileMuseContainCustom=تركيب وحدة خارجية من التطبيق حفظ الملفات وحدة في <strong>الدليل%s.</strong> أن يكون هذا الدليل معالجتها من قبل Dolibarr، يجب الإعداد <strong>أسيوط / conf.php</strong> لديك الخيار <br> - <strong>$ dolibarr_main_url_root_alt</strong> سكريبت لقيمة <strong>$ dolibarr_main_url_root_alt = "/ حسب الطلب"</strong> <br> - <strong>$ dolibarr_main_document_root_alt</strong> سكريبت لقيمة <strong>"٪ ق / مخصص"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=تسليط الضوء على خطوط الجدول عندما يمر تحرك الماوس فوق
 HighlightLinesColor=تسليط الضوء على لون الخط عند تمرير الماوس فوق (الحفاظ فارغة دون تمييز)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=مثال على الرسالة التي يمك
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP و CRM%s هو متاح. النسخة٪ s هو الإصدار الرئيسي مع الكثير من الميزات الجديدة لكل من المستخدمين والمطورين. يمكنك تحميل البرنامج من منطقة التحميل من http://www.dolibarr.org البوابة (الإصدارات المستقرة دليل فرعي). يمكنك أن تقرأ <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">سجل التغيير</a> للحصول على قائمة كاملة من التغييرات.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP و CRM%s هو متاح. النسخة٪ s هو الحفاظ على الصيغة، لذلك يحتوي فقط على الإصلاحات من البق. نوصي الجميع تستخدم نسخة قديمة للترقية إلى هذا واحد. مثل أي الافراج عن صيانة، لا ملامح جديدة، أو على تغيير بنية البيانات غير موجودة في هذا الإصدار. يمكنك تحميل البرنامج من منطقة التحميل من http://www.dolibarr.org البوابة (الإصدارات المستقرة دليل فرعي). يمكنك أن تقرأ <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">سجل التغيير</a> للحصول على قائمة كاملة من التغييرات.
 MultiPriceRuleDesc=عندما خيار "مستوى العديد من الأسعار لكل المنتجات / الخدمات" في وضع التشغيل، يمكنك تحديد أسعار مختلفة (واحد لكل مستوى الأسعار) لكل منتج. لتوفير الوقت، يمكنك الدخول هنا حكم أن يكون السعر لكل مستوى autocalculated وفقا لسعر المستوى الأول، لذلك سيكون لديك للدخول الثمن الوحيد للمستوى الأول على كل منتج. هذه الصفحة هي هنا لتوفر لك الوقت ويمكن أن تكون مفيدة فقط إذا كانت الأسعار الخاص لكل LEVE قريبة إلى المستوى الأول. يمكنك تجاهل هذه الصفحة في معظم الحالات.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 85348cf3fd2..8ac3a431786 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -58,6 +58,7 @@ Payment=الدفع
 PaymentBack=دفع العودة
 Payments=المدفوعات
 PaymentsBack=عودة المدفوعات
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=تسديدها
 DeletePayment=حذف الدفع
 ConfirmDeletePayment=هل أنت متأكد من أنك تريد حذف هذا المبلغ؟
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=من المقرر أن يسدد العميل
 DisabledBecauseRemainderToPayIsZero=تعطيل بسبب المتبقية غير المدفوعة صفر
 PriceBase=سعر الأساس
 BillStatus=حالة الفاتورة
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=مشروع (لا بد من التحقق من صحة)
 BillStatusPaid=دفع
 BillStatusPaidBackOrConverted=يدفع أو تحويلها إلى الخصم
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=خطأ ، لا يمكن إلغا
 BillFrom=من
 BillTo=مشروع قانون ل
 ActionsOnBill=الإجراءات على فاتورة
+RecurringInvoiceTemplate=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=فاتورة جديدة
 LastBills=آخر الفواتير %s
 LastCustomersBills=%s الماضي فواتير العملاء
@@ -199,6 +205,7 @@ Rest=بانتظار
 AmountExpected=المبلغ المطالب به
 ExcessReceived=تلقى الزائدة
 EscompteOffered=عرض الخصم (الدفع قبل الأجل)
+EscompteOfferedShort=Discount
 SendBillRef=تقديم فاتورة%s
 SendReminderBillRef=تقديم فاتورة%s (تذكير)
 StandingOrders=أوامر دائمة
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=فورا
 PaymentConditionRECEP=فورا
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index 7d138bc7092..a356d8ed94b 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=العقود %s الماضية
 BoxTitleLastModifiedDonations=أخر  %s التبرعات تعديل
 BoxTitleLastModifiedExpenses=أخر  %s  تقارير النفقات المعدلة
 BoxGlobalActivity=النشاط العالمي (الفواتير والمقترحات والطلبات)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=فشل لتحديث تدفق RSS. تاريخ آخر تحديث ناجحا:٪ الصورة
 LastRefreshDate=تاريخ آخر تحديث
 NoRecordedBookmarks=أية إشارات محددة.
@@ -95,4 +97,4 @@ ForCustomersInvoices=عملاء الفواتير
 ForCustomersOrders=أوامر العملاء
 ForProposals=اقتراحات
 LastXMonthRolling=أخر %s متداولة شهريا
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index f0ee9641305..f6f39963c5c 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=معرف البروفيسور 3
 ProfId4IN=معرف البروفيسور 4
 ProfId5IN=الأستاذ رقم 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=الرقم أ. 1 (RC)
 ProfId2MA=الرقم أ. 2 (Patente)
 ProfId3MA=الرقم أ. 3 (إذا)
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index a38ff238c10..3b75b67ac9a 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=تقرير العملاء الأجانب
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=استنادا الى اثنين من الأحرف الأولى من رقم ضريبة القيمة المضافة بأنهم مختلفون عن رمز البلد شركتك الخاصة لل
 SameCountryCustomersWithVAT=تقرير عملاء الوطني
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=استنادا الى اثنين من الأحرف الأولى من رقم ضريبة القيمة المضافة هي نفس رمز البلد شركتك الخاصة لل
+LinkedFichinter=Link to an intervention
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 04e11d87cd1..35e0599264c 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=مفتاح أمان للURL لإطلاق كرون الوظائ
 FileToLaunchCronJobs=سطر الأوامر لإطلاق كرون الوظائف
 CronExplainHowToRunUnix=على بيئة يونكس يجب عليك استخدام دخول كرونتاب التالي لتشغيل سطر الأوامر كل 5 دقائق
 CronExplainHowToRunWin=على مايكروسوفت (TM) ويندوز environement يمكنك استخدام أدوات مهمة مجدولة لتشغيل سطر الأوامر كل 5 دقائق
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=المهام المجدولة
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=بلا
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=إعدام المقبل
-CronDtLastLaunch=آخر إعدام
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=تردد
 CronClass=الصف
 CronMethod=الطريقة
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=تاريخ نهاية لا يمكن أن يكون قبل 
 CronStatusActiveBtn=تمكين
 CronStatusInactiveBtn=يعطل
 CronTaskInactive=تم تعطيل هذه الوظائف
-CronDtLastResult=آخر موعد نتيجة
 CronId=هوية شخصية
 CronClassFile=فصول (filename.class.php)
 CronModuleHelp=اسم Dolibarr وحدة الدليل (يعمل أيضا مع وحدة Dolibarr الخارجية). <BR> لexemple لجلب طريقة الكائن المنتج Dolibarr / htdocs / <u>المنتج</u> /class/product.class.php، وقيمة الوحدة هي <i>المنتج</i>
@@ -89,3 +90,5 @@ CronMenu=كرون
 CronCannotLoadClass=لا يمكن تحميل الطبقة %s أو الكائن %s
 UseMenuModuleToolsToAddCronJobs=الذهاب إلى قائمة "الرئيسية - أدوات الوحدات - قائمة الوظيفي" لرؤية وتعديل المهام المجدولة.
 TaskDisabled=تعطيل وظيفة
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang
index 766daf77c6e..8348514ab56 100644
--- a/htdocs/langs/ar_SA/languages.lang
+++ b/htdocs/langs/ar_SA/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=الإسبانية (المكسيك)
 Language_es_PY=الأسبانية (باراغواي)
 Language_es_PE=الإسبانية (بيرو)
 Language_es_PR=الأسبانية (بورتو ريكو)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=الإستونية
 Language_eu_ES=الباسكي
 Language_fa_IR=اللغة الفارسية
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 51547b388b9..32309a24c90 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=البريد الإلكتروني التحقق من
 MailUnsubcribe=إلغاء الاشتراك
 Unsuscribe=إلغاء الاشتراك
 MailingStatusNotContact=عدم الاتصال بعد الآن
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=البريد الإلكتروني المتلقي فارغة
 WarningNoEMailsAdded=بريد الكتروني جديدة تضاف الى قائمة المتلقي.
 ConfirmValidMailing=هل أنت متأكد أنك تريد إرساله عبر البريد الإلكتروني للتحقق من هذا؟
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 33eb00f16ba..f9196297cc6 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=سعر الوحدة (صافي)
 UnitPriceTTC=سعر الوحدة
 PriceU=إلى أعلى
 PriceUHT=UP (صافي)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=شبكة UP مطلوب
 PriceUTTC=UP (شركة الضريبة)
 Amount=كمية
@@ -321,6 +322,9 @@ AmountTTCShort=المبلغ (المؤتمر الوطني العراقي. الض
 AmountHT=المبلغ (صافية من الضرائب)
 AmountTTC=المبلغ (المؤتمر الوطني العراقي. الضريبية)
 AmountVAT=مبلغ الضريبة
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=مبلغ الضريبة 2
 AmountLT2=مبلغ الضريبة 3
 AmountLT1ES=كمية RE
@@ -335,6 +339,7 @@ Percentage=نسبة مئوية
 Total=الإجمالي الكلي
 SubTotal=حاصل الجمع
 TotalHTShort=المجموع (الصافي)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=إجمالي (شركة الضريبة)
 TotalHT=مجموع (صافي الضريبة)
 TotalHTforthispage=مجموع (صافي الضريبة) لهذه الصفحة
@@ -457,6 +462,7 @@ Datas=البيانات
 None=لا شيء
 NoneF=لا شيء
 Late=متأخر
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=صورة
 Photos=الصور
 AddPhoto=إضافة الصورة
@@ -539,6 +545,7 @@ NbOfCustomers=عدد من العملاء
 NbOfLines=عدد الخطوط
 NbOfObjects=عدد الأجسام
 NbOfReferers=عدد المشيرين
+NbOfObjectReferers=Number of refering objects
 Referers=اشارة الأجسام
 TotalQuantity=الكمية الإجمالية
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=يرتبط اسم مستخدم معين
 DeleteAFile=حذف ملف
 ConfirmDeleteAFile=هل أنت متأكد أنك تريد حذف الملف
 NoResults=لا نتائج
+AdminTools=Admin tools
 SystemTools=ادوات النظام
 ModulesSystemTools=أدوات حدات
 Test=اختبار
@@ -732,7 +740,8 @@ Hello=أهلا
 Sincerely=بإخلاص
 DeleteLine=حذف الخط
 ConfirmDeleteLine=هل أنت متأكد أنك تريد حذف هذا الخط؟
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index f38451a7281..582c71fb6a2 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=زيادة / نقصان الأسهم على التغ
 ComposedProduct=المنتج الفرعي
 MinSupplierPrice=الحد الأدنى لسعر المورد
 DynamicPriceConfiguration=التكوين سعر ديناميكي
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=المتغيرات العالمية
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=updaters متغير العالمية
 GlobalVariableUpdaterType0=البيانات JSON
 GlobalVariableUpdaterHelp0=يوزع البيانات JSON من URL محددة، تحدد قيمة الموقع من القيمة ذات الصلة،
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=سعر افتراضي، السعر ال
 WarningSelectOneDocument=يرجى تحديد وثيقة واحدة على الأقل
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index c5e2d64a36d..d39d5e63eee 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -5,6 +5,7 @@ ProjectId=رقم المشروع
 ProjectLabel=تسمية المشروع
 Project=المشروع
 Projects=المشاريع
+ProjectsArea=Projects Area
 ProjectStatus=حالة المشروع
 SharedProject=مشاريع مشتركة
 PrivateProject=اتصالات من المشروع
@@ -19,7 +20,7 @@ TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمه
 TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
 AllTaskVisibleButEditIfYouAreAssigned=جميع المهام لهذا المشروع واضحة، ولكن يمكنك إدخال الوقت فقط لمهمة تم تعيينك على. تعيين مهمة لك إذا كنت تريد أن تدخل من الوقت على ذلك.
 OnlyYourTaskAreVisible=فقط المهام الموكلة لك على مرئية. تعيين مهمة لك إذا كنت تريد أن تدخل من الوقت على ذلك.
-ProjectsArea=مشاريع المنطقة
+ProjectsArea=Projects Area
 NewProject=مشروع جديد
 AddProject=إنشاء مشروع
 DeleteAProject=حذف مشروع
@@ -67,6 +68,7 @@ Activities=المهام والأنشطة
 MyActivity=نشاط بلدي
 MyActivities=بلدي المهام والأنشطة
 MyProjects=بلدي المشاريع
+MyProjectsArea=My projects Area
 DurationEffective=فعالة لمدة
 Progress=تقدم
 ProgressDeclared=أعلن التقدم
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=المهمة الموكلة. يجب دخول الوقت
 IdTaskTime=الوقت مهمة معرف
 YouCanCompleteRef=إذا كنت ترغب في استكمال المرجع مع بعض المعلومات (لاستخدامه بمثابة مرشحات البحث)، وريكومانديد لإضافة - شخصية لفصلها، وبالتالي فإن الترقيم التلقائي سوف لا تزال تعمل بشكل صحيح للمشاريع المقبلة. على سبيل المثال٪ S-ABC. قد تفضل أيضا لإضافة مفاتيح البحث في التسمية.
 OpenedProjectsByThirdparties=مشاريع افتتحه thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=فرص المبلغ الإجمالي
 OpportunityPonderatedAmount=كمية الفرص المرجحة
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/ar_SA/receiptprinter.lang b/htdocs/langs/ar_SA/receiptprinter.lang
index 96e1ee8f4b8..079905513b9 100644
--- a/htdocs/langs/ar_SA/receiptprinter.lang
+++ b/htdocs/langs/ar_SA/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=طابعة٪ الصورة بإضافة
 PrinterUpdated=طابعة%s تجديد
 PrinterDeleted=طابعة٪ الصورة حذفها
 TestSentToPrinter=اختبار المرسلة إلى الطابعة٪ الصورة
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=إعداد الطابعات
 ReceiptPrinterTemplateDesc=إعداد قوالب
 ReceiptPrinterTypeDesc=وصف نوع استلام الطابعة
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index d364f753a9d..a88d2c750c6 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=التحركات الأخيرة
 Units=الوحدات
 Unit=وحدة
 StockCorrection=تصحيح الأوراق المالية
-StockTransfer=حركة الأسهم
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=حركة الأسهم
 StockMovements=تحركات الأسهم
 LabelMovement=تسمية الحركة
diff --git a/htdocs/langs/ar_SA/supplier_proposal.lang b/htdocs/langs/ar_SA/supplier_proposal.lang
index 328f2c3ffc8..66c89f5237c 100644
--- a/htdocs/langs/ar_SA/supplier_proposal.lang
+++ b/htdocs/langs/ar_SA/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=طلب السعر
 CommRequests=طلبات الأسعار
 SearchRequest=العثور على الطلب
 DraftRequests=مشروع طلبات
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=مشاركة الصورة٪ طلبات تعديل السعر
 RequestsOpened=طلبات السعر المفتوحة
 SupplierProposalArea=منطقة مقترحات المورد
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index fe8afd4b406..05478b406be 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=استخدام هوية OpenID للدخول
 WeeklyHours=الساعات الأسبوعية
 ColorUser=اللون المستخدم
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 1010bc09c58..eb87905874f 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Трета страна
 Labelcompte=Етикет на сметка
 Sens=Sens
 Codejournal=Дневник
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Формат за Експорт
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Тип на полетата
 Param=Допълнителни параметри
 EnabledProduct=В Продукт
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 809a97e8669..9b1d7e2ab12 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -154,6 +154,7 @@ Purge=Изчистване
 PurgeAreaDesc=Тази страница ви позволява да изтриете всички файлове, които са построени или съхраняват от Dolibarr (временни файлове, или всички файлове в <b>%s</b> директория). Използването на тази функция не е необходимо. Тя е предвидена за потребители, чиито Dolibarr се хоства от доставчик, който не предлага разрешения за изтриване на файлове, построени от уеб сървъра.
 PurgeDeleteLogFile=Изтриване на влезете файлове <b>%s,</b> определени за Syslog модул (без риск от загуба на данни)
 PurgeDeleteTemporaryFiles=Изтриване на всички временни файлове (без риск от загуба на данни)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Изтриване на всички файлове в директорията <b>%s.</b> Временни файлове, но също така и резервната база данни сметища, файлове, прикрепени към елементи (контрагенти, фактури, ...) и качени в модул ECM ще бъдат изтрити.
 PurgeRunNow=Изчистване сега
 PurgeNothingToDelete=Директория или файл да изтриете.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Конфигурация на превода
 TranslationDesc=Езика на интерфейса може да бъде променен:<br> * Глобално от менюто <strong>Начало - Настройки - Екран</strong> <br> * Само за потребителя от таба <strong>Изглед</strong> в картата на потребителя (кликнете върху потребителското име в горната част на екрана).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Общия брой на активираните модули е: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Трябва да даде възможност на най-малко 1 модул
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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=Цвят за подчертаване на линията, когато мишката мине отгоре (оставете празно за без подчертаване)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=Когато опция "Няколко нива за цени на продукт/услуга" е активирана, можете да определите различни цени (по една на ниво) за всеки продукт. За да спестите време, можете да въведете правило тук да имате цена за всяко ниво автоматично изчислена спрямо цената на първо ниво, така ще трябва да въведете само цена за първо ниво на всеки продукт. Тази страница, за да пести времето ви и може да бъде полезна само ако вашите цени за всяко ниво са относителни спрямо първото ниво. Можете да игнорирате тази страница в повечето случаи.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index ae63c28d14d..ba75fdbbd0f 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -58,6 +58,7 @@ Payment=Плащане
 PaymentBack=Обратно плащане
 Payments=Плащания
 PaymentsBack=Обратни плащания
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Платено обратно
 DeletePayment=Изтрий плащане
 ConfirmDeletePayment=Сигурен ли сте, че искате да изтриете това плащане?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Дължимото плащане на клиента
 DisabledBecauseRemainderToPayIsZero=Деактивирано понеже остатъка за плащане е нула
 PriceBase=Базова цена
 BillStatus=Статус на фактурата
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Чернова (трябва да се валидира)
 BillStatusPaid=Платена
 BillStatusPaidBackOrConverted=Платена или превърната в отстъпка
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Грешка, не може да
 BillFrom=От
 BillTo=За
 ActionsOnBill=Действия по фактура
+RecurringInvoiceTemplate=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=Нова фактура
 LastBills=Последните %s фактури
 LastCustomersBills=Последните %s продажни фактури
@@ -199,6 +205,7 @@ Rest=Чакаща
 AmountExpected=Претендирана сума
 ExcessReceived=Получено превишение
 EscompteOffered=Предложена отстъпка (плащане преди срока)
+EscompteOfferedShort=Discount
 SendBillRef=Изпращане на фактура %s
 SendReminderBillRef=Изпращане на фактура %s (напомняне)
 StandingOrders=Стоящи поръчки
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Веднага
 PaymentConditionRECEP=Веднага
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index 63703865c52..6462171bad6 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Последните %s договори
 BoxTitleLastModifiedDonations=Последните %s променени дарения
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Обща активност (фактури, предложения, поръчки)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Неуспешно опресняване на RSS поток. Последното успешно опресняване е на дата: %s
 LastRefreshDate=Последна промяна дата
 NoRecordedBookmarks=Няма дефинирани отметки.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Клиента фактури
 ForCustomersOrders=Клиентски поръчки
 ForProposals=Предложения
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 0ad11123283..4914c4e326e 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 5250c2a0866..a4c290ee1ab 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index cf1ebf3be08..6d47a2787ee 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Защитен ключ на URL за зареждане на c
 FileToLaunchCronJobs=Команден ред за изпъление на cron задача
 CronExplainHowToRunUnix=В Unix среда би трябвало да използвате следния crontab ред за изпълнение на командния ред на всеки 5 минути
 CronExplainHowToRunWin=В Microsoft(tm)-ска среда може да използвате инструментите за планирани задачи, за да се изпълни командния ред на всеки 5 минути
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Планирани задачи
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Няма
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Следващо изпълнение
-CronDtLastLaunch=Последно изпълнение
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Честота
 CronClass=Клас
 CronMethod=Метод
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Крайната дата не може да бъде пр
 CronStatusActiveBtn=Активирайте
 CronStatusInactiveBtn=Деактивирай
 CronTaskInactive=Тази задача е неактивирана
-CronDtLastResult=Последна дата на резултат
 CronId=Id
 CronClassFile=Класове (filename.class.php)
 CronModuleHelp=Име на Dolibarr модулна директория (работи също така с външен Dolibarr модул).<BR> Например, за да издърпате метод на обект Dolibarr Product /htdocs/<u>product</u>/class/product.class.php, стойността на модула е <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Крон (софтуер за изпънение на автомати
 CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s
 UseMenuModuleToolsToAddCronJobs=Върнете се в меню "Начало - Модулни инструменти - Списък задачи", за да видите и редактирате планираните задачи.
 TaskDisabled=Неактивирани задачи
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang
index 596f4e9d37e..d943b5f54c5 100644
--- a/htdocs/langs/bg_BG/languages.lang
+++ b/htdocs/langs/bg_BG/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Испански (Мексико)
 Language_es_PY=Испански (Парагвай)
 Language_es_PE=Испански (Перу)
 Language_es_PR=Испански (Пуерто Рико)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Естонски
 Language_eu_ES=Баска
 Language_fa_IR=Персийски
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 8fa8a3791af..a09977e1de1 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Имейл валидирани
 MailUnsubcribe=Отписване
 Unsuscribe=Отписване
 MailingStatusNotContact=Не се свържете с повече
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Email получателят е празна
 WarningNoEMailsAdded=Няма нови имейл, за да добавите към списъка на получателя.
 ConfirmValidMailing=Сигурен ли сте, че искате да проверите това електронната поща?
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 1c786f4154c..7549ef4b08e 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Единична цена (нето)
 UnitPriceTTC=Единична цена
 PriceU=Ед.ц.
 PriceUHT=Ед.ц. (нето)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=Ед.ц. (с данък)
 Amount=Сума
@@ -321,6 +322,9 @@ AmountTTCShort=Сума (с данък)
 AmountHT=Сума (без данък)
 AmountTTC=Сума (с данък)
 AmountVAT=Сума на данък
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Сума на данък 2
 AmountLT2=Сума на данък 3
 AmountLT1ES=Сума на RE
@@ -335,6 +339,7 @@ Percentage=Процент
 Total=Общо
 SubTotal=Междинна сума
 TotalHTShort=Общо (нето)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Общо (с данък)
 TotalHT=Общо (без данък)
 TotalHTforthispage=Общо (без данък) за тази страница
@@ -457,6 +462,7 @@ Datas=Данни
 None=Няма
 NoneF=Няма
 Late=Закъснели
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Снимка
 Photos=Снимки
 AddPhoto=Добавяне на снимка
@@ -539,6 +545,7 @@ NbOfCustomers=Брой на клиентите
 NbOfLines=Брой на редовете
 NbOfObjects=Брой на обектите
 NbOfReferers=Брой на референти
+NbOfObjectReferers=Number of refering objects
 Referers=Референтни обекти
 TotalQuantity=Общо количество
 DateFromTo=От %s до %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Свързано с контакт на потребите
 DeleteAFile=Изтриване на файл
 ConfirmDeleteAFile=Сигурни ли сте, че желаете да изтриете файл
 NoResults=Няма резултати
+AdminTools=Admin tools
 SystemTools=Системни инструменти
 ModulesSystemTools=Модулни инструменти
 Test=Тест
@@ -732,7 +740,8 @@ Hello=Здравейте
 Sincerely=Искрено
 DeleteLine=Изтриване на линия
 ConfirmDeleteLine=Сигурни ли сте, че искате да изтриете тази линия ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 3d7aeb676ab..c7df6127b9b 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Увеличаване/Намаляване на на
 ComposedProduct=Под-продукт
 MinSupplierPrice=Минимална цена на доставчика
 DynamicPriceConfiguration=Конфигурация на динамична цена
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Глобални променливи
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Обновители на глобални променливи
 GlobalVariableUpdaterType0=JSON информация
 GlobalVariableUpdaterHelp0=Обработва JSON информация от URL, СТОЙНОСТ определя мястото на съответната стойност,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Цена по подразбиране,
 WarningSelectOneDocument=Моля изберете поне един документ
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 63fb20e4508..4ce66f0ac14 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Id на проект
 ProjectLabel=Етикет на проект
 Project=Проект
 Projects=Проекти
+ProjectsArea=Projects Area
 ProjectStatus=Статус на проект
 SharedProject=Всички
 PrivateProject=Контакти на проекта
@@ -19,7 +20,7 @@ TasksPublicDesc=Този възглед представя всички прое
 TasksDesc=Този възглед представя всички проекти и задачи (потребителски разрешения ви даде разрешение да видите всичко).
 AllTaskVisibleButEditIfYouAreAssigned=Всички задачи за такъв проект са видими, но можете да въвеждате време само за задача, към която сте причислен. Причислете задача към себе си ако искате да въведете време за нея.
 OnlyYourTaskAreVisible=Само задачи, към които сте причислен са видими. Причислете задача към себе си ако искате да въведете време за нея
-ProjectsArea=Проекти област
+ProjectsArea=Projects Area
 NewProject=Нов проект
 AddProject=Създаване на проект
 DeleteAProject=Изтриване на проект
@@ -67,6 +68,7 @@ Activities=Задачите / дейностите
 MyActivity=Моята дейност
 MyActivities=Моите задачи / дейности
 MyProjects=Моите проекти
+MyProjectsArea=My projects Area
 DurationEffective=Ефективната продължителност
 Progress=Напредък
 ProgressDeclared=Деклариране прогрес
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Задачата е възложена. Въвеждан
 IdTaskTime=Ид. време на задача
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Отворени проекти от трети лица
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/bg_BG/receiptprinter.lang b/htdocs/langs/bg_BG/receiptprinter.lang
index ebaed371e79..49ef41d3754 100644
--- a/htdocs/langs/bg_BG/receiptprinter.lang
+++ b/htdocs/langs/bg_BG/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Принтер %s е добавен
 PrinterUpdated=Принтер %s е обновен
 PrinterDeleted=Принтер %s е изтрит
 TestSentToPrinter=Тестово изпращане към Принтер %s
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Настройка на принтери
 ReceiptPrinterTemplateDesc=Настройка на Шаблони
 ReceiptPrinterTypeDesc=Описание на типа на Квитанцовия Принтер
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 5d3f2fc9302..7419dec5772 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Складове
 NewWarehouse=Нов склад
 WarehouseEdit=Промяна на склад
 MenuNewWarehouse=Нов склад
-WarehouseOpened=Warehouse open
+WarehouseOpened=Складът е отворен
 WarehouseClosed=Склада е затворен
 WarehouseSource=Изпращащ склад
 WarehouseSourceNotDefined=Няма зададен склад,
@@ -16,7 +16,7 @@ CancelSending=Отмяна на изпращане
 DeleteSending=Изтриване на изпращане
 Stock=Наличност
 Stocks=Наличности
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Движение
 Movements=Движения
 ErrorWarehouseRefRequired=Изисква се референтно име на склад
@@ -34,9 +34,10 @@ LastMovements=Последни движения
 Units=Единици
 Unit=Единица
 StockCorrection=Промяна на наличност
-StockTransfer=Складов трансфер
-StockMovement=Трансфер
-StockMovements=Складови трансфери
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Етикет на движението
 NumberOfUnit=Брой единици
 UnitPurchaseValue=Единична покупна цена
@@ -53,8 +54,8 @@ QtyDispatched=Брой изпратени
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Правило за намаляване на управление на запасите
-RuleForStockManagementIncrease=Правило за увеличаване на управление на запасите
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Намаляване реалните запаси на клиентите фактури / кредитни известия за валидиране
 DeStockOnValidateOrder=Намаляване реалните запаси на клиентите за валидиране на поръчката
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -66,14 +67,14 @@ OrderStatusNotReadyToDispatch=Поръчка все още не е или не 
 StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
 NoPredefinedProductToDispatch=Няма предварително определени продукти за този обект. Така че не се изисква експедиция в състав.
 DispatchVerb=Изпращане
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Количество за предупреждение
+StockLimit=Минимално количество за предупреждение
 PhysicalStock=Факт. наличност
 RealStock=Реална наличност
 VirtualStock=Вирт. наличност
 MininumStock=Мин. наличност
 StockUp=Запасяване
-MininumStockShort=Stock min
+MininumStockShort=Минимална наличност
 StockUpShort=Запасяване
 IdWarehouse=Id на склад
 DescWareHouse=Описание на склад
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Средна входна цена
 AverageUnitPricePMP=Средна изходна цена
 SellPriceMin=Единична продажна цена
-EstimatedStockValueSellShort=Стойност за продажба
-EstimatedStockValueSell=Стойност за Продажба
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Входна стойност наличност
 EstimatedStockValue=Входна стойност наличност
 DeleteAWarehouse=Изтриване на склад
@@ -95,8 +96,8 @@ SelectWarehouseForStockDecrease=Изберете склад, да се изпо
 SelectWarehouseForStockIncrease=Изберете склад, да се използва за увеличение на склад
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Поръчки чакат за приеми
-DesiredStock=Desired minimum stock
-DesiredMaxStock=Desired maximum stock
+DesiredStock=Желано минимално количество
+DesiredMaxStock=Желано максимално количество
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
@@ -113,7 +114,7 @@ AlertOnly= Само известия
 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=За този склад
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Попълване
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
diff --git a/htdocs/langs/bg_BG/supplier_proposal.lang b/htdocs/langs/bg_BG/supplier_proposal.lang
index 3bd5c8dfee4..0d9cfa97677 100644
--- a/htdocs/langs/bg_BG/supplier_proposal.lang
+++ b/htdocs/langs/bg_BG/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Запитване за цена
 CommRequests=Запитвания за цени
 SearchRequest=Намиране на запитване
 DraftRequests=Чернови на запитвания
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Последни %s редактирани запитвания за цени
 RequestsOpened=Отваряне на запитване за цена
 SupplierProposalArea=Зона предложения от доставчици
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index b310aa4a2d1..88f777c9c69 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Използвай OpenID за вход
 WeeklyHours=Часове седмично
 ColorUser=Цвят на потребителя
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 9cff117f74a..deca56bf2c1 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index a4f919a6f49..e67ad0ade2d 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang
index 27b533c3f2d..bda34ce2299 100644
--- a/htdocs/langs/bn_BD/languages.lang
+++ b/htdocs/langs/bn_BD/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
 Language_fa_IR=Persian
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 4afa461226b..abc26865694 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/bn_BD/receiptprinter.lang b/htdocs/langs/bn_BD/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/bn_BD/receiptprinter.lang
+++ b/htdocs/langs/bn_BD/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/bn_BD/supplier_proposal.lang b/htdocs/langs/bn_BD/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/bn_BD/supplier_proposal.lang
+++ b/htdocs/langs/bn_BD/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 9d6ac45ef88..bca48ce78c7 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index b921ec4c8a6..4baec526e4b 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Izbrišite sve fajlove u datoteci <b>%s</b>. Privremeni fajlovi, ali i dump backup-a baze podataka, fajlova vezanih za elemenata (trećim strankama, fakturama, ...) i dodani u ECM modul, će biti izbrisani.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index ca6955081f4..fbb137b5a51 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -58,6 +58,7 @@ Payment=Uplata
 PaymentBack=Povrat uplate
 Payments=Uplate
 PaymentsBack=Povrat uplata
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Uplaćeno nazad
 DeletePayment=Obriši uplatu
 ConfirmDeletePayment=Jeste li sigurni da želite obrisati ovu uplatu?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Price base
 BillStatus=Status fakture
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Uzorak (Potrebna je potvrda)
 BillStatusPaid=Plaćeno
 BillStatusPaidBackOrConverted=Plaćeno ili pretvoreno u popust
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na fakturi
+RecurringInvoiceTemplate=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=Nova faktura
 LastBills=Zadnjih %s faktura
 LastCustomersBills=Zadnjih %s faktura kupca
@@ -199,6 +205,7 @@ Rest=Čekanje
 AmountExpected=Iznos za potraživati
 ExcessReceived=Višak primljen
 EscompteOffered=Popust ponuđen (uplata prije roka)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Trajni nalozi
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Odmah
 PaymentConditionRECEP=Odmah
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index f7ebb6d1b4d..85a59dd9e17 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Zadnjih %s ugovora
 BoxTitleLastModifiedDonations=Zadnjih %s izmijenjenih donacija
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Globalne aktivnosti (fakture, prijedlozi, narudžbe)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Neuspjelo osvježavanje RSS protoka. Datum zadnjeg uspješnog osvježavanja: %s
 LastRefreshDate=Zadnji datum osvježavanja
 NoRecordedBookmarks=Nema definisanih bookmark-a.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Fakture kupaca
 ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index ca6e538c678..a942b8c5864 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 3c2c4b23166..791fe8fb992 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index d649cf9381f..4d2aa6401c5 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Sigurnosni ključ za URL za pokretanje cron poslova
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Ništa
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Sljedeće izvršenje
-CronDtLastLaunch=Zadnje izvršenje
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Metoda
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Datum završetka ne može biti prije datuma početka
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Datum zadnjeg rezultata
 CronId=ID
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Ne može se otvoriti klada %s ili objekat %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/bs_BA/languages.lang b/htdocs/langs/bs_BA/languages.lang
index 0e53f29b6be..ad46a2f30f6 100644
--- a/htdocs/langs/bs_BA/languages.lang
+++ b/htdocs/langs/bs_BA/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Španjolski (Meksiko)
 Language_es_PY=Španjolski (Paragvaj)
 Language_es_PE=Španjolski (Peru)
 Language_es_PR=Španjolski (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonski
 Language_eu_ES=Baskijski
 Language_fa_IR=Persijski
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index e1b8ae0ccaa..958257b9410 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-pošta uspješno potvrđena
 MailUnsubcribe=Ispisati se
 Unsuscribe=Ispisati se
 MailingStatusNotContact=Nemoj kontaktirati više
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Primalac e-pošte je prazan
 WarningNoEMailsAdded=Nema nove e-pošte za dodati na listu primaoca.
 ConfirmValidMailing=Jeste li sigurni da želite potvrditi ovu e-poštu?
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index c6bb459ee2f..d7622933cff 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 4d934cc6080..e9d62a6044c 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 6cd98e8d7eb..9dc4d9e9eb2 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projekti
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Zajednički projekti
 PrivateProject=Kontakti za projekte
@@ -19,7 +20,7 @@ TasksPublicDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete 
 TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Područje za projekte
+ProjectsArea=Projects Area
 NewProject=Novi projekat
 AddProject=Create project
 DeleteAProject=Obisati projekat
@@ -67,6 +68,7 @@ Activities=Zadaci/aktivnosti
 MyActivity=Moja aktivnost
 MyActivities=Moji zadaci/aktivnosti
 MyProjects=Moji projekti
+MyProjectsArea=My projects Area
 DurationEffective=Efektivno trajanje
 Progress=Napredak
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/bs_BA/receiptprinter.lang b/htdocs/langs/bs_BA/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/bs_BA/receiptprinter.lang
+++ b/htdocs/langs/bs_BA/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 11fe5e2302b..3736433015f 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Poništi slanje
 DeleteSending=Obriši slanje
 Stock=Zaliha
 Stocks=Zalihe
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Kretanje
 Movements=Kretanja
 ErrorWarehouseRefRequired=Referentno ime skladište je potrebno
@@ -34,9 +34,10 @@ LastMovements=Zadnja kretanja
 Units=Jedinice
 Unit=Jedinica
 StockCorrection=Ispravi zalihu
-StockTransfer=Transfer zalihe
-StockMovement=Transfer
-StockMovements=Transfer zaliha
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Oznaka za kretanje
 NumberOfUnit=Broj jedinica
 UnitPurchaseValue=Kupovna cijena jedinice
@@ -53,8 +54,8 @@ QtyDispatched=Otpremljena količina
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Otpremanje zaliha
-RuleForStockManagementDecrease=Pravilo za upravljanje smanjenja zaliha
-RuleForStockManagementIncrease=Pravilo za upravljanje povećanja zaliha
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Smanji stvarne zalihe nakon potvrđivanja narudžbe kupca
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Ponderirani prosjek ulazne cijene
 AverageUnitPricePMP=Ponderirani prosjek ulazne cijene
 SellPriceMin=Prodajna cijena jedinice
-EstimatedStockValueSellShort=Prodajna vrijednost
-EstimatedStockValueSell=Prodajna vrijednost
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Procijenjena vrijednost zaliha
 EstimatedStockValue=Procijenjena vrijednost zaliha
 DeleteAWarehouse=Obrisati skladište
@@ -113,7 +114,7 @@ AlertOnly= Samo uzbune
 WarehouseForStockDecrease=Skladište <b>%s</b> će biti korišteno za smanjenje zalihe
 WarehouseForStockIncrease=Skladište <b>%s</b> će biti korišteno za povećanje zalihe
 ForThisWarehouse=Za ovo skladište
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Nadopune
 NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda (%s)
diff --git a/htdocs/langs/bs_BA/supplier_proposal.lang b/htdocs/langs/bs_BA/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/bs_BA/supplier_proposal.lang
+++ b/htdocs/langs/bs_BA/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index b81241776d0..9d974a9473a 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Koristiti OpenID za login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index cd5b19abb49..e94cf78fdbb 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Compte comptable
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Desglossament
 
+MenuAccountancy=Comptabilitat
 CustomersVentilation=Desglossament de clients
 SuppliersVentilation=Desglossament de proveïdors
 TradeMargin=Marge comercial
@@ -46,7 +47,7 @@ UpdateAccount=Modificació d'un compte comptable
 UpdateMvts=Modificació d'un moviment
 WriteBookKeeping=Registre de comptabilitat en el llibre major
 Bookkeeping=Llibre major
-AccountBalanceByMonth=Balanç comptable per mes
+AccountBalance=Account balance
 
 AccountingVentilation=Desglossament de comptabilitat
 AccountingVentilationSupplier=Desglossament de comptabilitat de proveïdor
@@ -103,6 +104,7 @@ Code_tiers=Tercer
 Labelcompte=Etiqueta de compte
 Sens=Significat
 Codejournal=Diari
+NumPiece=Número de peça
 
 DelBookKeeping=Eliminar els registres del llibre major
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Moviment no balancejat correctament. Crèdit = %s. Dèbi
 FicheVentilation=Desglossament de targetes
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Moviment no balancejat correctament. Crèdit = %s. Dèbit = %s
+
 ##Export Journal Feature
 ExportFormat=Format d'exportació
 Prefixname=Prefix del fitxer d'exportació
@@ -162,13 +166,14 @@ Headername=Nom en la capçalera
 Type=Tipus de camps
 Param=Paràmetres addicionals
 EnabledProduct=En producte
-EnabledTiers=In third party
-EnabledVat=En IVA
+EnabledTiers=En el tercer
+EnabledVat=En CIF/NIF
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+InitAccountancy=Inicialitza la comptabilitat
+InitAccountancyDesc=Aquesta pàgina es pot utilitzar per inicialitzar un compte comptable en productes i serveis que no tenen compte comptable definit per compres i vendes. Comprova abans que la configuració del mòdul de comptabilitat està completada.
+Options=Opcions
+OptionModeProductSell=En mode vendes
+OptionModeProductBuy=En mode compres
+OptionModeProductSellDesc=Mostra tots els productes sense compte comptable definit per vendes.
+OptionModeProductBuyDesc=Mostra tots els productes sense compte comptable definit per compres.
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index adda06f227c..3dc8b373900 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -3,7 +3,7 @@ Foundation=Entitat
 Version=Versió
 VersionProgram=Versió programa
 VersionLastInstall=Versió instal·lació inicial
-VersionLastUpgrade=Versió última actualització
+VersionLastUpgrade=Versió de l'última actualització
 VersionExperimental=Experimental
 VersionDevelopment=Desenvolupament
 VersionUnknown=Desconeguda
@@ -14,8 +14,8 @@ FilesUpdated=Arxius actualitzats
 FileCheckDolibarr=Comproveu arxius de Dolibarr
 XmlNotFound=Arxiu XML de Dolibarr no trobat
 SessionId=ID de sessió
-SessionSaveHandler=Modalitat de salvaguardat de sessions
-SessionSavePath=Localització salvaguardat de sessions
+SessionSaveHandler=Modalitat de desar sessions
+SessionSavePath=Emmagatzema la localització de les sessions
 PurgeSessions=Purga de sessions
 ConfirmPurgeSessions=Esteu segur de voler purgar totes les sessions? Desconnectarà a tots els usuaris (excepte a si mateix)
 NoSessionListWithThisHandler=El gestor de període de sessions configurat en la seva PHP no enumera les sessions en curs
@@ -30,25 +30,25 @@ HTMLCharset=Codificació de les pàgines HTML
 DBStoringCharset=Codificació base de dades per emmagatzematge de dades
 DBSortingCharset=Codificació base de dades per classificar les dades
 WarningModuleNotActive=Mòdul <b>%s</b> no actiu
-WarningOnlyPermissionOfActivatedModules=Atenció, només els permisos relacionats amb els mòduls activats s'indiquen aquí. Activar els altres mòduls a la pàgina Configuració->Mòduls
+WarningOnlyPermissionOfActivatedModules=Aquí només es mostren els permisos relacionats amb els mòduls activats. Pots activar altres mòduls en la pàgina Inici->Configuració->Mòduls.
 DolibarrSetup=Instal·lació/Actualització de Dolibarr
 DolibarrUser=Usuari Dolibarr
 InternalUser=Usuari intern
 ExternalUser=Usuari extern
 InternalUsers=Usuaris interns
 ExternalUsers=Usuaris externs
-GlobalSetup=General
+GlobalSetup=Configuracuó general
 GUISetup=Entorn
 SetupArea=Àrea configuració
 FormToTestFileUploadForm=Formulari de prova de càrrega de fitxer (segons opcions escollides)
 IfModuleEnabled=Nota: sí només és eficaç si el mòdul <b>%s</b> està activat
 RemoveLock=Esborreu el fitxer <b>%s</b>, si existeix, per permetre la utilitat d'actualització.
 RestoreLock=Substituir un arxiu <b>%s</b>, donant-li només drets de lectura a aquest arxiu per tal de prohibir noves actualitzacions.
-SecuritySetup=Configuració de la seguretat
+SecuritySetup=Configuració de seguretat
 ErrorModuleRequirePHPVersion=Error, aquest mòdul requereix una versió %s o superior de PHP
 ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s o superior de Dolibarr
 ErrorDecimalLargerThanAreForbidden=Error, les precisions superiors a <b>%s</b> no estan suportades.
-DictionarySetup=Diccionaris
+DictionarySetup=Configuració de Diccionari
 Dictionary=Diccionaris
 Chartofaccounts=Pla comptable
 Fiscalyear=Anys fiscals
@@ -63,7 +63,7 @@ UseSearchToSelectContactTooltip=També si vostè té un gran número de tercers
 UseSearchToSelectContact=Utilitzeu els camps de autocompletat per triar contactes (en lloc d'utilitzar un quadre de llista).
 DelaiedFullListToSelectCompany=Esperar que pressioni una tecla abans de carregar el contingut dels tercers en el combo (Això pot incrementar el rendiment si té un gran número de tercers)
 DelaiedFullListToSelectContact=Esperar que pressioni un tecla abans de carregar el contingut dels contactes en el combo (Això pot incrementar el rendiment si té un gran número de contactes)
-SearchFilter=Opcions filtres de cerca
+SearchFilter=Opcions de filtres de cerca
 NumberOfKeyToSearch=Nombre de caràcters per a desencadenar la cerca: %s
 ViewFullDateActions=Veure les dades de les accions en la seva totalitat en la fitxa de tercer
 NotAvailableWhenAjaxDisabled=No disponible quan Ajax estigui desactivat
@@ -96,8 +96,8 @@ AntiVirusCommandExample= Exemple per a ClamWin: c:\\Program Files (x86)\\ClamWin
 AntiVirusParam= Paràmetres complementaris en la línia de comandes
 AntiVirusParamExample= Exemple per a ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuració del mòdul Comptabilitat
-UserSetup=Configuració gestió dels usuaris
-MenuSetup=Administració dels menús per base de dades
+UserSetup=Configuració de gestió d'usuaris
+MenuSetup=Configuració de gestió de menús
 MenuLimits=Límits i precisió
 MenuIdParent=Id del menú pare
 DetailMenuIdParent=IDr del menú pare (buit per a un menú superior)
@@ -107,9 +107,9 @@ AllMenus=Tots
 NotConfigured=No configurat
 Activation=Activació
 Active=Actiu
-SetupShort=Config
+SetupShort=Configuració
 OtherOptions=Altres opcions
-OtherSetup=Varis
+OtherSetup=Altres configuracions
 CurrentValueSeparatorDecimal=Separador decimal
 CurrentValueSeparatorThousand=eparador milers
 Destination=Destinació
@@ -128,8 +128,8 @@ ClientTZ=Zona horària client (usuari)
 ClientHour=Hora client (usuari)
 OSTZ=Zona horària Servidor SO
 PHPTZ=Zona horària Servidor PHP
-PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons)
-ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons)
+PHPServerOffsetWithGreenwich=Mida offset del servidor PHP Greenwich (segons)
+ClientOffsetWithGreenwich=Mida offset del client/navegador Greenwich (segons)
 DaylingSavingTime=Horari d'estiu (usuari)
 CurrentHour=Hora PHP (servidor)
 CompanyTZ=Zona horària empresa (empresa principal)
@@ -154,9 +154,10 @@ Purge=Purga
 PurgeAreaDesc=Aquesta pàgina li permet eliminar tots els arxius creats o guardats per Dolibarr (arxius temporals o tots els fitxers de la carpeta <b>%s</b>). L'ús d'aquesta funció no és necessària. Es dóna per als usuaris que alberguen Dolibarr en un servidor que no ofereix els permisos d'eliminació d'arxius salvaguardat pel servidor web.
 PurgeDeleteLogFile=Esborrar el fitxer log <b>%s</b> definit pel mòdul Syslog (no hi ha risc de pèrdua de dades)
 PurgeDeleteTemporaryFiles=Eliminar tots els arxius temporals (sense risc de pèrdua de dades)
+PurgeDeleteTemporaryFilesShort=Elimina els fitxers temporals
 PurgeDeleteAllFilesInDocumentsDir=Eliminar tots els fitxers de la carpeta <b>%s</b>. Arxius temporals i arxius adjunts a elements (tercers, factures, etc.) Seran eliminats.
 PurgeRunNow=Purgar
-PurgeNothingToDelete=Cap carpeta a eliminar
+PurgeNothingToDelete=No hi ha cap carpeta o fitxer per eliminar.
 PurgeNDirectoriesDeleted=<b>%s</b> arxius o carpetes eliminats
 PurgeAuditEvents=Purgar els esdeveniments de seguretat
 ConfirmPurgeAuditEvents=Esteu segur de voler porgar la llista dels esdeveniments d'auditoria de seguretat. S'esborrarà tota la llista, però això no afecta les seves dades?
@@ -201,7 +202,7 @@ IgnoreDuplicateRecords=Ignorar els errors de duplicació (INSERT IGNORE)
 AutoDetectLang=Autodetecció (navegador)
 FeatureDisabledInDemo=Opció deshabilitada en demo
 Rights=Permisos
-BoxesDesc=Els panells són petites zones d'informació que hi ha en algunes pàgines. Pot triar activar o desactivar un panell fent clic a 'Activar', o fent click al cubell d'escombraries per desactivar. Només es mostren els panells relacionades amb un <a href="modules.php"> mòdul </a> actiu.
+BoxesDesc=Els panells són petites zones d'informació que hi ha en algunes pàgines. Pots activar o desactivar un panell fent clic a 'Activar', o fent clic al cubell d'escombraries per desactivar.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
 ModulesDesc=Els mòduls Dolibarr defineixen les funcionalitats disponibles en l'aplicació. Alguns mòduls requereixen drets que hauran d'indicar als usuaris perquè puguin accedir a les seves funcionalitats.
 ModulesInterfaceDesc=Els mòduls de interface són mòduls que permeten vincular Dolibarr amb sistemes, aplicacions o serveis externs.
@@ -278,7 +279,7 @@ FeatureNotAvailableOnLinux=Funcionalitat no disponible en sistemes Unix. Proveu
 SubmitTranslationENUS=Si la traducció d'aquest idioma no està completa o trobes errors, pots corregir-ho editant els arxius en el directori<b>langs/%s</b> i enviant els arxius modificats al fòrum de www.dolibarr.es o pels desenvolupadors a github.com/Dolibarr/dolibarr.
 SubmitTranslation=Si la traducció d'aquest idioma no està completa o trobes errors, pots corregir-ho editant els arxius en el directori<b>langs/%s</b> i enviant els canvis a www.transifex.com/dolibarr-association/dolibarr/
 ModuleSetup=Configuració del mòdul
-ModulesSetup=configuració dels mòduls
+ModulesSetup=Configuració dels mòduls
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestió client (CRM)
 ModuleFamilyProducts=Gestió de productes (PM)
@@ -294,7 +295,7 @@ ModuleFamilyInterface=Interfícies amb sistemes externs
 MenuHandlers=Gestors de menú
 MenuAdmin=Editor de menú
 DoNotUseInProduction=No utilitzar en producció
-ThisIsProcessToFollow=Heus aquí el procediment a seguir:
+ThisIsProcessToFollow=Aquesta és la configuració del procés:
 ThisIsAlternativeProcessToFollow=Aquesta es una configuració alternativa per processar:
 StepNb=Pas %s
 FindPackageFromWebSite=Cercar el paquet que respon a la seva necessitat (per exemple en el lloc web %s)
@@ -306,7 +307,7 @@ InfDirAlt=Des de la versió 3 és possible definir un directori root alternatiu,
 InfDirExample=<br>Seguidament es declara a l'arxiu conf.php:<br> $dolibarr_main_url_root_alt='http://miservidor/custom'<br>$dolibarr_main_document_root_alt='/directorio/de/dolibarr/htdocs/custom'<br>*Aquestes línies venen comentades amb un "#", per descomentar-les només cal retirar el caràcter.
 YouCanSubmitFile=Per aquest pas, pots enviar el paquet utilitzant aquesta utilitat: Selecciona el fitxer del mòdul
 CurrentVersion=Versió actual de Dolibarr
-CallUpdatePage=Trucar a la pàgina d'actualització de l'estructura i dades de la base de dades %s.
+CallUpdatePage=Ves a la pàgina d'actualització de dades i  estructura de base de dades: %s.
 LastStableVersion=Última versió estable
 UpdateServerOffline=Actualitzacións del servidor fora de línia
 GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara, pot utilitzar les següents etiquetes:<br><b>{000000}</b> correspon a un número que s'incrementa en cadascun %s. Introduïu tants zeros com longuitud desitgi mostrar. El comptador es completarà a partir de zeros per l'esquerra per tal de tenir tants zeros com la màscara. <br><b>{000000+000}</b>Igual que l'anterior, amb una compensació corresponent al número a la dreta del signe + s'aplica a partir del primer %s.<br><b>{000000@x}</b>igual que l'anterior, però el comptador es restableix a zero quan s'arriba a x mesos (x entre 1 i 12). Si aquesta opció s'utilitza i x és de 2 o superior, llavors la seqüència {yy}{mm} ó {yyyy}{mm} també és necessària.<br><b>  {dd}  </b> dies (01 a 31).<br><b> {mm}</b> mes (01 a 12).<br><b> {yy} </ b>, <b> {yyyy</ b> ó <b>{y} </b> any en 2, 4 ó 1 xifra.<br>
@@ -343,7 +344,7 @@ NumberOfModelFilesFound=Nombre d'arxius de plantilles ODT trobats en aquest(s) d
 ExampleOfDirectoriesForModelGen=Exemples de sintaxi:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Posant les següents etiquetes a la plantilla, obtindrà una substitució amb el valor personalitzat en generar el document:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
-FirstnameNamePosition=Ordre visualització nom/cognoms
+FirstnameNamePosition=Posició del Nom/Cognoms
 DescWeather=Els següents gràfics es mostraran en el panell si el nombre d'elements arriben a aquests valors:
 KeyForWebServicesAccess=clau per usar els Web Services (paràmetre "dolibarrkey" a webservices)
 TestSubmitForm=Formulari de proves
@@ -362,7 +363,7 @@ HideAnyVATInformationOnPDF=Amaga tota la informació relacionada amb l'IVA en el
 HideDescOnPDF=Amagar descripció dels productes en la generació dels PDF
 HideRefOnPDF=Amagar referència dels productes en la generació dels PDF
 HideDetailsOnPDF=Amagar detalls de les línies de productes en la generació dels PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PlaceCustomerAddressToIsoLocation=Utilitza la posició estandard francesa (La Poste) per la posició de l'adreça dels clients
 Library=Llibreria
 UrlGenerationParameters=Seguretat de les URL
 SecurityTokenIsUnique=Fer servir un paràmetre securekey únic per a cada URL?
@@ -416,7 +417,7 @@ ConfirmEraseAllCurrentBarCode=Esteu segur que voleu esborrar tots els valors de
 AllBarcodeReset=S'han eliminat tots els valors de codi de barres
 NoBarcodeNumberingTemplateDefined=No hi ha plantilla de codi de barres habilitada a la configuració del mòdul de codi de barres.
 NoRecordWithoutBarcodeDefined=Sense registres sense codis de barres definits
-EnableFileCache=Enable file cache
+EnableFileCache=Habilita la caché de fitxers
 
 # Modules
 Module0Name=Usuaris i grups
@@ -435,7 +436,7 @@ Module23Name=Energia
 Module23Desc=Realitza el seguiment del consum d'energies
 Module25Name=Comandes de clients
 Module25Desc=Gestió de comandes de clients
-Module30Name=Factures i abonaments
+Module30Name=Factures
 Module30Desc=Gestió de factures i abonaments de clients. Gestió factures de proveïdors
 Module40Name=Proveïdors
 Module40Desc=Gestió de proveïdors
@@ -500,7 +501,7 @@ Module510Desc=Gestió dels salaris dels empleats i pagaments
 Module520Name=Préstec
 Module520Desc=Gestió de préstecs
 Module600Name=Notificacions
-Module600Desc=Send EMail notifications (triggered by some business events) to third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Envia notificacions d'Email (disparades per algun esdeveniment de negoci) a contactes de tercers (configuració definida en cada tercer) o correus electrònics fixes.
 Module700Name=Donacions
 Module700Desc=Gestió de donacions
 Module770Name=Informes de despeses
@@ -570,7 +571,7 @@ Permission13=Devalidar factures
 Permission14=Validar factures
 Permission15=Envia factures per e-mail
 Permission16=Crear cobraments per factures de clients
-Permission19=Eliminar factures
+Permission19=Elimina factures de client
 Permission21=Consulta pressupostos
 Permission22=Crear/modificar pressupostos
 Permission24=Validar pressupostos
@@ -663,7 +664,7 @@ Permission205=Gestionar connexions
 Permission206=Consultar connexions
 Permission211=Consultar telefonia
 Permission212=Demanar línies
-Permission213=Activar una línia
+Permission213=Activa la línia
 Permission214=Configurar la telefonia
 Permission215=Configurar proveïdors
 Permission221=Consulta enviaments de correu
@@ -672,7 +673,7 @@ Permission223=Validar E-Mails (permet l'enviament)
 Permission229=Eliminar E-Mails
 Permission237=Veure els destinataris i la informació
 Permission238=Enviar els e-mails manualment
-Permission239=Eliminar els e-mails després de la seva validació o el seu enviament
+Permission239=Elimina els e-mails després de la seva validació o el seu enviament
 Permission241=Consultar categories
 Permission242=Crear/modificar categories
 Permission243=Eliminar categories
@@ -694,7 +695,7 @@ Permission282=Crea/modifica contactes
 Permission283=Elimina contactes
 Permission286=Exporta contactes
 Permission291=Consultar tarifes
-Permission292=Establir permisos en les tarifes
+Permission292=Indica permisos en les tarifes
 Permission293=Modificar les tarifes a clients
 Permission300=Consultar codis de barra
 Permission301=Crear/modificar codis de barra
@@ -840,18 +841,18 @@ VATManagement=Gestió IVA
 VATIsUsedDesc=El tipus d'IVA proposat per defecte en les creacions de pressupostos, factures, comandes, etc. Respon a la següent regla: <br> Si el venedor no està subjecte a IVA, IVA per defecte= 0. Final de regla. <br> Si el país del venedor= país del comprador llavors IVA per defecte= IVA del producte venut. Final de regla. <br> Si venedor i comprador resideixen a la Comunitat Europea i el bé venut= nou mitjà de transports (auto, vaixell, avió), IVA per defecte= 0 (l'IVA ha de ser pagat pel comprador a la hisenda pública del seu país i no al venedor). Final de regla <br> Si venedor i comprador resideixen a la Comunitat Europea i comprador= particular o empresa sense NIF intracomunitari llavors IVA per defecte= IVA del producte venut. Final de regla. <br> Si venedor i comprador resideixen a la Comunitat Europea i comprador= empresa amb NIF intracomunitari llavors IVA per defecte= 0. Final de regla. <br> Sinó, IVA proposat per defecte= 0. Final de regla. <br>
 VATIsNotUsedDesc=El tipus d'IVA proposat per defecte és 0. Aquest és el cas d'associacions, particulars o algunes petites societats.
 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 exemptes d'IVA o societats, organismes o professions liberals que han eligedo el règim fiscal de mòduls (IVA en franquícia), pagant un IVA en franquícia sense fer declaració d'IVA. Aquesta elecció fa aparèixer l'anotació "IVA no aplicable - art-293B del CGI" en les factures.
+VATIsNotUsedExampleFR=A França, es tracta d'associacions exemptes d'IVA o societats, organismes o professions liberals que han triat el règim fiscal de mòduls (IVA en franquícia), pagant un IVA en franquícia sense fer declaració d'IVA. Aquesta elecció fa aparèixer l'anotació "IVA no aplicable - art-293B del CGI" en les factures.
 ##### Local Taxes #####
 LTRate=Tarifa
 LocalTax1IsNotUsed=No subjecte
-LocalTax1IsUsedDesc=Ús d'un 2on. tipus d'impost (Diferent de l'IVA)
-LocalTax1IsNotUsedDesc=No utilitzar un 2on. tipus d'impost (Diferent de l'IVA)
+LocalTax1IsUsedDesc=Utilitza un 2n tipus d'impost (diferent de l'IVA)
+LocalTax1IsNotUsedDesc=No utilitzar un altre tipus d'impost (diferent de l'IVA)
 LocalTax1Management=Gestió 2on. tipus d'impost
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=No subjecte
-LocalTax2IsUsedDesc=Ús d'un 3er. tipus d'impost (Diferent de l'IVA)
-LocalTax2IsNotUsedDesc=No utilitzar un 3er. tipus d'impost (Diferent de l'IVA)
+LocalTax2IsUsedDesc=Utilitza un 3r tipus d'impost (diferent de l'IVA)
+LocalTax2IsNotUsedDesc=No utilitzar un altre tipus d'impost (diferent de l'IVA)
 LocalTax2Management=Gestió 2on. tipus d'impost
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
@@ -964,7 +965,7 @@ DelaysBeforeWarning=Terminis abans d'alerta
 DelaysOfToleranceBeforeWarning=Terminis de tolerància abans d'alerta
 DelaysOfToleranceDesc=Aquesta pantalla permet configura els terminis de tolerància abans que es alerti amb el símbol %s, sobre cada element en retard.
 Delays_MAIN_DELAY_ACTIONS_TODO=Tolerància de retard abans de l'alerta (en dies) sobre accions planificades no realitzades
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks not yet realised
+Delays_MAIN_DELAY_TASKS_TODO=Tolerància de retard (en dies) abans de l'alerta en tasques planificades i no realitzades
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerància de retard abans de l'alerta (en dies) sobre comandes de clients no processades
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerància de retard abans de l'alerta (en dies) sobre comandes a proveïdors no processades
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerància de retard abans de l'alerta (en dies) sobre pressupostos a tancar
@@ -1051,7 +1052,7 @@ YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP
 DownloadMoreSkins=Més temes per descarregar
 SimpleNumRefModelDesc=Retorna el nombre sota el format %syymm-nnnn on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense tornar a 0
 ShowProfIdInAddress=Mostrar l'identificador professional en les direccions dels documents
-ShowVATIntaInAddress=Amaga el identificador IVA en les direccions dels documents
+ShowVATIntaInAddress=Oculta el NIF intracomunitari en les direccions dels documents
 TranslationUncomplete=Traducció parcial
 SomeTranslationAreUncomplete=Alguns idiomes poden estar traduïts parcialment o poden obtenir errors. Si detecta alguns, pot arreglar els arxius d'idiomes registrant-se a <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 MenuUseLayout=Fer el menú esquerre ocultable (l'opció javascript no hauria de deshabilitar-se)
@@ -1089,8 +1090,8 @@ PathDirectory=Catàleg
 SendmailOptionMayHurtBuggedMTA=La funcionalitat d'enviar correus electrònics a través del "correu directe PHP" genera una sol·licitud que poden ser mal interpretats per alguns servidors de correu. Això és tradueix en missatges de correu electrònic illegibles per a les persones allotjades a aquestes plataformes. Aquest és el cas de clients en certs proveïdors de serveis d'internet (Ex: Orange). Això no és un problema ni de Dolibarr ni de PHP, però si del servidor de correu. Encara que, pot agregar la opció MAIN_FIX_FOR_BUGGED_MTA amb el valor 1 a la Configuració -> Varis per tractar que Dolibarr eviti l'error. Un altre solució (recomanada) és utilitzar el mètode d'enviament per SMTP que no té aquest inconvenient.
 TranslationSetup=Configuració traducció
 TranslationDesc=L'elecció de l'idioma mostrat en pantalla es modifica:<br>* A nivell global des del menú <strong>Inici - Configuració - Entorn</strong><br>* De manera específica a l'usuari des de la pestanya <strong>interface usuari</strong> de la seva fitxa d'usuari (fer clic al seu login a la part superior esquerra de la pantalla).
-TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Nombre total de mòduls activats: <b>%s</b>
+TranslationOverwriteDesc=També pots sobreescriure algun valor completant/editant la següent taula. Pots utilitzar "%s" el codi d'idioma, per "%s" la clau que trobis en el fitxer langs/xx_XX/nomfitxer.lang i "%s" el nou valor que vols utilitzar com a nova traducció.
+TotalNumberOfActivatedModules=Número total de mòduls activats: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Ha d'activar almenys 1 mòdul.
 ClassNotFoundIntoPathWarning=No s'ha trobat la classe %s en el seu path PHP
 YesInSummer=Sí a l'estiu
@@ -1183,8 +1184,8 @@ ForceInvoiceDate=Forçar la data de factura a la data de validació
 AllowCreditNoteWithoutRelatedInvoice=Permetre crear un abonament sense una factura relacionada
 DisableRepeatable=Desactivar les factures recurrents
 SuggestedPaymentModesIfNotDefinedInInvoice=Formes de pagament suggerides per a les factures si no estan definides explícitament
-EnableEditDeleteValidInvoice=Activar la possibilitat d'editar/eliminar una factura validada sense pagament
-SuggestPaymentByRIBOnAccount=Sugerir el pagament per abonament en compte
+EnableEditDeleteValidInvoice=Activa la possibilitat d'editar/eliminar una factura validada sense pagament
+SuggestPaymentByRIBOnAccount=Suggereix el pagament per domiciliació en compte
 SuggestPaymentByChequeToAddress=Sugerir el pagament per xec a
 FreeLegalTextOnInvoices=Text lliure en factures
 WatermarkOnDraftInvoices=Marca d'aigua en les factures esborrany (en cas d'estar buit)
@@ -1240,14 +1241,14 @@ FreeLegalTextOnContracts=Text lliure en contractes
 WatermarkOnDraftContractCards=Marca d'aigua en contractes (en cas d'estar buit)
 ContractsAndServices=Llistat de contractes i serveis
 ##### Members #####
-MembersSetup=Configuració del mòdulo Associacions
+MembersSetup=Configuració del mòdul Socis
 MemberMainOptions=Opcions principals
 AddSubscriptionIntoAccount=Proposar per defecte la creació d'un moviment, en el mòdul bancs, en el registre d'un pagament de cotització
 AdherentLoginRequired= Gestiona un compte d'usuari per a cada soci
 AdherentMailRequired=E-Mail obligatori per crear un nou soci
 MemberSendInformationByMailByDefault=Casella de verificació per enviar un missatge de confirmació als socis (validació o nova subscripció) activada per defecte
 ##### LDAP setup #####
-LDAPSetup=Configuracón del mòdul LDAP
+LDAPSetup=Configuració de LDAP
 LDAPGlobalParameters=Paràmetres globals
 LDAPUsersSynchro=Usuaris
 LDAPGroupsSynchro=Grups
@@ -1360,7 +1361,7 @@ LDAPFieldTownExample=Exemple : l
 LDAPFieldCountry=Pais
 LDAPFieldCountryExample=Exemple : c
 LDAPFieldDescription=Descripció
-LDAPFieldDescriptionExample=Exemple : description
+LDAPFieldDescriptionExample=Exemple : descripció
 LDAPFieldNotePublic=Nota publica
 LDAPFieldNotePublicExample=Exemple: publicnote
 LDAPFieldGroupMembers= Socis del grup
@@ -1404,7 +1405,7 @@ TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb
 ##### Products #####
 ProductSetup=Configuració del mòdul Productes
 ServiceSetup=Configuració del mòdul Serveis
-ProductServiceSetup=Configuración dels mòduls Productos i Serveis
+ProductServiceSetup=Configuració dels mòduls Productes i Serveis
 NumberOfProductShowInSelect=Nº de productes màx a les llistes (0= sense límit)
 ConfirmDeleteProductLineAbility=Confirmació d'eliminació d'una línia de producte en els formularis
 ModifyProductDescAbility=Personalització de les descripcions dels productes en els formularis
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Tancar any fiscal
 DeleteFiscalYear=Eliminar any fiscal
 ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal?
 AlwaysEditable=Sempre es pot editar
+IsHidden=No està visible
 MAIN_APPLICATION_TITLE=Forçar visibilitat del nom de l'aplicació (advertència: indicar el seu propi nom aquí pot trencar la característica d'auto-omple natge de l'inici de sessió en utilitzar l'aplicació mòbil DoliDroid)
 NbMajMin=Nombre mínim de caràcters en majúscules
 NbNumMin=Nombre mínim de caràcters numèrics
@@ -1664,10 +1666,10 @@ BackupDumpWizard=Asistent per crear una copia de seguretat de la base de dades
 SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó:
 SomethingMakeInstallFromWebNotPossible2=Per aquesta raó, explicarem aquí els passos del procés d'actualització manual que pot realitzar un usuari amb privilegis
 InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu <strong>%s</strong> per habilitar aquesta funció
-ConfFileMuseContainCustom=La instal·lació de mòduls externs des de l'aplicació guarda els arxius dels mòduls en el directori <strong>%s</strong>. Per disposar d'aquest directori a Dolibarr, té que configurar l'arxiu <strong>conf/conf.php</strong> per tenir l'opció <br>- <strong>$dolibarr_main_url_root_alt</strong> activat amb el valor <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> activat amb el valor <strong"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Remarca línies de la taula quan el ratolí passi per sobre
 HighlightLinesColor=Remarca el color de la línia quan el ratolí hi passa per sobre (deixa-ho buit per a no remarcar)
-TextTitleColor=Color of page title
+TextTitleColor=Color de títol de pàgina
 LinkColor=Color dels enllaços
 PressF5AfterChangingThis=Prem F5 en el teclat després de canviar aquest valor per fer-ho efectiu
 NotSupportedByAllThemes=Funcionarà amb el tema eldy però no està suportat pels altres temes
@@ -1703,9 +1705,11 @@ MailToSendSupplierOrder=Enviar comanda de proveïdor
 MailToSendSupplierInvoice=Enviar factura de proveïdor
 MailToThirdparty=Enviar correu electrònic de la pàgina del tercer
 ByDefaultInList=Mostra per defecte en la vista del llistat
-YouUseLastStableVersion=Estàs utilitzant la última versió estable
+YouUseLastStableVersion=Estàs utilitzant l'última versió estable
 TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de versió (ets lliure d'utilitzar-ho a les teves webs)
 TitleExampleForMaintenanceRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de manteniment (ets lliure d'utilitzar-ho a les teves webs)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió principal amb un munt de noves característiques per als usuaris i desenvolupadors. Es pot descarregar des de la secció de descàrregues del portal http://www.dolibarr.org (subdirectori de versions estables). Pots llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió de manteniment que només conté correcció d'errors. Recomanem a tothom que utilitzi una versió anterior que s'actualitzi a aquesta. Com qualsevol versió de manteniment, no hi ha noves característiques ni canvis d'estructures de dades en aquesta versió. Es pot descarregar des de la secció de descàrregues del portal http://www.dolibarr.org (subdirectori de versions estables). Pots llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
 MultiPriceRuleDesc=Quan l'opció "Varis nivells de preus per producte/servei" està activada, pots definir diferents preus (un preu per nivell) per cada producte. Per estalviar temps, pots entrar una regla per tenir preu per cada nivell autocalculat d'acord al preu del primer nivell, així només hauràs d'introduir el preu del primer nivell de cada producte. Aquesta pàgina està aqui per estalviar temps i pot ser útil només si els teus preus per cada nivell son relatius al primer nivell. Pots ignorar aquesta pàgina en la majoria dels casos.
+ModelModulesProduct=Plantilles per documents de productes
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 2e7a5a0f20e..066e8793a41 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -35,9 +35,9 @@ AllActions= Tots els esdeveniments/tasques
 ViewCal=Vista mensual
 ViewDay=Vista diària
 ViewWeek=Vista setmanal
-ViewYear=Year view
+ViewYear=Vista per any
 ViewPerUser=Vista d'usuaris
-ViewPerType=Per type view
+ViewPerType=Vista per tipus
 ViewWithPredefinedFilters= Veure amb els filtres predefinits
 AutoActions= Inclusió automàtica a l'agenda
 AgendaAutoActionDesc= Indiqueu en aquesta pestanya els esdeveniments per els que desitja que Dolibarr creu automàticament una acció a l'agenda. Si no es marca cap cas (per defecte), només les accions manuals s'han d'incloure en l'agenda.
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 09b2f668f53..0b30e547a78 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -2,7 +2,7 @@
 Bank=Banc
 Banks=Bancs
 MenuBankCash=Bancs/Caixes
-MenuSetupBank=Param. banc/caixa
+MenuSetupBank=Configuració Banc/Caixa
 BankName=Nom del banc
 FinancialAccount=Compte
 FinancialAccounts=Comptes
@@ -40,8 +40,8 @@ SwiftValid=BIC/SWIFT és vàlid
 SwiftNotValid=BIC/SWIFT no és vàlid
 StandingOrders=Domiciliacions
 StandingOrder=Domiciliació
-Withdrawals=Reintegraments
-Withdrawal=Reintegrament
+Withdrawals=Domiciliacions
+Withdrawal=Domiciliació
 AccountStatement=Extracte
 AccountStatementShort=Extracte
 AccountStatements=Extractes
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 87ee2b4ab15..a80818313e5 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -25,7 +25,7 @@ InvoiceReplacement=Factura rectificativa
 InvoiceReplacementAsk=Factura rectificativa de la factura
 InvoiceReplacementDesc=La <b>factura rectificativa</b> serveix per a cancel·lar i per substituir una factura existent sobre la qual encara no hi ha pagaments.<br> <br>Nota: Només una factura sense cap pagament pot rectificar-se. Si aquesta última no està tancada, passarà automàticament al estat 'abandonada'.
 InvoiceAvoir=Abonament
-InvoiceAvoirAsk=Abonament per corregir la factura
+InvoiceAvoirAsk=Abonament per factura rectificativa
 InvoiceAvoirDesc=El <b>abonament</ b> és una factura negativa destinada a compensar un import de factura que difereix de l'import realment pagat (per haver pagat de més o per devolució de productes, per exemple).
 invoiceAvoirWithLines=Crear abonament amb les línies de la factura d'origen
 invoiceAvoirWithPaymentRestAmount=Crear abonament de la factura pendent de pagament
@@ -34,14 +34,14 @@ ReplaceInvoice=Rectificar la factura %s
 ReplacementInvoice=Rectificació factura
 ReplacedByInvoice=Rectificada per la factura %s
 ReplacementByInvoice=Rectificada per factura
-CorrectInvoice=Correcció factura %s
-CorrectionInvoice=Correcció
+CorrectInvoice=Rectificació factura %s
+CorrectionInvoice=Factura rectificativa
 UsedByInvoice=Aplicat a la factura
 ConsumedBy=Consumit per
 NotConsumed=No consumit
 NoReplacableInvoice=Sense factures rectificables
 NoInvoiceToCorrect=Sense factures a corregir
-InvoiceHasAvoir=Corregida per un o mes abonaments
+InvoiceHasAvoir=Corregida per una o més factures
 CardBill=Fitxa factura
 PredefinedInvoices=Factura predefinida
 Invoice=Factura
@@ -58,6 +58,7 @@ Payment=Pagament
 PaymentBack=Reembossament
 Payments=Pagaments
 PaymentsBack=Reembossaments
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Reemborsat
 DeletePayment=Eliminar el pagament
 ConfirmDeletePayment=Esteu segur de voler eliminar aquest pagament?
@@ -73,8 +74,8 @@ PaymentsAlreadyDone=Pagaments efectuats
 PaymentsBackAlreadyDone=Reemborsaments ja efectuats
 PaymentRule=Regla de pagament
 PaymentMode=Forma de pagament
-IdPaymentMode=Payment type (id)
-LabelPaymentMode=Payment type (label)
+IdPaymentMode=Forma de pagament (Id)
+LabelPaymentMode=Forma de pagament (etiqueta)
 PaymentModeShort=Forma de pagament
 PaymentTerm=Termini de pagament
 PaymentConditions=Condicions de pagament
@@ -102,10 +103,11 @@ DoPayment=Emetre pagament
 DoPaymentBack=Emetre reembossament
 ConvertToReduc=Convertir en reducció futura
 EnterPaymentReceivedFromCustomer=Afegir cobrament rebut del client
-EnterPaymentDueToCustomer=Fer pagament d'abonaments al client
+EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
 PriceBase=Preu base
 BillStatus=Estat de la factura
+StatusOfGeneratedInvoices=Estat de factures generades
 BillStatusDraft=Esborrany (a validar)
 BillStatusPaid=Pagada
 BillStatusPaidBackOrConverted=Reemborsada o convertida en reducció
@@ -127,18 +129,22 @@ BillShortStatusNotPaid=Pendent de cobrament
 BillShortStatusClosedUnpaid=Tancada
 BillShortStatusClosedPaidPartially=Pagada
 PaymentStatusToValidShort=A validar
-ErrorVATIntraNotConfigured=Número d'IVA intracomunitari encara no configurat
-ErrorNoPaiementModeConfigured=No hi ha definit mode de pagament per defecte. Corregir des del mòdul factura
-ErrorCreateBankAccount=Crea un compte bancari i després en la configuració del mòdul factura definir els modes de pagament
+ErrorVATIntraNotConfigured=NIF intracomunitari encara no configurat
+ErrorNoPaiementModeConfigured=No s'ha definit la forma de pagament per defecte. Ves a la configuració del mòdul Factures per corregir-ho.
+ErrorCreateBankAccount=Crea un compte bancari i després ves al panell de configuració del mòdul Factures per definir les formes de pagament
 ErrorBillNotFound=Factura %s inexistent
 ErrorInvoiceAlreadyReplaced=Error, vol validar una factura que rectifica la factura %s. Però aquesta última ja està rectificada per la factura %s.
 ErrorDiscountAlreadyUsed=Error, la remesa ja està assignada
-ErrorInvoiceAvoirMustBeNegative=Error, una factura de tipus Abonament ha de tenir un import negatiu
+ErrorInvoiceAvoirMustBeNegative=Error, una factura rectificativa ha de tenir un import negatiu
 ErrorInvoiceOfThisTypeMustBePositive=Error, una factura d'aquest tipus ha de tenir un import positiu
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no és possible cancel·lar una factura que ha estat substituïda per una altra que es troba en l'estat 'esborrany'.
 BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
+RecurringInvoiceTemplate=Factura recurrent
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=No és una plantilla de factura recurrent
 NewBill=Nova factura
 LastBills=Les %s últimes factures
 LastCustomersBills=Les %s últimes factures a clients
@@ -157,9 +163,9 @@ ConfirmCancelBill=Esteu segur de voler anul·lar la factura <b>%s</b>?
 ConfirmCancelBillQuestion=Per quina raó vol abandonar la factura?
 ConfirmClassifyPaidPartially=Esteu segur de voler classificar la factura <b>%s</b> com pagada?
 ConfirmClassifyPaidPartiallyQuestion=Aquesta factura no ha estat totalment pagada. Per què vol classificar-la com a pagada?
-ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar <b>(%s %s)</b> s'ha regularitzat (ja que l'article s'ha tornat, oblidat lliurar, descompte no definit ...) mitjançant un abonament
+ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps. Regularitzo l'IVA d'aquest descompte amb un abonament.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar <b>(%s %s)</b> és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte
-ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> és un descompte
+ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps. Recupero l'IVA d'aquest descompte, sense un abonament.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
 ConfirmClassifyPaidPartiallyReasonOther=D'altra raó
@@ -186,7 +192,7 @@ ShowInvoice=Veure factura
 ShowInvoiceReplace=Veure factura rectificativa
 ShowInvoiceAvoir=Veure abonament
 ShowInvoiceDeposit=Mostrar factura d'acompte
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Mostra la situació de la factura
 ShowPayment=Veure pagament
 AlreadyPaid=Ja pagat
 AlreadyPaidBack=Ja reemborsat
@@ -199,6 +205,7 @@ Rest=Pendent
 AmountExpected=Import reclamat
 ExcessReceived=Rebut en excés
 EscompteOffered=Descompte (pagament aviat)
+EscompteOfferedShort=Descompte
 SendBillRef=Enviament de la factura %s
 SendReminderBillRef=Recordatori de la factura %s
 StandingOrders=Domiciliacions
@@ -221,10 +228,10 @@ ClassifyBill=Classificar la factura
 SupplierBillsToPay=Factures de proveïdors pendents de pagament
 CustomerBillsUnpaid=Factures de clients pendents de cobrament
 NonPercuRecuperable=No percebut recuperable
-SetConditions=Definir condicions de pagament
-SetMode=Definir mode de pagament
+SetConditions=Indica les condicions de pagament
+SetMode=Indica la forma de pagament
 Billed=Facturat
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Factures recurrents
 RepeatableInvoice=Factura recurrent
 RepeatableInvoices=Factures recurrents
 Repeatable=Recurrent
@@ -247,8 +254,8 @@ AddRelativeDiscount=Crear descompte relatiu
 EditRelativeDiscount=Editar descompte relatiu
 AddGlobalDiscount=Crear descompte fixe
 EditGlobalDiscounts=Editar descompte fixe
-AddCreditNote=Crear factura de pagament
-ShowDiscount=Veure el abonament
+AddCreditNote=Crea factura d'abonament
+ShowDiscount=Veure el descompte
 ShowReduc=Visualitzar la deducció
 RelativeDiscount=Descompte relatiu
 GlobalDiscount=Descompte fixe
@@ -273,7 +280,7 @@ HelpAbandonBadCustomer=Aquest import es va abandonar (client jutjat com morós)
 HelpAbandonOther=Aquest import es va abandonar ja que es tractava d'un error de facturació (mala introducció de dades, factura substituïda per una altra).
 IdSocialContribution=Id. pagament d'impost social
 PaymentId=ID pagament
-PaymentRef=Payment ref.
+PaymentRef=Ref. pagament
 InvoiceId=Id factura
 InvoiceRef=Ref. factura
 InvoiceDateCreation=Data creació factura
@@ -301,11 +308,23 @@ RelatedSupplierInvoices=Factures de proveïdor relacionades
 LatestRelatedBill=Última factura relacionada
 WarningBillExist=Advertència, una o més factures ja existeixen
 MergingPDFTool=Eina de fusió PDF
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-
+AmountPaymentDistributedOnInvoice=Import de pagament distribuït en la factura
+PaymentNote=Nota de pagament
+ListOfPreviousSituationInvoices=Llista de situació de factures anterior
+ListOfNextSituationInvoices=Llista de següents situacions de factures
+FrequencyPer_d=Cada %s dies
+FrequencyPer_m=Cada %s mesos
+FrequencyPer_y=Cada %s anys
+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=Data de la propera generació de factures
+DateLastGeneration=Data de l'última generació
+MaxPeriodNumber=Nº màxim de generació de factures
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Valida la factura automàticament
+GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=La factura %s s'ha generat des de la plantilla de factura recurrent %s
 # PaymentConditions
 PaymentConditionShortRECEP=A la recepció
 PaymentConditionRECEP=A la recepció de la factura
@@ -366,7 +385,7 @@ PhoneNumber=Tel.
 FullPhoneNumber=Telèfon
 TeleFax=Fax
 PrettyLittleSentence=Accepta el pagament mitjançant xecs al meu nom de les sumes degudes, en la meva qualitat de soci d'una empresa autoritzada per l'Administració Fiscal.
-IntracommunityVATNumber=Número d'IVA intracomunitari
+IntracommunityVATNumber=NIF intracomunitari
 PaymentByChequeOrderedTo=Pagament mitjançant xec nominatiu a %s enviat a
 PaymentByChequeOrderedToShort=Pagament mitjançant xec nominatiu a
 SendTo=enviat a
@@ -402,10 +421,10 @@ Reported=Ajornat
 DisabledBecausePayments=No disponible ja que hi ha pagaments
 CantRemovePaymentWithOneInvoicePaid=Eliminació impossible quan hi ha almenys una factura classificada com a pagada.
 ExpectedToPay=Esperant el pagament
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=No es pot eliminar la conciliació de pagament
 PayedByThisPayment=Pagada per aquest pagament
 ClosePaidInvoicesAutomatically=Classificar com "Pagades" les factures rectificatives completament pagades.
-ClosePaidCreditNotesAutomatically=Classificar automàticament com "Pagats" els abonaments completament reemborsats
+ClosePaidCreditNotesAutomatically=Classifica com "Pagats" tots els abonaments completament reemborsats
 AllCompletelyPayedInvoiceWillBeClosed=Totes les factures amb una resta a pagar 0 seran automàticament tancades a l'estat "Pagada".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reemborsar
@@ -414,7 +433,7 @@ NoteListOfYourUnpaidInvoices=Nota: Aquest llistat inclou només els tercers dels
 RevenueStamp=Timbre fiscal
 YouMustCreateInvoiceFromThird=Aquesta opció només està disponible quan es crea la factura des de la pestanya "client" des de tercers
 PDFCrabeDescription=Model de factura complet (model recomanat per defecte)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
+PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de factura completa per situacions de factures.
 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
 MarsNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures, %syymm-nnnn per a les factures rectificatives, %syymm-nnnn per a les factures de dipòsit i %syymm-nnnn pels abonaments  on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense retorn a 0
 TerreNumRefModelError=Ja hi ha una factura amb $syymm i no és compatible amb aquest model de seqüència. Elimineu o renómbrela per poder activar aquest mòdul
@@ -444,11 +463,11 @@ DisabledBecauseFinal=Aquesta situació és definitiva.
 CantBeLessThanMinPercent=El progrés no pot ser menor que el seu valor en la situació anterior.
 NoSituations=No hi ha situacions obertes
 InvoiceSituationLast=Factura final i general
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+PDFCrevetteSituationNumber=Situació N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situació de factura - COUNT
+PDFCrevetteSituationInvoiceTitle=Situació factures
+PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de factura completa per situacions de factures.
+PDFCrevetteSituationInvoiceLine=Situació N°%s : Inv. N°%s en %s
+TotalSituationInvoice=Total situació
+invoiceLineProgressError=El progrés de la línia de factura no pot ser igual o superior a la següent línia de factura
+updatePriceNextInvoiceErrorUpdateline=Error : actualització de preu en línia de factura : %s
diff --git a/htdocs/langs/ca_ES/bookmarks.lang b/htdocs/langs/ca_ES/bookmarks.lang
index 1bfbbbff778..79c53f25f26 100644
--- a/htdocs/langs/ca_ES/bookmarks.lang
+++ b/htdocs/langs/ca_ES/bookmarks.lang
@@ -12,7 +12,7 @@ BookmarkTitle=Títol del marcador
 UrlOrLink=URL
 BehaviourOnClick=Comportament al fer clic a la URL
 CreateBookmark=Crea marcador
-SetHereATitleForLink=Indiqueu aquí un títol del marcador
+SetHereATitleForLink=Indica un títol pel marcador
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Indicar una URL http externa o una URL Dolibarr relativa
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Tria si ha d'obrir-se la pàgina en una nova finestra o en l'actual
 BookmarksManagement=Gestió de marcadors
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index f47aa9d8374..1dbd87afade 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -13,8 +13,8 @@ BoxLastCustomers=Últims clients modificats
 BoxLastSuppliers=Últims proveïdors modificats
 BoxLastCustomerOrders=Últimes comandes
 BoxLastValidatedCustomerOrders=Ultimes comandes de clients validades
-BoxLastBooks=Últims books
-BoxLastActions=Últims esdeveniments
+BoxLastBooks=Últims llibres
+BoxLastActions=Últimes accions
 BoxLastContracts=Últims contractes
 BoxLastContacts=Últims contactes/adreçes
 BoxLastMembers=Últims socis
@@ -23,26 +23,26 @@ BoxCurrentAccounts=Balanç de comptes oberts
 BoxSalesTurnover=Volum de vendes
 BoxTotalUnpaidCustomerBills=Total factures a clients pendents de cobrament
 BoxTotalUnpaidSuppliersBills=Total factures de proveïdors pendents de pagament
-BoxTitleLastBooks=Els %s darrers marcadors registrats
+BoxTitleLastBooks=Els %s últims llibres registrats
 BoxTitleNbOfCustomers=Nombre de clients
-BoxTitleLastRssInfos=Les %s últimes infos de %s
-BoxTitleLastProducts=Els %s darrers productes/serveis registrats
+BoxTitleLastRssInfos=Les %s últimes notícies de %s
+BoxTitleLastProducts=Els %s últims productes/serveis modificats
 BoxTitleProductsAlertStock=Productes en alerta d'estoc
-BoxTitleLastCustomerOrders=Ultimes %s comandes de clients
-BoxTitleLastModifiedCustomerOrders=Últimes %s comandes de clients modificades
-BoxTitleLastSuppliers=Els %s darrers proveïdors registrats
-BoxTitleLastCustomers=Els %s darrers clients registrats
+BoxTitleLastCustomerOrders=Les %s últimes comandes de clients
+BoxTitleLastModifiedCustomerOrders=Les %s últimes comandes de clients modificades
+BoxTitleLastSuppliers=Els %s últims proveïdors registrats
+BoxTitleLastCustomers=Els %s últims clients registrats
 BoxTitleLastModifiedSuppliers=Els %s últims proveïdors modificats
 BoxTitleLastModifiedCustomers=Els %s últims clients modificats
-BoxTitleLastCustomersOrProspects=Últims %s clients o clients potencials
-BoxTitleLastPropals=Últims %s pressupostos
-BoxTitleLastModifiedPropals=Últims %s pressupostos modificats
-BoxTitleLastCustomerBills=Les %s últimes factures a clients modificades
-BoxTitleLastModifiedCustomerBills=Ultimes %s factures de clients modificades
-BoxTitleLastSupplierBills=Les %s últimes factures de proveïdors modificades
-BoxTitleLastModifiedSupplierBills=Últimes %s factures de proveïdors modificades
+BoxTitleLastCustomersOrProspects=Els %s últims clients o clients potencials
+BoxTitleLastPropals=Els %s últims pressupostos
+BoxTitleLastModifiedPropals=Els %s últims pressupostos modificats
+BoxTitleLastCustomerBills=Les %s últimes factures a clients
+BoxTitleLastModifiedCustomerBills=Les %s últimes factures de clients modificades
+BoxTitleLastSupplierBills=Les %s últimes factures de proveïdors
+BoxTitleLastModifiedSupplierBills=Les %s últimes factures de proveïdors modificades
 BoxTitleLastModifiedProspects=Els %s últims clients potencials modificats
-BoxTitleLastProductsInContract=Els %s darrers productes/serveis contractats
+BoxTitleLastProductsInContract=Els %s últims productes/serveis en un contracte
 BoxTitleLastModifiedMembers=Últims %s socis
 BoxTitleLastFicheInter=Les %s últimes intervencions modificades
 BoxTitleOldestUnpaidCustomerBills=Les %s factures més antigues a clients pendents de cobrament
@@ -51,17 +51,19 @@ BoxTitleCurrentAccounts=Balanços de comptes oberts
 BoxTitleSalesTurnover=Volum de vendes realitzades
 BoxTitleTotalUnpaidCustomerBills=Factures a clients pendents de cobrament
 BoxTitleTotalUnpaidSuppliersBills=Factures de proveïdors pendents de pagament
-BoxTitleLastModifiedContacts=Els últims %s contactes/adreçes modificades
-BoxMyLastBookmarks=Els meus %s darrers marcadors
+BoxTitleLastModifiedContacts=Els %s últims contactes/adreçes modificats
+BoxMyLastBookmarks=Els meus %s últims marcadors
 BoxOldestExpiredServices=Serveis antics expirats
 BoxLastExpiredServices=Els %s contactes més antics amb serveis actius expirats
-BoxTitleLastActionsToDo=Les %s últims esdeveniments a realitzar
+BoxTitleLastActionsToDo=Les %s últimes accions a fer
 BoxTitleLastContracts=Els %s últims contractes
 BoxTitleLastModifiedDonations=Les %s últimes donacions modificades
-BoxTitleLastModifiedExpenses=Els %s darrers informes de despeses modificats
+BoxTitleLastModifiedExpenses=Els %s últims informes de despeses modificats
 BoxGlobalActivity=Activitat global
+BoxGoodCustomers=Bons clients
+BoxTitleGoodCustomers=%s bons clients
 FailedToRefreshDataInfoNotUpToDate=Error en el refresc del flux RSS. Data de l'últim refresc :%s
-LastRefreshDate=Data darrera actualització
+LastRefreshDate=Data de l'última actualització
 NoRecordedBookmarks=No hi ha marcadors personals.
 ClickToAdd=Faci clic aquí per afegir.
 NoRecordedCustomers=Cap client registrat
@@ -80,8 +82,8 @@ NoContractedProducts=Sense productes/serveis contractats
 NoRecordedContracts=Sense contractes registrats
 NoRecordedInterventions=No hi ha intervencions registrades
 BoxLatestSupplierOrders=Últimes comandes a proveïdors
-BoxTitleLatestSupplierOrders=Últimes %s comandes a proveïdors
-BoxTitleLatestModifiedSupplierOrders=Últimes %s comandes de proveïdors modificades
+BoxTitleLatestSupplierOrders=Les %s últimes comandes a proveïdors
+BoxTitleLatestModifiedSupplierOrders=Les %s últimes comandes de proveïdors modificades
 NoSupplierOrder=Sense comandes a proveïdors
 BoxCustomersInvoicesPerMonth=Factures a clients per mes
 BoxSuppliersInvoicesPerMonth=Factures de proveïdors per mes
@@ -94,5 +96,5 @@ BoxProductDistributionFor=Distribució de %s per %s
 ForCustomersInvoices=Factures a clientes
 ForCustomersOrders=Comandes de clients
 ForProposals=Pressupostos
-LastXMonthRolling=L'ultim %s mes natural
-ChooseBoxToAdd=Choose a box to add
+LastXMonthRolling=L'últim %s mes natural
+ChooseBoxToAdd=Afegeix un panell a la teva taula de control
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 113380acabd..abf19cc425c 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -76,7 +76,7 @@ ProductsCategoryShort=Etiqueta de productes
 MembersCategoryShort=Etiqueta de socis
 SuppliersCategoriesShort=Etiquetes de proveïdors
 CustomersCategoriesShort=Etiquetes de clients
-ProspectsCategoriesShort=Prospects tags/categories
+ProspectsCategoriesShort=Etiquetes de potencials
 CustomersProspectsCategoriesShort=Categories clients
 ProductsCategoriesShort=Etiquetes de productes
 MembersCategoriesShort=Etiquetes de socis
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 516acdbfe83..1bb5ef75453 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -35,8 +35,8 @@ ShowCustomer=Veure client
 ShowProspect=Veure clients potencials
 ListOfProspects=Llista de clients potencials
 ListOfCustomers=Llista de clients
-LastDoneTasks=Les %s últimes accions efectuades
-LastRecordedTasks=Darrers esdeveniments registrats
+LastDoneTasks=Les %s últimes accions acabades
+LastRecordedTasks=Últimes tasques registrades
 LastActionsToDo=Les %s últimes accions no acabades
 DoneAndToDoActionsFor=Llista d'esdeveniments realitzats o a realitzar per %s
 DoneAndToDoActions=Llista d'esdeveniments realitzats o a realitzar
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index e7150e375ad..c244c748a2f 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=El nom de l'empresa %s ja existeix. Indiqui altre.
 ErrorPrefixAlreadyExists=El prefix %s ja existeix. Indiqui altre.
-ErrorSetACountryFirst=Definiu en primer lloc el país
+ErrorSetACountryFirst=Indica en primer lloc el país
 SelectThirdParty=Seleccionar un tercer
 DeleteThirdParty=Eliminar un tercer
 ConfirmDeleteCompany=Esteu segur de voler eliminar aquesta empresa i tota la informació dependent?
@@ -107,36 +107,36 @@ SupplierCodeModel=Model de codi proveïdor
 Gencod=Codi de barra
 ##### Professional ID #####
 ProfId1Short=CIF/NIF
-ProfId2Short=Prof. id 2
-ProfId3Short=Prof. id 3
+ProfId2Short=Núm. S.S.
+ProfId3Short=CNAE
 ProfId4Short=Prof. id 4
 ProfId5Short=Prof. id 5
 ProfId6Short=Prof. id 6
 ProfId1=ID profesional 1
-ProfId2=ID profesional 2
-ProfId3=ID profesional 3
-ProfId4=ID profesional 4
-ProfId5=ID profesional 5
+ProfId2=ID professional 2
+ProfId3=ID professional 3
+ProfId4=ID professional 4
+ProfId5=ID professional 5
 ProfId6=ID professional 6
-ProfId1AR=CUIT/CUIL
+ProfId1AR=CIF/NIF
 ProfId2AR=Ingressos bruts
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Id prof. 1 (USt.-IdNr)
-ProfId2AT=Id prof. 2 (USt.-Nr)
-ProfId3AT=Id prof. 3 (Handelsregister-Nr.)
+ProfId1AT=CIF/NIF
+ProfId2AT=Núm. seguretat social
+ProfId3AT=CNAE
 ProfId4AT=-
 ProfId5AT=-
 ProfId6AT=-
-ProfId1AU=ABN
+ProfId1AU=CIF/NIF
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=N° col·legiat
+ProfId1BE=CIF/NIF
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
@@ -150,37 +150,37 @@ ProfId4BR=CPF
 #ProfId6BR=INSS
 ProfId1CH=-
 ProfId2CH=-
-ProfId3CH=Número federat
+ProfId3CH=CIF/NIF
 ProfId4CH=Num registre de comerç
 ProfId5CH=-
 ProfId6CH=-
-ProfId1CL=R.U.T.
+ProfId1CL=CIF/NIF
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=R.U.T.
+ProfId1CO=CIF/NIF
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Id prof. 1 (USt.-IdNr)
-ProfId2DE=Id prof. 2 (USt.-Nr)
-ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
+ProfId1DE=CIF/NIF
+ProfId2DE=Núm. seguretat social
+ProfId3DE=CNAE
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
 ProfId1ES=CIF/NIF
-ProfId2ES=Núm seguretat social
+ProfId2ES=Núm. seguretat social
 ProfId3ES=CNAE
-ProfId4ES=Núm col·legiat
+ProfId4ES=Núm. col·legiat
 ProfId5ES=-
 ProfId6ES=-
-ProfId1FR=SIREN
-ProfId2FR=SIRET
-ProfId3FR=NAF (Ex APE)
+ProfId1FR=CIF/NIF
+ProfId2FR=Núm. seguretat social
+ProfId3FR=CNAE
 ProfId4FR=RCS/RM
 ProfId5FR=-
 ProfId6FR=-
@@ -196,21 +196,27 @@ ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=Id prof. 1 (TIN)
-ProfId2IN=Id prof. 2 (PAN)
-ProfId3IN=Id prof. 3 (SRVC TAX)
+ProfId1IN=CIF/NIF
+ProfId2IN=Núm. seguretat social
+ProfId3IN=CNAE
 ProfId4IN=Id prof. 4
 ProfId5IN=Id prof. 5
 ProfId6IN=-
+ProfId1LU=CIF/NIF (RCS)
+ProfId2LU=Núm. seguretat social (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=CIF/NIF
-ProfId2MA=Id prof. 2 (Patente)
-ProfId3MA=Id prof. 3 (I.F.)
+ProfId2MA=Núm. seguretat social
+ProfId3MA=CNAE
 ProfId4MA=Id prof. 4 (C.N.S.S.)
 ProfId5MA=Id prof. 5 (C.I.C.E.)
 ProfId6MA=-
-ProfId1MX=R.F.C.
-ProfId2MX=Registre Patronal IMSS
-ProfId3MX=Cèdula Professional
+ProfId1MX=CIF/NIF
+ProfId2MX=Núm. seguretat social
+ProfId3MX=CNAE
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -220,9 +226,9 @@ ProfId3NL=-
 ProfId4NL=-
 ProfId5NL=-
 ProfId6NL=-
-ProfId1PT=NIPC
-ProfId2PT=Núm seguretat social
-ProfId3PT=Num reg. comercial
+ProfId1PT=CIF/NIF
+ProfId2PT=Núm. seguretat social
+ProfId3PT=CNAE
 ProfId4PT=Conservatori
 ProfId5PT=-
 ProfId6PT=-
@@ -232,21 +238,21 @@ ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=RC
+ProfId1TN=CIF/NIF
 ProfId2TN=Matrícula fiscal
-ProfId3TN=Codi en aduana
+ProfId3TN=CNAE
 ProfId4TN=CCC
 ProfId5TN=-
 ProfId6TN=-
-ProfId1RU=OGRN
-ProfId2RU=INN
-ProfId3RU=KPP
+ProfId1RU=CIF/NIF
+ProfId2RU=Núm. seguretat social
+ProfId3RU=CNAE
 ProfId4RU=OKPO
 ProfId5RU=-
 ProfId6RU=-
-VATIntra=IVA
-VATIntraShort=IVA
-VATIntraVeryShort=IVA
+VATIntra=CIF/NIF Intracomunitari
+VATIntraShort=CIF/NIF Intra.
+VATIntraVeryShort=CIF/NIF
 VATIntraSyntaxIsValid=Sintaxi vàlida
 VATIntraValueIsValid=Valor vàlid
 ProspectCustomer=Client potencial/Client
@@ -261,7 +267,7 @@ CustomerAbsoluteDiscountShort=Descompte fixe
 CompanyHasRelativeDiscount=Aquest client té un descompte per defecte de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Aquest client no té descomptes relatius per defecte
 CompanyHasAbsoluteDiscount=Aquest client té <b>%s %s</b> descomptes disponibles (descomptes, bestretes...)
-CompanyHasCreditNote=Aquest client té <b>%s %s</b> bestretes disponibles
+CompanyHasCreditNote=Aquest client encara té abonaments per <b>%s</b> %s
 CompanyHasNoAbsoluteDiscount=Aquest client no té més descomptes fixos disponibles
 CustomerAbsoluteDiscountAllUsers=Descomptes fixos en curs (acordat per tots els usuaris)
 CustomerAbsoluteDiscountMy=Descomptes fixos en curs (acordats personalment)
@@ -296,7 +302,7 @@ RequiredIfCustomer=Requerida si el tercer és un client o client potencial
 RequiredIfSupplier=Requerida si el tercer és un proveïdor
 ValidityControledByModule=Validació controlada pel mòdul
 ThisIsModuleRules=Aquesta és la regla per aquest mòdul
-LastProspect=Últim client potencial
+LastProspect=Últim
 ProspectToContact=Client potencial a contactar
 CompanyDeleted=L'empresa "%s" ha estat eliminada
 ListOfContacts=Llistat de contactes
@@ -308,7 +314,7 @@ ListOfCompanies=Llistat d'empreses
 ListOfThirdParties=Llistat de tercers
 ShowCompany=Mostrar tercer
 ShowContact=Mostrar contacte
-ContactsAllShort=Tots (sens filtre)
+ContactsAllShort=Tots (sense filtre)
 ContactType=Tipus de contacte
 ContactForOrders=Contacte de comandes
 ContactForProposals=Contacte de pressupostos
@@ -329,9 +335,9 @@ EditCompany=Modificar empresa
 EditDeliveryAddress=Modificar adreça d'enviament
 ThisUserIsNot=Aquest usuari no és ni un client potencial, ni un client, ni un proveïdor
 VATIntraCheck=Verificar
-VATIntraCheckDesc=El link <b>%s</b> permet consultar al servei europeu de control de números d'IVA intracomunitari. Es requereix accés a internet per a que el servei funcioni
+VATIntraCheckDesc=L'enllaç <b>%s</b> permet consultar el NIF intracomunitari al servei de control europeu. Es requereix accés a internet per a que el servei funcioni.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Verificar a la web de la Comissió Europea
+VATIntraCheckableOnEUSite=Verifica el NIF Intracomunitari a la web de la Comissió Europea
 VATIntraManualCheck=Podeu també fer una verificació manual a la web europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Comprovació impossible. El servei de comprovació no és prestat pel país membre (%s).
 NorProspectNorCustomer=Ni client, ni client potencial
@@ -399,7 +405,7 @@ AddAddress=Crear direcció
 NoOtherDeliveryAddress=No hi ha adreces alternatives definides
 SupplierCategory=Categoria de proveïdor
 JuridicalStatus200=Independent
-DeleteFile=Eliminació d'un arxiu
+DeleteFile=Elimina el fitxer
 ConfirmDeleteFile=Esteu segur de voler eliminar aquest fitxer?
 AllocateCommercial=Assignar un comercial
 SelectCountry=Seleccionar un país
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 46c4e2495a0..5d33828d6ee 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -3,8 +3,8 @@ Accountancy=Comptabilitat
 AccountancyCard=Fitxa comptable
 Treasury=Tresoreria
 MenuFinancial=Financera
-TaxModuleSetupToModifyRules=Anar a <a href="%s">configuració  mòdul impostos</a> per modificar les regles de càlcul
-TaxModuleSetupToModifyRulesLT=Anar a la <a href="%s">configuració de l'Empresa</a> per modificar les regles de càlcul
+TaxModuleSetupToModifyRules=Ves a la <a href="%s">Configuració mòdul impostos</a> per modificar les regles de càlcul
+TaxModuleSetupToModifyRulesLT=Ves a la <a href="%s">Configuració de l'empresa</a> per modificar les regles de càlcul
 OptionMode=Opció de gestió comptable
 OptionModeTrue=Opció Ingressos-Despeses
 OptionModeVirtual=Opció Crèdits-Deutes
@@ -13,7 +13,7 @@ OptionModeVirtualDesc=En aquest mètode, el balanç es calcula sobre la base de
 FeatureIsSupportedInInOutModeOnly=Funció disponible només en el mode comptes CREDITS-DEUTES (Veure la configuració del mòdul comptes)
 VATReportBuildWithOptionDefinedInModule=Els imports obtinguts es calculen segons la configuració del mòdul Impostos.
 LTReportBuildWithOptionDefinedInModule=Els imports obtinguts es calculen segons la configuració de l'Empresa
-Param=Parametrizaje
+Param=Configuració
 RemainingAmountPayment=Import restant del pagament :
 AmountToBeCharged=Import total a pagar :
 AccountsGeneral=Comptes generals
@@ -34,8 +34,8 @@ Balance=Saldo
 Debit=Dèbit
 Credit=Crèdit
 Piece=Doc. Comptabilitat
-Withdrawal=Reintegrament
-Withdrawals=Reintegraments
+Withdrawal=Domiciliació
+Withdrawals=Domiciliacions
 AmountHTVATRealReceived=Total repercutit
 AmountHTVATRealPaid=Total pagat
 VATToPay=IVA vendes
@@ -118,7 +118,7 @@ ErrorWrongAccountancyCodeForCompany=Codi comptable incorrecte per a %s
 SuppliersProductsSellSalesTurnover=Volum de vendes generat per la venda dels productes dels proveïdors
 CheckReceipt=Llista de remeses
 CheckReceiptShort=Remeses
-LastCheckReceiptShort=%s Ultimes remeses
+LastCheckReceiptShort=Les %s últimes remeses
 NewCheckReceipt=Nova remesa
 NewCheckDeposit=Nou ingrés
 NewCheckDepositOn=Crear nova remesa al compte: %s
@@ -155,7 +155,7 @@ DepositsAreNotIncluded=- Les factures de bestreta no estan incloses
 DepositsAreIncluded=- Les factures de bestreta estan incloses
 LT2ReportByCustomersInInputOutputModeES=Informe per tercer del IRPF
 LT1ReportByCustomersInInputOutputModeES=Informe de RE per tercers
-VATReport=VAT report
+VATReport=Informe d'IVA
 VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat
 VATReportByCustomersInDueDebtMode=Informe per clients d'IVA cobrat i pagat
 VATReportByQuartersInInputOutputMode=Informe per tipus d'IVA cobrat i pagat
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Informe de clients estrangers
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basat en les dues primeres lletres del CIF que són diferents del codi de país de la teva empresa
 SameCountryCustomersWithVAT=Informe de clients nacionals
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basat en les dues primeres lletres del CIF que són iguals del codi de país de la teva empresa
+LinkedFichinter=Enllaça a una intervenció
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index 4c2c3b5d233..4dbebd8277f 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Àrea contractes
 ListOfContracts=Llistat de contractes
-LastModifiedContracts=Últims %s contractes modificats
+LastModifiedContracts=Els %s últims contractes modificats
 AllContracts=Tots els contractes
 ContractCard=Fitxa contracte
 ContractStatus=Estat del contracte
@@ -58,9 +58,9 @@ ListOfRunningContractsLines=Llistat de línies de contractes en servei
 ListOfRunningServices=Llistat de serveis actius
 NotActivatedServices=Serveis no activats (amb els contractes validats)
 BoardNotActivatedServices=Serveis a activar amb els contractes validats
-LastContracts=Últims %s contractes
-LastActivatedServices=Els %s darrers serveis activats
-LastModifiedServices=Els  %s darrers serveis modificats
+LastContracts=Els %s últims contractes
+LastActivatedServices=Els %s últims serveis activats
+LastModifiedServices=Els %s últims serveis modificats
 EditServiceLine=Edició línia del servei
 ContractStartDate=Data inici
 ContractEndDate=Data finalització
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index 509de32301c..9075e32fe9d 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -16,19 +16,20 @@ KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques autom
 FileToLaunchCronJobs=Ordre per llançar les tasques automàtiques
 CronExplainHowToRunUnix=A entorns Unix s'ha d'utilitzar la següent entrada crontab per executar la comanda cada 5 minuts
 CronExplainHowToRunWin=En entorns Microsoft (tm) Windows, pot utilitzar l'eina 'tareas programadas' per executar la comanda cada 5 minuts
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Tasques programades
-CronListActive=List of enabled/scheduled jobs
+CronListActive=Tasques programades habilitades
 CronListInactive=Llistat de tasques planificades inactives
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Habilitat i deshabilitat
 # Page list
-CronDateLastRun=Últim llançament
-CronLastOutput=Última sortida
-CronLastResult=Últim codi tornat
+CronDateLastRun=Última execució
+CronLastOutput=Última sortida d'execució
+CronLastResult=Últim codi retornat
 CronListOfCronJobs=Llista de tasques programades
 CronCommand=Comando
 CronList=Tasques programades
-CronDelete=Eliminar tasca programada
+CronDelete=Elimina les tasques programades
 CronConfirmDelete=Esteu segur de voler eliminar aquesta tasca programada?
 CronExecute=Llançar tasques programades
 CronConfirmExecute=Esteu segur de voler executar ara aquesta tasca programada?
@@ -36,10 +37,11 @@ CronInfo=Tasques programades li permet executar tasques que han sigut programade
 CronWaitingJobs=Treballs en espera
 CronTask=Tasca
 CronNone=Ningún
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=No abans
+CronDtEnd=No després
 CronDtNextLaunch=Propera execució
-CronDtLastLaunch=Darrera execució
+CronDtLastLaunch=Data d'inici de l'última execució
+CronDtLastResult=Data final de l'última execució
 CronFrequency=Freqüència
 CronClass=Classe
 CronMethod=Mètod
@@ -51,8 +53,8 @@ CronStatusInactive=Inactiva
 CronNoJobs=Sense treballs actualment
 CronPriority=Prioritat
 CronLabel=Descripció
-CronNbRun=Nº ejec.
-CronMaxRun=Max nb. launch
+CronNbRun=Nº execucions
+CronMaxRun=Nº màx. d'exec.
 CronEach=Tota (s)
 JobFinished=Tasques llançades i finalitzades
 #Page card
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=La data de fi no pot ser anterior a la d'inici
 CronStatusActiveBtn=Activar
 CronStatusInactiveBtn=Desactivar
 CronTaskInactive=Aquesta tasca es troba desactivada
-CronDtLastResult=Data de l'últim resultat de l'última execució
 CronId=Id
 CronClassFile=Classe (arxiu)
 CronModuleHelp=Nombre del directorio del módulo Dolibarr (funciona automáticamente con los módulos externos Dolibarr). <BR> Por ejemplo para llamar al método fetch del objeto Product de Dolibarr /htdocs/<u>product</u>/class/product.class.php, el valor del módulo es <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=impossible carregar la classe %s de l'objecte %s
 UseMenuModuleToolsToAddCronJobs=Anar a "inici - Utilitats mòduls - Llista de tasques Cron" per veure i editar tasques programades
 TaskDisabled=Tasca desactivada
+MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/ca_ES/deliveries.lang b/htdocs/langs/ca_ES/deliveries.lang
index daa0a91630c..5fec50bf2b3 100644
--- a/htdocs/langs/ca_ES/deliveries.lang
+++ b/htdocs/langs/ca_ES/deliveries.lang
@@ -9,7 +9,7 @@ DeliveryDateShort=Data lliurament
 CreateDeliveryOrder=Generar nota de recepció
 DeliveryStateSaved=Estat d'enviament desat
 QtyDelivered=Cant. enviada
-SetDeliveryDate=Indicar la data de lliurament
+SetDeliveryDate=Indica la data de lliurament
 ValidateDeliveryReceipt=Validar el rebut de lliurament
 ValidateDeliveryReceiptConfirm=Estàs segur de voler validar aquest rebut de lliurament?
 DeleteDeliveryReceipt=Eliminar el rebut de lliurament
@@ -17,9 +17,9 @@ DeleteDeliveryReceiptConfirm=Esteu segur de voler eliminar aquesta nota de lliur
 DeliveryMethod=Mètode d'enviament
 TrackingNumber=Nº de tracking
 DeliveryNotValidated=Nota de recepció no validada
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+StatusDeliveryCanceled=Cancel·lat
+StatusDeliveryDraft=Esborrany
+StatusDeliveryValidated=Rebut
 # merou PDF model
 NameAndSignature=Nom i signatura:
 ToAndDate=En___________________________________ a ____/_____/__________
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 588eaf832ed..8e98847ddb4 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -29,7 +29,7 @@ ErrorBarCodeRequired=Codi de barres requerit
 ErrorCustomerCodeAlreadyUsed=Codi de client ja utilitzat
 ErrorBarCodeAlreadyUsed=El codi de barres ja és utilitzat
 ErrorPrefixRequired=Prefix obligatori
-ErrorUrlNotValid=L'adreça del lloc web és incorrecta
+ErrorUrlNotValid=L'adreça de la pàgina web és incorrecta
 ErrorBadSupplierCodeSyntax=La sintaxi del codi proveïdor és incorrecta
 ErrorSupplierCodeRequired=Codi proveïdor obligatori
 ErrorSupplierCodeAlreadyUsed=Codi de proveïdor ja utilitzat
@@ -73,7 +73,7 @@ ErrorRefAlreadyExists=La referència utilitzada per a la creació ja existeix
 ErrorPleaseTypeBankTransactionReportName=Introduïu el nom del registre bancari sobre el qual l'escrit està constatat (format AAAAMM o AAAMMJJ)
 ErrorRecordHasChildren=No es pot esborrar el registre perquè té registrses fills.
 ErrorRecordIsUsedCantDelete=No es pot eliminar el registre. S'està utilitzant o incloent en un altre objecte.
-ErrorModuleRequireJavascript=Javascript ha d'estar activat per a que aquesta opció pugui utilitzar-se. Per activar/desactivar JavaScript, aneu al menú Inici->Configuració->Entorn.
+ErrorModuleRequireJavascript=Javascript ha d'estar activat per a que aquesta opció pugui utilitzar-se. Per activar/desactivar JavaScript, ves al menú Inici->Configuració->Entorn.
 ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre
 ErrorContactEMail=S'ha produït un error tècnic. Contacti amb l'administrador al e-mail <b>%s</b>, indicant el codi d'error <b>%s</b> en el seu missatge, o pot també adjuntar una còpia de pantalla d'aquesta pàgina.
 ErrorWrongValueForField=Valor incorrecte per al camp número <b>%s</b> (el valor '<b>%s</b>' no compleix amb la regla <b>%s</b>)
@@ -85,7 +85,7 @@ ErrorSpecialCharNotAllowedForField=Els caràcters especials no són admesos pel
 ErrorDatabaseParameterWrong=El paràmetre de configuració de la base de dades '<b>%s</b>' té un valor no compatible per una instal lació de Dolibarr (ha de tenir el valor '<b>%s</b>').
 ErrorNumRefModel=Hi ha una referència a la base de dades (%s) i és incompatible amb aquesta numeració. Elimineu la línia o renomeneu la referència per activar aquest mòdul.
 ErrorQtyTooLowForThisSupplier=Quantitat insuficient per aquest proveïdor
-ErrorModuleSetupNotComplete=La configuració del mòdul sembla incompleta. Aneu al àrea Configuració - Mòduls per corregir
+ErrorModuleSetupNotComplete=La configuració del mòdul sembla incompleta. Ves Configuració - Mòduls per completar-ho.
 ErrorBadMask=Error en la màscara
 ErrorBadMaskFailedToLocatePosOfSequence=Error, sense número de seqüència en la màscara
 ErrorBadMaskBadRazMonth=Error, valor de tornada a 0 incorrecte
@@ -192,5 +192,5 @@ WarningClickToDialUserSetupNotComplete=La configuració de ClickToDial per al co
 WarningNotRelevant=Operació irrellevant per a aquest conjunt de dades
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalitat desactivada quant la configuració de visualització és optimitzada per a persones cegues o navegadors de text.
 WarningPaymentDateLowerThanInvoiceDate=La data de pagament (%s) és anterior a la data (%s) de la factura %s.
-WarningTooManyDataPleaseUseMoreFilters=Massa dades (més de %s línies). Utilitza més filtres o modifica la constant %s a un límit superior.
+WarningTooManyDataPleaseUseMoreFilters=Massa dades (més de %s línies). Utilitza més filtres o indica la constant %s amb un límit superior.
 WarningSomeLinesWithNullHourlyRate=Algunes vegades van ser registrats pels usuaris quan no s'havia definit el seu preu per hora. Es va utilitzar un valor de 0, però això pot resultar en una valoració equivocada del temps invertit.
diff --git a/htdocs/langs/ca_ES/externalsite.lang b/htdocs/langs/ca_ES/externalsite.lang
index 3ba2889b994..de2a2d77050 100644
--- a/htdocs/langs/ca_ES/externalsite.lang
+++ b/htdocs/langs/ca_ES/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configuració de l'enllaç al lloc web extern
+ExternalSiteSetup=Configuració de l'enllaç a la pàgina web externa
 ExternalSiteURL=URL del lloc extern
 ExternalSiteModuleNotComplete=El mòdul Lloc web extern no ha estat configurat correctament.
 ExampleMyMenuEntry=La meva entrada del menú
diff --git a/htdocs/langs/ca_ES/ftp.lang b/htdocs/langs/ca_ES/ftp.lang
index 567ae1cf5fa..54903cb63c4 100644
--- a/htdocs/langs/ca_ES/ftp.lang
+++ b/htdocs/langs/ca_ES/ftp.lang
@@ -10,5 +10,5 @@ FailedToConnectToFTPServerWithCredentials=No s'ha pogut connectar amb el login/c
 FTPFailedToRemoveFile=No s'ha pogut suprimir el fitxer <b>%s</b>.
 FTPFailedToRemoveDir=No s'ha pogut suprimir la carpeta <b>%s</b> (Comproveu els permisos i que el directori està buit).
 FTPPassiveMode=Mode passiu
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
+ChooseAFTPEntryIntoMenu=Tria una entrada FTP en el menú...
+FailedToGetFile=Error obtenint els fitxers %s
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index 786b872ec1b..f2715d5086f 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -22,7 +22,7 @@ ReviewedByCP=Serà revisada per
 DescCP=Descripció
 SendRequestCP=Enviar la petició de dies lliures
 DelayToRequestCP=Les peticions de dies lliures s'han de realitzar al menys <b>%s dies</b> abans.
-MenuConfCP=Balance of leaves
+MenuConfCP=Saldo de dies lliures
 UpdateAllCP=Actualitzar els dies lliures
 SoldeCPUser=El seu saldo de dies lliures es de <b>%s dies</b>
 ErrorEndDateCP=Ha d'indicar una data de fi superior a la data d'inici.
@@ -79,8 +79,8 @@ NewSoldeCP=Nou saldo
 alreadyCPexist=Ha s'ha efectuat una petició de dies lliures per aquest periode
 UserName=Nom Cognoms
 FirstDayOfHoliday=Primer dia lliure
-LastDayOfHoliday=Últim dia lliures
-BoxTitleLastLeaveRequests=Last %s modified leave requests
+LastDayOfHoliday=Últim dia de vacances
+BoxTitleLastLeaveRequests=Les %s últimes peticions de dies lliures modificades
 HolidaysMonthlyUpdate=Actualització mensual
 ManualUpdate=Actualització manual
 HolidaysCancelation=Anulació de dies lliures
@@ -91,7 +91,7 @@ DescOptionCP=Descripció de l'opció
 ValueOptionCP=Valor
 GroupToValidateCP=Grup amb possibilitat d'aprobar els dies lliures
 ConfirmConfigCP=Validar la configuració
-LastUpdateCP=Última actualització automàticament de dies lliures
+LastUpdateCP=Última actualització automàtica de dies lliures
 MonthOfLastMonthlyUpdate=Mes de l'última actualització automàtica de dies lliures
 UpdateConfCPOK=Actualització efectuada correctament.
 ErrorUpdateConfCP=S'ha produït un error durant l'actualització, torne a provar.
@@ -140,7 +140,7 @@ HolidaysRefusedBody=La seva sol·licitud de dies lliures retribuïts des de el %
 HolidaysCanceled=Dies lliures retribuïts cancel·lats
 HolidaysCanceledBody=La seva solicitud de dies lliures retribuïts del %s al %s ha sigut cancel·lada.
 NewByMonth=Afegit per mes
-Affect=Followed by a counter
-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
+Affect=Seguit per un comptador
+FollowedByACounter=1: Aquest tipus de dia lliure necessita el seguiment d'un comptador. El comptador s'incrementa manualment o automàticament i quan hi ha una petició de dia lliure validada, el comptador es decrementa.<br>0: No seguit per un comptador.
+NoLeaveWithCounterDefined=No s'han definit els tipus de dies lliures que son necessaris per poder seguir-los amb comptador
 GoIntoDictionaryHolidayTypes=Ves a <strong>Inici - Configuració - Diccionaris - Tipus de dies lliures</strong> per configurar els diferents tipus de dies lliures
diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
index e74c8767957..e1ee4bd7b9e 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -15,6 +15,6 @@ DictionaryFunction=HRM - Llistat de funcions
 ListOfEmployees=Llistat d'empleats
 Employees=Empleats
 Employee=Empleat
-Employe=Employe
+Employe=Empleats
 NewEmployee=Nou empleat
 EmployeeCard=Fitxa d'empleat
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 9911437d637..2a53a2f3cd1 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -78,15 +78,15 @@ AdminAccountCreation=Creació del compte administrador
 PleaseTypePassword=Indiqui una contrasenya, no s'accepten les contrasenyes buides!
 PleaseTypeALogin=Indiqui un usuari!
 PasswordsMismatch=Les contrasenyes no coincideixen, torni a intentar-ho!
-SetupEnd=Fi de la instal·lació
+SetupEnd=Fi de la configuració
 SystemIsInstalled=S'està instal·lant el seu sistema
 SystemIsUpgraded=S'ha actualitzat Dolibarr correctament.
 YouNeedToPersonalizeSetup=Ara ha de configurar Dolibarr segons les seves necessitats (Elecció de l'aparença, de les funcionalitats, etc). Per això, feu clic en el següent link:
 AdminLoginCreatedSuccessfuly=Creació del compte gestor Dolibarr '<b>%s </b>' realitzat.
-GoToDolibarr=Accés a Dolibarr
-GoToSetupArea=Accés a Dolibarr (àrea de configuració)
+GoToDolibarr=Ves a Dolibarr
+GoToSetupArea=Ves a Dolibarr (àrea de configuració)
 MigrationNotFinished=La versió de la base de dades encara no està completament a nivell, per la qual cosa haureu de reiniciar una migració.
-GoToUpgradePage=Accedir a la pàgina de migració de nou
+GoToUpgradePage=Ves de nou a la pàgina d'actualització
 WithNoSlashAtTheEnd=Sense el signe "/" al final
 DirectoryRecommendation=Es recomana posar aquesta carpeta fora de la carpeta de les pàgines web.
 LoginAlreadyExists=Ja existeix
@@ -166,7 +166,7 @@ MigrationPaymentsUpdate=Actualització dels pagaments (vincle nn pagaments-factu
 MigrationPaymentsNumberToUpdate=%s pagament(s) a actualitzar
 MigrationProcessPaymentUpdate=Actualització pagament(s) %s
 MigrationPaymentsNothingToUpdate=No hi ha més pagaments orfes que hagin de corregir.
-MigrationPaymentsNothingUpdatable=Cap pagament orfe de correcció.
+MigrationPaymentsNothingUpdatable=No hi ha més pagaments per corregir
 MigrationContractsUpdate=Actualització dels contractes sense detalls (gestió del contracte + detall de contracte)
 MigrationContractsNumberToUpdate=%s contracte(s) a actualitzar
 MigrationContractsLineCreation=Creació linia contracte per contracte Ref. %s
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index 47425099f43..be237dd29b6 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -7,7 +7,7 @@ AddIntervention=Crea intervenció
 ListOfInterventions=Llistat d'intervencions
 EditIntervention=Editar
 ActionsOnFicheInter=Esdeveniments sobre l'intervenció
-LastInterventions=Les %s darreres intervencions
+LastInterventions=Les %s últimes intervencions
 AllInterventions=Totes les intervencions
 CreateDraftIntervention=Crear esborrany
 CustomerDoesNotHavePrefix=El client no té prefix de definit
@@ -54,9 +54,9 @@ PacificNumRefModelDesc1=Retorna el número amb el format %syymm-nnnn on yy és l
 PacificNumRefModelError=Una factura que comença per # $$syymm existeix en base i és incompatible amb aquesta numeració. Elemínela o renombrela per activar aquest mòdul.
 PrintProductsOnFichinter=Mostrar els productes a la fitxa d'intervenció
 PrintProductsOnFichinterDetails=Intervencions generades des de comandes
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=Nb of intervention cards
-NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+InterventionStatistics=Estadístiques de intervencions
+NbOfinterventions=Nº de fitxes de intervenció
+NumberOfInterventionsByMonth=Nº de fitxes de intervenció per mes (data de validació)
 ##### Exports #####
 InterId=Id. d'intervenció
 InterRef=Ref. d'intervenció
diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang
index 8102163328a..a5eb1d992f0 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -32,10 +32,11 @@ Language_es_MX=Espanyol (Mèxic)
 Language_es_PY=Espanyol (Paraguai)
 Language_es_PE=Espanyol (Perú)
 Language_es_PR=Espanyol (Puerto Rico)
+Language_es_VE=Espanyol (Veneçuela)
 Language_et_EE=Estonià
 Language_eu_ES=Basc
 Language_fa_IR=Persa
-Language_fi_FI=Finnish
+Language_fi_FI=Finès
 Language_fr_BE=Francès (Bèlgica)
 Language_fr_CA=Francès (Canadà)
 Language_fr_CH=Francès (Suïssa)
diff --git a/htdocs/langs/ca_ES/ldap.lang b/htdocs/langs/ca_ES/ldap.lang
index 916c2d2f74d..2421fb88104 100644
--- a/htdocs/langs/ca_ES/ldap.lang
+++ b/htdocs/langs/ca_ES/ldap.lang
@@ -15,11 +15,11 @@ LDAPCard=Fitxa LDAP
 LDAPRecordNotFound=Registre no trobat a la base de dades LDAP
 LDAPUsers=Usuaris a la base de dades LDAP
 LDAPGroups=Grups a la base de dades LDAP
-LDAPFieldStatus=Estatut
+LDAPFieldStatus=Estat
 LDAPFieldFirstSubscriptionDate=Data primera adhesió
 LDAPFieldFirstSubscriptionAmount=Import primera adhesió
-LDAPFieldLastSubscriptionDate=Data última adhesió
-LDAPFieldLastSubscriptionAmount=Import darrera adhesió
+LDAPFieldLastSubscriptionDate=Última data de subscripció
+LDAPFieldLastSubscriptionAmount=Últim import de subscripció
 SynchronizeDolibarr2Ldap=Sincronitzar usuari (Dolibarr -> LDAP)
 UserSynchronized=Usuari sincronitzat
 GroupSynchronized=Grup sincronizado
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 9b76f89cba4..afc8d718fcb 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-mailing validat correctament
 MailUnsubcribe=Desubscriure
 Unsuscribe=Desubscriure
 MailingStatusNotContact=No contactar
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=L'adreça del destinatari és buida
 WarningNoEMailsAdded=Cap nou e-mail a afegir a la llista destinataris.
 ConfirmValidMailing=Confirmeu la validació del E-Mailing?
@@ -69,7 +70,7 @@ CloneEMailing=Clonar E-Mailing
 ConfirmCloneEMailing=Esteu segur de voler clonar aquest e-mailing?
 CloneContent=Clonar missatge
 CloneReceivers=Clonar destinataris
-DateLastSend=Data últim enviament
+DateLastSend=Data de l'últim enviament
 DateSending=Data enviament
 SentTo=Enviat a <b>%s</b>
 MailingStatusRead=Llegit
@@ -81,7 +82,7 @@ ActivateCheckReadKey=Clau utilitzada per encriptar la URL utilitzada per les car
 EMailSentToNRecipients=E-Mail enviat a %s destinataris.
 XTargetsAdded=<b>%s</b> destinataris agregats a la llista
 EachInvoiceWillBeAttachedToEmail=Es creara i adjuntara a cada e-mail un document usant el model de factura per defecte.
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=Si el document PDF ja s'ha generat per la factura, s'adjuntarà al correu electrònic. Si no, no s'enviarà cap email (tingues en compte que en aquesta versió només es suporta com adjunts les factures PDF en enviaments massius).
 MailTopicSendRemindUnpaidInvoices=Recordatori de la factura %s (%s)
 SendRemind=Envia recordatori per e-mail
 RemindSent=%s recodatori(s) enviats
@@ -96,8 +97,8 @@ NbSent=Nº enviats
 MailingModuleDescContactCompanies=Contactes de tercers (clients potencials, clients, proveïdors ...)
 MailingModuleDescDolibarrUsers=Usuaris de Dolibarr
 MailingModuleDescFundationMembers=Socis de l'entitat amb correus electrònics
-MailingModuleDescEmailsFromFile=E-Mails d'un arxiu (e-mail;nom;varis)
-MailingModuleDescEmailsFromUser=E-mails introduïts per l'usuari (email, cognoms, nom, altres)
+MailingModuleDescEmailsFromFile=E-mails d'un fitxer de text (e-mail;cognoms;nom;altres)
+MailingModuleDescEmailsFromUser=E-mails introduïts per l'usuari (email;cognoms;nom;altres)
 MailingModuleDescContactsCategories=Tercers (per categoria)
 MailingModuleDescDolibarrContractsLinesExpired=Tercers amb línies de contractes de serveis expirats
 MailingModuleDescContactsByCompanyCategory=Contactes de tercers (per categoria de tercers)
@@ -108,7 +109,7 @@ LineInFile=Línea %s en archiu
 RecipientSelectionModules=Mòduls de selecció dels destinataris
 MailSelectedRecipients=Destinataris seleccionats
 MailingArea=Àrea E-Mailings
-LastMailings=Els %s darrers E-Mailings
+LastMailings=Els %s últims e-mailings
 TargetsStatistics=Estadístiques destinataris
 NbOfCompaniesContacts=Contactes/adreces únics
 MailNoChangePossible=Destinataris d'un E-Mailing validat no modificables
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 8d2dc705322..8d43817eb61 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connexió a la base de dades
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Aquest tipus d'email no té plantilla definida
 NoTranslation=Sense traducció
 NoRecordFound=No s'han trobat registres
 NoError=Cap error
@@ -41,14 +41,14 @@ ErrorUnknown=Error desconegut
 ErrorSQL=Error de SQL
 ErrorLogoFileNotFound=El arxiu logo '%s' no es troba
 ErrorGoToGlobalSetup=Ves a la configuració 'Empresa/Entitat' per corregir-ho
-ErrorGoToModuleSetup=Aneu a la configuració del mòdul per corregir
+ErrorGoToModuleSetup=Ves a la configuració del mòdul per corregir-ho
 ErrorFailedToSendMail=Error en l'enviament de l'e-mail (emissor =%s, destinatairo =%s)
 ErrorAttachedFilesDisabled=La gestió dels fitxers associats està desactivada en aquest servidor
 ErrorFileNotUploaded=El fitxer no s'ha pogut transferir
 ErrorInternalErrorDetected=Error detectat
 ErrorNoRequestRan=Cap petició realitzada
 ErrorWrongHostParameter=Paràmetre Servidor invàlid
-ErrorYourCountryIsNotDefined=El seu país no està definit. Ves a Inici-Configuració-Edita i omple de nou el formulari
+ErrorYourCountryIsNotDefined=El teu país no està definit. Ves a Inici-Configuració-Edita i omple de nou el formulari
 ErrorRecordIsUsedByChild=Impossible de suprimir aquest registre. Es sent utilitzat com a pare per almenys un registre fill.
 ErrorWrongValue=Valor incorrecte
 ErrorWrongValueForParameterX=Valor incorrecte del paràmetre %s
@@ -62,7 +62,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al paí
 ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost social definit per al país '%s'.
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
 NotAuthorized=No està autoritzat per fer-ho.
-SetDate=Definir data
+SetDate=Indica la data
 SelectDate=Seleccioneu una data
 SeeAlso=Veure també %s
 SeeHere=Mira aquí
@@ -85,17 +85,17 @@ Undefined=No definit
 PasswordForgotten=Heu oblidat la contrasenya?
 SeeAbove=Esmentar anteriorment
 HomeArea=Àrea inici
-LastConnexion=Darrera connexió
+LastConnexion=Última connexió
 PreviousConnexion=Connexió anterior
 ConnectedOnMultiCompany=Connexió a l'entitat
 ConnectedSince=Connectat des
 AuthenticationMode=Mode autentificació
 RequestedUrl=Url solicitada
 DatabaseTypeManager=Tipus de gestor de base de dades
-RequestLastAccess=Petició últim accés a la base de dades
-RequestLastAccessInError=Petición último acceso a la base de datos erroni
-ReturnCodeLastAccessInError=Codi retornat últim accés a la base de dades erroni
-InformationLastAccessInError=Informació sobre l'últim accés a la base de dades erroni
+RequestLastAccess=Petició de l'últim accés a la base de dades
+RequestLastAccessInError=Petició de l'últim accés a la base de dades erroni
+ReturnCodeLastAccessInError=Codi retornat de l'últim accés a la base de dades erroni
+InformationLastAccessInError=Informació de l'últim accés a la base de dades erroni
 DolibarrHasDetectedError=Dolibarr ha trobat un error tècnic
 InformationToHelpDiagnose=Heus aquí la informació que podrà ajudar al diagnòstic
 MoreInformation=Més informació
@@ -105,8 +105,8 @@ NotePublic=Nota (pública)
 NotePrivate=Nota (privada)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr està configurat per limitar la precisió dels preus unitaris a <b>%s </b> decimals.
 DoTest=Provar
-ToFilter=Filtrar
-NoFilter=No filter
+ToFilter=Filtre
+NoFilter=Sense filtre
 WarningYouHaveAtLeastOneTaskLate=Atenció, té almenys un element que ha passat la data de tolerencia.
 yes=sí
 Yes=Sí
@@ -205,7 +205,7 @@ RefOrLabel=Ref. o etiqueta
 Info=Log
 Family=Familia
 Description=Descripció
-Designation=Descripción
+Designation=Descripció
 Model=Model
 DefaultModel=Model per defecte
 Action=Acció
@@ -230,15 +230,15 @@ Now=Ara
 HourStart=Hora d'inici
 Date=Data
 DateAndHour=Data i hora
-DateToday=Today's date
-DateReference=Reference date
+DateToday=Data d'avui
+DateReference=Data de referència
 DateStart=Data inici
 DateEnd=Data fi
 DateCreation=Data de creació
 DateCreationShort=Data creació
 DateModification=Data modificació
 DateModificationShort=Data modif.
-DateLastModification=Data última modificació
+DateLastModification=Data de l'última modificació
 DateValidation=Data validació
 DateClosing=Data tancament
 DateDue=Data venciment
@@ -311,6 +311,7 @@ UnitPriceHT=Preu base
 UnitPriceTTC=Preu unitari total
 PriceU=P.U.
 PriceUHT=P.U.
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=Preu Unitari sol·licitat
 PriceUTTC=Preu unitari (IVA inclòs)
 Amount=Import
@@ -321,6 +322,9 @@ AmountTTCShort=Import
 AmountHT=Base imponible
 AmountTTC=Import total
 AmountVAT=Import IVA
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Import Impost 2
 AmountLT2=Import Impost 3
 AmountLT1ES=Import RE
@@ -335,6 +339,7 @@ Percentage=Percentatge
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Import
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total
 TotalHT=Base imponible
 TotalHTforthispage=Base imposable a la pagina
@@ -457,6 +462,7 @@ Datas=Dades
 None=Res
 NoneF=Ninguna
 Late=Retard
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Foto
 Photos=Fotos
 AddPhoto=Afegir foto
@@ -539,6 +545,7 @@ NbOfCustomers=Nombre de clients
 NbOfLines=Números de línies
 NbOfObjects=Nombre d'objectes
 NbOfReferers=Consumició
+NbOfObjectReferers=Número d'objectes vinculats
 Referers=Objectes vinculats
 TotalQuantity=Quantitat total
 DateFromTo=De %s a %s
@@ -612,7 +619,7 @@ TotalMan=Total
 NeverReceived=Mai rebut
 Canceled=Anul·lada
 YouCanChangeValuesForThisListFromDictionarySetup=Pot canviar aquestos valors al menú configuració->diccionaris
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanSetDefaultValueInModuleSetup=Pots indicar el valor per defecte utilitzat en la creació de nous registres en el mòdul de configuració
 Color=Color
 Documents=Documents
 DocumentsNb=Fitxers adjunts (%s)
@@ -694,13 +701,14 @@ LinkedToSpecificUsers=Enllaçat a un contacte d'usuari particular
 DeleteAFile=Eliminació d'arxiu
 ConfirmDeleteAFile=Confirme l'eliminació de l'arxiu
 NoResults=Cap resultat
+AdminTools=Utilitats d'administració
 SystemTools=Utilitats sistema
 ModulesSystemTools=Utilitats mòduls
 Test=Prova
 Element=Element
 NoPhotoYet=No hi ha fotografia disponible
 HomeDashboard=Resum
-Dashboard=Dashboard
+Dashboard=Quadre de comandament
 Deductible=Deduïble
 from=de
 toward=cap a
@@ -709,7 +717,7 @@ SelectAction=Selecciona acció
 HelpCopyToClipboard=Utilitzeu Ctrl+C per copiar al portapapers
 SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "<strong>%s</strong>" (del contrari "%s")
 OriginFileName=Nom original de l'arxiu
-SetDemandReason=Definir origen
+SetDemandReason=Indica l'origen
 SetBankAccount=Definir el compte bancari
 AccountCurrency=Divisa del compte
 ViewPrivateNote=Veure notes
@@ -730,9 +738,10 @@ ViewList=Vista llistat
 Mandatory=Obligatori
 Hello=Hola
 Sincerely=Sincerament
-DeleteLine=Elimina línia
+DeleteLine=Elimina la línia
 ConfirmDeleteLine=Esteu segur de voler eliminar aquesta línia ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
@@ -763,7 +772,7 @@ ShortFriday=Dv
 ShortSaturday=Ds
 ShortSunday=Dg
 SelectMailModel=Selecciona plantilla d'email
-SetRef=Definir ref
+SetRef=Indica ref
 Select2ResultFoundUseArrows=
 Select2NotFound=No s'han trobat resultats
 Select2Enter=Entrar
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index b11b8fd143e..f9c3cad1e03 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -19,7 +19,7 @@ SalesRepresentativeMargins=Marges per comercial
 UserMargins=Marges de l'usuari
 ProductService=Producte o servei
 AllProducts=Tots els productes i serveis
-ChooseProduct/Service=Trieu el producte o servei
+ChooseProduct/Service=Tria el producte o servei
 StartDate=Data d'inici
 EndDate=Data de fi
 Launch=Començar
@@ -35,9 +35,9 @@ MargeBrute=Marge brut
 MargeNette=Marge net
 MargeType1=Marge en el millor preu de proveïdor
 MargeType2=Marge en Preu mitjà ponderat (PMP)
-MargeType3=Margin on Cost Price
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
+MargeType3=Marge en preu de cost
+MARGIN_TYPE_DETAILS=Marge Raw : Preu de venda - Preu de compra<br>Marge net : Preu de venda - Preu de cost
+MarginTypeDesc=* Marge en el millor preu de venda = Preu de venda - Millor preu de proveïdor definit en la fitxa de producte<br>* Marge en Preu Mig Ponderat (PMP) = Preu de venda - Preu Mig Ponderat de producte (PMP) o millor preu de proveïdor si el PMP no està definit<br>* Marge en Preu de cost = Preu de venda - Preu de cost definit en la fitxa de producte o PMP si el preu de cost no està definit, o el millor preu de proveïdor si el PMP no està definit
 CostPrice=Preu de compra
 BuyingCost=Costos
 UnitCharges=Càrrega unitària
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 7bae0582292..71f960ad52c 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -86,7 +86,7 @@ SubscriptionNotReceivedShort=No rebuda
 ListOfSubscriptions=Llista d'afiliacions
 SendCardByMail=Envia fitxa per e-mail
 AddMember=Crea soci
-NoTypeDefinedGoToSetup=No s'ha definit cap tipus de soci. Aneu al menú "Tipus de socis"
+NoTypeDefinedGoToSetup=No s'ha definit cap tipus de soci. Ves al menú "Tipus de socis"
 NewMemberType=Nou tipus de soci
 WelcomeEMail=E-mail
 SubscriptionRequired=Subjecte a cotització
@@ -114,8 +114,8 @@ EnablePublicSubscriptionForm=Activar el formulari públic d'auto-inscripció
 MemberPublicLinks=Links/pàgines públiques
 ExportDataset_member_1=Socis i quotes
 ImportDataset_member_1=Socis
-LastMembers=Els %s darrers socis
-LastMembersModified=Els %s darrers socis modificats
+LastMembers=Els %s últims socis
+LastMembersModified=Els %s últims socis modificats
 LastSubscriptionsModified=Les %s últimes afiliacions modificades
 AttributeName=Nom de l'atribut
 String=Cadena
@@ -164,8 +164,8 @@ DocForAllMembersCards=Generació de targetes per a tots els socis
 DocForOneMemberCards=Generació de targetes per a un soci en particular
 DocForLabels=Generació d'etiquetes d'adreces (Format de plantilla configurat actualment: <b>%s</b>)
 SubscriptionPayment=Pagament quota
-LastSubscriptionDate=Data de l'última cotització
-LastSubscriptionAmount=Import de l'última cotització
+LastSubscriptionDate=Data de l'última afiliació
+LastSubscriptionAmount=Import de l'última afiliació
 MembersStatisticsByCountries=Estadístiques de socis per país
 MembersStatisticsByState=Estadístiques de socis per província
 MembersStatisticsByTown=Estadístiques de socis per població
@@ -176,7 +176,7 @@ NoValidatedMemberYet=No s'ha trobat cap soci validat
 MembersByCountryDesc=Aquesta pantalla presenta una estadística del nombre de socis per país. No obstant això, el gràfic utilitza el servei en línia de gràfics de Google i només és operatiu quan es troba disponible una connexió a Internet.
 MembersByStateDesc=Aquesta pantalla presenta una estadística del nombre de socis per província
 MembersByTownDesc=Aquesta pantalla presenta una estadística del nombre de socis per població.
-MembersStatisticsDesc=Trieu les estadístiques que voleu consultar...
+MembersStatisticsDesc=Tria les estadístiques que vols consultar...
 MenuMembersStats=Estadístiques
 LastMemberDate=Data de l'últim soci
 Nature=Caràcter
@@ -195,7 +195,7 @@ Associations=Entitats
 Collectivités=Col.lectivitats
 Particuliers=Particulars
 Entreprises=Empreses
-DOLIBARRFOUNDATION_PAYMENT_FORM=Per realitzar el pagament de la seva cotització per transferència bancària, visiteu la pàgina <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribirse#Para_una_adhesi.C3.B3n_por_transferencia">http://wiki.dolibarr.org/index.php/Subscribirse</a>.<br>Per pagar amb targeta de crèdit o PayPal, feu clic al botó a la part inferior d'aquesta pàgina.<br><br>
+DOLIBARRFOUNDATION_PAYMENT_FORM=Per pagar la quota per transferència bancària, visiteu la pàgina <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribirse#Para_una_adhesi.C3.B3n_por_transferencia">http://wiki.dolibarr.org/index.php/Subscribirse</a>.<br>Per pagar amb targeta de crèdit o PayPal, feu clic al botó a la part inferior d'aquesta pàgina.<br>
 ByProperties=Per característiques
 MembersStatisticsByProperties=Estadístiques dels socis per característiques
 MembersByNature=Aquesta pantalla mostra estadístiques de socis per caràcter.
diff --git a/htdocs/langs/ca_ES/oauth.lang b/htdocs/langs/ca_ES/oauth.lang
index 7456246c5e6..84cb6d1931d 100644
--- a/htdocs/langs/ca_ES/oauth.lang
+++ b/htdocs/langs/ca_ES/oauth.lang
@@ -8,7 +8,7 @@ TokenDeleted=Token eliminat
 RequestAccess=Clica aquí per demanar/renovar l'accés i rebre un nou token per desar
 DeleteAccess=Faci clic aquí per eliminar token
 UseTheFollowingUrlAsRedirectURI=Utilitza la següent URL com a URI de redirecció quan es crea la teva credencial en el teu proveïdor OAuth:
-ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
+ListOfSupportedOauthProviders=Entra les credencials donades pel teu proveïdor OAuth2. Només es poden veure proveïdors que suporten OAuth2. Aquesta configuració es pot utilitzar per altres mòduls que necessiten autenticació OAuth2.
 OAUTH_GOOGLE_NAME=Api Google
 OAUTH_GOOGLE_ID=Api Google Id
 OAUTH_GOOGLE_SECRET=Api Google Secret
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index aec67a14d43..7dd746bd66b 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -82,14 +82,14 @@ OrdersOpened=Comandes a processar
 NoOpenedOrders=No hi ha comandes obertes
 NoOtherOpenedOrders=No hi ha altres comandes obertes
 NoDraftOrders=Sense comandes esborrany
-NoOrder=No order
+NoOrder=Sense comanda
 NoSupplierOrder=Sense comanda a proveïdor
 OtherOrders=Altres comandes
-LastOrders=Últimes %s comandes de clients
-LastCustomerOrders=Últimes %s comandes de clients
-LastSupplierOrders=Últimes %s comandes a proveïdors
-LastModifiedOrders=Les %s darreres comandes modificades
-LastClosedOrders=Les %s darreres comandes tancades
+LastOrders=Les %s últimes comandes de clients
+LastCustomerOrders=Les %s últimes comandes de clients
+LastSupplierOrders=Les %s últimes comandes a proveïdors
+LastModifiedOrders=Les %s últimes comandes modificades
+LastClosedOrders=Les %s últimes comandes tancades
 AllOrders=Totes les comandes
 NbOfOrders=Nombre de comandes
 OrdersStatistics=Estadístiques de comandes
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index d22af8d23e1..5dcc40d09bb 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -68,14 +68,14 @@ PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nLi adjuntem l'enviament
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nLi adjuntem l'intervenció __FICHINTERREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr és un programari per a la gestió de negocis (professionals o associacions), compost de mòduls funcionals independents i opcionals. Una demostració que inclogui tots aquests mòduls no té sentit perquè no utilitzarà tots els mòduls. A més, té disponibles diversos tipus de perfils de demostració.
-ChooseYourDemoProfil=Seleccioneu el perfil de demostració que millor correspongui a la seva activitat ...
+ChooseYourDemoProfil=Tria el perfil de demostració que millor correspongui a la teva activitat...
 DemoFundation=Gestió de socis d'una entitat
 DemoFundation2=Gestió de socis i tresoreria d'una entitat
 DemoCompanyServiceOnly=Gestió d'un treballador per compte propi realitzant serveis
 DemoCompanyShopWithCashDesk=Gestió d'una botiga amb caixa
 DemoCompanyProductAndStocks=Gestió d'una PIME amb venda de productes
 DemoCompanyAll=Gestió d'una PIME amb activitats múltiples (tots els mòduls principals)
-GoToDemo=Accedir a la demo
+GoToDemo=Ves a la demo
 CreatedBy=Creat per %s
 ModifiedBy=Modificat per %s
 ValidatedBy=Validat per %s
@@ -87,7 +87,7 @@ ValidatedById=ID d'usuari que a validat
 CanceledById=ID d'usuari que ha cancel·lat
 ClosedById=ID d'usuari que a tancat
 CreatedByLogin=Login d'usuari que a creat
-ModifiedByLogin=Login d'usuari que ha realitzat l'últim canvi
+ModifiedByLogin=Nom d'usuari que ha realitzat l'últim canvi
 ValidatedByLogin=Login d'usuari que ha validat
 CanceledByLogin=Login d'usuari que ha cancel·lat
 ClosedByLogin=Login d'usuari que a tancat
@@ -162,7 +162,7 @@ NumberOfSupplierInvoices=Nombre de factures de proveïdors en els darrers 12 mes
 NumberOfUnitsProposals=Nombre d'unitats en els pressupostos en els darrers 12 mesos
 NumberOfUnitsCustomerOrders=Nombre d'unitats en les comandes de clients en els darrers 12 mesos
 NumberOfUnitsCustomerInvoices=Nombre d'unitats en les factures a clients en els darrers 12 mesos
-NumberOfUnitsSupplierOrders=Nombre d'unitats a les comandes a proveïdors en els últims 12 mesos
+NumberOfUnitsSupplierOrders=Nombre d'unitats a les comandes a proveïdors en els darrers 12 mesos
 NumberOfUnitsSupplierInvoices=Nombre d'unitats en les comandes a proveïdors en els darrers 12 mesos
 EMailTextInterventionValidated=Fitxa intervenció %s validada
 EMailTextInvoiceValidated=Factura %s validada
@@ -189,7 +189,7 @@ ThisIsListOfModules=Li mostrem un llistat de mòduls preseleccionats per a aques
 ClickHere=Faci clic aquí
 UseAdvancedPerms=Usar els drets avançats en els permisos dels mòduls
 FileFormat=Format d'arxiu
-SelectAColor=Trie un color
+SelectAColor=Tria un color
 AddFiles=Afegir arxius
 StartUpload=Transferir
 CancelUpload=Cancel·lar transferència
@@ -198,7 +198,7 @@ PleaseBePatient=Preguem esperi uns instants...
 RequestToResetPasswordReceived=S'ha rebut una sol·licitud per canviar la contrasenya de Dolibarr
 NewKeyIs=Aquesta és la nova contrasenya per iniciar sessió
 NewKeyWillBe=La seva nova contrasenya per iniciar sessió en el software serà
-ClickHereToGoTo=Faci clic aquí per anar a %s
+ClickHereToGoTo=Clica aquí per anar a %s
 YouMustClickToChange=però, primer ha de fer clic en el següent enllaç per validar aquest canvi de contrasenya
 ForgetIfNothing=Si vostè no ha sol·licitat aquest canvi, simplement ignori aquest e-mail. Les seves credencials són guardades de forma segura
 IfAmountHigherThan=si l'import es major que <strong>%s</strong>
@@ -238,8 +238,8 @@ ToExport=Exportar
 NewExport=Nova exportació
 ##### External sites #####
 ExternalSites=Llocs externs
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
-WEBSITE_KEYWORDS=Keywords
+WebsiteSetup=Configuració del mòdul de pàgina web
+WEBSITE_PAGEURL=URL de pàgina
+WEBSITE_TITLE=Títol
+WEBSITE_DESCRIPTION=Descripció
+WEBSITE_KEYWORDS=Paraules clau
diff --git a/htdocs/langs/ca_ES/paypal.lang b/htdocs/langs/ca_ES/paypal.lang
index a9c507b3b11..e1628bcf5ba 100644
--- a/htdocs/langs/ca_ES/paypal.lang
+++ b/htdocs/langs/ca_ES/paypal.lang
@@ -8,7 +8,7 @@ PAYPAL_API_SANDBOX=Mode de proves(sandbox)
 PAYPAL_API_USER=Nom usuari API
 PAYPAL_API_PASSWORD=Contrasenya usuari API
 PAYPAL_API_SIGNATURE=Signatura API
-PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_SSLVERSION=Versió Curl SSL
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proposar pagament integral (Targeta+Paypal) o només Paypal
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=Només PayPal
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 15da10d1f6e..235e507b740 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -18,5 +18,5 @@ printSellby=Límit venda: %s
 printQty=Quant.: %d
 AddDispatchBatchLine=Afegir una línia per despatx per caducitat
 BatchDefaultNumber=Indefinit
-WhenProductBatchModuleOnOptionAreForced=Si el mòdul de Lot/Serie esta activat, l'increment/disminució d'estoc esta forçada a l'últim escollit i no pot editar-se. Altres opcions poden definir-se si es necessita
+WhenProductBatchModuleOnOptionAreForced=Si el mòdul de Lot/Serie està activat, l'increment/disminució d'estoc està forçat a l'elecció anterior i no pot editar-se. Les altres opcions poden definir-se si cal.
 ProductDoesNotUseBatchSerial=Aquest producte no utilitza lot/número de sèrie
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index c07ef19d343..7a2100e8046 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -36,12 +36,12 @@ ServicesOnSell=Serveis en venda o compra
 ServicesNotOnSell=Serveis que no estan en venda
 ServicesOnSellAndOnBuy=Serveis en venda o de compra
 InternalRef=Referència interna
-LastRecorded=Ultims productes/serveis en venda registrats
-LastRecordedProductsAndServices=Els %s darrers productes/serveis registrats
-LastModifiedProductsAndServices=Els %s darrers productes/serveis registrats
-LastRecordedProducts=Els %s darrers productes registrats
-LastRecordedServices=Els %s darrers serveis registrats
-LastProducts=Ultims productes
+LastRecorded=Últims productes/serveis en venda registrats
+LastRecordedProductsAndServices=Els %s últims productes/serveis registrats
+LastModifiedProductsAndServices=Els %s últims productes/serveis modificats
+LastRecordedProducts=Els %s últims productes registrats
+LastRecordedServices=Els %s últims serveis registrats
+LastProducts=Últims productes
 CardProduct0=Fitxa producte
 CardProduct1=Fitxa servei
 CardContract=Fitxa contrate
@@ -105,7 +105,7 @@ AddToMyProposals=Adjuntar als meus pressupostos
 AddToOtherProposals=Adjuntar a altres pressupostos
 AddToMyBills=Adjuntar a les meves factures
 AddToOtherBills=Adjuntar a altres factures
-CorrectStock=Corregir stock
+CorrectStock=Regularització d'estoc
 ListOfStockMovements=Llistat de moviments de stock
 BuyingPrice=Preu de compra
 PriceForEachProduct=Productes amb preus específics
@@ -118,7 +118,7 @@ PrimaryWay=Ruta Primaria:
 PriceRemoved=Preu eliminat
 BarCode=Codi de barra
 BarcodeType=Tipus de codi de barres
-SetDefaultBarcodeType=Definiu el tipus de codi de barres
+SetDefaultBarcodeType=Indica el tipus de codi de barres
 BarcodeValue=Valor del codi de barres
 NoteNotVisibleOnBill=Nota (no visible en les factures, pressupostos, etc.)
 CreateCopy=Crear còpia
@@ -126,21 +126,21 @@ ServiceLimitedDuration=Si el servei és de durada limitada:
 MultiPricesAbility=Diversos nivells de preus per producte/servei
 MultiPricesNumPrices=Nº de preus
 MultiPriceLevelsName=Categoria de preus
-AssociatedProductsAbility=Activa les característiques del paquet
+AssociatedProductsAbility=Activa l'atribut de productes compostos
 AssociatedProducts=Producte compost
-AssociatedProductsNumber=Número de productes que composen aquest paquet de productes
+AssociatedProductsNumber=Número de productes que composen aquest producte compost
 ParentProductsNumber=Nº de productes que aquest compon
-IfZeroItIsNotAVirtualProduct=Si és 0, aquest producte no és un paquet de productes
-IfZeroItIsNotUsedByVirtualProduct=Si és 0, aquest producte no s'utilitza en cap paquet de productes
+IfZeroItIsNotAVirtualProduct=Si és 0, aquest producte no és un producte compost
+IfZeroItIsNotUsedByVirtualProduct=Si és 0, aquest producte no s'utilitza en cap producte compost
 EditAssociate=Compondre
 Translation=Traducció
 KeywordFilter=Filtre per clau
 CategoryFilter=Filtre per categoria
 ProductToAddSearch=Cercar productes a adjuntar
-AddDel=Adjuntar/Retirar
+AddDel=Afegir/Eliminar
 NoMatchFound=No s'han trobat resultats
-ProductAssociationList=Llistat de productes/serveis que son components d'aquest producte/paquet virtual
-ProductParentList=Llistat de productes/serveis amb aquest producte com a component
+ProductAssociationList=Llista de productes/serveis que són components d'aquest producte/paquet virtual
+ProductParentList=Llista de productes/serveis compostos amb aquest producte com a component
 ErrorAssociationIsFatherOfThis=Un dels productes seleccionats és pare del producte en curs
 DeleteProduct=Eliminar un producte/servei
 ConfirmDeleteProduct=Esteu segur de voler eliminar aquest producte/servei?
@@ -252,7 +252,7 @@ UnitPmp=Preu Compra Unitari
 CostPmpHT=Cost de compra
 ProductUsedForBuild=Auto consumit per producció
 ProductBuilded=Producció completada
-ProductsMultiPrice=Products and prices for each price level
+ProductsMultiPrice=Productes i preus per cada nivell de preu
 ProductsOrServiceMultiPrice=Preus de client (productes o serveis, multi-preus)
 ProductSellByQuarterHT=Facturació de productes trimestral abans d'impostos
 ServiceSellByQuarterHT=Facturació de serveis trimestral abans d'impostos
@@ -277,7 +277,7 @@ PriceByCustomer=Preus diferents per cada client
 PriceCatalogue=Preus únics per producte/servei
 PricingRule=Regles per preus a clients
 AddCustomerPrice=Afegir preus per client
-ForceUpdateChildPriceSoc=Establir el mateix preu a les filials dels clients
+ForceUpdateChildPriceSoc=Indica el mateix preu a les filials dels clients
 PriceByCustomerLog=Registre de preus de clients anteriors
 MinimumPriceLimit=El preu mínim no pot ser inferior a %s
 MinimumRecommendedPrice=El preu mínim recomenat es: %s
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Incrementar/Disminueix estoc en canviar el seu pare
 ComposedProduct=Sub-producte
 MinSupplierPrice=Preu mínim de proveïdor
 DynamicPriceConfiguration=Configuració de preu dinàmic
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Afegeix variable
+AddUpdater=Afegeix actualitzador
 GlobalVariables=Variables globals
+VariableToUpdate=Variable per actualitzar
 GlobalVariableUpdaters=Actualitzacions de variables globals
 GlobalVariableUpdaterType0=Dades JSON
 GlobalVariableUpdaterHelp0=Analitza dades JSON des de l'URL especificada, el valor especifica l'ubicació de valor rellevant
@@ -311,5 +315,6 @@ PropalMergePdfProductChooseFile=Selecciona fitxers PDF
 IncludingProductWithTag=Inclòs productes/serveis amb etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=Preu per defecte, el preu real depén de client
 WarningSelectOneDocument=Selecciona com a mínim un document
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
+DefaultUnitToShow=Unitat
+NbOfQtyInProposals=Qtat. en pressupostos
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 6612c6c2f59..58e142f4fcb 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -5,6 +5,7 @@ ProjectId=ID projecte
 ProjectLabel=Etiqueta de projecte
 Project=Projecte
 Projects=Projectes
+ProjectsArea=Àrea de projectes
 ProjectStatus=Estat el projecte
 SharedProject=Projecte compartit
 PrivateProject=Contactes del projecte
@@ -14,12 +15,12 @@ ProjectsPublicTaskDesc=Aquesta vista mostra tots els projectes als que té dret
 ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa).
 MyTasksDesc=Aquesta vista es limita als projectes i tasques en què vostè és un contacte afectat en almenys una tasca (qualsevol tipus).
 OnlyOpenedProject=Només visibles els projectes oberts (els projectes en estat d'esborrany o tancats no són visibles)
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Els projectes tancats no són visibles.
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
 TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritzacions li ofereixen una visió completa).
 AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques de cada projecte són visibles, però només pots entrar les hores per les tasques que tens assignades. Assigna't tasques si vols afegir-hi les hores.
 OnlyYourTaskAreVisible=Només són visibles les tasques que tens assignades. Assigna't tasques si vols afegir-hi les hores.
-ProjectsArea=Àrea projectes
+ProjectsArea=Àrea de projectes
 NewProject=Nou projecte
 AddProject=Crear projecte
 DeleteAProject=Eliminar un projecte
@@ -27,15 +28,15 @@ DeleteATask=Eliminar una tasca
 ConfirmDeleteAProject=Esteu segur de voler eliminar aquest projecte?
 ConfirmDeleteATask=Esteu segur de voler eliminar aquesta tasca?
 OfficerProject=Responsable del projecte
-LastProjects=Els %s ultims projectes
+LastProjects=Els %s últims projectes
 AllProjects=Tots els projectes
 OpenedProjects=Projectes oberts
-OpenedTasks=Opened tasks
+OpenedTasks=Tasques obertes
 OpportunitiesStatusForOpenedProjects=Quantitat d'oportunitats de projectes oberts per estat
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+OpportunitiesStatusForProjects=Import d'oportunitats de projectes per estat
 ProjectsList=Llistat de projectes
 ShowProject=Veure projecte
-SetProject=Definir projecte
+SetProject=Indica el projecte
 NoProject=Cap projecte definit
 NbOpenTasks=Nº Tasques obertes
 NbOfProjects=Nº de projectes
@@ -67,6 +68,7 @@ Activities=Tasques/activitats
 MyActivity=La meva activitat
 MyActivities=Les meves tasques/activitats
 MyProjects=Els meus projectes
+MyProjectsArea=Àrea dels meus projectes
 DurationEffective=Durada efectiva
 Progress=Progressió
 ProgressDeclared=Progressió declarada
@@ -132,8 +134,8 @@ TaskModifiedInDolibarr=La tasca %s a sigut modificada
 TaskDeletedInDolibarr=La tasca %s a sigut eliminada
 OpportunityStatus=Estat d'oportunitats
 OpportunityStatusShort=Estat d'oportunitat
-OpportunityProbability=Opportunity probability
-OpportunityProbabilityShort=Opp. probab.
+OpportunityProbability=Probabilitat d'oportunitat
+OpportunityProbabilityShort=Probab. d'op.
 OpportunityAmount=Import d'oportunitats
 OpportunityAmountShort=Import d'oportunitat
 ##### Types de contacts #####
@@ -168,7 +170,7 @@ ProjectsWithThisUserAsContact=Projectes amb aquest usuari com a contacte
 TasksWithThisUserAsContact=Tasques asignades a l'usuari
 ResourceNotAssignedToProject=No assignat a cap projecte
 ResourceNotAssignedToTask=No assignat a cap tasca
-ResourceNotAssignedToTheTask=Not assigned to the task
+ResourceNotAssignedToTheTask=No assignat a la tasca
 AssignTaskToMe=Assignar-me una tasca
 AssignTask=Assigna
 ProjectOverview=Informació general
@@ -183,9 +185,12 @@ TaskAssignedToEnterTime=Tasca assignada. És possible entrar els temps en aquest
 IdTaskTime=Id de temps de tasca
 YouCanCompleteRef=Si vols completar la referència amb més informació (per utilitzar-la als filtres de cerca), es recomanda afegir el caràcter - per separar-ho, així la numeració automàtica funcionarà correctament pels propers projectes. Per exemple %s-ABC. També pots preferir afegir claus de cerca en l'etiqueta.
 OpenedProjectsByThirdparties=Projectes oberts per tercers
+OnlyOpportunitiesShort=Només oportunitats
+OpenedOpportunitiesShort=Oportunitats obertes
+NotAnOpportunityShort=No és una oportunitat
 OpportunityTotalAmount=Import total d'oportunitats
 OpportunityPonderatedAmount=Quantitat ponderada d'oportunitats
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
+OpportunityPonderatedAmountDesc=Quantitat ponderada d'oportunitats amb probabilitat
 OppStatusPROSP=Potencial
 OppStatusQUAL=Qualificació
 OppStatusPROPO=Pressupost
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 75d8c33873a..851b5e7ff4b 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -19,13 +19,13 @@ ValidateProp=Validar pressupost
 AddProp=Crear pressupost
 ConfirmDeleteProp=Esteu segur de voler eliminar aquest pressupost?
 ConfirmValidateProp=Esteu segur de voler validar aquest pressupost sota la referència <b>%s</b>?
-LastPropals=Els %s darrers pressupostos
-LastClosedProposals=Els %s darrers pressupostos tancats
-LastModifiedProposals=Els %s darrers pressupostos modificats
+LastPropals=Els %s últims pressupostos
+LastClosedProposals=Els %s últims pressupostos tancats
+LastModifiedProposals=Els %s últims pressupostos modificats
 AllPropals=Tots els pressupostos
-LastProposals=Ultims pressupostos
+LastProposals=Últims pressupostos
 SearchAProposal=Cercar un pressupost
-NoProposal=No proposal
+NoProposal=Sense pressupost
 ProposalsStatistics=Estadístiques de pressupostos
 NumberOfProposalsByMonth=Número per mes
 AmountOfProposalsByMonthHT=Import per mes (Sense IVA)
@@ -63,8 +63,8 @@ DatePropal=Data pressupost
 DateEndPropal=Data fi validesa
 DateEndPropalShort=Data fi
 ValidityDuration=Durada de validesa
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Indica l'estat 
+SetAcceptedRefused=Indica acceptat/refusat
 ClassifyBilled=Classificar facturat
 BuildBill=Crear factura
 ErrorPropalNotFound=Pressupost %s inexistent
@@ -83,7 +83,7 @@ ConfirmReOpenProp=Esteu segur de voler reobrir el pressupost <b>%s</b> ?
 ProposalsAndProposalsLines=Pressupostos a clients i línies de pressupostos
 ProposalLine=Línia de pressupost
 AvailabilityPeriod=Temps de lliurament
-SetAvailability=Definir el temps de lliurament
+SetAvailability=Indica el temps de lliurament
 AfterOrder=després de la comanda
 ##### Availability #####
 AvailabilityTypeAV_NOW=Immediata
@@ -102,4 +102,4 @@ DefaultModelPropalCreate=Model per defecte
 DefaultModelPropalToBill=Model per defecte en tancar un pressupost (a facturar)
 DefaultModelPropalClosed=Model per defecte en tancar un pressupost (no facturat)
 ProposalCustomerSignature=Acceptació per escrit, segell de l'empresa, data i signatura
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalsStatisticsSuppliers=Estadístiques de pressupostos de proveïdor
diff --git a/htdocs/langs/ca_ES/receiptprinter.lang b/htdocs/langs/ca_ES/receiptprinter.lang
index b0a1331be94..2d3914c1a99 100644
--- a/htdocs/langs/ca_ES/receiptprinter.lang
+++ b/htdocs/langs/ca_ES/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Configuració del mòdul Impressió de Tiquets
 PrinterAdded=Impressora %s afegida
 PrinterUpdated=Impressora %s actualitzada
 PrinterDeleted=Impressora %s esborrada
 TestSentToPrinter=Prova enviada a la impressora %s
+ReceiptPrinter=Impressores de tiquets
 ReceiptPrinterDesc=Configuració de impressores
 ReceiptPrinterTemplateDesc=Configuració de plantilles
 ReceiptPrinterTypeDesc=Descripció del tipus d'impresora de tiquets
@@ -79,7 +81,7 @@ DOL_PRINT_CUSTOMER_MAIL=Imprimeix correu del client
 DOL_PRINT_CUSTOMER_PHONE=Imprimeix telèfon del client
 DOL_PRINT_CUSTOMER_MOBILE=Imprimeix mòbil del client
 DOL_PRINT_CUSTOMER_SKYPE=Imprimeix skype del client
-DOL_PRINT_CUSTOMER_TAX_NUMBER=Imprimeix el IVA del client
+DOL_PRINT_CUSTOMER_TAX_NUMBER=Imprimeix el CIF/NIF del client
 DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Imprimir balanç contable del client
 DOL_PRINT_VENDOR_LASTNAME=Imprimir cognom del venedor
 DOL_PRINT_VENDOR_FIRSTNAME=Imprimir nom del venedor
@@ -92,5 +94,5 @@ DOL_PRINT_IF_HAPPY_HOUR=Imprimeix la línia SI és Happy Hour
 DOL_PRINT_IF_NUM_ORDER_UNIQUE=Imprimeix la línia SI la comanda està validada
 DOL_PRINT_IF_CUSTOMER_POINTS=Imprimeix la línia SI els punts del client > 0
 DOL_PRINT_IF_ORDER_POINTS=Imprimeix la línia SI els punts de la comanda > 0
-DOL_PRINT_IF_CUSTOMER_TAX_NUMBER=Imprimeix la línia SI el client té IVA
+DOL_PRINT_IF_CUSTOMER_TAX_NUMBER=Imprimeix la línia SI el client té CIF/NIF
 DOL_PRINT_IF_CUSTOMER_ACCOUNT_BALANCE_POSITIVE=Imprimeix la línia SI el balanç del client > 0
diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang
index 0640abff4f0..d6c1fb08b55 100644
--- a/htdocs/langs/ca_ES/resource.lang
+++ b/htdocs/langs/ca_ES/resource.lang
@@ -19,7 +19,7 @@ ResourcesLinkedToElement=Recurs enllaçat a element
 
 ShowResource=Mostra recursos
 ShowResourcePlanning=Veure planificació de recursos
-GotoDate=Anar a la data
+GotoDate=Ves a la data
 
 ResourceElementPage=Elements de recursos
 ResourceCreatedWithSuccess=Recurs creat correctament
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 184022729ef..985eb69936f 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -6,18 +6,18 @@ AllSendings=Tots els enviaments
 Shipment=Enviament
 Shipments=Enviaments
 ShowSending=Mostra les expedicions
-Receivings=Delivery Receipts
+Receivings=Confirmacions d'entrega
 SendingsArea=Àrea enviaments
 ListOfSendings=Llista d'enviaments
 SendingMethod=Mètode d'enviament
-SendingReceipt=Albarà
-LastSendings=Els %s darrers enviaments
+SendingReceipt=Rebut d'enviament
+LastSendings=Els %s últims enviaments
 SearchASending=Cerca enviament
 StatisticsOfSendings=Estadístiques d'enviaments
 NbOfSendings=Nombre d'enviaments
 NumberOfShipmentsByMonth=Nombre d'enviaments per mes
 SendingCard=Fitxa d'enviament
-NewSending=Nuevo envío
+NewSending=Nou enviament
 CreateASending=Crear un enviament
 CreateSending=Crear enviament
 QtyOrdered=Qt. demanada
diff --git a/htdocs/langs/ca_ES/sms.lang b/htdocs/langs/ca_ES/sms.lang
index ae7e8f76227..4bc5271da63 100644
--- a/htdocs/langs/ca_ES/sms.lang
+++ b/htdocs/langs/ca_ES/sms.lang
@@ -49,6 +49,6 @@ SendSms=Envia SMS
 SmsInfoCharRemain=Nº restant de caràcters
 SmsInfoNumero= (format internacional ex: +33899701761)
 DelayBeforeSending=Retard abans d'enviar (en minuts)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=No hi ha qui envia. Comprova la configuració del proveïdor de SMS.
 SmsNoPossibleRecipientFound=No hi ha destinataris. Comproveu la configuració del seu proveïdor d'SMS.
 
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 773b8488da0..6ad9ea8cb79 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -11,9 +11,9 @@ WarehouseSource=Magatzem origen
 WarehouseSourceNotDefined=Sense magatzems definits,
 AddOne=Afegir un
 WarehouseTarget=Magatzem destinació
-ValidateSending=Validar enviament
+ValidateSending=Elimina l'enviament
 CancelSending=Cancel·la l'enviament
-DeleteSending=Eliminar enviament
+DeleteSending=Elimina l'enviament
 Stock=Estoc
 Stocks=Estocs
 StocksByLotSerial=Estocs per lot/sèrie
@@ -21,7 +21,7 @@ Movement=Moviment
 Movements=Moviments
 ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori
 ErrorWarehouseLabelRequired=L'etiqueta del magatzem és obligatòria
-CorrectStock=Corregir estoc
+CorrectStock=Regularització d'estoc
 ListOfWarehouses=Llistat de magatzems
 ListOfStockMovements=Llistat de moviments de estoc
 StocksArea=Àrea de magatzems
@@ -33,8 +33,9 @@ LastMovement=Últim moviment
 LastMovements=Ultims moviments
 Units=Unitats
 Unit=Unitat
-StockCorrection=Correcció estoc
-StockTransfer=Moviment d'estoc
+StockCorrection=Regularització d'estoc
+StockTransfer=Transferència d'estoc
+MassStockTransferShort=Transferència d'estoc massiu
 StockMovement=Moviment d'estoc
 StockMovements=Moviments d'estoc
 LabelMovement=Etiqueta del moviment
@@ -57,7 +58,7 @@ RuleForStockManagementDecrease=Regla per la reducció automàtica d'estoc (la re
 RuleForStockManagementIncrease=Regla per l'increment automàtic d'estoc (l'increment manual sempre és possible, excepte si hi ha una regla d'increment automàtica activada)
 DeStockOnBill=Decrementar els estocs físics sobre les factures/abonaments a clients
 DeStockOnValidateOrder=Decrementar els estocs físics sobre les comandes de clients
-DeStockOnShipment=Disminueix l'estoc real al validar l'albarà
+DeStockOnShipment=Disminueix l'estoc real al validar l'enviament
 ReStockOnBill=Incrementar els estocs físics sobre les factures/abonaments de proveïdors
 ReStockOnValidateOrder=Incrementar els estocs físics sobre les comandes a proveïdors
 ReStockOnDispatchOrder=Incrementa els estocs físics en el desglossament manual de la recepció de les comandes a proveïdors en els magatzems
@@ -91,8 +92,8 @@ DeleteAWarehouse=Eliminar un magatzem
 ConfirmDeleteWarehouse=Esteu segur que voleu eliminar el magatzem <b>%s</b> ?
 PersonalStock=Stoc personal %s
 ThisWarehouseIsPersonalStock=Aquest magatzem representa l'estoc personal de %s %s
-SelectWarehouseForStockDecrease=Seleccioneu el magatzem a usar en el decrement d'estoc
-SelectWarehouseForStockIncrease=Seleccioneu el magatzem a utilitzar en l'increment d'estoc
+SelectWarehouseForStockDecrease=Tria el magatzem a utilitzar en el decrement d'estoc
+SelectWarehouseForStockIncrease=Tria el magatzem a utilitzar en l'increment d'estoc
 NoStockAction=Sense accions sobre l'estoc
 LastWaitingSupplierOrders=Comandes en espera de recepció
 DesiredStock=Estoc mínim desitjat
@@ -107,7 +108,7 @@ UsePhysicalStock=Utilitzar estoc físic
 CurentSelectionMode=Mode de sel·leció actual
 CurentlyUsingVirtualStock=Estoc virtual
 CurentlyUsingPhysicalStock=Estoc físic
-RuleForStockReplenishment=Regla per al reaprovisionament de stcok
+RuleForStockReplenishment=Regla pels reaprovisionaments d'estoc
 SelectProductWithNotNullQty=Seleccioni almenys un producte amb la quantitat diferent de 0 i un proveïdor
 AlertOnly= Només alertes
 WarehouseForStockDecrease=Per la disminució d'estoc s'utilitzara el magatzem <b>%s</b>
@@ -130,10 +131,10 @@ StockMustBeEnoughForOrder=El nivell d'existències ha de ser suficient per afegi
 StockMustBeEnoughForShipment= El nivell d'existencies ha de ser suficient per afegir productes/serveis a albarans
 MovementLabel=Etiqueta del moviment
 InventoryCode=Moviments o codi d'inventari
-IsInPackage=Contingut del paquet
+IsInPackage=Contingut en producte compost
 ShowWarehouse=Mostrar magatzem
 MovementCorrectStock=Ajustament d'estoc del producte %s
-MovementTransferStock=Transferencia d'estoc del producte %s a un altre magatzem
+MovementTransferStock=Transferència d'estoc de producte %s a un altre magatzem
 WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=El magatzem d'origen s'ha de definir aquí quan el mòdul "lot del producte" està activat. S'utilitzarà per llistar quins lot/series estan disponibles per als productes que requereixen dades de lot/serie per moviment . Si vols enviar productes de diferents magatzems, simplement fes l'enviament en diversos passos
 InventoryCodeShort=Codi Inv./Mov.
 NoPendingReceptionOnSupplierOrder=No hi ha recepcions pendents en comandes de proveïdor obertes
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
index f33e55a9c00..04da2e626c8 100644
--- a/htdocs/langs/ca_ES/supplier_proposal.lang
+++ b/htdocs/langs/ca_ES/supplier_proposal.lang
@@ -1,16 +1,17 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Pressupostos de proveïdor
 supplier_proposalDESC=Gestiona les peticions de preu de proveïdors
-SupplierProposalShort=Supplier proposals
-SupplierProposalNew=New request
+SupplierProposalShort=Pressupostos de proveïdor
+SupplierProposalNew=Nova petició
 CommRequest=Petició de preu
 CommRequests=Peticions de preu
 SearchRequest=Busca una petició
 DraftRequests=Peticions en esborrany
-LastModifiedRequests=Les %s darreres peticions de preu modificades
+SupplierProposalsDraft=Pressupost de proveïdor esborrany
+LastModifiedRequests=Les %s últimes peticions de preu modificades
 RequestsOpened=Obre una petició de preu
 SupplierProposalArea=Àrea de pressupostos de proveïdor
-SupplierProposalShort=Supplier proposals
+SupplierProposalShort=Pressupostos de proveïdor
 SupplierProposals=Pressupost de proveïdor
 NewAskPrice=Nova petició de preu
 NewAsk=Nova petició
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index dc45e06e74a..553b5cf87d2 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -31,7 +31,7 @@ TripNDF=Informacions de l'informe de despeses
 PDFStandardExpenseReports=Plantilla estàndard per generar un document PDF per l'informe de despeses
 ExpenseReportLine=Línia de l'informe de despeses
 TF_OTHER=Altre
-TF_TRIP=Transportation
+TF_TRIP=Transport
 TF_LUNCH=Dieta
 TF_METRO=Metro
 TF_TRAIN=Tren
@@ -99,5 +99,5 @@ ConfirmSaveTrip=Esteu segur de voler validar aquest informe de despeses?
 NoTripsToExportCSV=No hi ha informe de despeses per exportar en aquest període
 ExpenseReportPayment=Informe de despeses pagades
 
-ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToApprove=Informes de despeses per aprovar
 ExpenseReportsToPay=Informes de despeses a pagar
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 39050a1cac0..70259294309 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -58,8 +58,8 @@ PasswordChangedAndSentTo=Contrasenya canviada i enviada a <b>%s</b>.
 PasswordChangeRequestSent=Petició de canvi de contrasenya per a <b>%s</b> enviada a <b>%s</b>.
 MenuUsersAndGroups=Usuaris i grups
 MenuMyUserCard=La meva fitxa d'usuari
-LastGroupsCreated=Els %s darrers grups creats
-LastUsersCreated=Els %s darrers usuaris creats
+LastGroupsCreated=Els %s últims grups creats
+LastUsersCreated=Els %s últims usuaris creats
 ShowGroup=Veure grup
 ShowUser=Veure usuari
 NonAffectedUsers=Usuaris no destinats al grup
@@ -121,4 +121,5 @@ OpenIDURL=URL d'OpenID
 LoginUsingOpenID=Utilitzeu OpenID per iniciar sessió
 WeeklyHours=Hores setmanals
 ColorUser=Color d'usuari
-DisabledInMonoUserMode=Disabled in maintenance mode
+DisabledInMonoUserMode=Deshabilitat en mode manteniment
+UserAccountancyCode=Codi comptable d'usuari
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 5cb4d0b5724..404c20d8672 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -6,8 +6,8 @@ StandingOrder=Domiciliació
 NewStandingOrder=Nova domiciliació
 StandingOrderToProcess=A processar
 StandingOrderProcessed=Processats
-Withdrawals=Reintegraments
-Withdrawal=Reintegrament
+Withdrawals=Domiciliacions
+Withdrawal=Domiciliació
 WithdrawalsReceipts=Ordres domiciliades
 WithdrawalReceipt=Ordre domiciliació
 WithdrawalReceiptShort=Ordre
@@ -22,14 +22,14 @@ CustomerStandingOrder=Domiciliació client
 NbOfInvoiceToWithdraw=Nº de factures pendents de domiciliació
 NbOfInvoiceToWithdrawWithInfo=Nombre de factures a l'espera de domiciliació per a clients que tenen número de compte definit
 InvoiceWaitingWithdraw=Factures en espera de domiciliació
-AmountToWithdraw=Quantitat a domiciliar
+AmountToWithdraw=Import a domiciliar
 WithdrawsRefused=Domiciliacions retornades
 NoInvoiceToWithdraw=Cap factura a client amb mode de pagament 'Domiciliació' en espera. Anar a la pestanya 'Domiciliació' a la fitxa de la factura per fer una petició.
 ResponsibleUser=Usuari responsable de les domiciliacions
 WithdrawalsSetup=Configuració de les domiciliacions
 WithdrawStatistics=Estadístiques de domiciliacions
 WithdrawRejectStatistics=Estadístiques de domiciliacions retornades
-LastWithdrawalReceipt=Les % últimes remeses
+LastWithdrawalReceipt=Les %s últimes ordres de domiciliacions
 MakeWithdrawRequest=Fer una petició de domiciliació
 ThirdPartyBankCode=Codi banc del tercer
 ThirdPartyDeskCode=Codi oficina del tercer
@@ -67,7 +67,7 @@ CreateGuichet=Només oficina
 CreateBanque=Només banc
 OrderWaiting=A l'espera de procés
 NotifyTransmision=Enviament de domiciliació
-NotifyEmision=Emisió de domiciliació
+NotifyEmision=Emissió de domiciliació
 NotifyCredit=Abonament de domiciliació
 NumeroNationalEmetter=Número Nacional del Emissor
 PleaseSelectCustomerBankBANToWithdraw=Introduïu la informació del compte bancari del client a domiciliar
@@ -90,8 +90,8 @@ WithdrawRequestAmount=Total de la petició de domiciliació:
 WithdrawRequestErrorNilAmount=No es pot crear la sol·licitud de domiciliació per un import nul.
 
 ### Notifications
-InfoCreditSubject=Abonament de domiciliació %s pel banc
-InfoCreditMessage=L'ordre de domiciliació %s ha estat abonada pel banc <br> Data d'abonament: %s
+InfoCreditSubject=Pagament de l'ordre de domiciliació %s pel banc
+InfoCreditMessage=L'ordre de domiciliació %s ha estat abonada pel banc <br> Data de pagament: %s
 InfoTransSubject=Enviament de domiciliació %s al banc
 InfoTransMessage=L'ordre de domiciliació %s ha estat enviada al banc per %s %s.<br><br>
 InfoTransData=Import: %s<br>Mètode: %s<br>Data: %s
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index f44c48a0324..85efe9fd857 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Účetní účet
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Přerušení
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Členění zákazníků
 SuppliersVentilation=Členění dodvatelů
 TradeMargin=Obchodní marže
@@ -46,7 +47,7 @@ UpdateAccount=Změna účetního účtu
 UpdateMvts=Změna pohybu
 WriteBookKeeping=Účetní záznamy v hlavní účetní knize
 Bookkeeping=Hlavní účetní kniha
-AccountBalanceByMonth=Zůstatek na účtu podle měsíce
+AccountBalance=Account balance
 
 AccountingVentilation=Členění účetnictví
 AccountingVentilationSupplier=Členění účetnictví dodavatel
@@ -103,6 +104,7 @@ Code_tiers=Třetí strana
 Labelcompte=Štítek účtu
 Sens=Sens
 Codejournal=Deník
+NumPiece=Piece number
 
 DelBookKeeping=Odstranit záznamy hlavní knihy
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Karta členění
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 9fd4299abe8..7a0ef99ecf3 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -154,6 +154,7 @@ Purge=Očistit
 PurgeAreaDesc=Tato stránka vám umožňuje odstranit všechny postavené nebo uložené soubory Dolibarr (dočasné soubory nebo všechny soubory v adresáři <b>%s</b>). Použití této funkce není nutné. Je k dispozici pro uživatele, jejichž Dolibarr je provozován u poskytovatele, který neposkytuje oprávnění k odstranění souborů na webovém serveru.
 PurgeDeleteLogFile=Vymažte log <b>%s</b>, definovaný pro modul Syslog (bez rizika ztráty)
 PurgeDeleteTemporaryFiles=Vymažte všechny dočasné soubory (bez rizika ztráty dat)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Odstraňte všechny soubory v adresáři <b>%s.</b> Dočasné soubory, zálohy databáze, soubory přiložené k prvkům (třetí strany, faktury, ...) a  uploady do modulu ECM budou vymazány.
 PurgeRunNow=Vyčistit nyní
 PurgeNothingToDelete=Žádný adresář nebo soubor k odstranění
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Funkce se odesílat e-maily pomocí metody "PHP m
 TranslationSetup=Konfigurace de la traduction
 TranslationDesc=Volba jazyka viditelné na obrazovce lze měnit: <br> * Globálně z menu <strong>Domů - Nastavení - Zobrazení</strong> <br> * Pro uživatele pouze ze <strong>zobrazení</strong> na kartě <strong>Uživatelské</strong> uživatelského karty (klikněte na přihlášení v horní části obrazovky).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Celkový počet aktivovaných funkcí modulů: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povolit alespoň jeden modul
 ClassNotFoundIntoPathWarning=Třída %s nenašli cestu do PHP
 YesInSummer=Ano v létě
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Zavřít fiskální rok
 DeleteFiscalYear=Smazat fiskální rok
 ConfirmDeleteFiscalYear=Jste si jisti, že chcete tento fiskální rok smazat?
 AlwaysEditable=Může být vždy upraveno
+IsHidden=Is not visible
 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=Minimální počet velkých písmen
 NbNumMin=Minimální počet číselných znaků
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Průvodce vybudovat záložní databázi soubor s výpisem
 SomethingMakeInstallFromWebNotPossible=Instalace externího modulu není možné z webového rozhraní z tohoto důvodu:
 SomethingMakeInstallFromWebNotPossible2=Z tohoto důvodu, proces upgradovat popsáno zde je pouze ruční kroky privilegovaný uživatel může dělat.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 47665afd9a2..a2251967476 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -58,6 +58,7 @@ Payment=Platba
 PaymentBack=Vrácení platby
 Payments=Platby
 PaymentsBack=Vrácení plateb
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Navrácené
 DeletePayment=Odstranit platby
 ConfirmDeletePayment=Jste si jisti, že chcete smazat tuto platbu?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Provést platbu pro zákazníka
 DisabledBecauseRemainderToPayIsZero=Zakázáno, protože zbývající nezaplacená částka je nula
 PriceBase=Základní cena
 BillStatus=Stav faktury
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Návrh (musí být ověřeno)
 BillStatusPaid=Placeno
 BillStatusPaidBackOrConverted=Placeno nebo převedeno na slevu
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Chyba, nelze zrušit, pokud fakt
 BillFrom=Z
 BillTo=Na
 ActionsOnBill=Akce na faktuře
+RecurringInvoiceTemplate=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=Nová faktura
 LastBills=Poslední %s faktury
 LastCustomersBills=Poslední %s zákazníci faktury
@@ -199,6 +205,7 @@ Rest=Čeká
 AmountExpected=Nárokovaná částka
 ExcessReceived=Přeplatek obdržel
 EscompteOffered=Nabídnutá  sleva (platba před termínem)
+EscompteOfferedShort=Discount
 SendBillRef=Předložení faktury %s
 SendReminderBillRef=Předložení faktury %s (upomínka)
 StandingOrders=Trvalé příkazy
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Bezprostřední
 PaymentConditionRECEP=Bezprostřední
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index fdb0f111eed..701ed71a9f4 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Poslední %s smlouvy
 BoxTitleLastModifiedDonations=Poslední %s upravené dary
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Globální aktivita (faktury, návrhy, objednávky)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Nepodařilo se obnovit RSS zdroj. Poslední úspěšný refresh dne: %s
 LastRefreshDate=Poslední obnovovací data
 NoRecordedBookmarks=Nejsou definované žádné záložky.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Zákaznické faktury
 ForCustomersOrders=Zákaznické objednávky
 ForProposals=Nabídky
 LastXMonthRolling=Poslední %s měsíc válcování
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index dd272212c34..c95615a3681 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 109fd5cfeaf..435fb6a760f 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index d3551b840de..ffcac2a0063 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Bezpečnostní klíč URL spuštění úlohy
 FileToLaunchCronJobs=Příkazový řádek pro spuštění úlohy
 CronExplainHowToRunUnix=Na Unixových systémech by jste měli použít následující položku crontab ke spuštění příkazového řádku každých 5 minut 
 CronExplainHowToRunWin=Na Microsoft Windows systémech můžete použít naplánováné nástroje úloh ke spuštění příkazového řádku každých 5 minut
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Naplánované úlohy
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Nikdo
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Další provedení
-CronDtLastLaunch=Poslední provedení
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frekvence
 CronClass=Třída
 CronMethod=Metoda
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Datum ukončení nemůže být před datem zahájení
 CronStatusActiveBtn=Umožnit
 CronStatusInactiveBtn=Zakázat
 CronTaskInactive=Tato úloha je zakázána
-CronDtLastResult=Datum posledního výsledku
 CronId=Id
 CronClassFile=Třídy (filename.class.php)
 CronModuleHelp=Název adresáře modulu Dalibor (pracuje i s externími moduly). <BR> Např načíst metody objektu produktu ../htdocs/<u>product</u>/class/product.class.php, hodnota modulu je <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s
 UseMenuModuleToolsToAddCronJobs=Jděte do menu "Home- Moduly nářadí- Seznam úloh" kde vidíte a upravujete naplánované úlohy.
 TaskDisabled=Úloha vypnuta
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
index d466de13dac..0ce6559fa56 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -148,7 +148,7 @@ MigrationFinished=Migrace dokončena
 LastStepDesc=<strong>Poslední krok:</strong> Definujte zde přihlašovací jméno a heslo které budete používat pro připojení k softwaru. Toto heslo neztraťte - jedná se o jediný administrátorský účet.
 ActivateModule=Aktivace modulu %s
 ShowEditTechnicalParameters=Klikněte zde pro zobrazení / editaci pokročilých parametrů (pro experty)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Varování:\nProvedli jste zálohu databáze jako první? \nPokud ji neprovede, můžete kvůli některým chybám v databázových systémech (například mysql verze 5.5.40/41/42/43) přijít o data, proto vám doporučujeme mít zálohu před spuštěním migrace.\n\nStiskněte OK pro spuštění migrace...
 ErrorDatabaseVersionForbiddenForMigration=Vaše verze databáze  je %s. Ta bohužel obsahuje kritickou chybu mající zásadní vliv na ztrátu dat, pokud provedete změnu struktury ve vaší databázi, stejně jako je to vyžadováno v procesu migrace. Z tohoto důvodu nebude migrace povolena, dokud neprovedete upgrade databáze na vyšší fixní verzi (seznam známých chybných verzí: %s)
 
 #########
@@ -202,6 +202,6 @@ MigrationActioncommElement=Aktualizovat údaje na činnostech
 MigrationPaymentMode=Migrace dat platebního režimu
 MigrationCategorieAssociation=Migrace kategorií
 MigrationEvents=Migrace událostí přidá vlastníka události do přiřazené tabulky
-MigrationReloadModule=Reload module %s
+MigrationReloadModule=Načíst modul %s
 ShowNotAvailableOptions=Ukázat nedostupné možnosti
 HideNotAvailableOptions=Skrýt nedostupné možnosti
diff --git a/htdocs/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang
index d5e259f15e9..15b3e1265b9 100644
--- a/htdocs/langs/cs_CZ/languages.lang
+++ b/htdocs/langs/cs_CZ/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Španělština (Mexiko)
 Language_es_PY=Španělština (Paraguay)
 Language_es_PE=Španělština (Peru)
 Language_es_PR=Španělština (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonština
 Language_eu_ES=Basque
 Language_fa_IR=Perština
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 396f7335c56..a239b235d66 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-mail úspěšně ověřen
 MailUnsubcribe=Odhlásit
 Unsuscribe=Odhlásit
 MailingStatusNotContact=Nekontaktujte mě už
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Příjemce e-mailu chybí
 WarningNoEMailsAdded=Žádné nové maily nebyly přidány do seznamu příjemců.
 ConfirmValidMailing=Jste si jisti, že chcete ověřit tento e-mail?
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 3d0546b7f86..1fb1d3998ae 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Jednotková cena (bez DPH)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Množství
@@ -321,6 +322,9 @@ AmountTTCShort=Částka (vč. DPH)
 AmountHT=Částka (bez DPH)
 AmountTTC=Částka (vč. DPH)
 AmountVAT=Částka daně
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Částka daně z 2
 AmountLT2=Částka daně 3
 AmountLT1ES=Množství RE
@@ -335,6 +339,7 @@ Percentage=Procento
 Total=Celkový
 SubTotal=Mezisoučet
 TotalHTShort=Celkem (bez DPH)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Celkem (vč. DPH)
 TotalHT=Celkem (bez daně)
 TotalHTforthispage=Celkem (po zdanění) pro tuto stránku
@@ -457,6 +462,7 @@ Datas=Údaje
 None=Nikdo
 NoneF=Nikdo
 Late=Pozdě
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Obrázek
 Photos=Obrázky
 AddPhoto=Přidat obrázek
@@ -539,6 +545,7 @@ NbOfCustomers=Počet zákazníků
 NbOfLines=Počet řádků
 NbOfObjects=Počet objektů
 NbOfReferers=Počet odkazů
+NbOfObjectReferers=Number of refering objects
 Referers=Odkazované objekty
 TotalQuantity=Celkové množství
 DateFromTo=Od %s na %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Souvisí s konkrétním uživatelem kontaktu
 DeleteAFile=Odstranění souboru
 ConfirmDeleteAFile=Jste si jisti, že chcete smazat tento soubor?
 NoResults=Žádné výsledky
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Moduly nástrojů
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Pondělí
 Tuesday=Úterý
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 6206e475fe6..6c4ac112271 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Zvýšit/snížit zásoby na výchozí změny
 ComposedProduct=Subprodukt
 MinSupplierPrice=Minimální dodavatelská cena
 DynamicPriceConfiguration=Dynamická konfigurace cen
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Globální proměnné
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Aktualizace globálních proměnných
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Analyzuje JSON data ze zadané adresy URL, VALUE určuje umístění příslušné hodnoty
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 13d828b5d46..8a1a3bedffb 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Id projektu
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projekty
+ProjectsArea=Projects Area
 ProjectStatus=Stav projektu
 SharedProject=Všichni
 PrivateProject=Kontakty na projektu
@@ -19,7 +20,7 @@ TasksPublicDesc=Tento pohled zobrazuje všechny projekty a úkoly které máte o
 TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské oprávnění vám umožňuje vidět vše).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projekty
+ProjectsArea=Projects Area
 NewProject=Nový projekt
 AddProject=Vytvořit projekt
 DeleteAProject=Odstranit projekt
@@ -67,6 +68,7 @@ Activities=Úkoly / činnosti
 MyActivity=Moje činnost
 MyActivities=Moje úkoly / činnosti
 MyProjects=Moje projekty
+MyProjectsArea=My projects Area
 DurationEffective=Efektivní doba trvání
 Progress=Progres
 ProgressDeclared=Hlášený progres
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/cs_CZ/receiptprinter.lang b/htdocs/langs/cs_CZ/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/cs_CZ/receiptprinter.lang
+++ b/htdocs/langs/cs_CZ/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index cea149cfd8e..e56418576e8 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Zrušit zasílání
 DeleteSending=Smazat odeslání
 Stock=Sklad
 Stocks=Sklady
-StocksByLotSerial=Sklad množství/série
+StocksByLotSerial=Stocks by lot/serial
 Movement=Pohyb
 Movements=Pohyby
 ErrorWarehouseRefRequired=Referenční jméno skladiště je povinné
@@ -34,9 +34,10 @@ LastMovements=Poslední pohyby
 Units=Jednotky
 Unit=Jednotka
 StockCorrection=Správný sklad
-StockTransfer=Přenos zásob
-StockMovement=Přenést
-StockMovements=Skladové převody
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Štítek pohybu
 NumberOfUnit=Počet jednotek
 UnitPurchaseValue=Jednotková kupní cena
@@ -53,8 +54,8 @@ QtyDispatched=Množství odesláno
 QtyDispatchedShort=Odeslané množství
 QtyToDispatchShort=Odesílané množství
 OrderDispatch=Skladový dispečink
-RuleForStockManagementDecrease=Pravidlo pro snížení řízení zásob
-RuleForStockManagementIncrease=Pravidlo pro zvýšení řízení zásob
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Pokles reálných zásob na zákaznických fakturách/dobropisech validace
 DeStockOnValidateOrder=Pokles reálné zásoby na objednávky zákazníků validace
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Skladiště a výrobky (s detaily na množství
 AverageUnitPricePMPShort=Vážený průměr cen vstupů
 AverageUnitPricePMP=Vážený průměr cen vstupů
 SellPriceMin=Prodejní jednotka Cena
-EstimatedStockValueSellShort=Hodnota k prodeji
-EstimatedStockValueSell=Hodnota k prodeji
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Vstupní hodnota zásob
 EstimatedStockValue=Vstupní hodnota zásob
 DeleteAWarehouse=Odstranění skladiště
@@ -113,7 +114,7 @@ AlertOnly= Pouze upozornění
 WarehouseForStockDecrease=Skladiště <b>%s</b> budou použity pro snížení skladu
 WarehouseForStockIncrease=Skladiště <b>%s</b> budou použity pro zvýšení stavu zásob
 ForThisWarehouse=Z tohoto skladiště
-ReplenishmentStatusDesc=Toto je seznam všech produktů s nižší než požadovanou zásobou skladem (nebo nižší než hodnota výstrahy, pokud je pole "pouze upozornění" zaškrtnuto), a doporučuje vám vytvořit dodavatelské objednávky pro doplnění rozdílu.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=Toto je seznam všech otevřených dodavatelských objednávek, včetně předem stanovených výrobků. Jen otevřené objednávky s předdefinovanými produkty, které mohou mít vliv na zásoby, jsou zde viditelné.
 Replenishments=Splátky
 NbOfProductBeforePeriod=Množství produktů %s na skladě, než zvolené období (< %s)
diff --git a/htdocs/langs/cs_CZ/supplier_proposal.lang b/htdocs/langs/cs_CZ/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/cs_CZ/supplier_proposal.lang
+++ b/htdocs/langs/cs_CZ/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index 77c80fc7106..c7fc84f1df4 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Použijte OpenID pro přihlášení
 WeeklyHours=Týdenní hodiny
 ColorUser=Barva uživatele
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 17807af1d5f..140f274df50 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Regnskabsmæssig konto
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Sammenbrud
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Udspecificer kunder
 SuppliersVentilation=Udspecificer leverandører
 TradeMargin=Handelsforskel
@@ -46,7 +47,7 @@ UpdateAccount=Ændring af en regnskabsmæssig konto
 UpdateMvts=Ændring af en bevægelse
 WriteBookKeeping=Optage konti i kontoplanen
 Bookkeeping=Kontoplan
-AccountBalanceByMonth=Kontobalance efter måned
+AccountBalance=Account balance
 
 AccountingVentilation=Udspecificer regnskab
 AccountingVentilationSupplier=Udspecificer regnskab leverandører
@@ -103,6 +104,7 @@ Code_tiers=Trediepart
 Labelcompte=Kontonavn
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Slet posterne i kontoplanen
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 8d05b13d321..e9bf96d4aaf 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=Denne side giver dig mulighed for at slette alle filer bygget eller lagret af Dolibarr (midlertidige filer eller alle filer <b>i %s</b> biblioteket). Brug af denne funktion er ikke nødvendigt. Det er forudsat for brugere, hvis Dolibarr er arrangeret af en udbyder, der ikke giver tilladelser til at slette filer bygget af web-serveren.
 PurgeDeleteLogFile=Slet log <b>fil %s</b> er defineret for Syslog modul (ingen risiko for at miste data)
 PurgeDeleteTemporaryFiles=Slet alle midlertidige filer (ingen risiko for at miste data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Slet alle filer i <b>mappen %s.</b> Midlertidige filer, men også vedhæftede filer elementer (tredjemand, fakturaer, ...) og uploades i ECM-modul vil blive slettet.
 PurgeRunNow=Rensningsanordningen nu
 PurgeNothingToDelete=ingen mappe for at slette.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index fad714c9e0f..0a00712b611 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -58,6 +58,7 @@ Payment=Betaling
 PaymentBack=Betaling tilbage
 Payments=Betalinger
 PaymentsBack=Betalinger tilbage
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Slet betaling
 ConfirmDeletePayment=Er du sikker på du vil slette denne betaling?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Foretag betaling til kunde
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Pris base
 BillStatus=Faktura status
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Udkast (skal valideres)
 BillStatusPaid=Betales
 BillStatusPaidBackOrConverted=Betales eller omdannes til discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Fejl, kan ikke annullere en fakt
 BillFrom=Fra
 BillTo=Bill til
 ActionsOnBill=Aktioner på faktura
+RecurringInvoiceTemplate=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=Ny faktura
 LastBills=Seneste %s fakturaer
 LastCustomersBills=Seneste %s kunder fakturaer
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Beløb hævdede
 ExcessReceived=Trop Peru
 EscompteOffered=Rabat (betaling før sigt)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Stående ordrer
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Omgående
 PaymentConditionRECEP=Omgående
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index a1e67b17104..7a5312c757b 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Sidste %s kontrakter
 BoxTitleLastModifiedDonations=Sidste %s ændret donationer
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Det lykkedes ikke at opdatere RSS flux. Seneste vellykkede opdatere dato: %s
 LastRefreshDate=Sidst opdateret dato
 NoRecordedBookmarks=No bookmarks defined. Click <a href=Nr. bogmærker defineret. Klik <a href="%s">her</a> for at tilføje bogmærker.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Kundernes fakturaer
 ForCustomersOrders=Customers orders
 ForProposals=Forslag
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 6dbd4ce9249..bbf71e02fd7 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof.. 1 (RC)
 ProfId2MA=Id prof.. 2 (Patente)
 ProfId3MA=Id prof.. 3 (IF)
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index f02af8180be..3e0be5acfcb 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index 4c3e5986f93..9f3aa0f5118 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Ingen
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Metode
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Deaktivere
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang
index 2727f9b03c8..b052f640504 100644
--- a/htdocs/langs/da_DK/languages.lang
+++ b/htdocs/langs/da_DK/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spansk (Mexico)
 Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estisk
 Language_eu_ES=Basque
 Language_fa_IR=Persian
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 24a6dd0b65e..9b1bd58da65 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=E-mail-modtager er tom
 WarningNoEMailsAdded=Ingen nye e-mail for at tilføje til modtagerens listen.
 ConfirmValidMailing=Er du sikker på at du ønsker at validere denne e-mail?
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 2bf7929f03d..3393124d792 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Enhedspris (netto)
 UnitPriceTTC=Enhedspris
 PriceU=UP
 PriceUHT=UP (netto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Mængde
@@ -321,6 +322,9 @@ AmountTTCShort=Beløb (inkl. moms)
 AmountHT=Beløb (efter skat)
 AmountTTC=Beløb (inkl. moms)
 AmountVAT=Beløb moms
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Beløb afgift 2
 AmountLT2=Beløb afgift 3
 AmountLT1ES=Beløb RE
@@ -335,6 +339,7 @@ Percentage=Pourcentage
 Total=Total
 SubTotal=Tilsammen
 TotalHTShort=I alt (netto)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=I alt (inkl. moms)
 TotalHT=Total (efter skat)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Oplysningerne
 None=Ingen
 NoneF=Ingen
 Late=Sen
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Billede
 Photos=Billeder
 AddPhoto=Tilføj billede
@@ -539,6 +545,7 @@ NbOfCustomers=Antal kunder
 NbOfLines=Antal linjer
 NbOfObjects=Antallet af objekter
 NbOfReferers=Antal referers
+NbOfObjectReferers=Number of refering objects
 Referers=Refererende objekt
 TotalQuantity=Samlet mængde
 DateFromTo=Fra %s til %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked til en bestemt bruger kontakt
 DeleteAFile=Slet en fil
 ConfirmDeleteAFile=Er du sikker du vil slette filen
 NoResults=Ingen resultater
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modul værktøjer
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 8f22f984fcd..efdce7c16a1 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index c0f751039d6..0962584a2f9 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projekter
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Fælles projekt
 PrivateProject=Kontakter af projektet
@@ -19,7 +20,7 @@ TasksPublicDesc=Dette synspunkt præsenterer alle projekter og opgaver, som du f
 TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertilladelser give dig tilladelse til at se alt).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projekter område
+ProjectsArea=Projects Area
 NewProject=Nyt projekt
 AddProject=Create project
 DeleteAProject=Slet et projekt
@@ -67,6 +68,7 @@ Activities=Opgaver / aktiviteter
 MyActivity=Min virksomhed
 MyActivities=Mine opgaver / aktiviteter
 MyProjects=Mine projekter
+MyProjectsArea=My projects Area
 DurationEffective=Effektiv varighed
 Progress=Fremskridt
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/da_DK/receiptprinter.lang b/htdocs/langs/da_DK/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/da_DK/receiptprinter.lang
+++ b/htdocs/langs/da_DK/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 0d771434010..a28547996cc 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Annuller afsendelse
 DeleteSending=Slet afsendelse
 Stock=Stock
 Stocks=Lagre
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Bevægelighed
 Movements=Bevægelser
 ErrorWarehouseRefRequired=Warehouse reference navn er påkrævet
@@ -34,9 +34,10 @@ LastMovements=Seneste bevægelser
 Units=Enheder
 Unit=Enhed
 StockCorrection=Korrekt lager
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock overførsler
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Antal enheder
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Afsendte mængde
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Bestil lastfordelingen
-RuleForStockManagementDecrease=Reglen for lagerstyring fald
-RuleForStockManagementIncrease=Reglen for lagerstyring stigning
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Fraførsel reelle bestande på fakturaer / kreditnotaer
 DeStockOnValidateOrder=Fraførsel reelle bestande om ordrer noter
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Gennemsnitlig input pris
 AverageUnitPricePMP=Gennemsnitlig input pris
 SellPriceMin=Salgsenhed Pris
-EstimatedStockValueSellShort=Value at sælge
-EstimatedStockValueSell=Værdi til Sælg
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Anslåede værdi af materiel
 EstimatedStockValue=Anslåede værdi af materiel
 DeleteAWarehouse=Slet et lager
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/da_DK/supplier_proposal.lang b/htdocs/langs/da_DK/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/da_DK/supplier_proposal.lang
+++ b/htdocs/langs/da_DK/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 84946d8c1d2..c4e9aaf3524 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/de_AT/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/de_AT/companies.lang b/htdocs/langs/de_AT/companies.lang
index 5d03cea798a..baae73569ac 100644
--- a/htdocs/langs/de_AT/companies.lang
+++ b/htdocs/langs/de_AT/companies.lang
@@ -8,6 +8,7 @@ Web=Webadresse
 LocalTax1IsUsedES=RE wird
 LocalTax2IsUsedES=IRPF verwendet wird
 ProfId1AR=Prof Id 1 (CUIL)
+ProfId5MA=Id prof. 5 (C.I.C.E.)
 CustomerCode=Kunden-Code
 CapitalOf=Hauptstadt von %s
 NorProspectNorCustomer=Weder Lead noch Kunde
diff --git a/htdocs/langs/de_AT/margins.lang b/htdocs/langs/de_AT/margins.lang
new file mode 100644
index 00000000000..f93f8ff712c
--- /dev/null
+++ b/htdocs/langs/de_AT/margins.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - margins
+MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
diff --git a/htdocs/langs/de_AT/projects.lang b/htdocs/langs/de_AT/projects.lang
index 4ca6e93544f..82efd9e0087 100644
--- a/htdocs/langs/de_AT/projects.lang
+++ b/htdocs/langs/de_AT/projects.lang
@@ -16,3 +16,4 @@ ReOpenAProject=Öffne Projekt
 DoNotShowMyTasksOnly=Zeige auch die Aufgaben Anderer
 TypeContact_project_task_internal_TASKEXECUTIVE=Task Exekutive
 TypeContact_project_task_external_TASKEXECUTIVE=Task Exekutive
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index ff29e0fe28e..8d40f13d9bf 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -152,7 +152,6 @@ CloseFiscalYear=Fiskalisches Jahr schliessen
 NbMajMin=Mindestanzahl Grossbuchstaben
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
 GoOntoContactCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" von einem  Geschäftspartner Kontakt , um Hinweise für Kontakte/Adressen zu erstellen oder zu entfernen
-ConfFileMuseContainCustom=Installation eines externen Modul aus der Anwendung speichern Sie die Modul-Dateien in Verzeichnis <strong>%s</strong>. Zu haben dieses Verzeichnis durch Dolibarr verarbeitet, müssen Sie das Setup Ihrer <strong>conf/conf.php</strong> Option haben <br> - - <strong>$dolibarr_main_url_root_alt</strong> auf <<strong>$dolibarr_main_url_root_alt="/custom"</strong> enabled <strong>= "/custom"</strong> <br> - <strong>$dolibarr_main_document_root_alt</strong>  zu Wert aktiviert <strong>"%s/custom"</strong>
 NbAddedAutomatically=Anzahl Tage die den Benutzern jeden Monat automatisch dazuaddiert werden
 RecuperableOnly=Ja für MwSt. "Wahrgenommene nicht Erstattungsfähig" für einige Regionen in Frankreich. Nein für alle anderen Fälle.
 MailToSendIntervention=Um Interventions zu schicken
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index c0694033e83..17158217131 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -41,6 +41,7 @@ AddBill=Erstelle eine Rechnung oder Gutschrift
 DeleteBill=Rechnung löschen
 SendRemindByMail=Mahnung per E-Mail senden
 BillShortStatusConverted=Verarbeitet
+PaymentStatusToValidShort=Freizugeben
 ErrorVATIntraNotConfigured=Intrakommunale MwSt.-Nr. noch nicht definiert
 ErrorNoPaiementModeConfigured=Keine standardmässige Zahlungsart definiert. Beheben Sie diesen Fehler in den Einstellungen des Rechnungsmoduls.
 ErrorCreateBankAccount=Legen Sie ein Bankkonto an und definieren Sie anschliessend die Zahlungsarten in den Einstellungen des Rechnungsmoduls.
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 2e19bfb4391..01fb066b4f1 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -24,6 +24,7 @@ CustomerCodeModel=Kunden-Code-Modell
 SupplierCodeModel=Lieferanten-Code Modell
 ProfId1BR=CNPJ
 ProfId4DE=Steuernummer
+ProfId5MA=Id prof. 5 (C.I.C.E.)
 VATIntraShort=MwSt.-Nr.
 CustomerCard=Kundenkarte
 CustomerRelativeDiscountShort=Rabatt rel.
diff --git a/htdocs/langs/de_CH/languages.lang b/htdocs/langs/de_CH/languages.lang
index 9494ea776fc..23cad92bc54 100644
--- a/htdocs/langs/de_CH/languages.lang
+++ b/htdocs/langs/de_CH/languages.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_en_GB=Englisch (Grossbritannien)
-Language_fi_FI=Finnisch
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 67466a1e135..fd52ffaf424 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -51,6 +51,7 @@ ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Geschäftspartn
 AddressesForCompany=Adressen für den Geschäftspartner
 ActionsOnCompany=Ereignisse zu diesem Geschäftspartner
 Refused=zurückgewiesen
+Validated=Freigegeben
 Size=Grösse
 ByCompanies=Von Geschäftspartnern
 NbOfThirdParties=Anzahl der Geschäftspartner
diff --git a/htdocs/langs/de_CH/opensurvey.lang b/htdocs/langs/de_CH/opensurvey.lang
new file mode 100644
index 00000000000..2b68a2418e8
--- /dev/null
+++ b/htdocs/langs/de_CH/opensurvey.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+ToReceiveEMailForEachVote=EMail für jede Stimme erhalten
+CheckBox=Einfache Checkbox
+SelectDayDesc=Für jeden ausgewählen Tag kann man die Besprechungszeiten im folgenden Format auswählen:<br>- leer,<br>- "8h", "8H" oder "8:00" für eine Besprechungs-Startzeit,<br>- "8-11", "8h-11h", "8H-11H" oder "8:00-11:00" für eine Besprechungs-Start und -Endzeit,<br>- "8h15-11h15", "8H15-11H15" oder "8:15-11:15" für das Gleiche aber mit Minuten.
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
index 5587b1139d4..93b67d5fa2d 100644
--- a/htdocs/langs/de_CH/projects.lang
+++ b/htdocs/langs/de_CH/projects.lang
@@ -11,3 +11,4 @@ ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt
 CloneTaskFiles=Aufgabe (n) clonen beigetreten Dateien (falls Aufgabe (n) geklont)
 OpenedProjectsByThirdparties=Offene Projekte nach Geschäftspartner
 OpportunityPonderatedAmount=Verkaufschancen geschätzer Betrag
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
index 661ea2d9631..a2945b3dd4b 100644
--- a/htdocs/langs/de_CH/stocks.lang
+++ b/htdocs/langs/de_CH/stocks.lang
@@ -1,2 +1,8 @@
 # Dolibarr language file - Source file is en_US - stocks
+CancelSending=Lieferung abbrechen
+ReStockOnDispatchOrder=Reale Bestände auf manuelle Dispatching in Hallen, nach Erhalt Lieferanten bestellen
+StockLimit=Sicherungsbestand für autom. Benachrichtigung
+AverageUnitPricePMP=Gewichteter Durchschnittpreis bei Erwerb
+UseVirtualStockByDefault=Nutze theoretische Lagerbestände anstatt des physischem Bestands für die Nachbestellungsfunktion
 ReplenishmentOrdersDesc=Das ist eine Liste aller offener Lieferantenbestellungen einschliesslich vordefinierter Produkte. Nur geöffnete Bestellungen mit vordefinierten Produkten, sofern es das Lager betrifft, sind hier sichtbar.
+ThisSerialAlreadyExistWithDifferentDate=Diese Charge- / Seriennummer (<strong>%s</strong>) ist bereits vorhanden, jedoch mit unterschiedlichen Haltbarkeits- oder Verfallsdatum. \n(Gefunden: <strong>%s</strong> Erfasst: <strong>%s</strong>)
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 13f77dcbe10..b7a5c659fca 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Buchhaltungskonto
 AccountAccountingSuggest=Buchhaltungskontovorschlag
 Ventilation=Aufteilung
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Aufteilung Kunden
 SuppliersVentilation=Aufteilung Lieferanten
 TradeMargin=Handelsspanne
@@ -46,7 +47,7 @@ UpdateAccount=Änderung eines Bilanzkontos
 UpdateMvts=Lagerbewegung ändern
 WriteBookKeeping=Konten ins Hauptbuch übernehmen
 Bookkeeping=Hauptbuch
-AccountBalanceByMonth=Kontostand pro Monat
+AccountBalance=Account balance
 
 AccountingVentilation=Überblick Rechnungswesen
 AccountingVentilationSupplier=Abbau von Buchhaltungs-Lieferanten
@@ -103,6 +104,7 @@ Code_tiers=Partner
 Labelcompte=Konto-Beschriftung
 Sens=Zweck
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Löschen Sie die Einträge des Hauptbuchs
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Der Saldo der Buchung ist nicht ausgeglichen. Haben = %s
 FicheVentilation=Zusammensetzung - Karte
 GeneralLedgerIsWritten=Vorgänge werden in das Hauptbuch übertragen.
 
+MvtNotCorrectlyBalanced=Der Saldo der Buchung ist nicht ausgeglichen. Haben = %s. Soll = %s
+
 ##Export Journal Feature
 ExportFormat=Dateiformat
 Prefixname=Präfix der Exportdatei
@@ -162,13 +166,14 @@ Headername=Name im Kopf
 Type=Feldtyp
 Param=zusätzliche Parameter
 EnabledProduct=in Produkt
-EnabledTiers=In third party
-EnabledVat=in Steuer
+EnabledTiers=In Partner
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+InitAccountancy=Rechnungswesen initialisieren
+InitAccountancyDesc=Hier kann für Artikel und Dienstleistungen ein Sachkonto vorgegeben werden, wenn noch kein Rechnungswesen-Konto für Ein- und Verkäufe definiert ist. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Moduls Rechnungswesen vollständig ist.
+Options=Optionen
+OptionModeProductSell=Modus Verkauf
+OptionModeProductBuy=Modus Einkäufe
+OptionModeProductSellDesc=Zeige alle Artikel ohne Sachkonto Verkauf
+OptionModeProductBuyDesc=Alle Artikel ohne Sachkonto Einkauf anzeigen
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 54a855c2836..5e503bd41f0 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -154,6 +154,7 @@ Purge=Säubern
 PurgeAreaDesc=Hier können Sie alle vom System erzeugten und gespeicherten Dateien löschen (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b>). Diese Funktion ist nicht erforderlich und richtet sich vorwiegend an Benutzer ohne Zugriff auf das Dateisystem des Webservers (z.B. Hostingpakete)
 PurgeDeleteLogFile=Löschen der Protokolldatei <b>%s</b> des Systemprotokollmoduls (kein Risiko des Datenverlusts)
 PurgeDeleteTemporaryFiles=Alle temporären Dateien löschen (kein Datenverlustrisiko)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis <b>%s</b> löschen. Dies beinhaltet temporäre Dateien ebenso wie Datenbanksicherungen, Dokumente (Partner, Rechnungen, ...) und alle Inhalte des ECM-Moduls.
 PurgeRunNow=Jetzt bereinigen
 PurgeNothingToDelete=Keine zu löschenden Verzeichnisse oder Dateien
@@ -362,7 +363,7 @@ HideAnyVATInformationOnPDF=Unterdrücken aller USt.-Informationen auf dem generi
 HideDescOnPDF=Unterdrücke Produktbeschreibungen in generierten PDF
 HideRefOnPDF=Unterdrücke Produkt-Referenzen in generierten PDF
 HideDetailsOnPDF=Unterdrücke Produktzeilen in generierten PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PlaceCustomerAddressToIsoLocation=Benutze Standardposition in Frankreich (La Posteà für Position der Kundenadresse
 Library=Bibliothek
 UrlGenerationParameters=Parameter zum Sichern von URLs
 SecurityTokenIsUnique=Verwenden Sie einen eindeutigen Sicherheitsschlüssel für jede URL
@@ -416,7 +417,7 @@ ConfirmEraseAllCurrentBarCode=Möchten Sie wirklich alle aktuellen Barcodes lös
 AllBarcodeReset=Alle Barcode-Werte wurden entfernt
 NoBarcodeNumberingTemplateDefined=Im Barcode-Modul wurde kein Numerierungs-Schema aktiviert.
 NoRecordWithoutBarcodeDefined=Kein Datensatz ohne Barcode definiert.
-EnableFileCache=Enable file cache
+EnableFileCache=Dateicache aktivieren
 
 # Modules
 Module0Name=Benutzer und Gruppen
@@ -500,7 +501,7 @@ Module510Desc=Verwaltung der Angestellten-Gehälter und -Zahlungen
 Module520Name=Darlehen
 Module520Desc=Verwaltung von Darlehen
 Module600Name=Benachrichtigungen
-Module600Desc=Send EMail notifications (triggered by some business events) to third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Senden Sie Benachrichtigungen (ausgelöst durch geschäftliche Ereignisse) an Partnerkontakte (Einrichtung für jeden Partner) oder festgelegte E-Mail-Adressen.
 Module700Name=Spenden
 Module700Desc=Spendenverwaltung
 Module770Name=Spesenabrechnungen
@@ -964,7 +965,7 @@ DelaysBeforeWarning=Fristen bis zur Warnung
 DelaysOfToleranceBeforeWarning=Verzögerungstoleranz vor Warnung
 DelaysOfToleranceDesc=Hier können Sie die Verspätungstoleranz einstellen, bevor eine Benachrichtigung auf dem Bildschirm für jedes verspätete Element mit dem Symbol %s ausgegeben wird.
 Delays_MAIN_DELAY_ACTIONS_TODO=Verzögerungstoleranz (in Tagen) vor Warnung für noch nicht erledigte, geplante Ereignisse
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks not yet realised
+Delays_MAIN_DELAY_TASKS_TODO=Verzögerungstoleranz (in Tagen) vor Warnung für noch nicht erledigte, geplante Aufgaben
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Verzögerungstoleranz (in Tagen) vor  Warnung für noch nicht bearbeitete Aufträge
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Verzögerungstoleranz (in Tagen), vor Warnung für nicht bearbeitete Lieferantenbestellungen
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Verzögerungstoleranz (in Tagen) vor  Warnung für abzuschließende Angebote
@@ -1089,8 +1090,8 @@ PathDirectory=Verzeichnispfad
 SendmailOptionMayHurtBuggedMTA=Feature-Mails mit der Methode "PHP mail direkt" senden generiert eine Mail-Nachricht, die nicht korrekt möglicherweise von einigen Mail-Servern empfangen analysiert werden. Ergebnis ist, dass manche Mails nicht von Menschen, die von thoose abgehört Plattformen gehostet gelesen werden. Es ist bei einigen Internet-Providern (Ex: Orange in Frankreich). Dies ist nicht ein Problem in Dolibarr noch in PHP aber auf empfangende Mail-Server. Sie können jedoch hinzuzufügen MAIN_FIX_FOR_BUGGED_MTA Option auf 1 in die Setup - andere zu Dolibarr ändern, um dies zu vermeiden. Sie können jedoch Probleme mit anderen Servern, dass die Achtung streng dem SMTP-Standard zu erleben. Die andere Lösung (empfohlen) ist es, die Methode "SMTP-Socket-Bibliothek", die keine Nachteile hat benutzen.
 TranslationSetup=Übersetzungseinstellungen
 TranslationDesc=Wahl der Sprache auf dem Bildschirm sichtbar verändert werden kann: <br> * Weltweit aus dem Menü <strong>Start - Einstellungen - Anzeige</strong> <br> * Für die Benutzer nur von <strong>Benutzer-Registerkarte Anzeige</strong> von Benutzer-Karte (klicken Sie auf Login-Bildschirm auf der Oberseite).
-TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Summe aktivierter Module: <b>%s</b>
+TranslationOverwriteDesc=Sie können also einige Werte durch Vervollständigen/Editieren der folgenden Tabelle überschreiben. Sie müssen für "%s" den Sprachcode, für "%s" den Schlüssel aus der Datei langs/xx_XX/datei.lang und "%s" für den neuen Wert, den Sie in der Übersetzung verwenden wollen.
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
 ClassNotFoundIntoPathWarning=Klasse %s nicht innerhalb PHP-Pfad gefunden
 YesInSummer=Ja im Sommer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Fiskalisches Jahr schließen
 DeleteFiscalYear=Fiskalisches Jahr löschen
 ConfirmDeleteFiscalYear=Möchten Sie dieses fiskalische Jahr wirklich löschen?
 AlwaysEditable=kann immer bearbeitet werden
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
 NbMajMin=Mindestanzahl Großbuchstaben
 NbNumMin=Mindestanzahl Ziffern
@@ -1664,10 +1666,10 @@ BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei
 SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
 SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann.
 InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
-ConfFileMuseContainCustom=Zur Installation eines externen Modul speichern Sie die Modul-Dateien in Verzeichnis <strong>%s</strong>. Damit Dolibarr dieses Verzeichnis verarbeitet, müssen Sie in der Datei <strong>conf/conf.php</strong> die Option<br> - - <strong>$dolibarr_main_url_root_alt</strong> mit dem Wert <strong>$dolibarr_main_url_root_alt="/custom"</strong> aktivieren.<br>- <strong>$dolibarr_main_document_root_alt</strong>  mit dem Wert <strong>"%s/custom"</strong> aktivieren.
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Zeilen hervorheben bei Mouseover
 HighlightLinesColor=Farbe der Zeile hervorheben, wenn die Maus darüberfährt (leer lassen, um den Effekt zu deaktivieren)
-TextTitleColor=Color of page title
+TextTitleColor=Farbe des Seitenkopfs
 LinkColor=Farbe für Hyperlinks
 PressF5AfterChangingThis=Drücken Sie F5 auf der Tastatur, nachdem dem Sie diesen Wert geändert haben, damit die Änderungen wirksam ist
 NotSupportedByAllThemes=Funktioniert mit dem eldy Theme, ist aber nicht in allen Themen unterstützt
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Beispielnachricht, die Sie nutzen können, um
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist eine Hauptversion mit vielen neuen Features für Benutzer und Entwickler. Sie können die Version aus dem Downloadbereich des Portals http://www.dolibarr.org laden (Unterverzeichnis stabile Versionen). Lesen Sie die komplette Liste der <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Änderungen</a>.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist ein Wartungsupdate mit vielen Fehlerbereinigungen. Wir empfehlen jedem auf diese Version zu wechseln. Wie bei jedem Wartungsupdate sind keinen neuen Features oder Änderungen in den Datenstrukturen enthalten. Sie können die Version aus dem Downloadbereich des Portals http://www.dolibarr.org laden (Unterverzeichnis stabile Versionen). Lesen Sie die komplette Liste der <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Änderungen</a>.
 MultiPriceRuleDesc=Wenn die Option "mehrere Preisebenen pro Artikel/Dienstleistung" aktiviert ist, können Sie verschiedene Preis (einen pro Ebene) für jeden artikel definieren. Um Zeit zu sparen, können Sie eine Regel anlegen, mit der der Preis pro Ebene automatisch anhand des Preise in der ersten Ebene kalkuliert wird, so dass Sie nur einen Preis in der ersten Ebene eingeben müssen. Diese Seite kann Ihnen nur Zeit sparen und nützlich sein, wenn die Preise anderer Ebenen vom Preis der ersten Ebene abhängig sind. Ansonsten können Sie diese Seite ignorieren.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 3898bbcba63..1abfe619da8 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -35,9 +35,9 @@ AllActions= Alle Ereignisse
 ViewCal=Kalenderansicht
 ViewDay=Tagesansicht
 ViewWeek=Wochenansicht
-ViewYear=Year view
+ViewYear=Anzeige pro Jahr
 ViewPerUser=Benutzeransicht
-ViewPerType=Per type view
+ViewPerType=Anzeige pro Typ
 ViewWithPredefinedFilters= Ansicht mit vordefinierten Filtern
 AutoActions= Automatische Befüllung der Tagesordnung
 AgendaAutoActionDesc= Definieren Sie hier Termine zur automatischen Übernahme in den Terminkalender. Ist nichts aktiviert (Standardmäßig), umfasst der Terminkalender nur manuell eingetragene Termine.
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 0868b5b0d56..185cc04466e 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -165,8 +165,8 @@ DeleteARib=Lösche Bankkonto-Nummern Eintrag
 ConfirmDeleteRib=Möchten Sie diesen Bankkonto-Nummern Eintrag wirklich löschen?
 StartDate=Startdatum
 EndDate=Enddatum
-RejectCheck=Überprüfung zurückgewiesen
-ConfirmRejectCheck=Wollen sie diesen Check wirklich als zurückgewiesen Kennzeichnen?
-RejectCheckDate=Datum die Überprüfung wurde zurückgewiesen
-CheckRejected=Überprüfung zurückgewiesen
-CheckRejectedAndInvoicesReopened=Überprüfung zurückgewiesen und Rechnungen wieder geöffnet
+RejectCheck=Scheck zurückgewiesen
+ConfirmRejectCheck=Wollen sie diesen Scheck wirklich als zurückgewiesen kennzeichnen?
+RejectCheckDate=Datum an dem der Scheck zurückgewiesen wurde
+CheckRejected=Scheck zurückgewiesen
+CheckRejectedAndInvoicesReopened=Scheck zurückgewiesen und Rechnungen wieder geöffnet
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 19b6f8e0a26..1a7402d1e5c 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -58,6 +58,7 @@ Payment=Zahlung
 PaymentBack=Rückzahlung
 Payments=Zahlungen
 PaymentsBack=Rückzahlungen
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Zurück bezahlt
 DeletePayment=Lösche Zahlung
 ConfirmDeletePayment=Möchten Sie diese Zahlung wirklich löschen?
@@ -73,8 +74,8 @@ PaymentsAlreadyDone=Bereits getätigte Zahlungen
 PaymentsBackAlreadyDone=Rückzahlungen bereits erledigt
 PaymentRule=Zahlungsregel
 PaymentMode=Zahlungsart
-IdPaymentMode=Payment type (id)
-LabelPaymentMode=Payment type (label)
+IdPaymentMode=Zahlungsart (ID)
+LabelPaymentMode=Zahlungsart (Label)
 PaymentModeShort=Zahlungsart
 PaymentTerm=Zahlungskonditionen
 PaymentConditions=Zahlungsbedingungen
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Kundenzahlung fällig stellen
 DisabledBecauseRemainderToPayIsZero=Deaktiviert, da Zahlungserinnerung auf null steht
 PriceBase=Preis
 BillStatus=Rechnung Status
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Entwurf (freizugeben)
 BillStatusPaid=Bezahlt
 BillStatusPaidBackOrConverted=Bezahlt oder in Rabatt umgewandelt
@@ -126,7 +128,7 @@ BillShortStatusStarted=Begonnen
 BillShortStatusNotPaid=Offen
 BillShortStatusClosedUnpaid=Geschlossen
 BillShortStatusClosedPaidPartially=Bezahlt (teilweise)
-PaymentStatusToValidShort=Freizugeben
+PaymentStatusToValidShort=zu bestätigen
 ErrorVATIntraNotConfigured=Intrakommunale UID-Nr. noch nicht definiert
 ErrorNoPaiementModeConfigured=Keine standardmäßige Zahlungsart definiert. Beheben Sie diesen Fehler in den Einstellungen des Rechnungsmoduls.
 ErrorCreateBankAccount=Legen Sie ein Bankkonto an und definieren Sie anschließend die Zahlungsarten in den Einstellungen des Rechnungsmoduls.
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Fehler: Sie können keine Rechnu
 BillFrom=Von
 BillTo=An
 ActionsOnBill=Ereignisse zu dieser Rechnung
+RecurringInvoiceTemplate=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=Neue Rechnung
 LastBills=%s neueste Rechnungen
 LastCustomersBills=%s neueste Kundenrechnungen
@@ -186,7 +192,7 @@ ShowInvoice=Zeige Rechnung
 ShowInvoiceReplace=Zeige Ersatzrechnung
 ShowInvoiceAvoir=Zeige Gutschrift
 ShowInvoiceDeposit=Show Anzahlung Rechnung
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Situation Rechnung anzeigen
 ShowPayment=Zeige Zahlung
 AlreadyPaid=Bereits bezahlt
 AlreadyPaidBack=Bereits zurückbezahlt
@@ -199,6 +205,7 @@ Rest=Ausstehend
 AmountExpected=Höhe der Forderung
 ExcessReceived=Erhaltener Überschuss
 EscompteOffered=Rabatt angeboten (Skonto)
+EscompteOfferedShort=Discount
 SendBillRef=Einreichung der Rechnung %s
 SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung)
 StandingOrders=Lastschriftverfahren
@@ -224,7 +231,7 @@ NonPercuRecuperable=Nicht erstattungsfähig
 SetConditions=Zahlungskonditionen einstellen
 SetMode=Definiere Zahlungsart
 Billed=In Rechnung gestellt
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Wiederkehrende Rechnungen
 RepeatableInvoice=Rechnungs-Vorlage
 RepeatableInvoices=Rechnungs-Vorlagen
 Repeatable=Vorlage
@@ -273,7 +280,7 @@ HelpAbandonBadCustomer=Dieser Betrag wurde aufgegeben (Kundenverschulden) ist al
 HelpAbandonOther=Dieser Betrag wurde auf Grund eines Fehlers aufgegeben (falsche Rechnung oder an falschen Kunden)
 IdSocialContribution=Sozialabgaben/Unternehmenssteuer Zahlungs-ID
 PaymentId=Zahlung id
-PaymentRef=Payment ref.
+PaymentRef=Zahlungsreferenz
 InvoiceId=Rechnungs ID
 InvoiceRef=Rechnungs Nr.
 InvoiceDateCreation=Datum der Rechnungserstellung
@@ -301,11 +308,23 @@ RelatedSupplierInvoices=Ähnliche Lieferantenrechnungen
 LatestRelatedBill=Letzte ähnliche Rechnung
 WarningBillExist=Achtung, es existiert bereits mindestens eine Rechnung
 MergingPDFTool=PDF zusammenführen
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-
+AmountPaymentDistributedOnInvoice=Zahlungsbetrag verteilt auf Rechnung
+PaymentNote=Zahlungshinweis
+ListOfPreviousSituationInvoices=Liste der vorherigen Fortschrittsrechnungen
+ListOfNextSituationInvoices=Liste der nächsten Fortschrittsrechnungen
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Prompt
 PaymentConditionRECEP=Sofort nach Erhalt
@@ -402,7 +421,7 @@ Reported=Verzögert
 DisabledBecausePayments=Nicht möglich, da es Zahlungen gibt
 CantRemovePaymentWithOneInvoicePaid=Die Zahlung kann nicht entfernt werden, da es mindestens eine Rechnung gibt, die als bezahlt markiert ist
 ExpectedToPay=Erwartete Zahlung
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Zugeordnete Zahlung kann nicht gelöscht werden.
 PayedByThisPayment=mit dieser Zahlung beglichen
 ClosePaidInvoicesAutomatically=Markiert alle Standard- oder Ersatzrechnungen als "bezahlt", wenn diese vollständig beglichen sind.
 ClosePaidCreditNotesAutomatically=Markiert alle Gutschriften als "bezahlt", wenn diese vollständig beglichen sind.
@@ -414,7 +433,7 @@ NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen
 RevenueStamp=Steuermarke
 YouMustCreateInvoiceFromThird=Diese Option steht nur zur Verfügung, wenn eine Rechnung vom Reiter "Kunde" eines Partners aus erstellt wird
 PDFCrabeDescription=Rechnungs-Modell Crabe. Eine vollständige Rechnung (Empfohlene Vorlage)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
+PDFCrevetteDescription=PDF-Rechnungsvorlage Crevette. Eine vollständige Rechnungsvorlage für Rechnungen nach Fortschritt
 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
 MarsNumRefModelDesc1=Liefere Nummer im Format  %syymm-nnnn für Standardrechnungen %syymm-nnnn für Ersatzrechnung,  %syymm-nnnn für Anzahlungsrechnung und %syymm-nnnn für Gutschriften wobei  yy Jahr, mm Monat und nnnn eine laufende Nummer ohne Unterbrechung und ohne Rückkehr zu 0 ist.
 TerreNumRefModelError=Eine Rechnung, beginnend mit $ syymm existiert bereits und ist nicht kompatibel mit diesem Modell der Reihe. Entfernen oder umbenennen, um dieses Modul.
@@ -444,11 +463,11 @@ DisabledBecauseFinal=Dieser Status ist endgültig.
 CantBeLessThanMinPercent=Der Fortschritt kann nicht kleiner als sein bisheriger Wert werden.
 NoSituations=Keine offenen Positionen
 InvoiceSituationLast=Allgemeine Endrechnung
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+PDFCrevetteSituationNumber=Situation Nr. %s
+PDFCrevetteSituationInvoiceLineDecompte=Fortschrittsrechnungen - Anzahl
+PDFCrevetteSituationInvoiceTitle=Rechnung nach Fortschritt
+PDFCrevetteDescription=PDF-Rechnungsvorlage Crevette. Eine vollständige Rechnungsvorlage für Rechnungen nach Fortschritt
+PDFCrevetteSituationInvoiceLine=Fortschritt Nr. %s: Rechnung Nr. %s nach %s
+TotalSituationInvoice=Gesamtsituation
+invoiceLineProgressError=Fortschritt der Rechnungsposition kann nicht kleiner oder höher sein als der Status der nächsten Rechnungsposition
+updatePriceNextInvoiceErrorUpdateline=Fehler: Preis der Rechnungsposition %s aktualisieren
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 2409f035b23..63d229685e6 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=%s zuletzt bearbeitete Verträge
 BoxTitleLastModifiedDonations=Zuletzt geändert %s Spenden
 BoxTitleLastModifiedExpenses=Zuletzt %s geänderte Spesenabrechnungen
 BoxGlobalActivity=Globale Aktivität (Rechnungen, Angebote, Aufträge)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Fehler beim RSS-Abruf. Letzte erfolgreiche Aktualisierung: %s
 LastRefreshDate=Letztes Aktualisierungsdatum
 NoRecordedBookmarks=Keine Lesezeichen gesetzt. Klicken Sie <a href="%s">hier</a>, um ein Lesezeichen zu setzen.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Kundenrechnungen
 ForCustomersOrders=Kundenaufträge
 ForProposals=Angebote
 LastXMonthRolling=Die letzten %s Monate gleitend
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 52fb6fd67a7..ddaceb274f7 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -76,7 +76,7 @@ ProductsCategoryShort=Produkt-Kategorie/#tag
 MembersCategoryShort=Mitglied-Kategorie/#tag
 SuppliersCategoriesShort=Lieferantenkategorien
 CustomersCategoriesShort=Kunden Tags/Kategorien
-ProspectsCategoriesShort=Prospects tags/categories
+ProspectsCategoriesShort=Leads Tags/Kategorien
 CustomersProspectsCategoriesShort=Kunden-/Leadkategorien
 ProductsCategoriesShort=Produktkategorien
 MembersCategoriesShort=Mitgliederkategorien
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index 2873a239268..8fd06a5ec48 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -18,8 +18,8 @@ CardAction=Ereignisse Übersicht
 PercentDone=Fortschritt
 ActionOnCompany=Partner
 ActionOnContact=Kontakt
-TaskRDV=Treffen
-TaskRDVWith=Treffen mit %s
+TaskRDV=Termine
+TaskRDVWith=Termin mit %s
 ShowTask=Zeige Aufgabe
 ShowAction=Ereignisse anzeigen
 ActionsReport=Ereignis Journal
@@ -70,7 +70,7 @@ ActionAC_TEL=Anruf
 ActionAC_FAX=Fax versenden
 ActionAC_PROP=Angebot senden
 ActionAC_EMAIL=E-Mail senden
-ActionAC_RDV=Treffen
+ActionAC_RDV=Termine
 ActionAC_INT=Serviceaufträge vor Ort
 ActionAC_FAC=Kundenrechnung senden
 ActionAC_REL=Kundenrechnung senden(Erinnerung)
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index caca577779f..e0c694c3fa7 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -202,11 +202,17 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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 (C.I.C.E.)
+ProfId5MA=ID Prof. 5 (C.I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 516814b4917..2aa4e5848c1 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -155,7 +155,7 @@ DepositsAreNotIncluded=- Noch sind Anzahlungsrechnungen inbegriffen
 DepositsAreIncluded=- Anzahlungsrechnungen sind inbegriffen
 LT2ReportByCustomersInInputOutputModeES=Bericht von Partner EKSt.
 LT1ReportByCustomersInInputOutputModeES=Bericht von Kunden RE
-VATReport=VAT report
+VATReport=USt-Bericht
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten USt. nach Kunden 
 VATReportByCustomersInDueDebtMode=Bericht zur vereinnahmten und bezahlten USt. nach Kunden
 VATReportByQuartersInInputOutputMode=Quartalsbericht zur vereinnahmten und bezahlten USt.
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Bericht Ausländische Kunden
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basierend auf den ersten beiden Buchstaben der Mehrwertsteuernummer die unterschiedlich ist, wie Ihr eigener Unternehmens Ländercode.
 SameCountryCustomersWithVAT=Nationale Kunden berichten
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basierend auf den ersten beiden Buchstaben der Mehrwertsteuernummer die gleiche ist wie Ihr eigener Unternehmens Ländercode.
+LinkedFichinter=Link to an intervention
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index f673e671aa5..0597c043c33 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -53,7 +53,7 @@ ShowContract=Zeige Vertrag
 ListOfServices=Liste der Services
 ListOfInactiveServices=Liste der nicht aktiven Services
 ListOfExpiredServices=Liste der abgelaufenen, aktiven Services
-ListOfClosedServices=Liste der geschlossenen Services
+ListOfClosedServices=Liste der geschlossenen Verträge/Abos
 ListOfRunningContractsLines=Liste der aktiven Vertragspositionen
 ListOfRunningServices=Liste aktiver Services
 NotActivatedServices=Inaktive Services (in freigegebenen Verträgen)
@@ -66,7 +66,7 @@ ContractStartDate=Vertragsbeginn
 ContractEndDate=Vertragsende
 DateStartPlanned=Geplanter Beginn
 DateStartPlannedShort=Beginn
-DateEndPlanned=Geplantes Ende
+DateEndPlanned=voraussichtliches Enddatum
 DateEndPlannedShort=Ende
 DateStartReal=Effektiver Beginn
 DateStartRealShort=effektives Startdatum
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 9638c09114d..a3fa030ab21 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -16,11 +16,12 @@ KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs
 FileToLaunchCronJobs=Kommandozeile zum Starten von Cronjobs
 CronExplainHowToRunUnix=In Unix-Umgebung sollten Sie die folgenden crontab-Eintrag verwenden, um die Befehlszeile alle 5 Minuten ausführen
 CronExplainHowToRunWin=In Microsoft(tm) Windows Umgebungen kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede 5 Minuten aufzurufen
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Geplante Jobs
-CronListActive=List of enabled/scheduled jobs
+CronListActive=Liste der aktivierten/geplanten Jobs
 CronListInactive=Liste der deaktivierten Jobs
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Aktiviert und Deaktiviert
 # Page list
 CronDateLastRun=Letzte Ausführung
 CronLastOutput=Ausgabe der letzten Ausführung
@@ -36,10 +37,11 @@ CronInfo=Das Modul "Zeitgesteuerte Cron-Jobs" erlaubt die geplanten Cron-Jobs di
 CronWaitingJobs=Wartende Jobs
 CronTask=Job
 CronNone=Keine
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=nicht vor
+CronDtEnd=nicht nach
 CronDtNextLaunch=Nächste Ausführung
-CronDtLastLaunch=Letzte Ausführung
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequenz
 CronClass=Klasse
 CronMethod=Methode
@@ -52,7 +54,7 @@ CronNoJobs=Keine Jobs eingetragen
 CronPriority=Rang
 CronLabel=Beschreibung
 CronNbRun=Anzahl Starts
-CronMaxRun=Max nb. launch
+CronMaxRun=max. Anzahl Starts
 CronEach=Jede
 JobFinished=Job gestartet und beendet
 #Page card
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Enddatum kann nicht vor dem Startdatum liegen
 CronStatusActiveBtn=Aktivieren
 CronStatusInactiveBtn=Deaktivieren
 CronTaskInactive=Dieser Job ist deaktiviert
-CronDtLastResult=Datum letztes Resultat
 CronId=ID
 CronClassFile=Klassen (filenames.class.php)
 CronModuleHelp=Name des Dolibarr Modul (funktioniert auch mit externen Dolibarr Modul). <BR> Als Beispiel um die Funktion fetch der Dolibarr Produkt Klasse  /htdocs/<u>product</u>/class/product.class.php aufzurufen, der Wert des Modul ist <i>product.</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden
 UseMenuModuleToolsToAddCronJobs=Öffnen Sie das Menü "Start - Module Werkzeuge - Cronjob Liste" auf um geplante Skript-Aufgaben zu sehen und zu verändern.
 TaskDisabled=Job deaktiviert
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/de_DE/deliveries.lang b/htdocs/langs/de_DE/deliveries.lang
index 4c9bc5fd51b..80c65f3df6f 100644
--- a/htdocs/langs/de_DE/deliveries.lang
+++ b/htdocs/langs/de_DE/deliveries.lang
@@ -17,9 +17,9 @@ DeleteDeliveryReceiptConfirm=Sind Sie sicher, dass Sie den Lieferschein <b>%s</b
 DeliveryMethod=Versandart
 TrackingNumber=Tracking Nummer
 DeliveryNotValidated=Lieferung nicht validiert
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+StatusDeliveryCanceled=Storniert
+StatusDeliveryDraft=Entwurf
+StatusDeliveryValidated=erhalten
 # merou PDF model
 NameAndSignature=Name und Unterschrift:
 ToAndDate=An___________________________________ am ____/_____/__________
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index eeaf129eafc..96faec76893 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -22,7 +22,7 @@ ReviewedByCP=Wird geprüft von
 DescCP=Beschreibung
 SendRequestCP=Urlaubs-Antrag erstellen
 DelayToRequestCP=Urlaubsanträge müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
-MenuConfCP=Balance of leaves
+MenuConfCP=Summe der Abwesenheitsanträge
 UpdateAllCP=Urlaube aktualisieren
 SoldeCPUser=Urlaubssaldo ist <b>%s</b> Tage.
 ErrorEndDateCP=Sie müssen ein Urlaubsende-Datum wählen, dass nach dem Urlaubsbeginn-Datum liegt.
@@ -80,7 +80,7 @@ alreadyCPexist=Ein Urlaubsantrag wurde für diese Periode bereits erstellt.
 UserName=Nachname
 FirstDayOfHoliday=Erster Tag des Urlaubs
 LastDayOfHoliday=Letzter Tag des Urlaubs
-BoxTitleLastLeaveRequests=Last %s modified leave requests
+BoxTitleLastLeaveRequests=die letzten %s veränderter Urlaubsanträge
 HolidaysMonthlyUpdate=Monatliches Update
 ManualUpdate=Manuelles Update
 HolidaysCancelation=Urlaubsantrag stornieren
@@ -140,7 +140,7 @@ HolidaysRefusedBody=Ihr Antrag auf Urlaub von %s bis %s wurde aus folgendem Grun
 HolidaysCanceled=stornierter Urlaubsantrag
 HolidaysCanceledBody=Ihr Urlaubsantrag von %s bis %s wurde storniert.
 NewByMonth=Hinzugefügt pro Monat
-Affect=Followed by a counter
-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
+Affect=gefolgt von einem Zähler
+FollowedByACounter=1: Diese Art von Antrag muss mit einem Zähler versehen werden. Der Zähler wird manuell oder automatisch erhöht und verringert, wenn der Urlaubsantrag geprüft wurde.<br>0: nicht mit einem Zähler versehen
+NoLeaveWithCounterDefined=Es gibt keine definierten Antragsarten , die mit einem Zähler versehen werden müssen.
 GoIntoDictionaryHolidayTypes=Öffnen Sie das Menü <strong>Start - Einstellungen - Wörterbücher - Art des Urlaubs </strong> um die verschiedene Urlaubsarten zu konfigurieren.
diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
index 23080cce19f..71999d753f3 100644
--- a/htdocs/langs/de_DE/hrm.lang
+++ b/htdocs/langs/de_DE/hrm.lang
@@ -15,6 +15,6 @@ DictionaryFunction=PV - Stellenbezeichnungen Liste
 ListOfEmployees=Liste der Mitarbeiter
 Employees=Mitarbeiter
 Employee=Mitarbeiter
-Employe=Employe
+Employe=Mitarbeiter
 NewEmployee=Neuer Mitarbeiter
 EmployeeCard=Mitarbeiter - Karte
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 26cea7b49d9..8ffdcf9e782 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -54,9 +54,9 @@ PacificNumRefModelDesc1=Liefere Nummer im Format %syymm-nnnn zurück, wobei yy d
 PacificNumRefModelError=Eine Serviceauftragskarte beginnend mit $syymm existiert bereits und ist nicht mir dieser Numerierungssequenz kompatibel. Bitte löschen oder umbenennen.
 PrintProductsOnFichinter=Drucke Produkte auf Serviceauftragskarte
 PrintProductsOnFichinterDetails=Serviceaufträge durch Bestellungen generiert
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=Nb of intervention cards
-NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+InterventionStatistics=Statistik Serviceaufträge
+NbOfinterventions=Anzahl Karten für Serviceaufträge
+NumberOfInterventionsByMonth=Anzahl Karten für Serviceaufträge pro Monat (Freigabedatum)
 ##### Exports #####
 InterId=Serviceauftrag ID
 InterRef=Serviceauftrag Ref.
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index e32decf7f86..79043aaa548 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -32,10 +32,11 @@ Language_es_MX=Spanisch (Mexiko)
 Language_es_PY=Spanisch (Paraguay)
 Language_es_PE=Spanisch (Peru)
 Language_es_PR=Spanisch (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estnisch
 Language_eu_ES=Baskisch
 Language_fa_IR=Persisch
-Language_fi_FI=Finnish
+Language_fi_FI=Finnisch
 Language_fr_BE=Französisch (Belgien)
 Language_fr_CA=Französisch (Kanada)
 Language_fr_CH=Französisch (Schweiz)
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index d2f5af605da..35eca94cb4c 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-Mail erfolgreich überprüft
 MailUnsubcribe=Abmelden
 Unsuscribe=Abmelden
 MailingStatusNotContact=Nicht mehr kontaktieren
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Das Empfängerfeld ist leer
 WarningNoEMailsAdded=Keine neuen E-Mail-Adressen für das Hinzufügen zur Empfängerliste.
 ConfirmValidMailing=Möchten Sie diese E-Mail-Kampagne wirklich freigeben?
@@ -81,7 +82,7 @@ ActivateCheckReadKey=Schlüssel um die URL für "Lesebestätigung" und "Abmelden
 EMailSentToNRecipients=E-Mail versandt an %s Empfänger.
 XTargetsAdded=<b>%s</b> Empfänger der Liste zugefügt
 EachInvoiceWillBeAttachedToEmail=Ein Dokument mit der Standard-Vorlage für Rechnungen wird erstellt und an jede E-Mail angehängt.
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=Wenn die PDF-Datei für die Rechnung schon erstellt wurde, wird sie der E-Mail angehängt. Ohne PDF-Datei wird keine E-Mail verschickt (es sind nur PDF-Dateien als Anhang für Seriendrucke zulässig).
 MailTopicSendRemindUnpaidInvoices=Zahlungserinnerung für Rechnung %s (%s)
 SendRemind=Zahlungserinnerung per E-Mail versenden
 RemindSent=%s Erinnerung(en) gesendet
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 740c5cb27fd..3fc77207e73 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%d.%m.%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Datenbankverbindung
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Für diesen Email-Typ ist keine Vorlage eingetragen
 NoTranslation=Keine Übersetzung
 NoRecordFound=Keinen Eintrag gefunden
 NoError=kein Fehler
@@ -106,7 +106,7 @@ NotePrivate=Anmerkung (privat)
 PrecisionUnitIsLimitedToXDecimals=Stückpreisgenauigkeit im System auf <b>%s</b> Dezimalstellen beschränkt.
 DoTest=Testen
 ToFilter=Filtern
-NoFilter=No filter
+NoFilter=Kein Filter
 WarningYouHaveAtLeastOneTaskLate=Achtung: Bei mindestens einem Element wurde die Toleranz der Zeitverzögerung überschritten.
 yes=ja
 Yes=Ja
@@ -230,8 +230,8 @@ Now=Jetzt
 HourStart=Startzeit
 Date=Datum
 DateAndHour=Datum und Uhrzeit
-DateToday=Today's date
-DateReference=Reference date
+DateToday=heutiges Datum
+DateReference=Referenzdatum
 DateStart=Startdatum
 DateEnd=Enddatum
 DateCreation=Erstellungsdatum
@@ -311,6 +311,7 @@ UnitPriceHT=Stückpreis (netto)
 UnitPriceTTC=Stückpreis (brutto)
 PriceU=VP
 PriceUHT=VP (netto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=Nettopreis anfordern
 PriceUTTC=E.P. (inkl. Steuern)
 Amount=Betrag
@@ -321,6 +322,9 @@ AmountTTCShort=Bruttobetrag
 AmountHT=Betrag (exkl. USt.)
 AmountTTC=Bruttobetrag
 AmountVAT=USt.-Betrag
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=USt.-Betrag 2
 AmountLT2=USt.-Betrag 3
 AmountLT1ES=RE Betrag
@@ -335,6 +339,7 @@ Percentage=Prozentangabe
 Total=Gesamt
 SubTotal=Zwischensumme
 TotalHTShort=Nettosumme
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Gesamtbetrag (inkl. USt.)
 TotalHT=Gesamtpreis
 TotalHTforthispage=Gesamtpreis für diese Seite
@@ -434,7 +439,7 @@ Reporting=Berichterstattung
 Reportings=Berichte
 Draft=Entwurf
 Drafts=Entwürfe
-Validated=Freigegeben
+Validated=Bestätigt
 Opened=geöffnet
 New=Neu
 Discount=Rabatt
@@ -457,6 +462,7 @@ Datas=Daten
 None=Keine
 NoneF=Keine
 Late=Verspätet
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Bild
 Photos=Bilder
 AddPhoto=Bild hinzufügen
@@ -539,6 +545,7 @@ NbOfCustomers=Anzahl der Kunden
 NbOfLines=Anzahl der Positionen
 NbOfObjects=Anzahl der Objekte
 NbOfReferers=Anzahl Verknüpfungen
+NbOfObjectReferers=Number of refering objects
 Referers=Verknüpfte Objekte
 TotalQuantity=Gesamtmenge
 DateFromTo=Von %s bis %s
@@ -612,7 +619,7 @@ TotalMan=Vollständig
 NeverReceived=Nie erhalten
 Canceled=Storniert
 YouCanChangeValuesForThisListFromDictionarySetup=Sie können die Listenoptionen in den Stammdaten anpassen
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanSetDefaultValueInModuleSetup=Sie können den Standardwert verwendet setzen, wenn ein neuer Datensatz in der Modulkonfiguration erstellt wird
 Color=Farbe
 Documents=Verknüpfte Dokumente
 DocumentsNb=Verknüpfte Dateien (%s)
@@ -694,13 +701,14 @@ LinkedToSpecificUsers=Mit Kontakt verknüpft
 DeleteAFile=Datei löschen
 ConfirmDeleteAFile=Sind Sie sicher dass Sie diese Datei löschen möchten?
 NoResults=Keine Ergebnisse
+AdminTools=Admin tools
 SystemTools=Systemwerkzeuge
 ModulesSystemTools=Module Hilfsprogramme
 Test=Testen
 Element=Element
 NoPhotoYet=Noch keine Bilder verfügbar
 HomeDashboard=Startseite Übersicht
-Dashboard=Dashboard
+Dashboard=Start
 Deductible=absetzbar
 from=von
 toward=zu
@@ -732,7 +740,8 @@ Hello=Hallo
 Sincerely=Mit freundlichen Grüßen
 DeleteLine=Zeile löschen
 ConfirmDeleteLine=Möchten Sie diese Zeile wirklich löschen?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Montag
 Tuesday=Dienstag
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index b56aac05f1a..6ece6c333da 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -35,9 +35,9 @@ MargeBrute=Roherlös
 MargeNette=Nettoerlös
 MargeType1=Spanne vom besten Lieferantenpreis
 MargeType2=gewichtete Durchschnittspreis (WAP)
-MargeType3=Margin on Cost Price
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
+MargeType3=Marge auf Herstellkosten
+MARGIN_TYPE_DETAILS=Roherlös: Verkaufspreis - Einkaufspreis<br/>Nettoerlös: Verkaufspreis - Kosten
+MarginTypeDesc=* Marge auf den günstigsten EK-Preis : Verkaufspreis - günstigster EK-Preis aus den Artikeldaten<br>* Marge auf den gleitenden Durchschnittspreis (GLD) : Verkaufspreis - gleitender Durchschnittspreis (GLD) oder günstigster EK-Preis falls der GLD nicht definiert ist<br>* Marge auf Herstellkosten = Verkaufspreis - Herstellkosten aus den Artikeldaten oder GLD, wenn die Herstellkosten nicht definiert sind oder günstigster EK-Preis, wenn der GLD nicht definiert ist
 CostPrice=Selbstkostenpreis
 BuyingCost=Kosten
 UnitCharges=Einheit Kosten
diff --git a/htdocs/langs/de_DE/oauth.lang b/htdocs/langs/de_DE/oauth.lang
index 403d8d7e2c1..88dc73faf4c 100644
--- a/htdocs/langs/de_DE/oauth.lang
+++ b/htdocs/langs/de_DE/oauth.lang
@@ -8,7 +8,7 @@ TokenDeleted=Token gelöscht
 RequestAccess=Hier klcien, um Zugriff anzufordern/zu verlängern und einen neuen Token zu bekommen.
 DeleteAccess=Hier klicken, um das Token zu löschen
 UseTheFollowingUrlAsRedirectURI=Benutzen Sie diese URL zur Weiterleitung, wenn Sie die Anmeldedaten Ihres OAuth Anbieters erstellen.
-ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
+ListOfSupportedOauthProviders=Hier Anmeldedaten Ihres OAuth2 Anbieters eintragen. Nur OAuth2 Anbieter werden hier angezeigt. Diese Einstellungen können von anderen Module genutzt werden, die OAuth2 Authentifizierung benötigen.
 OAUTH_GOOGLE_NAME=Google API
 OAUTH_GOOGLE_ID=Google APi ID
 OAUTH_GOOGLE_SECRET=API Google Secret
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index d47c05ca12c..154d413d85e 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -82,7 +82,7 @@ OrdersOpened=Bestellungen zu bearbeiten
 NoOpenedOrders=Keine offenen Bestellungen
 NoOtherOpenedOrders=Keine anderen offenen Bestellungen
 NoDraftOrders=Keine Auftrags-Entwürfe
-NoOrder=No order
+NoOrder=Kein Auftrag
 NoSupplierOrder=Keine Bestellung
 OtherOrders=Bestellungen Anderer
 LastOrders=Letzte %s Kundenaufträge
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index c628d971d30..721a0e1b9eb 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -238,8 +238,8 @@ ToExport=Export
 NewExport=Neuer Export
 ##### External sites #####
 ExternalSites=Externe Seiten
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
-WEBSITE_KEYWORDS=Keywords
+WebsiteSetup=Einrichtung der Modul-Website
+WEBSITE_PAGEURL=URL der Seite
+WEBSITE_TITLE=TItel
+WEBSITE_DESCRIPTION=Beschreibung
+WEBSITE_KEYWORDS=Schlüsselwörter
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index cff603a791a..4f84f795317 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -252,7 +252,7 @@ UnitPmp=Einzelpreis
 CostPmpHT=Netto Einkaufspreis
 ProductUsedForBuild=Automatisch für Produktion verbraucht
 ProductBuilded=Produktion fertiggestellt
-ProductsMultiPrice=Products and prices for each price level
+ProductsMultiPrice=Artikel und Preise für jede Preisebene
 ProductsOrServiceMultiPrice=Kundenpreise (von Produkten oder Leistungen, Multi-Preise)
 ProductSellByQuarterHT=Quartalsumsatz Produkte exkl. Steuer
 ServiceSellByQuarterHT=Quartalsumsatz Leistungen exkl. Steuer
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Erhöhen/verringern Lagerbestand  bei verknüpften Pr
 ComposedProduct=Teilprodukt
 MinSupplierPrice=Minimaler Einkaufspreis
 DynamicPriceConfiguration=Dynamische Preis Konfiguration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Globale Variablen
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Globale Variablen aktualisieren
 GlobalVariableUpdaterType0=JSON Daten
 GlobalVariableUpdaterHelp0=Analysiert JSON-Daten von angegebener URL, VALUE gibt den Speicherort des entsprechenden Wertes,
@@ -311,5 +315,6 @@ PropalMergePdfProductChooseFile=Wähle PDF-Dateien
 IncludingProductWithTag=Inklusive Artikel/Dienstleistung mit Schlagwörter
 DefaultPriceRealPriceMayDependOnCustomer=Standardpreis, echter Preis kann vom Kunden abhängig sein
 WarningSelectOneDocument=Bitte wählen Sie mindestens ein Dokument aus
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
+DefaultUnitToShow=Einheit
+NbOfQtyInProposals=Stückzahl in Angeboten
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 684cbca70db..bfc5a0281b8 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Projekt-ID
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projekte
+ProjectsArea=Projects Area
 ProjectStatus=Projekt Status
 SharedProject=Jeder
 PrivateProject=Kontakte zum Projekt
@@ -14,12 +15,12 @@ ProjectsPublicTaskDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben be
 ProjectsDesc=Es werden alle Projekte angezeigt (Ihre Berechtigungen berechtigt Sie alle Projekte zu sehen).
 MyTasksDesc=Diese Ansicht ist für Sie beschränkt auf Projekte oder Aufgaben bei welchen Sie als Ansprechpartner eingetragen sind.
 OnlyOpenedProject=Nur offene Projekte sind sichtbar. (Projekte im Status Entwurf oder Geschlossen sind nicht sichtbar)
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Abgeschlossene Projekte werden nicht angezeigt.
 TasksPublicDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
 TasksDesc=Diese Ansicht zeigt alle Projekte und Aufgaben (Ihre Benutzerberechtigungen berechtigt Sie alles zu sehen).
 AllTaskVisibleButEditIfYouAreAssigned=Alle Aufgaben dieser Projekte sind sichtbar, aber sie können nur auf ihnen zugewiesenen Aufgaben Zeit erfassen. Weisen sie sich die Aufgabe zu, wenn sie Zeit erfassen möchten.
 OnlyYourTaskAreVisible=Nur ihnen zugewiesene Aufgaben sind sichtbar. Weisen sie sich die Aufgabe zu, wenn sie Zeit auf der Aufgabe erfassen möchten.
-ProjectsArea=Projektübersicht
+ProjectsArea=Projects Area
 NewProject=Neues Projekt
 AddProject=Projekt erstellen
 DeleteAProject=Löschen eines Projekts
@@ -30,9 +31,9 @@ OfficerProject=Projektverantwortlicher
 LastProjects=Die %s neuesten Projekte
 AllProjects=Alle Projekte
 OpenedProjects=Offene Projekte
-OpenedTasks=Opened tasks
+OpenedTasks=Geöffnete Aufgaben
 OpportunitiesStatusForOpenedProjects=Chancen nach Projektstatus
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+OpportunitiesStatusForProjects=Betrag Verkaufschancen pro Projekt nach Status
 ProjectsList=Liste der Projekte
 ShowProject=Zeige Projekt
 SetProject=Projekt setzen
@@ -67,6 +68,7 @@ Activities=Aufgaben/Tätigkeiten
 MyActivity=Meine Tätigkeit
 MyActivities=Meine Aufgaben/Tätigkeiten
 MyProjects=Meine Projekte
+MyProjectsArea=My projects Area
 DurationEffective=Effektivdauer
 Progress=Fortschritt
 ProgressDeclared=Angegebener Fortschritt
@@ -132,8 +134,8 @@ TaskModifiedInDolibarr=Aufgabe %s geändert
 TaskDeletedInDolibarr=Aufgabe %s gelöscht
 OpportunityStatus=Verkaufschance Status
 OpportunityStatusShort=Chance Status
-OpportunityProbability=Opportunity probability
-OpportunityProbabilityShort=Opp. probab.
+OpportunityProbability=Wahrscheinlichkeit Verkaufschance
+OpportunityProbabilityShort=Wahrscheinlichkeit Verkaufschance
 OpportunityAmount=Verkaufschance Betrag
 OpportunityAmountShort=Chance Betrag
 ##### Types de contacts #####
@@ -168,7 +170,7 @@ ProjectsWithThisUserAsContact=Projekte mit diesem Anwender als Kontakt
 TasksWithThisUserAsContact=Aufgaben zugeordnet zu diesem Anwender
 ResourceNotAssignedToProject=Zugewiesen zu Projekt
 ResourceNotAssignedToTask= nicht zugewiesen zu Aufgabe
-ResourceNotAssignedToTheTask=Not assigned to the task
+ResourceNotAssignedToTheTask=nicht der Aufgabe zugewiesen
 AssignTaskToMe=Aufgabe mir selbst zuweisen
 AssignTask=Zuweisen
 ProjectOverview=Projekt-Übersicht
@@ -183,9 +185,12 @@ TaskAssignedToEnterTime=Aufgabe zugewiesen. Eingabe der Zeit zu diese Aufgabe so
 IdTaskTime=ID Zeit Aufgabe
 YouCanCompleteRef=Wenn Sie das Projektkürzel mit Informationen versehen wollen (um es als Suchfilter zu benutzen), wird empfohlen, ein Minuszeichen zur Trennung einzufügen. Die automatische Numerierung funktioniert für die zukünftigen Projekte normal, z.B. %s-ABC. Sie können auch Suchschlüssel im Label benutzen.
 OpenedProjectsByThirdparties=Offene Projekte nach Partner
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Verkaufschancen Gesamtbetrag
 OpportunityPonderatedAmount=Verkaufschancen geschätzter Betrag
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
+OpportunityPonderatedAmountDesc=Betrag der Verkaufschance gewichtet nach Wahrscheinlichkeit
 OppStatusPROSP=Geschäftsanbahnung
 OppStatusQUAL=Qualifikation
 OppStatusPROPO=Angebot
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index 42fb3698318..3d107a0aeb5 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -25,7 +25,7 @@ LastModifiedProposals=Die letzten %s bearbeiteten Angebote
 AllPropals=Alle Angebote
 LastProposals=Letzte Angebote
 SearchAProposal=Angebot suchen
-NoProposal=No proposal
+NoProposal=Kein Entwurf
 ProposalsStatistics=Angebote Statistiken
 NumberOfProposalsByMonth=Anzahl pro Monat
 AmountOfProposalsByMonthHT=Betrag pro Monat (nach Steuern)
@@ -63,8 +63,8 @@ DatePropal=Angebotsdatum
 DateEndPropal=Gültig bis
 DateEndPropalShort=Ablaufdatum
 ValidityDuration=Gültigkeitsdauer
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Status ändern in 
+SetAcceptedRefused=Bestätigte/Abgelehnte
 ClassifyBilled=Verrechnet
 BuildBill=Erzeuge Rechnung
 ErrorPropalNotFound=Angebot %s nicht gefunden
@@ -102,4 +102,4 @@ DefaultModelPropalCreate=Erstellung Standardvorlage
 DefaultModelPropalToBill=Standard-Template, wenn Sie ein Angebot schließen wollen (zur Verrechung)
 DefaultModelPropalClosed=Standard Schablone wenn sie ein Geschäftsangebot schließen wollen. (ohne Rechnung)
 ProposalCustomerSignature=Schriftliche Annahme, Firmenstempel, Datum und Unterschrift
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalsStatisticsSuppliers=Statistik Lieferantenanfragen
diff --git a/htdocs/langs/de_DE/receiptprinter.lang b/htdocs/langs/de_DE/receiptprinter.lang
index a28c731fba8..e06aa5e4337 100644
--- a/htdocs/langs/de_DE/receiptprinter.lang
+++ b/htdocs/langs/de_DE/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Drucker %s zugefügt
 PrinterUpdated=Drucker %s geändert
 PrinterDeleted=Drucker %s gelöscht
 TestSentToPrinter=Sende Test zu Drucker %s
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Druckereinrichtung
 ReceiptPrinterTemplateDesc=Einrichtung von Vorlagen
 ReceiptPrinterTypeDesc=Beschreibung des Typs des Quittungsdruckers
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 2b723c43492..a914500facb 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -6,7 +6,7 @@ AllSendings=Alle Lieferungen
 Shipment=Versand
 Shipments=Lieferungen
 ShowSending=Zeige Lieferungen
-Receivings=Delivery Receipts
+Receivings=Zustellbestätigungen
 SendingsArea=Versandübersicht
 ListOfSendings=Versandliste
 SendingMethod=Versandart
diff --git a/htdocs/langs/de_DE/sms.lang b/htdocs/langs/de_DE/sms.lang
index aec415ca7ab..c62f29b1c35 100644
--- a/htdocs/langs/de_DE/sms.lang
+++ b/htdocs/langs/de_DE/sms.lang
@@ -49,6 +49,6 @@ SendSms=SMS senden
 SmsInfoCharRemain=Anzahl der verbleibenden Zeichen
 SmsInfoNumero= (Format der Rufnummer: ++33899701761)
 DelayBeforeSending=Warten vor dem Senden (in Minuten)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=Kein Sender verfügbar. Prüfen Sie die Einstellungen Ihres SMS Providers.
 SmsNoPossibleRecipientFound=Keine möglichen Empfänger gefunden. Prüfen Sie die Einstellungen Ihres SMS Anbieters.
 
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 940d73eba24..02ececd6bef 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Letzte Bewegungen
 Units=Einheiten
 Unit=Einheit
 StockCorrection=Lagerstandsanpassung
-StockTransfer=Lagerbewegung
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Lagerbewegung
 StockMovements=Lagerbewegungen
 LabelMovement=Lagerbewegungs-Etikett
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
index ef7c52c4ebc..71126bdf2f8 100644
--- a/htdocs/langs/de_DE/supplier_proposal.lang
+++ b/htdocs/langs/de_DE/supplier_proposal.lang
@@ -1,16 +1,17 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Handelsangebot Lieferant
 supplier_proposalDESC=Preisanfrage an Lieferanten verwalten
-SupplierProposalShort=Supplier proposals
-SupplierProposalNew=New request
+SupplierProposalShort=Lieferanten Angebote
+SupplierProposalNew=Neue Anfrage
 CommRequest=Preisanfrage
 CommRequests=Preisanfragen
 SearchRequest=Anfrage suchen
 DraftRequests=Anfrage erstellen
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=letzten %s geänderte Preisanfragen
 RequestsOpened=offene Preisanfragen
 SupplierProposalArea=Bereich Lieferantenangebote
-SupplierProposalShort=Supplier proposals
+SupplierProposalShort=Lieferanten Angebote
 SupplierProposals=Lieferanten Angebote
 NewAskPrice=neue Preisanfrage
 NewAsk=neue Anfrage
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index e0d00beeec5..7aa1a75369a 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -31,7 +31,7 @@ TripNDF=Hinweise Spesenabrechnung
 PDFStandardExpenseReports=Standard-Vorlage, um ein PDF-Dokument für die Spesenabrechnung zu erzeugen
 ExpenseReportLine=Spesenabrechnung Zeile
 TF_OTHER=Andere
-TF_TRIP=Transportation
+TF_TRIP=Versand
 TF_LUNCH=Bewirtung
 TF_METRO=S- und U-Bahn
 TF_TRAIN=Bahn
@@ -99,5 +99,5 @@ ConfirmSaveTrip=Sind Sie sicher, dass Sie diese Spesenabrechnung bestätigen wol
 NoTripsToExportCSV=Keine Spesenabrechnung für diesen Zeitraum zu exportieren.
 ExpenseReportPayment=Spesenabrechnung Zahlung
 
-ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToApprove=zu genehmigende Spesenabrechnungen
 ExpenseReportsToPay=zu zahlende Spesenabrechnungen
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 72e283cb37b..05ac893d499 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -121,4 +121,5 @@ OpenIDURL=OpenID URL
 LoginUsingOpenID=Verwende OpenID für Anmeldung
 WeeklyHours=Wochenstunden
 ColorUser=Benutzerfarbe
-DisabledInMonoUserMode=Disabled in maintenance mode
+DisabledInMonoUserMode=Deaktiviert im Wartungsmodus
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index c01b12eee42..54539e8a563 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Λογιστική λογαριασμού
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Ανάλυση
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Ανάλυση πελατών
 SuppliersVentilation=Ανάλυση προμηθευτών
 TradeMargin=Εμπορικό Περιθώριο
@@ -46,7 +47,7 @@ UpdateAccount=Τροποποίηση του λογιστικού λογαρια
 UpdateMvts=Τροποποίηση μιας κίνησης
 WriteBookKeeping=Εγγραφή λογαριασμών στο γενικό καθολικό
 Bookkeeping=Γενικό Καθολικό
-AccountBalanceByMonth=Το υπόλοιπο του λογαριασμού ανά μήνα
+AccountBalance=Account balance
 
 AccountingVentilation=Ανάλυση των λογαριασμών
 AccountingVentilationSupplier=Ανάλυση λογιστικών προμηθευτή
@@ -103,6 +104,7 @@ Code_tiers=Πελ./Προμ.
 Labelcompte=Ετικέτα λογαριασμού
 Sens=Σημασία
 Codejournal=Ημερολόγιο
+NumPiece=Piece number
 
 DelBookKeeping=Διαγράψτε τα αρχεία της γενικής λογιστικής
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Φόρμα ανάλυσης
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 5affa6b3bbc..6b74139bacf 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -154,6 +154,7 @@ Purge=Εκκαθάριση
 PurgeAreaDesc=Αυτή η σελίδα σας επιτρέπει να διαγράψετε όλα τα αρχεία που κατασκευάζονται ή αποθηκεύονται από Dolibarr (προσωρινά αρχεία ή όλα τα αρχεία σε <b>%s </ b> directory).  Η χρήση αυτής της λειτουργίας δεν είναι απαραίτητη.  Παρέχεται για χρήστες των οποίων το Dolibarr φιλοξενείται από πάροχο, που δεν προσφέρει δικαίωμα διαγραφής αρχείων που κατασκευάστηκαν από τον web server.
 PurgeDeleteLogFile=Διαγραφή αρχείου καταγραφής <b>%s</b> που ορίζεται για τη μονάδα syslog (δεν υπάρχει κίνδυνος απώλειας δεδομένων)
 PurgeDeleteTemporaryFiles=Διαγραφή όλων των προσωρινών αρχείων (ΔΕΝ υπάρχει κίνδυνος απώλειας δεδομένων)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Διαγραφή όλων των αρχείων στον κατάλογο <b>%s</b>.  Προσωρινά αρχεία αλλά και βάση δεδομένων αντιγράφων ασφαλείας κάδου απορριμάτων, αρχεία που συνδέονται με τα στοιχεία (ΠΕΛ./ΠΡΟΜ., τιμολόγια, ...) και μεταφορτώνονται στη μονάδα ECM θα διαγραφούν.
 PurgeRunNow=Διαγραφή τώρα
 PurgeNothingToDelete=Δεν υπάρχει κατάλογος ή αρχείο για διαγραφή.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Κλείσιμο οικονομικού έτους
 DeleteFiscalYear=Διαγραφή οικονομικού έτους
 ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το οικονομικό έτος;
 AlwaysEditable=Μπορεί πάντα να επεξεργαστή
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Αναγκαστικό ορατό όνομα της εφαρμογής (προειδοποίηση: η ρύθμιση του δικού σας ονόματος μπορεί να δημιουργήσει πρόβλημα στη λειτουργία Αυτόματης συμπλήρωσης σύνδεσης όταν χρησιμοποιείτε το DoliDroid εφαρμογή για κινητά)
 NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων
 NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 522ccd9e738..29f40e2f562 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -58,6 +58,7 @@ Payment=Πληρωμή
 PaymentBack=Payment back
 Payments=Πληρωμές
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Διαγραφή Πληρωμής
 ConfirmDeletePayment=Είστε σίγουροι ότι θέλετε να διαγράψετε την πληρωμή;
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
 DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής
 PriceBase=Τιμή βάσης
 BillStatus=Κατάσταση τιμολογίου
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Πρόχειρο (απαιτείται επικύρωση)
 BillStatusPaid=Πληρωμένο
 BillStatusPaidBackOrConverted=Πληρωμένο ή αλλαγμένο σε έκπτωση
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=Από
 BillTo=Στοιχεία Πελάτη
 ActionsOnBill=Ενέργειες στο τιμολόγιο
+RecurringInvoiceTemplate=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=Νέο τιμολόγιο
 LastBills=Τελευταία %s τιμολόγια
 LastCustomersBills=Τελευταία %s τιμολόγια πελατών
@@ -199,6 +205,7 @@ Rest=Εκκρεμής
 AmountExpected=Ποσό που ζητήθηκε
 ExcessReceived=Περίσσεια που λήφθηκε
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Υποβολή των τιμολογίων %s
 SendReminderBillRef=Υποβολή των τιμολογίων %s (υπενθύμιση)
 StandingOrders=Πάγιες Εντολές
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Άμεση
 PaymentConditionRECEP=Άμεση
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 3debeeb7892..e1fa2fe8010 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Τα %s πιο πρόσφατα συμβόλαια
 BoxTitleLastModifiedDonations=Οι τελευταίες %s τροποποιημένες δωρεές
 BoxTitleLastModifiedExpenses=Τελευταία %s τροποποιημένη έκθεση εξόδων
 BoxGlobalActivity=Η γενική δραστηριότητα για (τιμολόγια, προσφορές, παραγγελίες)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Αποτυχία ανανέωσης RSS ροής. Τελευταία ημερομηνία επιτυχημένης ανανέωσης: %s
 LastRefreshDate=Τελευταία ημερομηνία ανανέωσης
 NoRecordedBookmarks=Δεν υπάρχουν σελιδοδείκτες που ορίζονται. Κάντε κλικ <a href="%s">εδώ</a> για να προσθέσετε σελιδοδείκτες.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Τιμολόγια Πελάτη
 ForCustomersOrders=Παραγγελίες πελατών
 ForProposals=Προσφορές
 LastXMonthRolling=Η τελευταία %s κίνηση του μήνα 
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index b419963c5b5..88becf4ed5e 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -54,7 +54,7 @@ Subsidiaries=Θυγατρικές
 NoSubsidiary=Δεν θυγατρική
 ReportByCustomers=Αναφορά ανά πελάτες
 ReportByQuarter=Αναφορά ανά τιμή
-CivilityCode=Civility code
+CivilityCode=Προσφωνήσεις
 RegisteredOffice=Έδρα της εταιρείας
 Lastname=Επίθετο
 Firstname=Όνομα
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Καθ ID 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (ΑΝ)
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index b547fc74063..d67621b73aa 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 0a0248a926d..3b2a2aec1ee 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Κλειδί ασφαλείας για το URL για να ξ
 FileToLaunchCronJobs=Γραμμής εντολών για να ξεκινήσει τις εργασίες
 CronExplainHowToRunUnix=Στο Unix περιβάλλον θα πρέπει να χρησιμοποιήσετε την ακόλουθη καταχώρηση crontab για να τρέχει η γραμμή εντολών καθένα 5 λεπτά
 CronExplainHowToRunWin=Σε Microsoft (tm) Windows περιβάλλον μπορείτε να χρησιμοποιήσετε τα εργαλεία Προγραμματισμένη εργασία ώστε να εκτελείτε η γραμμή εντολών καθένα 5 λεπτά
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Προγραμματισμένες εργασίες
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Καμία
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Επόμενη εκτέλεση
-CronDtLastLaunch=Τελευταία εκτέλεση
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Μέθοδος
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Η ημερομηνία λήξης δεν μπορεί ν
 CronStatusActiveBtn=Ενεργοποίηση
 CronStatusInactiveBtn=Απενεργοποίηση
 CronTaskInactive=Αυτή η εργασία είναι απενεργοποιημένη
-CronDtLastResult=Τελευταία ημερομηνία αποτελέσματος
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Μενού
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Πηγαίνετε στο μενού "Home - Modules εργαλεία - Λίστα εργασιών" για να δείτε και να επεξεργαστείτε τις προγραμματισμένες εργασίες.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/el_GR/dict.lang b/htdocs/langs/el_GR/dict.lang
index cf78416afc0..a0ea0064217 100644
--- a/htdocs/langs/el_GR/dict.lang
+++ b/htdocs/langs/el_GR/dict.lang
@@ -250,9 +250,9 @@ CountryMF=Saint Martin
 ##### Civilities #####
 CivilityMME=Κυρία
 CivilityMR=Κύριος
-CivilityMLE=Κυρία
+CivilityMLE=Δεσποινίς
 CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityDR=Δόκτορας
 ##### Currencies #####
 Currencyeuros=€
 CurrencyAUD=AU Dollars
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index 819171b73c1..69cab974238 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Απλά ακολουθήστε τις οδηγίες βήμα προς βήμα.
-MiscellaneousChecks=Prerequisites check
+MiscellaneousChecks=Ελέγχος Προαπαιτούμενων
 DolibarrWelcome=Καλώς ήρθατε στο Dolibarr
 ConfFileExists=Το αρχείο ρυθμίσεων <b>%s</b> υπάρχει.
 ConfFileDoesNotExists=Το αρχείο ρυθμίσεων <b>%s</b> δεν υπάρχει!
diff --git a/htdocs/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang
index 8023a14ea58..22fbaa5f16a 100644
--- a/htdocs/langs/el_GR/languages.lang
+++ b/htdocs/langs/el_GR/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Ισπανικά (Μεξικό)
 Language_es_PY=Ισπανικά (Παραγουάη)
 Language_es_PE=Ισπανικά (Περού)
 Language_es_PR=Ισπανικά (Πουέρτο Ρίκο)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Εσθονίας
 Language_eu_ES=Βάσκων
 Language_fa_IR=Περσικά
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index c7dcdc9359d..d57eca8a457 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Το Ηλεκτρονικό ταχυδρομείο
 MailUnsubcribe=Διαγραφή
 Unsuscribe=Διαγραφή
 MailingStatusNotContact=Μην επιτρέπετε την επαφή πια
+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 ?
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index c851fa0843d..a6d4b778251 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α)
 UnitPriceTTC=Τιμή Μονάδος
 PriceU=Τιμή μον.
 PriceUHT=Τιμή μον.
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=Τιμή μον. (συμπ. Φ.Π.Α.)
 Amount=Ποσό
@@ -321,6 +322,9 @@ AmountTTCShort=Ποσό (με Φ.Π.Α.)
 AmountHT=Ποσό (χ. Φ.Π.Α.)
 AmountTTC=Ποσό (με Φ.Π.Α.)
 AmountVAT=Ποσό Φόρου
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Ποσό Φόρου 2
 AmountLT2=Ποσό Φόρου 3
 AmountLT1ES=Ποσό RE
@@ -335,6 +339,7 @@ Percentage=Ποσοστό
 Total=Σύνολο
 SubTotal=Υποσύνολο
 TotalHTShort=Σύνολο (χ. Φ.Π.Α.)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Σύνολο (με Φ.Π.Α.)
 TotalHT=Σύνολο (χ. Φ.Π.Α.)
 TotalHTforthispage=Σύνολο (μετά από φόρους) για αυτή τη σελίδα
@@ -457,6 +462,7 @@ Datas=Δεδομένα
 None=None
 NoneF=None
 Late=Καθυστερ.
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Φωτογραφία
 Photos=Φωτογραφίες
 AddPhoto=Προσθήκη Φωτογραφίας
@@ -539,6 +545,7 @@ NbOfCustomers=Αριθμός πελατών
 NbOfLines=Αριθμός Γραμμών
 NbOfObjects=Αριθμός Αντικειμένων
 NbOfReferers=Αριθμός Παραπομπών
+NbOfObjectReferers=Number of refering objects
 Referers=Αναφορές από αντικείμενα
 TotalQuantity=Συνολική ποσότητα
 DateFromTo=Από %s μέχρι %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Συνδέεται με μια συγκεκριμένη ε
 DeleteAFile=Διαγραφή ενός αρχείου
 ConfirmDeleteAFile=Είστε σίγουροι ότι θέλετε να διαγράψετε το αρχείο
 NoResults=Δεν υπάρχουν αποτελέσματα
+AdminTools=Admin tools
 SystemTools=Εργαλεία συστήματος
 ModulesSystemTools=Modules tools
 Test=Δοκιμή
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Δευτέρα
 Tuesday=Τρίτη
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index b17dd068535..25f2ea8e880 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -57,13 +57,13 @@ Miscellaneous=Διάφορα
 NbOfActiveNotifications=Αριθμός κοινοποιήσεων (Αριθμός emails παραλήπτη)
 PredefinedMailTest=Δοκιμαστικο mail.\nΟι δύο γραμμές είναι χωρισμένες με carriage return.
 PredefinedMailTestHtml=Αυτό είναι ένα μήνυμα <b>δοκιμής</b> (η δοκιμή λέξη πρέπει να είναι με έντονα γράμματα). <br> Οι δύο γραμμές που χωρίζονται με ένα χαρακτήρα επαναφοράς.
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __REF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την προσφορά __PROPREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε τη παραγγελία __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παραγγελία μας __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __REF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την αποστολή __SHIPPINGREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παρέμβαση __FICHINTERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
@@ -109,11 +109,11 @@ CalculatedWeight=Υπολογισμένο βάρος
 CalculatedVolume=Υπολογισμένος όγκος
 Weight=Βάρος
 TotalWeight=Συνολικό βάρος
-WeightUnitton=τόνοι
+WeightUnitton=Τόνοι
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
-WeightUnitpound=pound
+WeightUnitpound=Λίβρες
 Length=Μήκος
 LengthUnitm=m
 LengthUnitdm=dm
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index d7d88a173c7..d3fc0fa6ed7 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -26,14 +26,14 @@ ProductOrService=Προϊόν ή Υπηρεσία
 ProductsAndServices=Προϊόντα και Υπηρεσίες
 ProductsOrServices=Προϊόντα ή Υπηρεσίες
 ProductsAndServicesOnSell=Προϊόντα και Υπηρεσίες για πώληση ή αγορά
-ProductsAndServicesNotOnSell=Products and Services not for sale
+ProductsAndServicesNotOnSell=Τα Προϊόντα και Υπηρεσίες δεν προορίζονται για Πώληση
 ProductsAndServicesStatistics=Στατιστικά Προϊόντων και Υπηρεσιών
 ProductsStatistics=Στατιστικά Προϊόντων
-ProductsOnSell=Product for sale or for purchase
-ProductsNotOnSell=Product not for sale and not for purchase
+ProductsOnSell=Προϊόν για Πώληση ή για Αγορά
+ProductsNotOnSell=Το Προϊόν δεν προορίζεται για Πώληση και για Αγορά
 ProductsOnSellAndOnBuy=Προϊόντα προς πώληση και για αγορά
 ServicesOnSell=Υπηρεσίες για πώληση ή αγορά
-ServicesNotOnSell=Services not for sale
+ServicesNotOnSell=Η Υπηρεσία δεν προορίζεται για Πώληση
 ServicesOnSellAndOnBuy=Υπηρεσίες προς πώληση και για αγορά
 InternalRef=Εσωτερική Παραπομπή
 LastRecorded=Last products/services on sell recorded
@@ -47,7 +47,7 @@ CardProduct1=Κάρτα Υπηρεσίας
 CardContract=Κάρτα Επαφής
 Warehouse=Αποθήκη
 Warehouses=Αποθήκες
-WarehouseOpened=Warehouse open
+WarehouseOpened=Αποθήκη ανοιχτή
 WarehouseClosed=Η αποθήκη έκλεισε
 Stock=Απόθεμα
 Stocks=Αποθέματα
@@ -58,19 +58,19 @@ Buy=Αγορές
 OnSell=Προς Πώληση
 OnBuy=Προς Αγορά
 NotOnSell=Χωρίς Διάθεση
-ProductStatusOnSell=Σε Διάθεση
-ProductStatusNotOnSell=Χωρίς Διάθεση
-ProductStatusOnSellShort=Σε Διάθεση
-ProductStatusNotOnSellShort=Χωρίς Διάθεση
-ProductStatusOnBuy=Σε Διάθεση
-ProductStatusNotOnBuy=Χωρίς Διάθεση
-ProductStatusOnBuyShort=Σε Διάθεση
-ProductStatusNotOnBuyShort=Χωρίς Διάθεση
-UpdatePrice=Update price
+ProductStatusOnSell=Προς Πώληση
+ProductStatusNotOnSell=Δεν είναι προς Πώληση
+ProductStatusOnSellShort=Προς Πώληση
+ProductStatusNotOnSellShort=Δεν είναι προς Πώληση
+ProductStatusOnBuy=Προς Αγορά
+ProductStatusNotOnBuy=Δεν είναι προς Αγορά
+ProductStatusOnBuyShort=Προς Αγορά
+ProductStatusNotOnBuyShort=Δεν είναι προς Αγορά
+UpdatePrice=Ενημέρωση Τιμής
 UpdateVAT=Update vat
 UpdateDefaultPrice=Update default price
 UpdateLevelPrices=Update prices for each level
-AppliedPricesFrom=Applied prices from
+AppliedPricesFrom=Εφαρμοσμένες Τιμές από
 SellingPrice=Τιμή Πώλησης
 SellingPriceHT=Τιμή Πώλησης (χωρίς Φ.Π.Α.)
 SellingPriceTTC=Τιμή Πώλησης (με Φ.Π.Α)
@@ -79,16 +79,16 @@ CurrentPrice=Τρέχουσα Τιμή
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost 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=In a future version, this value could be used for margin calculation.
 NewPrice=Νέα Τιμή
-MinPrice=Min. selling price
+MinPrice=Ελάχιστη Τιμή Πώλησης
 MinPriceHT=Min. selling price (net of tax)
 MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Η τιμή πώλησης δεν μπορεί να είναι μικρότερη από την ορισμένη ελάχιστη τιμή πώλησης (%s χωρίς Φ.Π.Α.)
 ContractStatus=Κατάσταση Συμβολαίου
 ContractStatusClosed=Κλειστό
-ContractStatusRunning=Ongoing
+ContractStatusRunning=Σε Εξέλιξη
 ContractStatusExpired=Ληγμένο
-ContractStatusOnHold=On hold
-ContractStatusToRun=Make ongoing
+ContractStatusOnHold=Σε Αναμονή
+ContractStatusToRun=Κάντε σε Εξέλιξη
 ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη.
 ErrorProductBadRefOrLabel=Λάθος τιμή για την αναφορά ή την ετικέτα.
@@ -119,7 +119,7 @@ PriceRemoved=Η τιμή αφαιρέθηκε
 BarCode=Barcode
 BarcodeType=τύπος Barcode
 SetDefaultBarcodeType=Ορισμός τύπου barcode
-BarcodeValue=ΤΙμή Barcode
+BarcodeValue=Τιμή Barcode
 NoteNotVisibleOnBill=Σημείωση (μη ορατή σε τιμολόγια, προτάσεις...)
 CreateCopy=Δημιουργία Αντιγράφου
 ServiceLimitedDuration=Εάν το προϊόν είναι μια υπηρεσία με περιορισμένη διάρκεια:
@@ -161,7 +161,7 @@ Restock=Εφοδιάζω με νέα εμπορεύματα
 ProductSpecial=Ειδικές
 QtyMin=Ελάχιστη Ποσότητα
 PriceQty=Τιμή για την ποσότητα αυτή
-PriceQtyMin=Τιμή για ελάχιστη ποσότητα (w/o έκπτωση)
+PriceQtyMin=Τιμή για ελάχιστη ποσότητα (χωρίς έκπτωση)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
 DiscountQtyMin=Προεπιλεγμένη έκπτωση για ποσότητα
 NoPriceDefinedForThisSupplier=Δεν υπάρχει τιμή / έκαστος ορίζεται αυτής της επιχείρησης / του προϊόντος
@@ -190,39 +190,39 @@ ClonePricesProduct=Κλώνος κύριες πληροφορίες και τι
 CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=Μεταχειρισμένο
 NewRefForClone=Ref. of new product/service
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Supplier prices
+SellingPrices=Τιμές Πώλησης
+BuyingPrices=Τιμές Αγοράς
+CustomerPrices=Τιμές Πελατών
+SuppliersPrices=Τιμές Προμηθευτών
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Τελωνειακός Κώδικας
 CountryOrigin=Χώρα προέλευσης
 HiddenIntoCombo=Κρυμμένο σε λίστες επιλογής
 Nature=Nature
 ShortLabel=Short label
-Unit=Unit
+Unit=Μονάδα
 p=u.
-set=set
-se=set
+set=Σετ
+se=Σετ
 second=Δευτερόλεπτο
 s=s
-hour=hour
+hour=Ώρα
 h=h
 day=Ημέρα
 d=d
 kilogram=Κιλό
 kg=Kg
-gram=gram
+gram=Γραμμάριο
 g=g
-meter=meter
+meter=Μέτρο
 m=m
 linearmeter=linear meter
 lm=lm
-squaremeter=τετραγωνικό μέτρο
+squaremeter=Τετραγωνικό μέτρο
 m2=m²
 cubicmeter=Κυβικό μέτρο
 m3=m³
-liter=liter
+liter=Λίτρο
 l=L
 ProductCodeModel=Προϊόν κωδ. Πρότυπο
 ServiceCodeModel=Υπηρεσία κωδ. Πρότυπο
@@ -230,7 +230,7 @@ AddThisProductCard=Create product card
 HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
 AddThisServiceCard=Create service card
 HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
-CurrentProductPrice=Current price
+CurrentProductPrice=Τρέχουσα Τιμή
 AlwaysUseNewPrice=Always use current price of product/service
 AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Διαφορετικές τιμές από την ποσότητα
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Αύξηση/Μείωση αποθεμάτων στη
 ComposedProduct=Υποπροϊόν
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -311,5 +315,6 @@ 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
+DefaultUnitToShow=Μονάδα
 NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 38737866ed1..84427b795f2 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Id Έργου
 ProjectLabel=Project label
 Project=Έργο
 Projects=Έργα
+ProjectsArea=Projects Area
 ProjectStatus=Κατάσταση έργου
 SharedProject=Όλοι
 PrivateProject=Αντιπρόσωποι του έργου
@@ -19,7 +20,7 @@ TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργ
 TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Περιοχή Έργων
+ProjectsArea=Projects Area
 NewProject=Νέο Έργο
 AddProject=Δημιουργία έργου
 DeleteAProject=Διαγραφή Έργου
@@ -67,6 +68,7 @@ Activities=Εργασίες/Δραστηριότητες
 MyActivity=Η δραστηριότητά μου
 MyActivities=Οι εργασίες/δραστηρ. μου
 MyProjects=Τα έργα μου
+MyProjectsArea=My projects Area
 DurationEffective=Αποτελεσματική διάρκεια
 Progress=Πρόοδος
 ProgressDeclared=Χαρακτηρίστηκε σε εξέλιξη
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/el_GR/receiptprinter.lang b/htdocs/langs/el_GR/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/el_GR/receiptprinter.lang
+++ b/htdocs/langs/el_GR/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 1f37f4c2766..176f679d3f2 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Αποθήκες
 NewWarehouse=Νέα αποθήκη / Χρηματιστήριο περιοχή
 WarehouseEdit=Τροποποίηση αποθήκη
 MenuNewWarehouse=Νέα αποθήκη
-WarehouseOpened=Warehouse open
+WarehouseOpened=Αποθήκη ανοιχτή
 WarehouseClosed=Αποθήκη κλειστό
 WarehouseSource=Αποθήκη Πηγή
 WarehouseSourceNotDefined=No warehouse defined,
@@ -16,7 +16,7 @@ CancelSending=Ακύρωση αποστολής
 DeleteSending=Διαγραφή αποστολή
 Stock=Χρηματιστήριο
 Stocks=Αποθέματα
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Κίνηση
 Movements=Κινήματα
 ErrorWarehouseRefRequired=Αποθήκη όνομα αναφοράς απαιτείται
@@ -34,9 +34,10 @@ LastMovements=Τελευταία κινήσεις
 Units=Μονάδες
 Unit=Μονάδα
 StockCorrection=Σωστή απόθεμα
-StockTransfer=Stock Μεταφορά
-StockMovement=Μεταφορά
-StockMovements=Μεταφορές Χρηματιστήριο
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Ετικέτα
 NumberOfUnit=Αριθμός μονάδων
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Ποσότητα αποστέλλονται
 QtyDispatchedShort=Απεσταλμένη ποσότητα
 QtyToDispatchShort=Ποσότητα για αποστολή
 OrderDispatch=Χρηματιστήριο αποστολή
-RuleForStockManagementDecrease=Κανόνας για μείωση της διαχείρισης των αποθεμάτων
-RuleForStockManagementIncrease=Κανόνας για την αύξηση της διαχείρισης των αποθεμάτων
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Μείωση πραγματικών αποθεμάτων για τους πελάτες τιμολόγια / πιστωτικά επικύρωση σημειώσεις
 DeStockOnValidateOrder=Μείωση πραγματικών αποθεμάτων σχετικά με τις παραγγελίες των πελατών επικύρωσης
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Μέση σταθμική τιμή εισόδου
 AverageUnitPricePMP=Μέση σταθμική τιμή εισόδου
 SellPriceMin=Πώληση Τιμή μονάδας
-EstimatedStockValueSellShort=Αξία για την πώληση
-EstimatedStockValueSell=Αξία για Πώληση
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Είσοδος αξία μετοχών
 EstimatedStockValue=Είσοδος αξία μετοχών
 DeleteAWarehouse=Διαγραφή μιας αποθήκης
@@ -113,7 +114,7 @@ AlertOnly= Ειδοποιήσεις μόνο
 WarehouseForStockDecrease=Η αποθήκη <b>%s</b> να να χρησιμοποιηθεί για μείωση αποθεμάτων
 WarehouseForStockIncrease=Η αποθήκη <b>%s</b> θα χρησιμοποιηθεί για την αύξηση των αποθεμάτων
 ForThisWarehouse=Για αυτή την αποθήκη
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Αναπληρώσεις
 NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s)
diff --git a/htdocs/langs/el_GR/supplier_proposal.lang b/htdocs/langs/el_GR/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/el_GR/supplier_proposal.lang
+++ b/htdocs/langs/el_GR/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 209ff6af78b..47b9bd121c7 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Χρησιμοποιήστε το OpenID για να συνδε
 WeeklyHours=Εβδομαδιαίες ώρες
 ColorUser=Χρώμα του χρήστη
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
index 12159db0d73..4a851f31c28 100644
--- a/htdocs/langs/en_AU/accountancy.lang
+++ b/htdocs/langs/en_AU/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-EnabledTiers=In third party
+EnabledProduct=In Product
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 1c53b65c99c..61b7d006abf 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -2,3 +2,4 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/en_AU/cron.lang b/htdocs/langs/en_AU/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/en_AU/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/en_AU/projects.lang b/htdocs/langs/en_AU/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/en_AU/projects.lang
+++ b/htdocs/langs/en_AU/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
index 12159db0d73..4a851f31c28 100644
--- a/htdocs/langs/en_CA/accountancy.lang
+++ b/htdocs/langs/en_CA/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-EnabledTiers=In third party
+EnabledProduct=In Product
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 9bf5497f19b..a1e1c2dac9b 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -7,3 +7,4 @@ LocalTax1IsUsedDesc=Use a second tax (PST)
 LocalTax1IsNotUsedDesc=Do not use second tax (PST)
 LocalTax1Management=PST Management
 LocalTax2IsNotUsedDesc=Do not use second tax (PST)
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/en_CA/cron.lang b/htdocs/langs/en_CA/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/en_CA/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/en_CA/projects.lang b/htdocs/langs/en_CA/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/en_CA/projects.lang
+++ b/htdocs/langs/en_CA/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index 12159db0d73..4a851f31c28 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-EnabledTiers=In third party
+EnabledProduct=In Product
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 1c53b65c99c..61b7d006abf 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -2,3 +2,4 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/en_GB/cron.lang b/htdocs/langs/en_GB/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/en_GB/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/en_GB/projects.lang b/htdocs/langs/en_GB/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/en_GB/projects.lang
+++ b/htdocs/langs/en_GB/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
index 12159db0d73..4a851f31c28 100644
--- a/htdocs/langs/en_IN/accountancy.lang
+++ b/htdocs/langs/en_IN/accountancy.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
-EnabledTiers=In third party
+EnabledProduct=In Product
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 1c53b65c99c..61b7d006abf 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -2,3 +2,4 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/en_IN/cron.lang b/htdocs/langs/en_IN/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/en_IN/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/en_IN/projects.lang b/htdocs/langs/en_IN/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/en_IN/projects.lang
+++ b/htdocs/langs/en_IN/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/es_AR/margins.lang b/htdocs/langs/es_AR/margins.lang
new file mode 100644
index 00000000000..f93f8ff712c
--- /dev/null
+++ b/htdocs/langs/es_AR/margins.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - margins
+MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
diff --git a/htdocs/langs/es_AR/projects.lang b/htdocs/langs/es_AR/projects.lang
new file mode 100644
index 00000000000..3a53dd52c2d
--- /dev/null
+++ b/htdocs/langs/es_AR/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_AR/propal.lang b/htdocs/langs/es_AR/propal.lang
new file mode 100644
index 00000000000..90b012fd6f9
--- /dev/null
+++ b/htdocs/langs/es_AR/propal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - propal
+CloseAs=Set status to
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/es_BO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/es_BO/margins.lang b/htdocs/langs/es_BO/margins.lang
new file mode 100644
index 00000000000..f93f8ff712c
--- /dev/null
+++ b/htdocs/langs/es_BO/margins.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - margins
+MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
diff --git a/htdocs/langs/es_BO/projects.lang b/htdocs/langs/es_BO/projects.lang
new file mode 100644
index 00000000000..3a53dd52c2d
--- /dev/null
+++ b/htdocs/langs/es_BO/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_BO/propal.lang b/htdocs/langs/es_BO/propal.lang
new file mode 100644
index 00000000000..90b012fd6f9
--- /dev/null
+++ b/htdocs/langs/es_BO/propal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - propal
+CloseAs=Set status to
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/es_CL/margins.lang b/htdocs/langs/es_CL/margins.lang
new file mode 100644
index 00000000000..f93f8ff712c
--- /dev/null
+++ b/htdocs/langs/es_CL/margins.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - margins
+MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index d483e1e5659..64918dbdbae 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
 ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/es_CO/margins.lang b/htdocs/langs/es_CO/margins.lang
new file mode 100644
index 00000000000..f93f8ff712c
--- /dev/null
+++ b/htdocs/langs/es_CO/margins.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - margins
+MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
diff --git a/htdocs/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
new file mode 100644
index 00000000000..3a53dd52c2d
--- /dev/null
+++ b/htdocs/langs/es_CO/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_CO/propal.lang b/htdocs/langs/es_CO/propal.lang
new file mode 100644
index 00000000000..90b012fd6f9
--- /dev/null
+++ b/htdocs/langs/es_CO/propal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - propal
+CloseAs=Set status to
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/es_DO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/es_DO/margins.lang b/htdocs/langs/es_DO/margins.lang
new file mode 100644
index 00000000000..f93f8ff712c
--- /dev/null
+++ b/htdocs/langs/es_DO/margins.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - margins
+MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
diff --git a/htdocs/langs/es_DO/projects.lang b/htdocs/langs/es_DO/projects.lang
new file mode 100644
index 00000000000..3a53dd52c2d
--- /dev/null
+++ b/htdocs/langs/es_DO/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_DO/propal.lang b/htdocs/langs/es_DO/propal.lang
new file mode 100644
index 00000000000..90b012fd6f9
--- /dev/null
+++ b/htdocs/langs/es_DO/propal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - propal
+CloseAs=Set status to
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index e8b95e365b5..f57118d93b9 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Cuenta contable
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Contabilizar
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Contabilizar clientes
 SuppliersVentilation=Contabilizar proveedores
 TradeMargin=Margen de beneficio
@@ -46,7 +47,7 @@ UpdateAccount=Modificar una cuenta contable
 UpdateMvts=Modificar un movimiento
 WriteBookKeeping=Registrar los asientos en el libro mayor
 Bookkeeping=Libro Mayor
-AccountBalanceByMonth=Saldo mensual
+AccountBalance=Account balance
 
 AccountingVentilation=Descuadre contabilidad
 AccountingVentilationSupplier=Contablilización compras
@@ -103,6 +104,7 @@ Code_tiers=Tercero
 Labelcompte=Descripción
 Sens=Sentido
 Codejournal=Diario
+NumPiece=Piece number
 
 DelBookKeeping=Eliminar los registros del Diario Mayor
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Movimiento descuadrado. Debe = %s. Haber = %s
 FicheVentilation=Ficha contable
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Movimiento descuadrado. Debe = %s. Haber = %s
+
 ##Export Journal Feature
 ExportFormat=Formato de exportación
 Prefixname=Prefijo del archivo de exportación
@@ -162,13 +166,14 @@ Headername=Nombre en la cabecera
 Type=Tipos de campos
 Param=Parámetros adicionales
 EnabledProduct=En producto
-EnabledTiers=In third party
-EnabledVat=En IVA
+EnabledTiers=En el tercero
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+InitAccountancy=Iniciar contabilidad
+InitAccountancyDesc=Esta página puede usarse para inicializar una cuenta contable en productos y servicios que no tienen definida cuenta contable de ventas y compras. Compruebe antes de que la configuración del módulo contabilidad está completa.
+Options=Opciones
+OptionModeProductSell=Modo ventas
+OptionModeProductBuy=Modo compras
+OptionModeProductSellDesc=Mostrar todos los productos sin cuenta contable definida para ventas.
+OptionModeProductBuyDesc=Mostrar todos los productos sin cuenta contable definida para compras.
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index d1405cacf46..64a71bfaf52 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -154,6 +154,7 @@ Purge=Purga
 PurgeAreaDesc=Esta página le permite eliminar todos los archivos creados o guardados por Dolibarr (archivos temporales o todos los archivos del directorio <b>%s</b>). El uso de esta función no es necesaria. Se proporciona para los usuarios que albergan a Dolibarr en un servidor que no ofrece los permisos de eliminación de archivos salvaguardados por el servidor Web.
 PurgeDeleteLogFile=Borrar el archivo log <b>%s</b> definido por el módulo Syslog (no hay riesgo de pérdida de datos)
 PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (sin riesgo de perdida de datos)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos del directorio <b>%s</b>. Archivos temporales y archivos adjuntados a elementos (terceros, facturas, etc.) serán eliminados.
 PurgeRunNow=Purgar
 PurgeNothingToDelete=Ningún directorio a eliminar
@@ -362,7 +363,7 @@ HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el IVA e
 HideDescOnPDF=Ocultar descripción de los productos en la generación de los PDF
 HideRefOnPDF=Ocultar referencia de los productos en la generación de los PDF
 HideDetailsOnPDF=Ocultar detalles de las líneas de productos en la generación de los PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PlaceCustomerAddressToIsoLocation=Usar posición estándar francesa (La Poste) para la posición de la dirección del cliente
 Library=Librería
 UrlGenerationParameters=Seguridad de las URLs
 SecurityTokenIsUnique=¿Usar un parámetro securekey único para cada URL?
@@ -416,7 +417,7 @@ ConfirmEraseAllCurrentBarCode=¿Está seguro de querer eliminar todos los regist
 AllBarcodeReset=Todos los códigos de barras han sido eliminados
 NoBarcodeNumberingTemplateDefined=No hay establecida una numeración en la configuración del módulo de códigos de barras. 
 NoRecordWithoutBarcodeDefined=Sin registros sin códigos de barras definidos.
-EnableFileCache=Enable file cache
+EnableFileCache=Habilitar caché de archivos
 
 # Modules
 Module0Name=Usuarios y grupos
@@ -500,7 +501,7 @@ Module510Desc=Gestión de salarios y pagos
 Module520Name=Crédito
 Module520Desc=Gestión de créditos
 Module600Name=Notificaciones
-Module600Desc=Send EMail notifications (triggered by some business events) to third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Enviar notificaciones por e-mail (provocados por algunos eventos) a los contactos de terceros (configuración definida en cada tercero) o a e-mails fijos
 Module700Name=Donaciones
 Module700Desc=Gestión de donaciones
 Module770Name=Informes de gastos
@@ -964,7 +965,7 @@ DelaysBeforeWarning=Plazos antes de alerta
 DelaysOfToleranceBeforeWarning=Plazos de tolerancia antes de alerta
 DelaysOfToleranceDesc=Esta pantalla permite configura los plazos de tolerancia antes de que se alerte con el símbolo %s, sobre cada elemento en retraso.
 Delays_MAIN_DELAY_ACTIONS_TODO=Tolerancia de retraso antes de la alerta (en días) sobre acciones planificadas no realizadas
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks not yet realised
+Delays_MAIN_DELAY_TASKS_TODO=Tolerancia de retraso (en días) sobre tareas planificadas no realizadas
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerancia de retraso antes de la alerta (en días) sobre pedidos de clientes no procesados
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerancia de retraso antes de la alerta (en días) sobre pedidos a proveedores no procesados
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre presupuestos a cerrar
@@ -1089,8 +1090,8 @@ PathDirectory=Directorio
 SendmailOptionMayHurtBuggedMTA=La funcionalidad de enviar correo electrónico a través del "correo directo PHP" genera una solicitud que puede ser mal interpretado por algunos servidores de correo. Esto se traduce en mensajes de correo electrónico ilegibles para las personas alojadas en estas plataformas. Este es el caso de clientes en ciertos proveedores de servicios de Internet (Ej: Orange). Esto no es un problema ni de Dolibarr ni de PHP, pero sí del servidor de correo. Sin embargo, puede agregar la opción MAIN_FIX_FOR_BUGGED_MTA con valor 1 en configuración-varios para tratar que Dolibarr evite el error. Otra solución (recomendada) es utilizar el método de envío por SMTP que no tiene este inconveniente.
 TranslationSetup=Configuración traducción
 TranslationDesc=La elección del idioma mostrado en pantalla se modifica:<br>* A nivel global desde el menú <strong>Inicio - Configuración - Entorno</strong><br>* De manera específica al usuario desde la pestaña <strong>Interfaz usuario</strong> de su ficha de usuario (hacer clic en su login en la parte superior izquierda de la pantalla).
-TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b>
+TranslationOverwriteDesc=También puede sobreescribir algún valor completando/editando la tabla siguiente. Debe utilizar  "%s" para el código de idioma, "%s" para la clave que encuentra en el archivo langs/xx_XX/somefile.lang y "%s" para el nuevo valor que desea utilizar como nueva traducción.
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Debe activar al menos un módulo.
 ClassNotFoundIntoPathWarning=No se ha encontrado la clase %s en su path PHP
 YesInSummer=Sí en verano
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Cerrar año fiscal
 DeleteFiscalYear=Eliminar año fiscal
 ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal?
 AlwaysEditable=Puede editarse siempre
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid)
 NbMajMin=Número mínimo de caracteres en mayúsculas
 NbNumMin=Número mínimo de caracteres numéricos
@@ -1664,10 +1666,10 @@ BackupDumpWizard=Asistente para crear una copia de seguridad de la base de datos
 SomethingMakeInstallFromWebNotPossible=No es posible la instalación de módulos externos desde la interfaz web por la siguiente razón:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, explicaremos aquí los pasos del proceso de actualización manual que puede realizar un usuario con privilegios. 
 InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos desde la aplicación se encuentra desactivada por el administrador. Debe requerirle que elimine el archivo <strong>%s</strong> para habilitar esta funcionalidad.
-ConfFileMuseContainCustom=La instalación de módulos externos desde la aplicación guarda los archivos de los módulos en el directorio <strong>%s</strong>. Para disponer de este directorio en Dolibarr, debe configurar el archivo <strong>conf/conf.php</strong> para tener la opción <br>- <strong>$dolibarr_main_url_root_alt</strong> activada al valor <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> activa al valor <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
 HighlightLinesColor=Resalta el color de la línea cuando el ratón pasa por encima (mantener vacío para no resaltar)
-TextTitleColor=Color of page title
+TextTitleColor=Color para la página de título
 LinkColor=Color para los enlaces
 PressF5AfterChangingThis=Una vez cambiado este valor, pulse F5 en el teclado para hacerlo efectivo
 NotSupportedByAllThemes=Funciona con el tema eldy, pero no es soportado por todos los temas
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Ejemplo de mensaje que puede usar para anuncia
 ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versión %s es una versión mayor con un montón de nuevas características para los usuarios y desarrolladores. Se puede descargar desde la sección de descargas del portal http://www.dolibarr.org  (subdirectorio versiones estables). Puede leer <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para ver la lista completa de los cambios.
 ExampleOfNewsMessageForMaintenanceRelease=Disponible ERP/CRM Dolibarr %s. La versión %s es una versión de mantenimiento, por lo que sólo contiene correcciones de errores. Recomendamos a todo el mundo que use una versión anterior que actualice a esta. Como cualquier versión de mantenimiento, no hay novedades. Se puede descargar desde la sección de descargas del portal http://www.dolibarr.org (subdirectorio versiones estables subdirectorio). Puede leer <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para ver la lista completa de los cambios.
 MultiPriceRuleDesc=Cuando la opción "Varios niveles de precios por producto/servicio" está activada, puede definir diferentes precios (uno por nivel de precios) para cada producto. Para ahorrar tiempo, puede ingresar aquí una regla para autocalcular cada nivel de acuerdo con el precio del primer nivel, por lo que tendrá que introducir sólo el precio para el primer nivel de cada producto. Esta página le sirve para ahorrar tiempo y puede serle muy útil si sus precios para cada nivel son relativos al primer nivel. Puede pasar por alto esta página en la mayoría de los casos.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 7dc07cde08a..cb3ad332c51 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -35,9 +35,9 @@ AllActions= Todos los eventos/tareas
 ViewCal=Vista mensual
 ViewDay=Vista diaria
 ViewWeek=Vista semanal
-ViewYear=Year view
+ViewYear=Vista anual
 ViewPerUser=Vista por usuario
-ViewPerType=Per type view
+ViewPerType=Vista por tipo
 ViewWithPredefinedFilters= Ver con los filtros predefinidos
 AutoActions= Inclusión automática en la agenda
 AgendaAutoActionDesc= Indique en esta pestaña los eventos para los que desea que Dolibarr cree automáticamente un evento en la agenda. Si no se marca nada (por defecto),  solamente las acciones manuales se incluirán en la agenda.
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 477faf956b9..1688c0f846a 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -58,6 +58,7 @@ Payment=Pago
 PaymentBack=Reembolso
 Payments=Pagos
 PaymentsBack=Reembolsos
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Reembolsado
 DeletePayment=Eliminar el pago
 ConfirmDeletePayment=¿Está seguro de querer eliminar este pago?
@@ -73,8 +74,8 @@ PaymentsAlreadyDone=Pagos efectuados
 PaymentsBackAlreadyDone=Reembolsos ya efectuados
 PaymentRule=Forma de pago
 PaymentMode=Forma de pago
-IdPaymentMode=Payment type (id)
-LabelPaymentMode=Payment type (label)
+IdPaymentMode=Tipo de pago (id)
+LabelPaymentMode=Tipo de pago (etiqueta)
 PaymentModeShort=Forma de pago
 PaymentTerm=Condición de pago
 PaymentConditions=Condiciones de pago
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Realizar pago de abonos al cliente
 DisabledBecauseRemainderToPayIsZero=Desactivado ya que el resto a pagar es 0
 PriceBase=Precio base
 BillStatus=Estado de la factura
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Borrador (a validar)
 BillStatusPaid=Pagada
 BillStatusPaidBackOrConverted=Reembolsada o convertida en reducción
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no es posible cancelar un
 BillFrom=Emisor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
+RecurringInvoiceTemplate=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=Nueva factura
 LastBills=Las %s últimas facturas
 LastCustomersBills=Las %s últimas facturas a clientes
@@ -186,7 +192,7 @@ ShowInvoice=Ver factura
 ShowInvoiceReplace=Ver factura rectificativa
 ShowInvoiceAvoir=Ver abono
 ShowInvoiceDeposit=Ver factura de anticipo
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Ver situación factura
 ShowPayment=Ver pago
 AlreadyPaid=Ya pagado
 AlreadyPaidBack=Ya reembolsado
@@ -199,6 +205,7 @@ Rest=Pendiente
 AmountExpected=Importe reclamado
 ExcessReceived=Recibido en exceso
 EscompteOffered=Descuento (Pronto pago)
+EscompteOfferedShort=Discount
 SendBillRef=Envío de la factura %s
 SendReminderBillRef=Envío de la factura %s (recordatorio)
 StandingOrders=Domiciliaciones
@@ -224,7 +231,7 @@ NonPercuRecuperable=No percibido recuperable
 SetConditions=Definir condiciones de pago
 SetMode=Definir modo de pago
 Billed=Facturado
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Facturas recurrentes
 RepeatableInvoice=Plantilla de factura
 RepeatableInvoices=Plantilla de facturas
 Repeatable=Plantilla
@@ -273,7 +280,7 @@ HelpAbandonBadCustomer=Este importe se abandonó (cliente juzgado como moroso) y
 HelpAbandonOther=Este importe se abandonó este importe ya que se trataba de un error de facturación (mala introducción de datos, factura sustituida por otra).
 IdSocialContribution=Id pago tasa social/fiscal
 PaymentId=ID pago
-PaymentRef=Payment ref.
+PaymentRef=Ref. pago
 InvoiceId=Id factura
 InvoiceRef=Ref. factura
 InvoiceDateCreation=Fecha creación factura
@@ -301,11 +308,23 @@ RelatedSupplierInvoices=Facturas de proveedores asociadas
 LatestRelatedBill=Última factura relacionada
 WarningBillExist=Atención, ya existe al menos una factura
 MergingPDFTool=Herramienta de fusión PDF
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-
+AmountPaymentDistributedOnInvoice=Importe del pago distribuido en la factura
+PaymentNote=Nota del pago
+ListOfPreviousSituationInvoices=Listado de facturas de situación previas
+ListOfNextSituationInvoices=Listado de las próximas facturas de situación
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=A la recepción
 PaymentConditionRECEP=A la recepción de la factura
@@ -402,7 +421,7 @@ Reported=Aplazado
 DisabledBecausePayments=No disponible ya que existen pagos
 CantRemovePaymentWithOneInvoicePaid=Eliminación imposible cuando existe al menos una factura clasificada como pagada.
 ExpectedToPay=Esperando el pago
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=No se puede eliminar un pago conciliado
 PayedByThisPayment=Pagada por este pago
 ClosePaidInvoicesAutomatically=Clasificar como "Pagadas" las facturas, facturas de situación y facturas rectificativas completamente pagadas.
 ClosePaidCreditNotesAutomatically=Clasificar automáticamente como "Pagados" los abonos completamente reembolsados
@@ -414,7 +433,7 @@ NoteListOfYourUnpaidInvoices=Nota: Este listado incluye solamente los terceros d
 RevenueStamp=Timbre fiscal
 YouMustCreateInvoiceFromThird=Esta opción está solo disponible en la creación de facturas desde la pestaña "cliente" de un tercero
 PDFCrabeDescription=Modelo de factura completo (modelo recomendado por defecto)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
+PDFCrevetteDescription=Modelo PDF de factura Crevette. Un completo modelo de facturas para 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
 MarsNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas, %syymm-nnnn para las facturas rectificativas, %syymm-nnnn para los anticipos 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
 TerreNumRefModelError=Ya existe una factura con $syymm y no es compatible con este modelo de secuencia. Elimínela o renómbrela para poder activar este módulo
@@ -444,11 +463,11 @@ DisabledBecauseFinal=Esta situación es la última.
 CantBeLessThanMinPercent=El progreso de una línea no puede ser inferior a su valor a la situación anterior.
 NoSituations=Sin situaciones abiertas
 InvoiceSituationLast=Factura final y general
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+PDFCrevetteSituationNumber=Situación nº %s
+PDFCrevetteSituationInvoiceLineDecompte=Factura de situación - Cuentas
+PDFCrevetteSituationInvoiceTitle=Factura de situación
+PDFCrevetteDescription=Modelo PDF de factura Crevette. Un completo modelo de facturas para facturas de situación
+PDFCrevetteSituationInvoiceLine=Situación nº %s : Fact. nº %s de %s
+TotalSituationInvoice=Total situación
+invoiceLineProgressError=La línea de avance de factura no puede ser  igual o superior  a la próxima línea de factura
+updatePriceNextInvoiceErrorUpdateline=Error: Actualización de precio en línea de factura: %s
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index d87a857c33b..bedacd37bb5 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Los %s últimos contratos
 BoxTitleLastModifiedDonations=Las %s últimas donaciones modificadas
 BoxTitleLastModifiedExpenses=Los %s últimos informes de gastos modificados
 BoxGlobalActivity=Actividad global
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Error en el refresco del flujo RSS. Fecha del último refresco: %s
 LastRefreshDate=Fecha última actualización
 NoRecordedBookmarks=No hay marcadores personales.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedidos de clientes
 ForProposals=Presupuestos
 LastXMonthRolling=El último %s mes natural
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 32dee3b05d8..25b846125a5 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -76,7 +76,7 @@ ProductsCategoryShort=Etiquetas/categorías de productos
 MembersCategoryShort=Etiquetas/categorías de miembros
 SuppliersCategoriesShort=Etiquetas/categorías de proveedores
 CustomersCategoriesShort=Etiquetas/categorías de clientes
-ProspectsCategoriesShort=Prospects tags/categories
+ProspectsCategoriesShort=Etiquetas/categorías clientes potenciales
 CustomersProspectsCategoriesShort=Categorías clientes
 ProductsCategoriesShort=Etiquetas/categorías de productos
 MembersCategoriesShort=Etiquetas/categorías de miembros
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 5a0e30ce530..22f46c2c4dc 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Id prof. 3
 ProfId4IN=Id prof. 4
 ProfId5IN=Id prof. 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 3e32262f1c8..1dc77b513cd 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -155,7 +155,7 @@ DepositsAreNotIncluded=- Las facturas de anticipo no están incluidas
 DepositsAreIncluded=- Las facturas de anticipo están incluidas
 LT2ReportByCustomersInInputOutputModeES=Informe por tercero del IRPF
 LT1ReportByCustomersInInputOutputModeES=Informe de RE por terceros
-VATReport=VAT report
+VATReport=Informe IVA
 VATReportByCustomersInInputOutputMode=Informe por cliente del IVA repercutido y soportado
 VATReportByCustomersInDueDebtMode=Informe por cliente del IVA repercutido y soportado
 VATReportByQuartersInInputOutputMode=Informe por tasa del IVA repercutido y soportado
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Informe de clientes extranjeros
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basado en que las dos primeras letras del IVA intracomunitario sea diferente al de el código de país de su empresa
 SameCountryCustomersWithVAT=Informe de clientes nacionales
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basado en que las dos primeras letras del IVA intracomunitario sean las mismas que el código de país de su empresa
+LinkedFichinter=Link to an intervention
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index be14eb213ce..eef866fdbea 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -16,11 +16,12 @@ KeyForCronAccess=Clave para la URL para ejecutar tareas Cron
 FileToLaunchCronJobs=Comando para ejecutar tareas Cron
 CronExplainHowToRunUnix=En entornos Unix se debe utilizar la siguiente entrada crontab para ejecutar el comando cada 5 minutos
 CronExplainHowToRunWin=En entornos Microsoft (tm) Windows, puede utilizar las herramienta  tareas programadas para ejecutar el comando cada 5 minutos
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Tareas programadas
-CronListActive=List of enabled/scheduled jobs
+CronListActive=Listado de habilitados/programados
 CronListInactive=Tareas Inactivas
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Habilitado y deshabilitado
 # Page list
 CronDateLastRun=Últ. ejec.
 CronLastOutput=Res. ult. ejec.
@@ -36,10 +37,11 @@ CronInfo=Tareas programadas le permite ejecutar tareas que han sido programadas
 CronWaitingJobs=Trabajos en espera
 CronTask=Tarea
 CronNone=Ninguna
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=No antes de
+CronDtEnd=No después de
 CronDtNextLaunch=Sig. ejec.
-CronDtLastLaunch=Últ. ejec.
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frecuencia
 CronClass=Clase
 CronMethod=Metodo
@@ -52,7 +54,7 @@ CronNoJobs=Sin trabajos registrados
 CronPriority=Prioridad
 CronLabel=Descripcion
 CronNbRun=Núm. ejec.
-CronMaxRun=Max nb. launch
+CronMaxRun=Nº máximo ejecuciones
 CronEach=Toda(s)
 JobFinished=Tareas lanzadas y finalizadas
 #Page card
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=La fecha de finalizacion no puede ser anterior a la fecha
 CronStatusActiveBtn=Activo
 CronStatusInactiveBtn=Inactivo
 CronTaskInactive=Esta tarea esta inactiva
-CronDtLastResult=Fecha del ultimo resultado
 CronId=Id
 CronClassFile=Clases (nombre archivo)
 CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con módulos externos). <BR> Por ejemplo, para realizar un fetch del objeto Product /htdocs/<u>product</u>/class/product.class.php, el valor del módulo es <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Programador
 CronCannotLoadClass=No se puede cargar la clase %s u objeto %s
 UseMenuModuleToolsToAddCronJobs=Ir a "Inicio - Utilidades módulos - Lista de tareas Cron" para ver y editar tareas programadas.
 TaskDisabled=Tarea desactivada
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/es_ES/deliveries.lang b/htdocs/langs/es_ES/deliveries.lang
index f80fe19e819..94a84f858b0 100644
--- a/htdocs/langs/es_ES/deliveries.lang
+++ b/htdocs/langs/es_ES/deliveries.lang
@@ -17,9 +17,9 @@ DeleteDeliveryReceiptConfirm=¿Está seguro de querer eliminar esta nota de entr
 DeliveryMethod=Método de envío
 TrackingNumber=Nº de seguimiento
 DeliveryNotValidated=Nota de recepción no validada
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+StatusDeliveryCanceled=Anulado
+StatusDeliveryDraft=Borrador
+StatusDeliveryValidated=Recibido
 # merou PDF model
 NameAndSignature=Nombre y firma :
 ToAndDate=En___________________________________ a ____/_____/__________
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index 9264b23e81a..370779099b5 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -22,7 +22,7 @@ ReviewedByCP=Será revisada por
 DescCP=Descripción
 SendRequestCP=Enviar la petición de días libres
 DelayToRequestCP=Las peticiones de días libres deben realizarse al menos <b>%s días</b> antes.
-MenuConfCP=Balance of leaves
+MenuConfCP=Balance de vacaciones
 UpdateAllCP=Actualizar los días libres
 SoldeCPUser=Su saldo de días libres es de <b>%s días</b>.
 ErrorEndDateCP=Debe indicar una fecha de fin superior a la fecha de inicio.
@@ -80,7 +80,7 @@ alreadyCPexist=Ya se ha efectuado una petición de días libres para este period
 UserName=Nombre Apellidos
 FirstDayOfHoliday=Primer día libre
 LastDayOfHoliday=Último día libre
-BoxTitleLastLeaveRequests=Last %s modified leave requests
+BoxTitleLastLeaveRequests=Las %s peticiones modificadas
 HolidaysMonthlyUpdate=Actualización mensual
 ManualUpdate=Actualización manual
 HolidaysCancelation=Anulación días libres
@@ -140,7 +140,7 @@ HolidaysRefusedBody=Su solicitud de días libres retribuidos desde el %s al %s h
 HolidaysCanceled=Días libres retribuidos cancelados
 HolidaysCanceledBody=Su solicitud de días libres retribuidos desde el %s al %s ha sido cancelada.
 NewByMonth=Añadida por mes
-Affect=Followed by a counter
-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
+Affect=Seguido por un contador
+FollowedByACounter=1: Este tipo de día retribuido necesita ser seguido por un contador. El contador se incrementa de forma manual o automáticamente y cuando se valida una solicitud, el contador disminuye.<br> 0: No es seguido por un contador.
+NoLeaveWithCounterDefined=No hay ningún tipo de peticiones definidas que deben ser seguidas por un contador
 GoIntoDictionaryHolidayTypes=Vaya a <strong>Inicoi - Configuración - Diccionarios - Tipos de vacaciones </strong> para configurar los diferentes tipos.
diff --git a/htdocs/langs/es_ES/hrm.lang b/htdocs/langs/es_ES/hrm.lang
index 71828d3bc46..9fb4662b10b 100644
--- a/htdocs/langs/es_ES/hrm.lang
+++ b/htdocs/langs/es_ES/hrm.lang
@@ -15,6 +15,6 @@ DictionaryFunction= R.R.H.H. Listado funciones
 ListOfEmployees=Listado de empleados
 Employees=Empleados
 Employee=Empleado
-Employe=Employe
+Employe=Empleado
 NewEmployee=Nuevo empleado
 EmployeeCard=Ficha de empleado
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index d23b69efb75..98ac29f9189 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -54,9 +54,9 @@ PacificNumRefModelDesc1=Devuelve el número con el formato %syymm-nnnn dónde yy
 PacificNumRefModelError=Una factura que empieza por # $$syymm existe en base y es incompatible con esta numeración. Elimínela  o renombrela para activar este módulo.
 PrintProductsOnFichinter=Mostrar los productos en la ficha de intervención
 PrintProductsOnFichinterDetails=Intervenciones generadas desde pedidos
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=Nb of intervention cards
-NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+InterventionStatistics=Estadísticas de intervenciones
+NbOfinterventions=Nº de fichas de intervención
+NumberOfInterventionsByMonth=Nº de fichas de intervención por mes (fecha de validación)
 ##### Exports #####
 InterId=Id. intervención
 InterRef=Ref. intervención
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index 59ed92d658a..0351b200f58 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Español (México)
 Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonio
 Language_eu_ES=Vasco
 Language_fa_IR=Persa
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 9ffa6cb071a..8744ab61ed6 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-mailing validado correctamente
 MailUnsubcribe=Desuscribe
 Unsuscribe=Desuscribe
 MailingStatusNotContact=No contactar
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=La dirección del destinatario está vacía
 WarningNoEMailsAdded=Ningún nuevo E-Mailing a añadir a la lista destinatarios.
 ConfirmValidMailing=¿Confirma la validación del E-Mailing?
@@ -81,7 +82,7 @@ ActivateCheckReadKey=Clave usada para cifrar la URL utilizada para la función d
 EMailSentToNRecipients=E-Mail enviado a %s destinatarios.
 XTargetsAdded=<b>%s</b> destinatarios agregados a la lista
 EachInvoiceWillBeAttachedToEmail=Se creará y adjuntará a cada e-mail un documento usando el modelo de factura por defecto.
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=Si el documento PDF ya se generó para la factura, se adjuntará al e-mail. Si no, no se enviará ningún correo electrónico (también, tenga en cuenta que en esta versión sólo se admiten pdf de facturas como archivo adjunto en envío masivo).
 MailTopicSendRemindUnpaidInvoices=Recordatorio de la factura %s (%s)
 SendRemind=Enviar recordatorios por e-mail
 RemindSent=%s recordatorio(s) enviados
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 21fdb856653..d1ca7e599d6 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexión a la base de datos
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Sin plantilla definida para este tipo de e-mail
 NoTranslation=Sin traducción
 NoRecordFound=No se han encontrado registros
 NoError=Ningún error
@@ -106,7 +106,7 @@ NotePrivate=Nota (privada)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar la precisión de los precios unitarios a <b>%s</b> decimales.
 DoTest=Probar
 ToFilter=Filtrar
-NoFilter=No filter
+NoFilter=Sin filtro
 WarningYouHaveAtLeastOneTaskLate=Atención, tiene al menos un elemento que ha pasado la fecha de tolerancia.
 yes=sí
 Yes=Sí
@@ -230,8 +230,8 @@ Now=Ahora
 HourStart=Hora de inicio
 Date=Fecha
 DateAndHour=Fecha y hora
-DateToday=Today's date
-DateReference=Reference date
+DateToday=Fecha de hoy
+DateReference=Fecha de referencia
 DateStart=Fecha inicio
 DateEnd=Fecha fin
 DateCreation=Fecha de creación
@@ -311,6 +311,7 @@ UnitPriceHT=Precio base
 UnitPriceTTC=Precio unitario total
 PriceU=P.U.
 PriceUHT=P.U.
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=P.U. neto solicitado
 PriceUTTC=P.U. (i.i.)
 Amount=Importe
@@ -321,6 +322,9 @@ AmountTTCShort=Importe
 AmountHT=Base imponible
 AmountTTC=Importe total
 AmountVAT=Importe IVA
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Importe Impuesto 2
 AmountLT2=Importe Impuesto 3
 AmountLT1ES=Importe RE
@@ -335,6 +339,7 @@ Percentage=Porcentaje
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Importe
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total
 TotalHT=Base imponible
 TotalHTforthispage=Total (base imponible) de esta página
@@ -457,6 +462,7 @@ Datas=Datos
 None=Nada
 NoneF=Ninguna
 Late=Retraso
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Foto
 Photos=Fotos
 AddPhoto=Añadir foto
@@ -539,6 +545,7 @@ NbOfCustomers=Numero de clientes
 NbOfLines=Números de líneas
 NbOfObjects=Número de objetos
 NbOfReferers=Consumición
+NbOfObjectReferers=Number of refering objects
 Referers=Objetos vinculados
 TotalQuantity=Cantidad total
 DateFromTo=De %s a %s
@@ -612,7 +619,7 @@ TotalMan=Total
 NeverReceived=Nunca recibido
 Canceled=Cancelado
 YouCanChangeValuesForThisListFromDictionarySetup=Puede cambiar estos valores en el menú configuración->diccionarios
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanSetDefaultValueInModuleSetup=Puede establecer el valor predeterminado que se utiliza cuando se crea un nuevo registro en la configuración del módulo
 Color=Color
 Documents=Documentos
 DocumentsNb=archivos adjuntos (%s)
@@ -694,13 +701,14 @@ LinkedToSpecificUsers=Enlazado a un contacto de usuario particular
 DeleteAFile=Eliminación de archivo
 ConfirmDeleteAFile=Confirme la eliminación del archivo
 NoResults=Ningún resultado
+AdminTools=Admin tools
 SystemTools=Utilidades sistema
 ModulesSystemTools=Utilidades módulos
 Test=Prueba
 Element=Elemento
 NoPhotoYet=No hay fotografía disponible
 HomeDashboard=Resumen
-Dashboard=Dashboard
+Dashboard=Tablero
 Deductible=Deducible
 from=de
 toward=hacia
@@ -732,7 +740,8 @@ Hello=Hola
 Sincerely=Atentamente
 DeleteLine=Eliminación de línea
 ConfirmDeleteLine=¿Está seguro de querer eliminar esta línea?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Lunes
 Tuesday=Martes
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index 42846224605..47d8a4b05e4 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -35,9 +35,9 @@ MargeBrute=Margen bruto
 MargeNette=Margen neto
 MargeType1=Margen en Mejor precio de proveedor
 MargeType2=Margen en Precio Medio Ponderado (PMP)
-MargeType3=Margin on Cost Price
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
+MargeType3=Margen en Precio de coste
+MARGIN_TYPE_DETAILS=Margen bruto: Precio venta - Precio compra<br>Margen neto: Precio venta - Precio de coste
+MarginTypeDesc=* Margen sobre mejor precio de compra = Precio de venta - Mejor precio proveedor definido en la ficha del producto <br> * Margen sobre Precio Medio Ponderado (PMP) = Precio de venta - Precio Promedio Ponderado (PMP) o mejor precio proveedor si aún no hay PMP<br> * Margen sobre el precio de coste = Precio venta - Precio de coste definido en la ficha del producto o PMP si el precio de coste no se ha definido, o mejor precio proveedor si aún no hay PMP
 CostPrice=Precio de compra
 BuyingCost=Costos
 UnitCharges=Carga unitaria
diff --git a/htdocs/langs/es_ES/oauth.lang b/htdocs/langs/es_ES/oauth.lang
index f759090fbe9..14e7b7e8fc8 100644
--- a/htdocs/langs/es_ES/oauth.lang
+++ b/htdocs/langs/es_ES/oauth.lang
@@ -8,7 +8,7 @@ TokenDeleted=Token eliminado
 RequestAccess=Haga clic aquí para consultar/renovar acceso y recibir un nuevo token a guardar
 DeleteAccess=Haga clic aquí para eliminar el token
 UseTheFollowingUrlAsRedirectURI=Utilice la siguiente dirección URL como redireccionamiento URI al crear su credencial de su proveedor OAuth:
-ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
+ListOfSupportedOauthProviders=Indique aquí la credencial proporcionada por su proveedor de OAuth2. Sólo son mostrados los proveedores OAuth2 soportados. Esta configuración puede ser usada por otros módulos que requieren autenticación OAuth2.
 OAUTH_GOOGLE_NAME=Api Google
 OAUTH_GOOGLE_ID=Api Google Id
 OAUTH_GOOGLE_SECRET=Api Google Secreto
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 82bd221056b..1755f5018ff 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -82,7 +82,7 @@ OrdersOpened=Pedidos a procesar
 NoOpenedOrders=Sin pedidos abiertos
 NoOtherOpenedOrders=Sin otros pedidos abiertos
 NoDraftOrders=Sin pedidos borrador
-NoOrder=No order
+NoOrder=Sin pedidos
 NoSupplierOrder=Sin pedidos a proveedor
 OtherOrders=Otros pedidos
 LastOrders=Últimos %s pedidos de clientes
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index cc5b44a2145..fe377cf0b89 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -238,8 +238,8 @@ ToExport=Exportar
 NewExport=Nueva exportación
 ##### External sites #####
 ExternalSites=Sitios externos
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
-WEBSITE_KEYWORDS=Keywords
+WebsiteSetup=Configuración del módulo website
+WEBSITE_PAGEURL=URL de la página
+WEBSITE_TITLE=Título
+WEBSITE_DESCRIPTION=Descripción
+WEBSITE_KEYWORDS=Claves
diff --git a/htdocs/langs/es_ES/paypal.lang b/htdocs/langs/es_ES/paypal.lang
index 2418a11a79d..d14173dfcb4 100644
--- a/htdocs/langs/es_ES/paypal.lang
+++ b/htdocs/langs/es_ES/paypal.lang
@@ -8,7 +8,7 @@ PAYPAL_API_SANDBOX=Modo de pruebas (sandbox)
 PAYPAL_API_USER=Nombre usuario API
 PAYPAL_API_PASSWORD=Contraseña usuario API
 PAYPAL_API_SIGNATURE=Firma API
-PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_SSLVERSION=Versión Curl SSL
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proponer pago integral (Tarjeta+Paypal) o sólo Paypal
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=Sólo PayPal
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index e1ffef54086..fee15fb7b5d 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -252,7 +252,7 @@ UnitPmp=Precio de compra unitario
 CostPmpHT=Coste de compra sin IVA
 ProductUsedForBuild=Auto consumido por producción
 ProductBuilded=Producción completada
-ProductsMultiPrice=Products and prices for each price level
+ProductsMultiPrice=Productos y precios para cada nivel de precios
 ProductsOrServiceMultiPrice=Precios a clientes (productos o servicios, multiprecios)
 ProductSellByQuarterHT=Facturación trimestral de productos antes de impuestos
 ServiceSellByQuarterHT=Facturación trimestral de servicios antes de impuestos
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Incrementar/Decrementar stock al cambiar su padre
 ComposedProduct=Sub-producto
 MinSupplierPrice=Precio mínimo de proveedor
 DynamicPriceConfiguration=Configuración de precio dinámico
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Variables globales
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Actualizaciones de variables globales
 GlobalVariableUpdaterType0=datos JSON
 GlobalVariableUpdaterHelp0=Analiza datos JSON desde la URL especificada, el valor especifica la ubicación de valor relevante,
@@ -311,5 +315,6 @@ PropalMergePdfProductChooseFile=Seleccione los archivos PDF
 IncludingProductWithTag=Productos/servicios incluidos en el tag
 DefaultPriceRealPriceMayDependOnCustomer=Precio por defecto, el precio real puede depender del cliente
 WarningSelectOneDocument=Seleccione al menos un documento
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
+DefaultUnitToShow=Unidad
+NbOfQtyInProposals=Cant. en presupuestos
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 7ea47273029..c1fdad6cb99 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Id proyecto
 ProjectLabel=Etiqueta proyecto
 Project=Proyecto
 Projects=Proyectos
+ProjectsArea=Projects Area
 ProjectStatus=Estado del proyecto
 SharedProject=Proyecto compartido
 PrivateProject=Contactos del proyecto
@@ -14,12 +15,12 @@ ProjectsPublicTaskDesc=Esta vista muestra todos los proyectos a los que tiene de
 ProjectsDesc=Esta vista muestra todos los proyectos (sus permisos de usuario le permiten tener una visión completa).
 MyTasksDesc=Esta vista se limita a los proyectos y tareas en los que usted es un contacto afectado en al menos una tarea (cualquier tipo).
 OnlyOpenedProject=Sólo los proyectos abiertos son visibles (los proyectos en estado borrador cerrado no son visibles).
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Los proyectos cerrados no son visibles.
 TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted tiene derecho a tener visibilidad.
 TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuario le permiten tener una visión completa).
 AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas de este proyectos son visibles, pero solo puede indicar tiempos en las tareas que tenga asignadas. Asignese  tareas si desea indicar tiempos en ellas.
 OnlyYourTaskAreVisible=Sólo puede ver tareas que le son asignadas. Asignese tareas si desea indicar tiempos en ellas.
-ProjectsArea=Área proyectos
+ProjectsArea=Projects Area
 NewProject=Nuevo proyecto
 AddProject=Crear proyecto
 DeleteAProject=Eliminar un proyecto
@@ -30,9 +31,9 @@ OfficerProject=Responsable del proyecto
 LastProjects=Los %s últimos proyectos
 AllProjects=Todos los proyectos
 OpenedProjects=Proyectos abiertos
-OpenedTasks=Opened tasks
+OpenedTasks=Tareas abiertas
 OpportunitiesStatusForOpenedProjects=Importe oportunidades de proyectos abiertos por estado
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+OpportunitiesStatusForProjects=Importe oportunidades de proyectos por estado
 ProjectsList=Listado de proyectos
 ShowProject=Ver proyecto
 SetProject=Definir proyecto
@@ -67,6 +68,7 @@ Activities=Tareas/actividades
 MyActivity=Mi actividad
 MyActivities=Mis tareas/actividades
 MyProjects=Mis proyectos
+MyProjectsArea=My projects Area
 DurationEffective=Duración efectiva
 Progress=Progresión
 ProgressDeclared=Progresión declarada
@@ -132,8 +134,8 @@ TaskModifiedInDolibarr=La tarea %s fue modificada
 TaskDeletedInDolibarr=La tarea %s fue eliminada
 OpportunityStatus=Estado de oportunidad
 OpportunityStatusShort=Estado oportunidad
-OpportunityProbability=Opportunity probability
-OpportunityProbabilityShort=Opp. probab.
+OpportunityProbability=Probabilidad de oportunidades
+OpportunityProbabilityShort=Prob. Opor.
 OpportunityAmount=Importe Oportunidad
 OpportunityAmountShort=Importe oportunidad
 ##### Types de contacts #####
@@ -168,7 +170,7 @@ ProjectsWithThisUserAsContact=Proyectos con este usuario como contacto
 TasksWithThisUserAsContact=Tareas asignadas a este usuario
 ResourceNotAssignedToProject=No asignado al proyecto
 ResourceNotAssignedToTask=No asignado a la tarea
-ResourceNotAssignedToTheTask=Not assigned to the task
+ResourceNotAssignedToTheTask=No asignado a la tarea
 AssignTaskToMe=Asignarme tarea
 AssignTask=Asignar
 ProjectOverview=Resumen
@@ -183,9 +185,12 @@ TaskAssignedToEnterTime=Tarea asignada. Debería poder introducir tiempos en est
 IdTaskTime=Id
 YouCanCompleteRef=Si quiere completar la referencia con alguna información (para usarla como filtros de búsqueda), se recomienda añadir un caracter - como separación, por lo que la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-ABC. También puede preferir añadir claves de búsqueda en la etiqueta.
 OpenedProjectsByThirdparties=Proyectos abiertos de terceros
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Importe total oportunidades
 OpportunityPonderatedAmount=Importe medio oportunidades
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
+OpportunityPonderatedAmountDesc=Importe ponderado oportunidades con probabilidad
 OppStatusPROSP=Prospección
 OppStatusQUAL=Cualificación
 OppStatusPROPO=Presupuesto
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index a707e7742ff..ade670abbb6 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -25,7 +25,7 @@ LastModifiedProposals=Los %s últimos presupuestos modificados
 AllPropals=Todos los presupuestos
 LastProposals=Últimos presupuestos
 SearchAProposal=Buscar un presupuesto
-NoProposal=No proposal
+NoProposal=Sin presupuestos
 ProposalsStatistics=Estadísticas de presupuestos
 NumberOfProposalsByMonth=Número por mes
 AmountOfProposalsByMonthHT=Importe por mes (sin IVA)
@@ -63,8 +63,8 @@ DatePropal=Fecha presupuesto
 DateEndPropal=Fecha fin de validez
 DateEndPropalShort=Fecha fin
 ValidityDuration=Duración de validez
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Establecer estado a
+SetAcceptedRefused=Establecer aceptado/rechazado
 ClassifyBilled=Clasificar facturado
 BuildBill=Crear factura
 ErrorPropalNotFound=Presupuesto %s inexistente
@@ -102,4 +102,4 @@ DefaultModelPropalCreate=Modelo por defecto
 DefaultModelPropalToBill=Modelo por defecto al cerrar un presupuesto (a facturar)
 DefaultModelPropalClosed=Modelo por defecto al cerrar un presupuesto (no facturado)
 ProposalCustomerSignature=Aceptación por escrito, sello de la empresa, fecha y firma
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalsStatisticsSuppliers=Estadísticas presupuestos de proveedores
diff --git a/htdocs/langs/es_ES/receiptprinter.lang b/htdocs/langs/es_ES/receiptprinter.lang
index 60b05ce2f4c..66e7bfefb1b 100644
--- a/htdocs/langs/es_ES/receiptprinter.lang
+++ b/htdocs/langs/es_ES/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Impresora %s añadida
 PrinterUpdated=Impresora %s actualizada
 PrinterDeleted=Impresora %s eliminada
 TestSentToPrinter=Enviar prueba a la impresora %s
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Configuración de impresoras
 ReceiptPrinterTemplateDesc=Configuración de plantillas
 ReceiptPrinterTypeDesc=Descripción del tipo de impresora de tickets
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 071993395a4..7c4144a4a80 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -6,7 +6,7 @@ AllSendings=Todos los envíos
 Shipment=Envío
 Shipments=Envíos
 ShowSending=Mostrar envíos
-Receivings=Delivery Receipts
+Receivings=Recepciones
 SendingsArea=Área envíos
 ListOfSendings=Listado de envíos
 SendingMethod=Método de envío
diff --git a/htdocs/langs/es_ES/sms.lang b/htdocs/langs/es_ES/sms.lang
index 723092196be..171575eb7f6 100644
--- a/htdocs/langs/es_ES/sms.lang
+++ b/htdocs/langs/es_ES/sms.lang
@@ -49,6 +49,6 @@ SendSms=Enviar SMS
 SmsInfoCharRemain=Nº restante de caracteres
 SmsInfoNumero= (formato internacional ej : +33899701761)
 DelayBeforeSending=Retraso antes de enviarlo (en minutos)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=Remitente no disponible. Compruebe la configuración de su proveedor de SMS.
 SmsNoPossibleRecipientFound=No hay destinatarios. Compruebe la configuración de su proveedor de SMS.
 
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index daf512736f6..d497e86f569 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Últimos movimientos
 Units=Unidades
 Unit=Unidad
 StockCorrection=Corrección stock
-StockTransfer=Movimiento de stock
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Movimiento de stock
 StockMovements=Movimientos de stock
 LabelMovement=Etiqueta del movimiento
diff --git a/htdocs/langs/es_ES/supplier_proposal.lang b/htdocs/langs/es_ES/supplier_proposal.lang
index 48eb73e8950..245aa6593f1 100644
--- a/htdocs/langs/es_ES/supplier_proposal.lang
+++ b/htdocs/langs/es_ES/supplier_proposal.lang
@@ -1,16 +1,17 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Presupuestos de proveedor
 supplier_proposalDESC=Gestionar presupuestos de proveedor
-SupplierProposalShort=Supplier proposals
-SupplierProposalNew=New request
+SupplierProposalShort=Presupuestos de proveedores
+SupplierProposalNew=Nueva petición
 CommRequest=Presupuesto
 CommRequests=Presupuestos
 SearchRequest=Buscar un presupuesto
 DraftRequests=Presupuestos borrador
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Los %s últimos presupuestos modificados
 RequestsOpened=Presupuestos abiertos
 SupplierProposalArea=Área presupuestos de proveedores
-SupplierProposalShort=Supplier proposals
+SupplierProposalShort=Presupuestos de proveedores
 SupplierProposals=Presupuestos de proveedor
 NewAskPrice=Nuevo presupuesto
 NewAsk=Nuevo presupuesto
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index c91dff5ba8c..be7f94de396 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -31,7 +31,7 @@ TripNDF=Información del gasto
 PDFStandardExpenseReports=Plantilla estandard para generar un documento de gasto
 ExpenseReportLine=Línea de gasto
 TF_OTHER=Otro
-TF_TRIP=Transportation
+TF_TRIP=Transporte
 TF_LUNCH=Dieta
 TF_METRO=Metro
 TF_TRAIN=Tren
@@ -99,5 +99,5 @@ ConfirmSaveTrip=¿Está seguro de querer validar este gasto?
 NoTripsToExportCSV=Sin gastos a exportar para este periodo.
 ExpenseReportPayment=Informe de pagos de gastos
 
-ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToApprove=Informe de gastos a aprobar
 ExpenseReportsToPay=Informe de gastos a pagar
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index a60fdd8268d..4567ed67375 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -121,4 +121,5 @@ OpenIDURL=Dirección OpenID
 LoginUsingOpenID=Usar OpenID para iniciar sesión
 WeeklyHours=Horas semanales
 ColorUser=Color para el usuario
-DisabledInMonoUserMode=Disabled in maintenance mode
+DisabledInMonoUserMode=Desactivado en modo mantenimiento
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 955ff24d027..c8d2b5fa242 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -18,7 +18,6 @@ UpdateAccount=Modificación de una cuenta contable
 UpdateMvts=Modificación de un movimiento
 WriteBookKeeping=Cuentas de registro en el libro mayor
 Bookkeeping=Libro mayor
-AccountBalanceByMonth=Balance de la cuenta por mes
 AccountingVentilation=Desglose de contablidad
 AccountingVentilationSupplier=Desglose de contabilidad de proveedores
 AccountingVentilationCustomer=Desglose de contabilidad de clientes
@@ -79,3 +78,4 @@ ExportFormat=Formato de Exportación
 Textframe=Marco de texto
 Headercol=Nombre de columna en el encabezado del archivo
 Headername=Nombre del encabezado
+EnabledProduct=In Product
diff --git a/htdocs/langs/es_MX/projects.lang b/htdocs/langs/es_MX/projects.lang
index a61042da6ef..5e14c200b38 100644
--- a/htdocs/langs/es_MX/projects.lang
+++ b/htdocs/langs/es_MX/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
 ProjectReferers=Refiriéndose objetos
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/es_PE/margins.lang b/htdocs/langs/es_PE/margins.lang
new file mode 100644
index 00000000000..f93f8ff712c
--- /dev/null
+++ b/htdocs/langs/es_PE/margins.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - margins
+MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
diff --git a/htdocs/langs/es_PE/projects.lang b/htdocs/langs/es_PE/projects.lang
new file mode 100644
index 00000000000..3a53dd52c2d
--- /dev/null
+++ b/htdocs/langs/es_PE/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/es_PY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/es_PY/margins.lang b/htdocs/langs/es_PY/margins.lang
new file mode 100644
index 00000000000..f93f8ff712c
--- /dev/null
+++ b/htdocs/langs/es_PY/margins.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - margins
+MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
diff --git a/htdocs/langs/es_PY/projects.lang b/htdocs/langs/es_PY/projects.lang
new file mode 100644
index 00000000000..3a53dd52c2d
--- /dev/null
+++ b/htdocs/langs/es_PY/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_PY/propal.lang b/htdocs/langs/es_PY/propal.lang
new file mode 100644
index 00000000000..90b012fd6f9
--- /dev/null
+++ b/htdocs/langs/es_PY/propal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - propal
+CloseAs=Set status to
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/es_VE/projects.lang b/htdocs/langs/es_VE/projects.lang
index 8fd41c4e71b..a9637d43781 100644
--- a/htdocs/langs/es_VE/projects.lang
+++ b/htdocs/langs/es_VE/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
 DocumentModelBaleine=Plantilla de informe tareas del Proyecto
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 531d10a2fd6..4f20f7e69b5 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 37de780e420..f894270eab1 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -154,6 +154,7 @@ Purge=Tühjenda
 PurgeAreaDesc=Antud leht võimaldab kõikide Dolibarri poolt loodud või säilitud failide kustutamist (ajutised failid või kõik failid <b>%s</b> kaustas). Selle funktsionaalsuse kasutamine ei ole vajalik ning see on mõeldud vaid neile, kelle Dolibarri veebimajutuse pakkuja ei võimalda veebiserveri poolt loodud failide kustutamist.
 PurgeDeleteLogFile=Kustuta Syslog moodulis määratletud logifail <b>%s</b> (andmekao riski pole)
 PurgeDeleteTemporaryFiles=Kustuta kõik ajutised failid (andmekao riski pole)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Kustuta kõik failid kataloogis <b>%s</b>. Kustutatakse ajutised failid, andmebaasi varukoopiad, elementidega (kolmandad isikud, arved, ...) seotud failid ning dokumendihaldusse üles laetud failid.
 PurgeRunNow=Tühjenda nüüd
 PurgeNothingToDelete=Pole ühtki faili ega kausta, mida kustutada.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Tõlke seadistus
 TranslationDesc=Ekraanil kasutatava keele valikut saab muuta:<br>* Üldist keelt menüüst <strong>Kodu->Seadistamine->Kuva</strong><br>* Kasutajapõhiselt sakist <strong>Kasutaja kuva</strong> kasutaja kaardilt (klõpsa kasutajanime ekraani ülaosas).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Aktiveeritud mooduleid kokku: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Pead vähemalt 1 mooduli sisse lülitama
 ClassNotFoundIntoPathWarning=Klassi %s ei ole PHP rajas
 YesInSummer=Suviti 'jah'
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Sulge majandusaasta
 DeleteFiscalYear=Kustuta majandusaasta
 ConfirmDeleteFiscalYear=Kas oled kindel, et soovid selle majandusaasta kustutada?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 0d4cec4e195..234eccab73a 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -58,6 +58,7 @@ Payment=Makse
 PaymentBack=Tagasimakse
 Payments=Maksed
 PaymentsBack=Tagasimaksed
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Tagasi makstud
 DeletePayment=Kustuta makse
 ConfirmDeletePayment=Kas oled täiesti kindel, et soovid selle makse kustutada?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Soorita kliendile makse
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Baashind
 BillStatus=Arve staatus
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Mustand (kinnitada)
 BillStatusPaid=Makstud
 BillStatusPaidBackOrConverted=Makstud või teisendatud allahindluseks
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Viga: ei saa tühistada arvet, m
 BillFrom=Kellelt
 BillTo=Kellele
 ActionsOnBill=Tegevused arvel
+RecurringInvoiceTemplate=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=Uus arve
 LastBills=Viimased %s arvet
 LastCustomersBills=Viimased %s müügiarvet
@@ -199,6 +205,7 @@ Rest=Ootel
 AmountExpected=Väidetav väärtus
 ExcessReceived=Liigne saadud
 EscompteOffered=Soodustus pakutud (makse enne tähtaega)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Püsikorraldused
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Kohene
 PaymentConditionRECEP=Kohene
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index f80b40c8cdd..df925fd547d 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Viimased %s lepingut
 BoxTitleLastModifiedDonations=Viimased %s muudetud annetust
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Üldine tegevus (arved, pakkumised, tellimused)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Ei suutnud RSS voogu värskendada. Viimane värskendamise kuupäev: %s
 LastRefreshDate=Viimane värskendamise kuupäev
 NoRecordedBookmarks=Järjehoidjaid pole määratletud.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Müügiarved
 ForCustomersOrders=Müügiarved
 ForProposals=Pakkumised
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index f709a1d415f..f6254d8922b 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (IF)
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index ba4a4d7760d..fd2dac34efd 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index 83d05e1a656..52e769017f3 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Croni käivitatavate programmide URLile ligipääsu turvavõti
 FileToLaunchCronJobs=Käsurea käsk cron programmide käivitamiseks
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Plaanitud käivitused
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Mitte ükski
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Järgmine käivitus
-CronDtLastLaunch=Viimane käivitus
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Meetod
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Lõppkuupäev ei saa olla alguskuupäevast varasem
 CronStatusActiveBtn=Lülita sisse
 CronStatusInactiveBtn=Lülita välja
 CronTaskInactive=See tegevus on välja lülitatud
-CronDtLastResult=Viimase vastuse kuupäev
 CronId=ID
 CronClassFile=Klassid (filename.class.php)
 CronModuleHelp=Dolibarri moodulite kausta nimi (töötab ka välise Dolibarro mooduliga). <br> Näiteks Dolibarri Product objekti kasutamisel /htdocs/<u>product</u>/class/product.class.php on mooduli väärtuseks <i>product</i>.
@@ -89,3 +90,5 @@ CronMenu=Cro
 CronCannotLoadClass=Klassi %s või objekti %s laadimine ebaõnnestus
 UseMenuModuleToolsToAddCronJobs=Mine menüüsse "Kodu - Moodulite tööriistad - Tegevuste nimekiri" planeeritud tegevuste vaatamiseks ja muutmiseks.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/et_EE/languages.lang b/htdocs/langs/et_EE/languages.lang
index 763268e67c2..690951ff928 100644
--- a/htdocs/langs/et_EE/languages.lang
+++ b/htdocs/langs/et_EE/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Hispaania (Mehhiko)
 Language_es_PY=Hispaania (Paraguay)
 Language_es_PE=Hispaania (Peruu)
 Language_es_PR=Hispaania (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Eesti
 Language_eu_ES=Baski
 Language_fa_IR=Pärsia
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index ffd60b6b301..b5504ff6aba 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-postitus edukalt kinnitatud
 MailUnsubcribe=Tühista tellimus
 Unsuscribe=Tühista tellimus
 MailingStatusNotContact=Ära võta enam ühendust
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=E-kirja saaja lahter on tühi
 WarningNoEMailsAdded=Saajate nimekirja pole ühtki uut e-kirja lisada.
 ConfirmValidMailing=Kas oled täiesti kindel, et soovid selle e-postituse kinnitada?
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 15d82cedb7e..2c997be43ac 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Ühiku hind (neto)
 UnitPriceTTC=Ühiku hind
 PriceU=ÜH
 PriceUHT=ÜH (neto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Summa
@@ -321,6 +322,9 @@ AmountTTCShort=Summa (koos km-ga)
 AmountHT=Summa (maksudeta)
 AmountTTC=Summa (koos km-ga)
 AmountVAT=Maksu summa
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Maksu summa 2
 AmountLT2=Maksu summa 3
 AmountLT1ES=RE summa
@@ -335,6 +339,7 @@ Percentage=Protsent
 Total=Kokku
 SubTotal=Vahesumma
 TotalHTShort=Kokku (neto)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Kokku (km-ga)
 TotalHT=Kokku (km-ta)
 TotalHTforthispage=Selle lehekülje summa (neto)
@@ -457,6 +462,7 @@ Datas=Andmed
 None=Puudub
 NoneF=Puudub
 Late=Hilja
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Pilt
 Photos=Pildid
 AddPhoto=Lisa pilt
@@ -539,6 +545,7 @@ NbOfCustomers=Klientide arv
 NbOfLines=Ridade arv
 NbOfObjects=Objektide arv
 NbOfReferers=Viitajate arv
+NbOfObjectReferers=Number of refering objects
 Referers=Viitavad objektid
 TotalQuantity=Üldkogus
 DateFromTo=Alates %s kuni %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Seostatud kindla kasutaja kontaktiga
 DeleteAFile=Kustuta fail
 ConfirmDeleteAFile=Kas oled kindel, et soovid kustutada faili
 NoResults=Vasteid ei leitud
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Moodulite tööriistad
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Esmaspäev
 Tuesday=Teisipäev
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 1777909bafc..ab969f9c690 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON andmed
 GlobalVariableUpdaterHelp0=Sõelu JSONi andmed määratletud URLilt, VALUE määrab ära seotud väärtuse asukoha
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 4aa3a22b7a9..80c9cd8f57b 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Projekti ID
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projektid
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Kõik
 PrivateProject=Projekti kontaktid
@@ -19,7 +20,7 @@ TasksPublicDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on luba
 TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõigused annavad ligipääsu kõigele)
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projektide ala
+ProjectsArea=Projects Area
 NewProject=Uus projekt
 AddProject=Create project
 DeleteAProject=Kustuta projekt
@@ -67,6 +68,7 @@ Activities=Ülesanded/toimingud
 MyActivity=Minu aktiivsus
 MyActivities=Minu ülesanded/aktiivsused
 MyProjects=Minu projektid
+MyProjectsArea=My projects Area
 DurationEffective=Efektiivne kestus
 Progress=Progress
 ProgressDeclared=Deklareeritud progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/et_EE/receiptprinter.lang b/htdocs/langs/et_EE/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/et_EE/receiptprinter.lang
+++ b/htdocs/langs/et_EE/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 6f39ecc9ce1..103dc239ef9 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Tühista saatmine
 DeleteSending=Kustuta saatmine
 Stock=Laojääk
 Stocks=Laojäägid
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Liikumine
 Movements=Liikumised
 ErrorWarehouseRefRequired=Lao viide on nõutud
@@ -34,9 +34,10 @@ LastMovements=Viimased liikumised
 Units=Ühikud
 Unit=Ühik
 StockCorrection=Õige laojääk
-StockTransfer=Laojäägi ülekanne
-StockMovement=Ülekanne
-StockMovements=Laojäägi ülekanded
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Liikumise silt
 NumberOfUnit=Ühikute arv
 UnitPurchaseValue=Ühiku ostuhind
@@ -53,8 +54,8 @@ QtyDispatched=Saadetud kogus
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Laojäägi saatmine
-RuleForStockManagementDecrease=Laojäägi haldamise vähenemise reegel
-RuleForStockManagementIncrease=Laojäägi suurenemise haldamise reegel
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Vähenda reaalset laojääki müügiarve/kreeditarve kinnitamisel
 DeStockOnValidateOrder=Vähenda reaalset laojääki müügitellimuse kinnitamisel
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Kaalutud keskmine sisendhind
 AverageUnitPricePMP=Kaalutud keskmine sisendhind
 SellPriceMin=Ühiku müügihind
-EstimatedStockValueSellShort=Müügiväärtus
-EstimatedStockValueSell=Müügiväärtus
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Sisesta laojäägi väärtus
 EstimatedStockValue=Sisesta laojäägi väärtus
 DeleteAWarehouse=Kustuta ladu
@@ -113,7 +114,7 @@ AlertOnly= Ainult hoiatused
 WarehouseForStockDecrease=Laojäägi vähendamiseks kasutatakse ladu <b>%s</b>
 WarehouseForStockIncrease=Laojäägi suurendamiseks kasutatakse ladu <b>%s</b>
 ForThisWarehouse=Antud lao tarbeks
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Värskendamised
 NbOfProductBeforePeriod=Toote %s laojääk enne valitud perioodi (< %s)
diff --git a/htdocs/langs/et_EE/supplier_proposal.lang b/htdocs/langs/et_EE/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/et_EE/supplier_proposal.lang
+++ b/htdocs/langs/et_EE/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index 91099756685..ac967ef7977 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Kasuta sisselogimiseks OpenIDd
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index fb1e8c45656..69ea02cbf58 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -154,6 +154,7 @@ Purge=Garbitu
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Orain garbitu
 PurgeNothingToDelete=Ez dago ezabatzeko karpeta edo fitxategirik
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index c6ef3a2e2ef..39799cc2f1c 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Ordainketak
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Ordainketa ezabatu
 ConfirmDeletePayment=Ziur zaude ordainketa hay ezabatu nahi duzuna?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 1943621e98f..238f5999e18 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index c3dc167f4f5..02aeb1cffb8 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang
index 8b55a93927b..3b97c25142d 100644
--- a/htdocs/langs/eu_ES/languages.lang
+++ b/htdocs/langs/eu_ES/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Gaztelania (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Euskera
 Language_fa_IR=Persian
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 1ef40ac0efd..7f1646a534e 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index be983898125..323fbfc0b2b 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Irudia
 Photos=Irudiak
 AddPhoto=Irudia gehitu
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/eu_ES/receiptprinter.lang b/htdocs/langs/eu_ES/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/eu_ES/receiptprinter.lang
+++ b/htdocs/langs/eu_ES/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/eu_ES/supplier_proposal.lang b/htdocs/langs/eu_ES/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/eu_ES/supplier_proposal.lang
+++ b/htdocs/langs/eu_ES/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 321c459b7af..3db852c2506 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=حساب حسابداری
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=ورشکستگی
 
+MenuAccountancy=Accountancy
 CustomersVentilation=مشتریان ورشکسته
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=حاشیه سود معامله
@@ -46,7 +47,7 @@ UpdateAccount=اصلاح حساب حسابداری
 UpdateMvts=اصلاح نقل و انتقال
 WriteBookKeeping=ثبت حساب ها در دفتر کل
 Bookkeeping=دفتر کل
-AccountBalanceByMonth=تراز حساب های ماه
+AccountBalance=Account balance
 
 AccountingVentilation=حسابداری تفکیک
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=برچسب حساب
 Sens=SENS
 Codejournal=روزنامه
+NumPiece=Piece number
 
 DelBookKeeping=حذف پرونده از دفتر کل
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index fa42a3d32c3..04439b56c1a 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -154,6 +154,7 @@ Purge=پالایش
 PurgeAreaDesc=این صفحه اجازه می دهد تا شما را به حذف تمام فایل های ساخته شده و یا ذخیره شده توسط Dolibarr (فایل های موقت و یا تمام فایل ها در <b>شاخه٪ s).</b> با استفاده از این ویژگی ضروری نیست. این است که برای کاربران که Dolibarr است که توسط یک ارائه دهنده است که مجوز فایل های ساخته شده توسط وب سرور به حذف ارائه نمی میزبانی.
 PurgeDeleteLogFile=فایل حذف ورود به <b>سیستم٪ s را</b> تعریف ماژول های Syslog (بدون ریسک از دست داده)
 PurgeDeleteTemporaryFiles=حذف همه فایل های موقت (بدون خطر از دست داده)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=حذف همه فایل ها در <b>دایرکتوری٪ است.</b> فایل های موقتی، بلکه افسردگی پشتیبان پایگاه داده، فایل های پیوست شده به عناصر (اشخاص ثالث، فاکتورها، ...) و ارسال به ماژول ECM حذف خواهد شد.
 PurgeRunNow=اکنون پاکسازی
 PurgeNothingToDelete=بدون شاخه یا فایل را حذف کنید.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=پیکربندی د لا traduction
 TranslationDesc=انتخاب زبان بر روی صفحه نمایش قابل مشاهده است می تواند اصلاح شود: <br> * در سطح جهانی را از منوی <strong>صفحه اصلی - راه اندازی - نمایش</strong> <br> * برای کاربر تنها از تب <strong>صفحه نمایش کاربر</strong> از کارت کاربر (در ورود در بالای صفحه کلیک کنید).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=مجموع ماژول ها از ویژگی های <b>فعال:٪ s را</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=شما باید حداقل قادر می سازد 1 ماژول
 ClassNotFoundIntoPathWarning=کلاس٪ s ​​را به مسیر PHP یافت نشد
 YesInSummer=بله در فصل تابستان
@@ -1640,6 +1641,7 @@ CloseFiscalYear=بستن سال مالی
 DeleteFiscalYear=حذف سال مالی
 ConfirmDeleteFiscalYear=آیا مطمئن هستید این سال مالی را حذف کنید؟
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 22449249018..d57737760cc 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -58,6 +58,7 @@ Payment=پرداخت
 PaymentBack=برگشت پرداخت
 Payments=پرداخت
 PaymentsBack=پرداخت به عقب
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=پرداخت به عقب
 DeletePayment=حذف پرداخت
 ConfirmDeletePayment=آیا مطمئن هستید که می خواهید به حذف این پرداخت؟
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=پرداخت با توجه به مشتری
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=پایه قیمت
 BillStatus=وضعیت فاکتور
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=پیش نویس (نیاز به تایید می شود)
 BillStatusPaid=پرداخت
 BillStatusPaidBackOrConverted=پرداخت شده و یا تبدیل به تخفیف
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=خطا، می تواند یک ف
 BillFrom=از
 BillTo=به
 ActionsOnBill=عملیات در فاکتور
+RecurringInvoiceTemplate=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=صورت حساب جدید
 LastBills=تاریخ و زمان آخرین٪ s را فاکتورها
 LastCustomersBills=تاریخ و زمان آخرین٪ مشتریان فاکتورها
@@ -199,6 +205,7 @@ Rest=در انتظار
 AmountExpected=مقدار ادعا
 ExcessReceived=اضافی دریافت
 EscompteOffered=تخفیف ارائه شده (پرداخت قبل از ترم)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=سفارشات ایستاده
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=فوری
 PaymentConditionRECEP=فوری
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 16f27544ce6..28a1061d93e 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=تاریخ و زمان آخرین٪ s در قرارداد
 BoxTitleLastModifiedDonations=تاریخ و زمان آخرین٪ بازدید کنندگان کمک های مالی اصلاح شده
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=فعالیت های جهانی (فاکتورها، پیشنهادات، سفارشات)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=به روز کردن شار RSS شکست خورده است. آخرین تاریخ تازه کردن موفق:٪ s را
 LastRefreshDate=آخرین تاریخ تازه کردن
 NoRecordedBookmarks=بدون بوک مارک ها تعریف شده است.
@@ -95,4 +97,4 @@ ForCustomersInvoices=مشتریان فاکتورها
 ForCustomersOrders=سفارشات مشتریان
 ForProposals=پیشنهادات
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 26f5f6cb685..35fdd9a76db 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=پروفسور کد 3 (TAX SRVC)
 ProfId4IN=پروفسور کد 4
 ProfId5IN=پروفسور کد 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=استاد آیدی. 1 (RC)
 ProfId2MA=استاد آیدی. 2 (Patente)
 ProfId3MA=استاد آیدی. 3 (IF)
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index a6ea0b58574..6f439ec4548 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index 9ebc376be38..55a5a41c510 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=کلید امنیتی برای URL برای راه اندازی
 FileToLaunchCronJobs=خط فرمان برای راه اندازی کارهای cron
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=شغل برنامه ریزی
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=هیچ یک
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=اعدام بعدی
-CronDtLastLaunch=تاریخ و زمان آخرین اعدام
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=روش
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=تاریخ پایان نمی تواند قبل از تار
 CronStatusActiveBtn=قادر ساختن
 CronStatusInactiveBtn=از کار انداختن
 CronTaskInactive=این کار غیر فعال است
-CronDtLastResult=آخرین تاریخ نتیجه
 CronId=شناسایی
 CronClassFile=کلاس ها (filename.class.php)
 CronModuleHelp=نام Dolibarr دایرکتوری ماژول (با ماژول Dolibarr خارجی کار می کنند). <BR> برای exemple به بهانه روش Dolibarr شی محصولات / htdocs / <u>محصول</u> / کلاس / product.class.php، ارزش ماژول <i>محصول</i>
@@ -89,3 +90,5 @@ CronMenu=cron را
 CronCannotLoadClass=آیا می توانم کلاس٪ s ​​را بار نیست و یا شی از٪ s
 UseMenuModuleToolsToAddCronJobs=برو به منوی "صفحه اصلی - ماژول ابزار - فهرست فرصت های شغلی" برای دیدن و ویرایش کار برنامه ریزی شده.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang
index dbd7b1bc12d..a46379ee04d 100644
--- a/htdocs/langs/fa_IR/languages.lang
+++ b/htdocs/langs/fa_IR/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=اسپانیایی (مکزیک)
 Language_es_PY=اسپانیایی پروگوئه
 Language_es_PE=اسپانیایی پرو
 Language_es_PR=اسپانیایی (پورتوریکو)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=زبان استونی
 Language_eu_ES=باسک
 Language_fa_IR=پارسی
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 3021fae1df3..f7fef300c02 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=ایمیل با موفقیت معتبر
 MailUnsubcribe=لغو اشتراک
 Unsuscribe=لغو اشتراک
 MailingStatusNotContact=آیا تماس نمی
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=نشانی پست الکترونیکی خالی است
 WarningNoEMailsAdded=آدرس ایمیل جدید برای اضافه کردن به لیست گیرنده.
 ConfirmValidMailing=آیا مطمئن هستید که می خواهید به اعتبار این ایمیل؟
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 65a54f0d790..10f8259c0ac 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=قیمت واحد (خالص)
 UnitPriceTTC=قیمت واحد
 PriceU=UP
 PriceUHT=UP (خالص)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=مقدار
@@ -321,6 +322,9 @@ AmountTTCShort=مقدار (مالیات شرکت)
 AmountHT=مقدار (خالص از مالیات)
 AmountTTC=مقدار (مالیات شرکت)
 AmountVAT=مالیات بر مقدار
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=مالیات مقدار 2
 AmountLT2=مالیات مقدار 3
 AmountLT1ES=مقدار RE
@@ -335,6 +339,7 @@ Percentage=در صد
 Total=کل
 SubTotal=جمع جزء
 TotalHTShort=مجموع (خالص)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=مجموع (مالیات شرکت)
 TotalHT=مجموع (خالص از مالیات)
 TotalHTforthispage=مجموع (خالص از مالیات) به این صفحه
@@ -457,6 +462,7 @@ Datas=اطلاعات
 None=هیچ یک
 NoneF=هیچ یک
 Late=دیر
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=تصویر
 Photos=تصاویر
 AddPhoto=اضافه کردن عکس
@@ -539,6 +545,7 @@ NbOfCustomers=تعدادی از مشتریان
 NbOfLines=تعداد خطوط
 NbOfObjects=تعدادی از اشیاء
 NbOfReferers=تعداد ارجاعات
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=مقدار کل
 DateFromTo=از٪ s به٪ s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=لینک به تماس با کاربر خاص
 DeleteAFile=حذف یک فایل
 ConfirmDeleteAFile=آیا مطمئن هستید که می خواهید به حذف فایل
 NoResults=هیچ نتیجه ای
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=ماژول ابزار
 Test=تست
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=دوشنبه
 Tuesday=سهشنبه
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 8aa566851f2..de5525023f3 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index cc1032675b9..ff7fd2f4256 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -5,6 +5,7 @@ ProjectId=پروژه کد
 ProjectLabel=Project label
 Project=پروژه
 Projects=پروژه ها
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=هر کسی
 PrivateProject=اطلاعات تماس پروژه
@@ -19,7 +20,7 @@ TasksPublicDesc=این دیدگاه ارائه تمام پروژه ها و کا
 TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=منطقه پروژه ها
+ProjectsArea=Projects Area
 NewProject=پروژه های جدید
 AddProject=Create project
 DeleteAProject=حذف یک پروژه
@@ -67,6 +68,7 @@ Activities=وظایف / فعالیت ها
 MyActivity=فعالیت های من
 MyActivities=کارهای من / فعالیت ها
 MyProjects=پروژه های من
+MyProjectsArea=My projects Area
 DurationEffective=مدت زمان موثر
 Progress=پیشرفت
 ProgressDeclared=پیشرفت اعلام کرد
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/fa_IR/receiptprinter.lang b/htdocs/langs/fa_IR/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/fa_IR/receiptprinter.lang
+++ b/htdocs/langs/fa_IR/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 2f4bc034588..e0e2978f99f 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=لغو ارسال
 DeleteSending=حذف ارسال
 Stock=موجودی
 Stocks=سهام
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=جنبش
 Movements=جنبش
 ErrorWarehouseRefRequired=نام انبار مرجع مورد نیاز است
@@ -34,9 +34,10 @@ LastMovements=تاریخ و زمان آخرین جنبش های
 Units=واحد
 Unit=واحد
 StockCorrection=سهام صحیح
-StockTransfer=انتقال سهام
-StockMovement=انتقال
-StockMovements=نقل و انتقال سهام
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=برچسب جنبش
 NumberOfUnit=تعداد واحد
 UnitPurchaseValue=قیمت خرید واحد
@@ -53,8 +54,8 @@ QtyDispatched=تعداد اعزام
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=اعزام سهام
-RuleForStockManagementDecrease=قانون کاهش مدیریت سهام
-RuleForStockManagementIncrease=قانون برای افزایش مدیریت سهام
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=کاهش سهام واقعی بر روی مشتریان اعتبار فاکتورها / یادداشت های اعتباری
 DeStockOnValidateOrder=کاهش سهام واقعی در اعتبار سنجی سفارشات مشتریان
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=میانگین وزنی قیمت ورودی
 AverageUnitPricePMP=میانگین وزنی قیمت ورودی
 SellPriceMin=فروش قیمت واحد
-EstimatedStockValueSellShort=ارزش به فروش
-EstimatedStockValueSell=ارزش فروش
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=ارزش سهام ورودی
 EstimatedStockValue=ارزش سهام ورودی
 DeleteAWarehouse=حذف یک انبار
@@ -113,7 +114,7 @@ AlertOnly= فقط هشدارها
 WarehouseForStockDecrease=<b>انبار٪ خواهد</b> شد برای سهام کاهش استفاده
 WarehouseForStockIncrease=<b>انبار٪ خواهد</b> شد برای افزایش سهام استفاده
 ForThisWarehouse=برای این انبار
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=پر کردن
 NbOfProductBeforePeriod=تعداد محصول٪ s را در انبار قبل از دوره (<٪) انتخاب
diff --git a/htdocs/langs/fa_IR/supplier_proposal.lang b/htdocs/langs/fa_IR/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/fa_IR/supplier_proposal.lang
+++ b/htdocs/langs/fa_IR/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 413cae2b6fe..e9b10e25069 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=استفاده از حساب کاربری برای ورود ب
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index e6b8a366a6e..b5162e3dd27 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=Tämän sivun avulla voit poistaa kaikki tiedostot rakennettu tai varastoinut Dolibarr (väliaikainen tiedostoja tai kaikki <b>tiedostot %s</b> hakemistoon). Käyttämällä tätä ominaisuutta ei ole tarpeen. Se on säädetty käyttäjät, joiden Dolibarr isännöi tarjoaja ei tarjoa oikeudet poistaa tiedostoja rakentanut www-palvelin.
 PurgeDeleteLogFile=Poista <b>lokitiedoston %s</b> määritelty Syslog moduulin (ei aiheuta vaaraa löysä tiedot)
 PurgeDeleteTemporaryFiles=Poista kaikki väliaikaiset tiedostot (no riskin löysä tiedot)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Poista kaikki tiedostot <b>hakemistoon %s.</b> Väliaikaiset tiedostot, mutta myös liitetyt tiedostot elementtejä (kolmansien osapuolten, laskut, ...) ja siirretty osaksi ECM moduuli on poistettu.
 PurgeRunNow=Siivoa nyt
 PurgeNothingToDelete=ei hakemistoon poistaa.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 9b76e19c304..80aebee368f 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -58,6 +58,7 @@ Payment=Maksu
 PaymentBack=Maksun
 Payments=Maksut
 PaymentsBack=Maksut takaisin
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Poista maksu
 ConfirmDeletePayment=Oletko varma, että haluat poistaa tämän maksutavan?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Tee maksun asiakkaan
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Hinta base
 BillStatus=Laskun tila
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Luonnos (on vahvistettu)
 BillStatusPaid=Maksetaan
 BillStatusPaidBackOrConverted=Maksetaan tai muunnetaan edullisista
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Virhe ei voi peruuttaa laskun, j
 BillFrom=Mistä
 BillTo=Billistä
 ActionsOnBill=Toimet lasku
+RecurringInvoiceTemplate=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=Uusi lasku
 LastBills=Viimeisin %s laskut
 LastCustomersBills=Viimeisin %s asiakkaiden laskut
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Määrä väitti
 ExcessReceived=Trop Peru
 EscompteOffered=Discount tarjotaan (maksu ennen aikavälillä)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Pysyvän tilaukset
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Välittömät
 PaymentConditionRECEP=Välittömät
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index fb8c77a6750..f0999b61c12 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Viimeisimmät %s sopimukset
 BoxTitleLastModifiedDonations=Viimeisimmät %s muokatut lahjoitukset
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Yleisaktiviteetit (laskut, ehdotukset, tilaukset)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=RSS päivitys epäonnistui. Viimeisin onnistunut päivityksen päivämäärä: %s
 LastRefreshDate=Viimeisin päivitys
 NoRecordedBookmarks=Kirjanmerkkejä ei ole määritelty.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Asiakkaiden laskut
 ForCustomersOrders=Asiakkaiden tilaukset
 ForProposals=Ehdotukset
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 9419fd576b2..05bedc40afc 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (IF)
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index f8700af6c1d..be68e832f7d 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index b3bfcd31c46..08d33a2b1fe 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Turva avain ajastettujen  tehtävien ajamiseen URL-sta
 FileToLaunchCronJobs=Ajastettujen tehtävien komentorivi
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Ei mitään
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Menetelmä
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Poistaa käytöstä
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/fi_FI/languages.lang b/htdocs/langs/fi_FI/languages.lang
index 3ab84bd9094..3a391e221ef 100644
--- a/htdocs/langs/fi_FI/languages.lang
+++ b/htdocs/langs/fi_FI/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Espanja (Meksiko)
 Language_es_PY=Espanja (Paraguay)
 Language_es_PE=Espanja (Peru)
 Language_es_PR=Espanja (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Virolainen
 Language_eu_ES=Baski
 Language_fa_IR=Persialainen
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index ee19e27d4d3..2cc002fc92b 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Sähköposti vastaanottaja on tyhjä
 WarningNoEMailsAdded=Ei uusia Email lisätä vastaanottajan luetteloon.
 ConfirmValidMailing=Oletko varma, että haluat vahvistaa tämän sähköpostitse?
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 677e288f9e5..176794c582f 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Yksikköhinta (netto)
 UnitPriceTTC=Yksikköhinta
 PriceU=UP
 PriceUHT=UP (netto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Määrä
@@ -321,6 +322,9 @@ AmountTTCShort=Määrä (sis. alv)
 AmountHT=Määrä (ilman veroja)
 AmountTTC=Määrä (sis. alv)
 AmountVAT=Verot
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Verot 2
 AmountLT2=Verot 3
 AmountLT1ES=Määrä RE
@@ -335,6 +339,7 @@ Percentage=Prosenttia
 Total=Yhteensä
 SubTotal=Välisumma
 TotalHTShort=Yhteensä (netto)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Yhteensä (sis. alv)
 TotalHT=Yhteensä (ilman veroja)
 TotalHTforthispage=Yhteensä (veroton) tällä sivulla
@@ -457,6 +462,7 @@ Datas=Tiedot
 None=Ei mitään
 NoneF=Ei mitään
 Late=Myöhässä
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Kuva
 Photos=Kuvat
 AddPhoto=Lisää kuva
@@ -539,6 +545,7 @@ NbOfCustomers=Asiakkaiden määrä
 NbOfLines=Rivien määrä
 NbOfObjects=Kohteiden määrä
 NbOfReferers=Viittaajien määrä
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Kokonaismäärä
 DateFromTo=Kohteesta %s %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linkitetty käyttäjätietoon
 DeleteAFile=Poista tiedosto
 ConfirmDeleteAFile=Haluatko varmasti poistaa tiedoston
 NoResults=Ei tuloksia
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Moduuli työkalut
 Test=Testi
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Maanantai
 Tuesday=Tiistai
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 78df9b99b94..dc8451ffc06 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 668517ff23e..bb539c3611e 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Hanke
 Projects=Projektit
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Yhteiset hanke
 PrivateProject=Yhteystiedot Hankkeen
@@ -19,7 +20,7 @@ TasksPublicDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät sinull
 TasksDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projektit alueella
+ProjectsArea=Projects Area
 NewProject=Uusi projekti
 AddProject=Create project
 DeleteAProject=Poista hanke
@@ -67,6 +68,7 @@ Activities=Tehtävät / toiminnot
 MyActivity=Oma aktiivisuus
 MyActivities=Omat tehtävät / toiminnot
 MyProjects=Omat hankkeet
+MyProjectsArea=My projects Area
 DurationEffective=Todellisen keston
 Progress=Edistyminen
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/fi_FI/receiptprinter.lang b/htdocs/langs/fi_FI/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/fi_FI/receiptprinter.lang
+++ b/htdocs/langs/fi_FI/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 258eb61c005..f4c65145f0c 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Peruuta lähettäminen
 DeleteSending=Poista lähettäminen
 Stock=Kanta
 Stocks=Varastot
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Liikkeet
 ErrorWarehouseRefRequired=Warehouse viite nimi tarvitaan
@@ -34,9 +34,10 @@ LastMovements=Viimeisin liikkeet
 Units=Yksiköt
 Unit=Yksikkö
 StockCorrection=Oikea varastossa
-StockTransfer=Stock transfer
-StockMovement=Siirto
-StockMovements=Kanta siirrot
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Kappalemäärä
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Määrä lähetysolosuhteita
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Tilaa lähetyskeskukset
-RuleForStockManagementDecrease=Sääntö varaston hallintaan lasku
-RuleForStockManagementIncrease=Sääntö varaston hallintaan lisätä
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease todellinen varastot laskuista / hyvityslaskuja
 DeStockOnValidateOrder=Decrease todellinen varastot tilaukset toteaa
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Keskimääräiset tulohintajärjestelmää
 AverageUnitPricePMP=Keskimääräiset tulohintajärjestelmää
 SellPriceMin=Myynnin Yksikköhinta
-EstimatedStockValueSellShort=Arvo myydä
-EstimatedStockValueSell=Arvo Myy
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Arvioitu arvo varastossa
 EstimatedStockValue=Arvioitu arvo varastossa
 DeleteAWarehouse=Poista varasto
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/fi_FI/supplier_proposal.lang b/htdocs/langs/fi_FI/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/fi_FI/supplier_proposal.lang
+++ b/htdocs/langs/fi_FI/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index edb566a00c8..c4ba8d89603 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 883df19c098..4a9ea284165 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -29,3 +29,4 @@ Pcgtype=Classe du compte
 Pcgsubtype=Sous-classe du compte
 DescVentilCustomer=Consulter la subdivision comptable annuelle de vos factures clients
 TotalMarge=Marge de ventes totale
+EnabledProduct=In Product
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index a7b7f36bd74..e559beee170 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -27,3 +27,4 @@ RemoveLock=Supprimez le fichier <b>%s</b> s'il existe pour autoriser l'utilisati
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/fr_BE/projects.lang b/htdocs/langs/fr_BE/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/fr_BE/projects.lang
+++ b/htdocs/langs/fr_BE/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/fr_BE/propal.lang b/htdocs/langs/fr_BE/propal.lang
new file mode 100644
index 00000000000..90b012fd6f9
--- /dev/null
+++ b/htdocs/langs/fr_BE/propal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - propal
+CloseAs=Set status to
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index a0d128330fe..c8598b437d2 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -36,6 +36,7 @@ LocalTax2IsUsedDesc=Utilisation d'un 3ème type taxe (autre que TVA(TPS))
 LocalTax2IsNotUsedDesc=Pas d'utilisation de 3ème type taxe (autre que TVA(TPS))
 ShowBugTrackLink=Afficher le lien "Signaler un défaut"
 MAIN_ROUNDING_RULE_TOT=Taille du pas des arrondis (pour les très rares pays qui arrondissent sur une autre base que la base 10)
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelles que soient les permissions de ces utilisateurs) :
 NotificationsDesc=La fonction des notifications par emails permet d'envoyer automatiquement un email, lors de certains événements Dolibarr. La cible des notifications peut être défini:<br>* par contacts de tiers (clients, prospects ou fournisseurs), contact par contact.<br>* ou en positionnant un email en paramètre global sur la page de configuration du module Notification.
 ShippableOrderIconInList=Ajouter un icône dans la liste des commandes qui indique si la commande est expédiable.
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index 17a8453b93a..7688d7d07dc 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - bills
 ShowSocialContribution=Afficher charge sociale
+EscompteOffered=Escompte (règlement avant échéance)
 AddGlobalDiscount=Créer ligne de déduction
 IdSocialContribution=Id charge sociale
 ClosePaidInvoicesAutomatically=Classer "Payées" touts les factures standards ou de remplacements ayant un reste à payer nul
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 3d43a176367..cdb2d5c4e00 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -19,6 +19,7 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
+DatabaseConnection=Connexion à la base de donnée
 ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'.
 PriceUHT=Prix
 PriceUTTC=P.U. TTC
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/fr_CA/propal.lang b/htdocs/langs/fr_CA/propal.lang
new file mode 100644
index 00000000000..90b012fd6f9
--- /dev/null
+++ b/htdocs/langs/fr_CA/propal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - propal
+CloseAs=Set status to
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
new file mode 100644
index 00000000000..4a851f31c28
--- /dev/null
+++ b/htdocs/langs/fr_CH/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+EnabledProduct=In Product
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index 1c53b65c99c..61b7d006abf 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -2,3 +2,4 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/fr_CH/projects.lang b/htdocs/langs/fr_CH/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/fr_CH/projects.lang
+++ b/htdocs/langs/fr_CH/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/fr_CH/propal.lang b/htdocs/langs/fr_CH/propal.lang
new file mode 100644
index 00000000000..90b012fd6f9
--- /dev/null
+++ b/htdocs/langs/fr_CH/propal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - propal
+CloseAs=Set status to
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index b33bd1e3421..acf24fc9a36 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Compte comptable
 AccountAccountingSuggest=Suggestion du compte
 Ventilation=Ventilation
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Ventilation clients
 SuppliersVentilation=Ventilation fournisseurs
 TradeMargin=Marge commerciale
@@ -46,7 +47,7 @@ UpdateAccount=Modification de compte comptable
 UpdateMvts=Modification de mouvements
 WriteBookKeeping=Enregistrer les écritures dans le grand livre
 Bookkeeping=Grand livre
-AccountBalanceByMonth=Solde par mois
+AccountBalance=Account balance
 
 AccountingVentilation=Ventilation comptable
 AccountingVentilationSupplier=Ventilation comptable client
@@ -103,6 +104,7 @@ Code_tiers=Tiers
 Labelcompte=Libellé du compte
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Supprimer les écritures du grand livre
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Le mouvement n'est pas équilibré. Crédit = %s. Débit
 FicheVentilation=Fiche ventilation
 GeneralLedgerIsWritten=Les opérations ont été inscrites dans le grand livre
 
+MvtNotCorrectlyBalanced=Le mouvement n'est pas équilibré. Crédit = %s. Débit = %s
+
 ##Export Journal Feature
 ExportFormat=Format de l'export
 Prefixname=Préfixe du fichier d'export
@@ -163,7 +167,8 @@ Type=Type de champs
 Param=Paramètres Supplémentaires
 EnabledProduct=Dans produit
 EnabledTiers=In third party
-EnabledVat=Dans TVA
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 6966dac11c4..ef95c99ec18 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -154,6 +154,7 @@ Purge=Purger
 PurgeAreaDesc=Cette page vous permet d'effacer tous les fichiers construits ou stockés par Dolibarr (fichiers temporaires ou tous les fichiers du répertoire <b>%s</b>). L'utilisation de cette fonction n'est pas nécessaire. Elle est fournie pour les utilisateurs qui hébergent Dolibarr chez un hébergeur qui n'offre pas les permissions de supprimer les fichiers sauvegardés par le serveur Web.
 PurgeDeleteLogFile=Effacer le fichier journal <b>%s</b> défini pour le module 'Journaux et traces' (pas de risque de perte de données)
 PurgeDeleteTemporaryFiles=Effacer tous les fichiers temporaires (pas de risque de perte de données)
+PurgeDeleteTemporaryFilesShort=Effacer les fichiers temporaires
 PurgeDeleteAllFilesInDocumentsDir=Effacer tous les fichiers du répertoire <b>%s</b>. Les fichiers temporaires mais aussi les fichiers « dumps » de sauvegarde de base de données, les fichiers joints aux éléments (tiers, factures, ...) ou fichiers stockés dans le module GED seront irrémédiablement effacés.
 PurgeRunNow=Lancer la purge maintenant
 PurgeNothingToDelete=Aucun répertoire ou fichier à supprimer.
@@ -362,7 +363,7 @@ HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TVA
 HideDescOnPDF=Cacher la description des produits sur les PDF générés
 HideRefOnPDF=Cacher la référence des produits sur les PDF générés
 HideDetailsOnPDF=Cacher les détails des lignes de produits sur les PDF générés
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PlaceCustomerAddressToIsoLocation=Utiliser la position standard française (La Poste) pour la position de l'adresse client
 Library=Bibliothèque
 UrlGenerationParameters=Sécurisation des URLs
 SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL ?
@@ -416,7 +417,7 @@ ConfirmEraseAllCurrentBarCode=Etes-vous sur de vouloir effacer toutes les valeur
 AllBarcodeReset=Tous les codes-barre ont été supprimés
 NoBarcodeNumberingTemplateDefined=Aucun modèle de numérotation de code-barre n'a été activé dans la configuration du module code-barre.
 NoRecordWithoutBarcodeDefined=Aucun enregistrement sans code-barre défini.
-EnableFileCache=Enable file cache
+EnableFileCache=Utiliser des fichiers caches
 
 # Modules
 Module0Name=Utilisateurs & groupes
@@ -500,7 +501,7 @@ Module510Desc=Gestion des paiements des salaires des employés
 Module520Name=Emprunt
 Module520Desc=Gestion des emprunts
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Envoi de notifications Email (déclenchées sur des événements métiers) sur certains événements métiers Dolibarr, aux contacts de tiers (configuration réalisée sur chaque tiers)
 Module700Name=Dons
 Module700Desc=Gestion des dons
 Module770Name=Notes de frais
@@ -964,7 +965,7 @@ DelaysBeforeWarning=Délais avant alerte
 DelaysOfToleranceBeforeWarning=Délais de tolérance avant alerte
 DelaysOfToleranceDesc=Cet écran permet de définir les délais de tolérance après lesquels une alerte sera signalée à l'écran par le pictogramme %s sur chaque élément en retard.
 Delays_MAIN_DELAY_ACTIONS_TODO=Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks not yet realised
+Delays_MAIN_DELAY_TASKS_TODO=Tolérance de retard avant alerte (en jours) sur les tâches planifiées pas encore réalisées
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolérance de retard avant alerte (en jours) sur commandes clients non traitées
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolérance de retard avant alerte (en jours) sur propales à cloturer
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=La fonction d'envoi de mails par la méthode "PHP
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Le choix de la langue affichée à l'écran se modifie:<br>* Soit de manière globale depuis le menu <strong>Accueil - Configuration - Affichage</strong><br>* Soit de manière spécifique à l'utilisateur depuis l'onglet <strong>Interface utilisateur</strong> de sa fiche utilisateur (cliquer sur l'identifiant en haut de l'écran).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Nombre total de modules fonctionnels activés: <b>%s</b>
+TotalNumberOfActivatedModules=Nombre total de modules/fonctionnalités activés: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Vous devez activer au moins une fonctionnalité
 ClassNotFoundIntoPathWarning=La classe %s n'a pas été trouvée dans le chemin PHP
 YesInSummer=Oui en été
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Exercice fiscal cloturé
 DeleteFiscalYear=Effacer exercice fiscal
 ConfirmDeleteFiscalYear=Êtes-vous sûr de vouloir supprimer cet exercice fiscal ?
 AlwaysEditable=Peut toujours être édité
+IsHidden=Est invisible
 MAIN_APPLICATION_TITLE=Forcer la valeur visible du nom de l'application (attention : positionner ici son propre nom rendra inopérante la fonction de remplissage automatique de l'identifiant lorsque vous utilisez l'application mobile DoliDroid)
 NbMajMin=Nombre minimal de caractères majuscules
 NbNumMin=Nombre minimal de caractères numériques
@@ -1664,10 +1666,10 @@ BackupDumpWizard=Assistant de génération d'un fichier de sauvegarde de la base
 SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante : 
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est uniquement une série de manipulations que seul un utilisateur ayant des droits privilégiés peut faire
 InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
-ConfFileMuseContainCustom=Installé un module externe pour l'application enregistre les fichiers de module dans le répertoire <strong>%s</strong>. Pour avoir ce répertoire vu par Dolibarr, vous devez configurer votre <strong>conf/conf.php</strong> d'avoir l'option <br> - <strong>$dolibarr_main_url_root_alt</strong> activé à la valeur <strong>$dolibarr_main_url_root_alt="/custom"</strong><br> - <strong>$dolibarr_main_document_root_alt</strong> activé à la valeur <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installé un module externe pour l'application enregistre les fichiers de module dans le répertoire <strong>%s</strong>. Pour avoir ce répertoire vu par Dolibarr, vous devez configurer votre <strong>conf/conf.php</strong> afin d'avoir l'option <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de la table lorsque la souris passe au-dessus
 HighlightLinesColor=Mettez en surbrillance les lignes de la table lorsque la souris passe au-dessus (garder vide pour ne pas avoir de surbrillance)
-TextTitleColor=Color of page title
+TextTitleColor=Couleur du titre des pages
 LinkColor=Couleur des liens
 PressF5AfterChangingThis=Appuyez sur F5 sur le clavier après avoir modifié cette valeur pour que le changement soit effectif
 NotSupportedByAllThemes=Fonctionne avec le thème eldy mais n'est pas pris en charge par tous les thèmes
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Exemple de message que vous pouvez utiliser po
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version majeure avec de nouvelles fonctionnalités pour les utilisateurs et les développeurs. Vous pouvez la télécharger à partir de la zone de téléchargement du portail http://www.dolibarr.org (sous-répertoire "Versions stables"). Vous pouvez lire le <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pour la liste complète des changements.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version de maintanance, aussi elle ne contient que des correctifs de bugs. Nous recommandons tout personne utilisant une version plus ancienne de migrer sur celle-ci. En tant que version de maintenance, aucune nouvelle fonctionnalité n'est ajouté, ni modification de format de données. Vous pouvez télécharger cette version à partir de la zone de téléchargement du portail http://www.dolibarr.org (sous-répertoire "Versions stables"). Vous pouvez lire le <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pour la liste complète des changements.
 MultiPriceRuleDesc=Quand l'option « Plusieurs niveaux de prix par produit/service» est activée, vous pouvez définir différents prix (un par niveau de prix) pour chaque produits. Pour sauver du temps, vous pouvez entrer ici une règle pour avoir un prix pour chaque niveau calculé automatiquement. Cette page est ici pour sauver du temps et peut être utile si vos prix pour chaque niveaux sont relatif au premier niveau. Vous pouvez ignorer cette page dans la plupart des cas
+ModelModulesProduct=Modèles des documents de produits
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index ccd0160bf09..06ab41f7dfb 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -58,6 +58,7 @@ Payment=Règlement
 PaymentBack=Remboursement
 Payments=Règlements
 PaymentsBack=Remboursements
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Remboursé
 DeletePayment=Supprimer le paiement
 ConfirmDeletePayment=Êtes-vous sûr de vouloir supprimer ce paiement ?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Saisie d'un remboursement d'un avoir client
 DisabledBecauseRemainderToPayIsZero=Désactivé car reste à payer est nul
 PriceBase=Base du prix
 BillStatus=État de la facture
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Brouillon (à valider)
 BillStatusPaid=Payée
 BillStatusPaidBackOrConverted=Remboursé ou converti en réduction
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Erreur, il n'est pas possible d'
 BillFrom=Émetteur
 BillTo=Adressé à
 ActionsOnBill=Événements sur la facture
+RecurringInvoiceTemplate=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=Nouvelle facture
 LastBills=Les %s dernières factures
 LastCustomersBills=Les %s dernières factures clients
@@ -186,7 +192,7 @@ ShowInvoice=Afficher facture
 ShowInvoiceReplace=Afficher facture de remplacement
 ShowInvoiceAvoir=Afficher facture d'avoir
 ShowInvoiceDeposit=Afficher facture d'acompte
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Afficher la facture de situation
 ShowPayment=Afficher règlement
 AlreadyPaid=Déjà réglé
 AlreadyPaidBack=Déjà remboursé
@@ -198,8 +204,8 @@ RemainderToPayBack=Montant à rembourser
 Rest=Créance
 AmountExpected=Montant réclamé
 ExcessReceived=Trop perçu
-EscompteOffered=Escompte (règlement avant échéance)
-EscompteOfferedShort=Escompte
+EscompteOffered=Escompte (règl. avt échéance)
+EscompteOfferedShort=Discount
 SendBillRef=Envoi de la facture %s
 SendReminderBillRef=Relance de la facture %s (rappel)
 StandingOrders=Prélèvements
@@ -306,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Montant paiement affecté à la facture
 PaymentNote=Note du paiement
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=À réception
 PaymentConditionRECEP=À réception de facture
@@ -447,7 +465,7 @@ NoSituations=Pas de situations ouvertes
 InvoiceSituationLast=Dernière facture
 PDFCrevetteSituationNumber=Situation N°%s
 PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceTitle=Facture de situation
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
 PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 4f9c5fa9504..a006c333239 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Les %s derniers contrats
 BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
 BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
 BoxGlobalActivity=Activité globale (factures, propositions, commandes)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Échec du rafraichissement du flux RSS. Date du dernier rafraichissement : %s
 LastRefreshDate=Date dernier rafraichissement
 NoRecordedBookmarks=Pas de marques-pages personnels.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Factures clients
 ForCustomersOrders=Commandes clients
 ForProposals=Propositions commerciales
 LastXMonthRolling=Les %s derniers mois tournant
-ChooseBoxToAdd=Choisissez une boîte à ajouter
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index d9a85c72175..cbc25ec597d 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Id. prof. 3 (SRVC TAX)
 ProfId4IN=Id. prof. 4
 ProfId5IN=Id. prof. 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index dd7ca2fc4cc..21ea1e71538 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Rapport client étranger
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basé sur les deux premières lettres du numéro de TVA étant différent du code de pays de votre propre entreprise
 SameCountryCustomersWithVAT=Rapport clients nationaux
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basé sur les deux premières lettres du numéro de TVA étant les mêmes que le code pays de votre propre entreprise
+LinkedFichinter=Link to an intervention
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 93e79c2991f..9e39df83ccf 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Clé de sécurité pour l'URL de lancement des travaux programm
 FileToLaunchCronJobs=Commande pour lancer les travaux programmés actifs
 CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser l'entrée suivante en crontab pour exécuter la ligne de commande toutes les 5 minutes
 CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tache pour lancer cette commande toute les 5 minutes.
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Travaux programmés
 CronListActive=Liste des travaux activés/planifiés
@@ -39,7 +40,8 @@ CronNone=Aucun(e)
 CronDtStart=Pas avant
 CronDtEnd=Pas après
 CronDtNextLaunch=Prochaine exécution
-CronDtLastLaunch=Dernière exécution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Fréquence
 CronClass=Classe
 CronMethod=Méthode
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=La date de fin ne peux être avant la date de début
 CronStatusActiveBtn=Activer
 CronStatusInactiveBtn=Désactiver
 CronTaskInactive=Cette tâche est désactivée
-CronDtLastResult=Date du dernier résulat
 CronId=Id
 CronClassFile=Classes (nom de fichier)
 CronModuleHelp=Nom du répertoire du module Dolibarr (fonctionne aussi avec les modules externes de Dolibarr). <BR> Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/<u>product</u>/class/product.class.php, la valeur de module est <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Impossible de charger la classe %s ou l'objet %s
 UseMenuModuleToolsToAddCronJobs=Aller dans le menu "Accueil - Outils modules - Liste des travaux" pour voir et éditer les travaux planifiés.
 TaskDisabled=Travail non programmé
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index 84ba2e40185..1823770a1d7 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -17,9 +17,9 @@ DeleteDeliveryReceiptConfirm=Êtes-vous sûr de vouloir supprimer ce bon de livr
 DeliveryMethod=Méthode de livraison
 TrackingNumber=Numéro de suivi
 DeliveryNotValidated=Bon de réception non validé
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+StatusDeliveryCanceled=Annulé
+StatusDeliveryDraft=Brouillon
+StatusDeliveryValidated=Reçu
 # merou PDF model
 NameAndSignature=Nom et Signature :
 ToAndDate=A___________________________________ le ____/_____/__________
diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
index 43f97555ff8..86bbd0705aa 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -15,6 +15,6 @@ DictionaryFunction=GRH - List des fonctions
 ListOfEmployees=List des salariés
 Employees=Salariés
 Employee=Salarié
-Employe=Employe
+Employe=Employeur
 NewEmployee=Nouveau salarié
 EmployeeCard=Fiche salarié
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index 86f34a77158..2b78a7e463a 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -54,9 +54,9 @@ PacificNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn où yy est
 PacificNumRefModelError=Une facture commençant par $syymm existe en base et est incompatible avec cette numérotation. Supprimez la ou renommez la pour activer ce module.
 PrintProductsOnFichinter=Afficher les produits sur la fiche d'intervention
 PrintProductsOnFichinterDetails=interventions générées à partir des commandes
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=Nb of intervention cards
-NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+InterventionStatistics=Statistiques des interventions
+NbOfinterventions=Nb de fiches d'intervention
+NumberOfInterventionsByMonth=Nb de fiches d'intervention par mois (date de validation)
 ##### Exports #####
 InterId=Id intervention
 InterRef=Intervention ref.
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 0ba64b3f059..dd730bd73a2 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Espagnol (Mexique)
 Language_es_PY=Espagnol (Paraguay)
 Language_es_PE=Espagnol (Peru)
 Language_es_PR=Espagnol (Puerto Rico)
+Language_es_VE=Espagnol (Venezuela)
 Language_et_EE=Estonien
 Language_eu_ES=Basque
 Language_fa_IR=Perse
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index dd6cbf9ec77..b884698a01c 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Email validé
 MailUnsubcribe=Désinscription
 Unsuscribe=Désinscription
 MailingStatusNotContact=Ne plus contacter
+MailingStatusReadAndUnsubscribe=Lu et désinscrit
 ErrorMailRecipientIsEmpty=L'adresse du destinataire est vide
 WarningNoEMailsAdded=Aucun nouvel email à ajouter à la liste des destinataires.
 ConfirmValidMailing=Confirmez-vous la validation de l'emailing ?
@@ -81,7 +82,7 @@ ActivateCheckReadKey=Clé de sécurité permettant le chiffrement des URL utilis
 EMailSentToNRecipients=Email envoyé à %s destinataires.
 XTargetsAdded=<b>%s</b> destinataires ajoutés dans la liste cible
 EachInvoiceWillBeAttachedToEmail=Un document utilisant le modèle par défaut de facture sera généré et attaché à l'email.
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=Si le document PDF a déjà généré pour la facture, il sera attaché à l'email. Si non, aucun e-mail ne sera envoyé (aussi notez que seule les factures au format PDF sont prises en charge en tant que pièce jointe pour un envoi en masse dans cette version).
 MailTopicSendRemindUnpaidInvoices=Rappel de la facture %s (%s)
 SendRemind=Envoyer relance par email
 RemindSent=%s relance(s) envoyée(s)
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 672261fcbac..fbd66fb9623 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connexion à la base
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Pas de modèle défini pour ce type d'email
 NoTranslation=Pas de traduction
 NoRecordFound=Aucun enregistrement trouvé
 NoError=Aucune erreur
@@ -106,7 +106,7 @@ NotePrivate=Note (privée)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr a été configuré pour limiter la précision des prix unitaires à <b>%s</b> décimales.
 DoTest=Tester
 ToFilter=Filtrer
-NoFilter=No filter
+NoFilter=Pas de filtre
 WarningYouHaveAtLeastOneTaskLate=Attention, vous avez au moins un élément qui a dépassé le délai de tolérance de retard.
 yes=oui
 Yes=Oui
@@ -230,8 +230,8 @@ Now=Maintenant
 HourStart=Heure de début
 Date=Date
 DateAndHour=Date et heure
-DateToday=Today's date
-DateReference=Reference date
+DateToday=Date du jour
+DateReference=Date de référence
 DateStart=Date début
 DateEnd=Date fin
 DateCreation=Date création
@@ -311,6 +311,7 @@ UnitPriceHT=Prix unitaire HT
 UnitPriceTTC=Prix unitaire TTC
 PriceU=P.U.
 PriceUHT=P.U. HT
+PriceUHTCurrency=P.U. (devise)
 SupplierProposalUHT=Prix unitaire net requis
 PriceUTTC=P.U TTC
 Amount=Montant
@@ -321,6 +322,9 @@ AmountTTCShort=Montant TTC
 AmountHT=Montant HT
 AmountTTC=Montant TTC
 AmountVAT=Montant TVA
+MulticurrencyAmountHT=Montant HT, devise d'origine
+MulticurrencyAmountTTC=Montant TTC, devise d'origine
+MulticurrencyAmountVAT=Montant TVA, devise d'origine
 AmountLT1=Montant Tax 2
 AmountLT2=Montant Tax 3
 AmountLT1ES=Montant RE
@@ -335,6 +339,7 @@ Percentage=Pourcentage
 Total=Total
 SubTotal=Sous-total
 TotalHTShort=Total HT
+TotalHTShortCurrency=Total HT (devise d'origine)
 TotalTTCShort=Total TTC
 TotalHT=Total HT
 TotalHTforthispage=Montant (HT) pour la page
@@ -457,6 +462,7 @@ Datas=Données
 None=Aucun
 NoneF=Aucune
 Late=Retard
+LateDesc=Le délai qui définit si un enregistrement est en retard ou non dépend de votre configuration. Demandez à votre administrateur pour changer ce délai depuis Accueil - Configuration - Alertes 
 Photo=Photo
 Photos=Photos
 AddPhoto=Ajouter photo
@@ -539,6 +545,7 @@ NbOfCustomers=Nombre de clients
 NbOfLines=Nombre de lignes
 NbOfObjects=Nombre d'objets
 NbOfReferers=Nombre de références
+NbOfObjectReferers=Nombre d'objets référent
 Referers=Objets référents
 TotalQuantity=Quantité totale
 DateFromTo=Du %s au %s
@@ -612,7 +619,7 @@ TotalMan=Total
 NeverReceived=Jamais reçu
 Canceled=Annulé
 YouCanChangeValuesForThisListFromDictionarySetup=Vous pouvez changer ces valeurs depuis le menu accueil - configuration - dictionnaires
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanSetDefaultValueInModuleSetup=Vous pouvez définir la valeur par défaut utilisée lors de la création d'un nouvel enregistrement dans la configuration du module
 Color=Couleur
 Documents=Fichiers joints
 DocumentsNb=Fichiers joints (%s)
@@ -694,13 +701,14 @@ LinkedToSpecificUsers=Liés à un contact utilisateur particulier
 DeleteAFile=Suppression de fichier
 ConfirmDeleteAFile=Confirmez-vous la suppression du fichier
 NoResults=Aucun résultat
+AdminTools=Outils d'administration
 SystemTools=Outils système
 ModulesSystemTools=Outils Modules
 Test=Test
 Element=Élément
 NoPhotoYet=Pas de photo disponible pour l'instant
 HomeDashboard=Synthèse accueil
-Dashboard=Dashboard
+Dashboard=Tableau de bord
 Deductible=Déductible
 from=de
 toward=vers
@@ -732,7 +740,8 @@ Hello=Bonjour
 Sincerely=Sincèrement
 DeleteLine=Effacer ligne
 ConfirmDeleteLine=Êtes-vous sûr de vouloir supprimer cette ligne ?
-
+NoPDFAvailableForDocGenAmongChecked=Aucun PDF n'est disponible pour la génération du document parmi les enregistrements cochés
+TooManyRecordForMassAction=Trop d'enregistrements sélectionnés pour l'action de masse. De telles actions sont restreintes à une liste de %s enregistrements maximum.
 # Week day
 Monday=Lundi
 Tuesday=Mardi
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index fae303e678e..41e5dfc312e 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -82,7 +82,7 @@ OrdersOpened=Commandes à traiter
 NoOpenedOrders=Pas de commande ouvertes
 NoOtherOpenedOrders=Pas d'autres commande ouvertes
 NoDraftOrders=Pas de commandes brouillons
-NoOrder=No order
+NoOrder=Pas de commande
 NoSupplierOrder=Pas de commande fournisseur
 OtherOrders=Autres commandes
 LastOrders=Les %s dernières commandes clients
diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang
index b267e1f1671..603222144a8 100644
--- a/htdocs/langs/fr_FR/paypal.lang
+++ b/htdocs/langs/fr_FR/paypal.lang
@@ -8,7 +8,7 @@ PAYPAL_API_SANDBOX=Mode test/bac à sable (sandbox)
 PAYPAL_API_USER=Nom utilisateur API
 PAYPAL_API_PASSWORD=Mot de passe utilisateur API
 PAYPAL_API_SIGNATURE=Signature API
-PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_SSLVERSION=Curl Version SSL
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proposer le paiement intégral (Carte+Paypal) ou Paypal seul
 PaypalModeIntegral=Intégral
 PaypalModeOnlyPaypal=PayPal seul
@@ -24,9 +24,9 @@ PAYPAL_PAYONLINE_SENDEMAIL=Email à prévenir en cas de paiement (succès ou non
 ReturnURLAfterPayment=URL de retour de paiement
 ValidationOfPaypalPaymentFailed=Echéc de validation du paiement Paypal
 PaypalConfirmPaymentPageWasCalledButFailed=La page de confirmation de paiement Paypal a été appelé par Paypal mais cette confirmation a échouée
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+SetExpressCheckoutAPICallFailed=L'appel à l'API SetExpressCheckout a échoué.
+DoExpressCheckoutPaymentAPICallFailed=L'appel à l'API DoExpressCheckoutPayment a échoué.
 DetailedErrorMessage=Message d'erreur détaillé
 ShortErrorMessage=Message d'erreur court
 ErrorCode=Code erreur
-ErrorSeverityCode=Error Severity Code
+ErrorSeverityCode=Code d'erreur sévérité
diff --git a/htdocs/langs/fr_FR/printing.lang b/htdocs/langs/fr_FR/printing.lang
index a05ae27f75e..0859a96f917 100644
--- a/htdocs/langs/fr_FR/printing.lang
+++ b/htdocs/langs/fr_FR/printing.lang
@@ -83,4 +83,4 @@ MEDIA_IPP_thermal=Température
 IPP_COLOR_print-black=Imprimante NB
 DirectPrintingJobsDesc=Cette page liste les travaux d'impression trouvés sur les imprimantes disponibles
 GoogleAuthNotConfigured=Configuration Google OAuth non terminé. Activer le module OAuth et entrer un Google ID/Secret
-GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
+GoogleAuthConfigured=Identifiants Google OAuth trouvé dans la configuration du module OAuth.
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index dc2c7d76554..0e99bc447e9 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Réf. produit
 ProductLabel=Libellé produit
-ProductLabelTranslated=Translated product label
-ProductDescriptionTranslated=Translated product description
+ProductLabelTranslated=Libellé produit traduit
+ProductDescriptionTranslated=Description produit traduite
 ProductNoteTranslated=Traduire la note de produit
 ProductServiceCard=Fiche produit/service
 Products=Produits
@@ -67,9 +67,9 @@ ProductStatusNotOnBuy=Hors achat
 ProductStatusOnBuyShort=En achat
 ProductStatusNotOnBuyShort=Hors achat
 UpdatePrice=Changer le prix
-UpdateVAT=Mise-à-Jour de la TVA
-UpdateDefaultPrice=Mise-à-Jour de prix par défaut
-UpdateLevelPrices=Mise-à-Jour des prix pour chaque niveau
+UpdateVAT=Modifier TVA
+UpdateDefaultPrice=Modifier prix par défaut
+UpdateLevelPrices=Modifier prix pour chaque niveau
 AppliedPricesFrom=Prix de vente pratiqués à partir du
 SellingPrice=Prix de vente
 SellingPriceHT=Prix de vente HT
@@ -190,7 +190,7 @@ ClonePricesProduct=Cloner les informations générales et les prix
 CloneCompositionProduct=Cloner le produits packagés
 ProductIsUsed=Ce produit est utilisé
 NewRefForClone=Réf. du nouveau produit/service
-SellingPrices=Les prix de vente
+SellingPrices=Prix de vente
 BuyingPrices=Prix d'achat
 CustomerPrices=Prix clients
 SuppliersPrices=Prix fournisseurs
@@ -240,8 +240,8 @@ UpdateOriginalProductLabel=Modifier étiquette d'origine
 HelpUpdateOriginalProductLabel=Permet modifier le nom du produit
 MultipriceRules=Règles du niveau de prix
 UseMultipriceRules=Utilisation des règles de niveau de prix (défini dans la configuration du module de produit) pour calcul automatique du prix de tous les autres niveau en fonction de premier niveau
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
+PercentVariationOver=%% de variation sur %s
+PercentDiscountOver=%% de remis sur %s
 ### composition fabrication
 Building=Fabrication
 Build=Fabriquer
@@ -252,7 +252,7 @@ UnitPmp=Prix Achat Unitaire
 CostPmpHT=Cout à l'achat HT
 ProductUsedForBuild=Consommé automatiquement par la fabrication
 ProductBuilded=Fabrication terminée
-ProductsMultiPrice=Products and prices for each price level
+ProductsMultiPrice=Prix produits pour chaque niveau de prix
 ProductsOrServiceMultiPrice=Prix clients (des produits ou services, multi-prix)
 ProductSellByQuarterHT=Chiffre d'affaires trimestriel des produits hors taxes
 ServiceSellByQuarterHT=Chiffre d'affaire trimestriel des services hors taxes
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Augmenter/Réduire le stock sur changement du stock d
 ComposedProduct=Sous-produits
 MinSupplierPrice=Prix minimum fournisseur
 DynamicPriceConfiguration=Configuration du prix dynamique
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Variables globales
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Mis à jour variable globale
 GlobalVariableUpdaterType0=Données JSON
 GlobalVariableUpdaterHelp0=Analyse les données JSON depuis l'URL spécifiée, VALUE indique l'emplacement de la valeur pertinente,
@@ -311,5 +315,6 @@ PropalMergePdfProductChooseFile=Sélectionnez les fichiers PDF
 IncludingProductWithTag=Comprenant produit / service avec tag
 DefaultPriceRealPriceMayDependOnCustomer=Prix ​​par défaut, le prix réel peut dépendre du client
 WarningSelectOneDocument=Sélectionnez au moins un document
-DefaultUnitToShow=Unit
+DefaultUnitToShow=Unité
 NbOfQtyInProposals=Qté en propositions
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index a579f4f20ab..d9e0c374dda 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Id projet
 ProjectLabel=Libellé projet
 Project=Projet
 Projects=Projets
+ProjectsArea=Espace projets
 ProjectStatus=Statut projet
 SharedProject=Tout le monde
 PrivateProject=Contacts du projet
@@ -19,7 +20,7 @@ TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vo
 TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
 AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches de ce projet sont visibles, mais vous pouvez entrer le temps seulement pour une tâche qui vous est attribuée. Attribuez-vous la tâche si vous voulez entrer du temps dessus.
 OnlyYourTaskAreVisible=Seules les tâches qui vous sont attribuées sont visibles. Attribuez-vous la tâche si vous voulez entrer du temps dessus.
-ProjectsArea=Espace projet
+ProjectsArea=Espace projets
 NewProject=Nouveau projet
 AddProject=Créer projet
 DeleteAProject=Supprimer un projet
@@ -67,6 +68,7 @@ Activities=Tâches/activités
 MyActivity=Mon activité
 MyActivities=Mes tâches/activités
 MyProjects=Mes projets
+MyProjectsArea=Espace Mes projets
 DurationEffective=Durée effective
 Progress=Progression
 ProgressDeclared=Progression déclarée
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Tâche assignée. La saisie de temps sur cette tâche de
 IdTaskTime=Id ligne de temps
 YouCanCompleteRef=Si vous souhaitez compléter la référence avec quelques informations (pour l'utiliser comme filtres de recherche), il est recommandé d'ajouter un caractère - pour la séparer, de sorte que la numérotation automatique fonctionne toujours correctement pour les projets à venir. Par exemple %s-ABC. Vous pouvez aussi préférer ajouter des clés de recherche dans le libellé.
 OpenedProjectsByThirdparties=Projets ouverts par tiers
+OnlyOpportunitiesShort=Opportunités uniquement
+OpenedOpportunitiesShort=Opportunités ouvertes
+NotAnOpportunityShort=Non une opportunité
 OpportunityTotalAmount=Montant total des opportunités
 OpportunityPonderatedAmount=Montant pondéré des opportunités
 OpportunityPonderatedAmountDesc=Montant des opportunités pondéré par la probabilité
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index fc138bd05ad..a3c20f17066 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -25,7 +25,7 @@ LastModifiedProposals=Les %s dernières propositions commerciales modifiées
 AllPropals=Toutes les propales
 LastProposals=Dernières propositions
 SearchAProposal=Rechercher une proposition commerciale
-NoProposal=No proposal
+NoProposal=Pas de proposition
 ProposalsStatistics=Statistiques des propositions commerciales
 NumberOfProposalsByMonth=Nombre par mois
 AmountOfProposalsByMonthHT=Montant par mois (HT)
@@ -63,8 +63,8 @@ DatePropal=Date de proposition
 DateEndPropal=Date de fin de validité
 DateEndPropalShort=Date de fin
 ValidityDuration=Durée de validité
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Positionner le statut à
+SetAcceptedRefused=Accepter/Refuser 
 ClassifyBilled=Classer facturée
 BuildBill=Créer facture
 ErrorPropalNotFound=Propale %s inexistante
@@ -102,4 +102,4 @@ DefaultModelPropalCreate=Modèle par défaut à la création
 DefaultModelPropalToBill=Modèle par défaut lors de la clôture d'une proposition commerciale (à facturer)
 DefaultModelPropalClosed=Modèle par défaut lors de la clôture d'une proposition commerciale (non facturée)
 ProposalCustomerSignature=Cachet, Date, Signature et mention "Bon pour Accord"
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalsStatisticsSuppliers=Statistiques de propositions commerciales
diff --git a/htdocs/langs/fr_FR/receiptprinter.lang b/htdocs/langs/fr_FR/receiptprinter.lang
index d829e5a51ae..e4ce287659e 100644
--- a/htdocs/langs/fr_FR/receiptprinter.lang
+++ b/htdocs/langs/fr_FR/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Imprimante %s ajoutée
 PrinterUpdated=Imprimante %s mis à jour
 PrinterDeleted=Imprimante %s supprimée
 TestSentToPrinter=Test envoyé à l'imprimante %s
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Setup of printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index d73112049d4..02d7ede6a4e 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -6,7 +6,7 @@ AllSendings=Toutes les expéditions
 Shipment=Expédition
 Shipments=Expéditions
 ShowSending=Afficher Expéditions
-Receivings=Delivery Receipts
+Receivings=Bons de réceptions
 SendingsArea=Espace expéditions
 ListOfSendings=Liste des expéditions
 SendingMethod=Méthode d'expédition
diff --git a/htdocs/langs/fr_FR/sms.lang b/htdocs/langs/fr_FR/sms.lang
index 7f1f8b03fb3..452ffe04329 100644
--- a/htdocs/langs/fr_FR/sms.lang
+++ b/htdocs/langs/fr_FR/sms.lang
@@ -49,6 +49,6 @@ SendSms=Envoyer SMS
 SmsInfoCharRemain=Nombre de caractères restant
 SmsInfoNumero= (format international ex : +33899701761)
 DelayBeforeSending=Délai avant envoi (en minutes)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=Aucun émetteur disponible. Vérifier la configuration de votre fournisseur de SMS.
 SmsNoPossibleRecipientFound=Aucun destinataire disponible. Vérifier la configuration de votre fournisseur de SMS.
 
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 3714dee47c1..285546461f3 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Derniers mouvements
 Units=Unités
 Unit=Unité
 StockCorrection=Corriger le stock
-StockTransfer=Mouvement de stock
+StockTransfer=Transférer stock
+MassStockTransferShort=Transfert stock en masse
 StockMovement=Mouvement de stock
 StockMovements=Mouvements de stock
 LabelMovement=Libellé du mouvement
diff --git a/htdocs/langs/fr_FR/supplier_proposal.lang b/htdocs/langs/fr_FR/supplier_proposal.lang
index ec3a21a17c7..cf28a391457 100644
--- a/htdocs/langs/fr_FR/supplier_proposal.lang
+++ b/htdocs/langs/fr_FR/supplier_proposal.lang
@@ -1,16 +1,17 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Demande de prix fournisseur
 supplier_proposalDESC=Gestion des demandes de prix aux fournisseurs
-SupplierProposalShort=Supplier proposals
-SupplierProposalNew=New request
+SupplierProposalShort=Propositions fournisseurs
+SupplierProposalNew=Nouvelle demande
 CommRequest=Demande de prix
 CommRequests=Demandes de prix
 SearchRequest=Rechercher une demande
 DraftRequests=Demandes brouillons
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Les %s dernières demandes de prix modifiées
 RequestsOpened=Demandes de prix ouvertes
 SupplierProposalArea=Zone des propositions de fournisseurs
-SupplierProposalShort=Supplier proposals
+SupplierProposalShort=Propositions fournisseurs
 SupplierProposals=Propositions commerciales founisseurs
 NewAskPrice=Nouvelle demande de prix
 NewAsk=Nouvelle demande
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 41d9e1a2a98..c301cd4a790 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Se connecter par OpenID
 WeeklyHours=Heures de travail hebdomadaires
 ColorUser=Couleur de l'utilisateur
 DisabledInMonoUserMode=Désactivé en mode maintenance
+UserAccountancyCode=Code comptable utilisateur
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 44f99ccd7b0..1b80178604b 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=דף זה מאפשר לך למחוק את כל הקבצים מאוחסנים על ידי בנו או Dolibarr (הקבצים הזמניים או את כל הקבצים בספרייה <b>%s).</b> באמצעות תכונה זו אינה הכרחית. הוא מצורף עבור משתמשים אשר Dolibarr מאוחסנת על ידי ספק, כי אינו מציע הרשאות למחוק קבצים שנבנו על ידי שרת האינטרנט.
 PurgeDeleteLogFile=מחק להתחבר <b>%s</b> קבצים שהוגדרו עבור מודול Syslog (אין סיכון נתונים רופפים)
 PurgeDeleteTemporaryFiles=למחוק את כל הקבצים הזמניים (אין סיכון לנתונים רופפים)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=מחק את כל הקבצים <b>%s</b> במדריך. קבצים זמניים, אלא גם גיבוי מסד הנתונים משליכה, קבצים המצורפים אלמנטים (צדדים שלישיים, חשבוניות, ...) ורק לאחר מכן להעלות את מודול ECM יימחקו.
 PurgeRunNow=לטהר עכשיו
 PurgeNothingToDelete=אין ספרייה או קובץ למחוק.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=תצורת דה לה traduction
 TranslationDesc=בחירת שפה גלוי על המסך יכול להיות שונה: <br> * בכל העולם <strong>מהבית</strong> התפריט <strong>- התקנה - תצוגה</strong> <br> * עבור המשתמש רק <strong>מהתצוגה</strong> כרטיסיית <strong>המשתמש</strong> של כרטיס המשתמש (לחץ על כניסה על גבי המסך).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index dfe8f3e7ce4..78d2c5248a0 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=הוראות קבע
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index ec76f79496d..757bd6048da 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=הצעות
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 24e3adc04f8..18f364fc620 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 33b57ba3ff0..e2af646ba6d 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index 94551a711f0..321c0b9e27a 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/he_IL/languages.lang b/htdocs/langs/he_IL/languages.lang
index 3de4e999ef6..afb4054bcfd 100644
--- a/htdocs/langs/he_IL/languages.lang
+++ b/htdocs/langs/he_IL/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=ספרדית (מקסיקו)
 Language_es_PY=ספרדית (פרגוואי)
 Language_es_PE=ספרדית (פרו)
 Language_es_PR=ספרדית (פורטו ריקו)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=אסטונית
 Language_eu_ES=הבסקים
 Language_fa_IR=פרסיים
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 7e331e4e8f7..a65c130f366 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 2077028a9e6..8d642ec68cf 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=נתונים
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 7a0bd1ac917..cdf3054c26d 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 3f900ff255f..a68a72e500b 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=פרוייקטים
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/he_IL/receiptprinter.lang b/htdocs/langs/he_IL/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/he_IL/receiptprinter.lang
+++ b/htdocs/langs/he_IL/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 054bb194131..96588cd798d 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=מניות
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/he_IL/supplier_proposal.lang b/htdocs/langs/he_IL/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/he_IL/supplier_proposal.lang
+++ b/htdocs/langs/he_IL/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index c064b99303c..a0bf208cacf 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index b5ef73db162..e9ea05f18c8 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index baed5f638ba..a01e7c730a0 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -58,6 +58,7 @@ Payment=Plaćanja
 PaymentBack=Povratno plaćanje
 Payments=Plaćanja
 PaymentsBack=Povratna plaćanja
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Uplaćeno natrag
 DeletePayment=Izbriši plaćanje
 ConfirmDeletePayment=Jeste li sigurni da želite izbrisati ovo plaćanje?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Napravi
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Osnovica
 BillStatus=Stanje računa
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Skica (potrebno potvrditi)
 BillStatusPaid=Plaćeno
 BillStatusPaidBackOrConverted=Plaćeno ili pretvoreno u popust
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Greška! Ne može se poništiti
 BillFrom=Od
 BillTo=Za
 ActionsOnBill=Radnje na računu
+RecurringInvoiceTemplate=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=Novi račun
 LastBills=Zadnjih %s računa
 LastCustomersBills=Zadnjih %s računa kupaca
@@ -199,6 +205,7 @@ Rest=U toku
 AmountExpected=Utvrđen iznos
 ExcessReceived=Previše primljeno
 EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća)
+EscompteOfferedShort=Discount
 SendBillRef=Podnošenje računa %s
 SendReminderBillRef=Podnošenje Računa %s (podsjetnik)
 StandingOrders=Otvorene narudžbe
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Odmah
 PaymentConditionRECEP=Odmah
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 310f3490481..447b1032242 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Prošlogodišnji% s ugovorima
 BoxTitleLastModifiedDonations=Prošlogodišnji% s modificirani donacije
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Nisam uspio osvježiti RSS tok. Zadnja uspješna datum osvježavanja:% s
 LastRefreshDate=Posljednji dan osvježavanja
 NoRecordedBookmarks=Nema oznaka definirana.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Kupci računi
 ForCustomersOrders=Kupci narudžbe
 ForProposals=Prijedlozi
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 87183afac74..bab15c2603a 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
index e2049b78e81..cf80ae6157e 100644
--- a/htdocs/langs/hr_HR/languages.lang
+++ b/htdocs/langs/hr_HR/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Španjolski (Meksiko)
 Language_es_PY=Španjolski (Paragvaj)
 Language_es_PE=Španjolski (Peru)
 Language_es_PR=Španjolski (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonski
 Language_eu_ES=Baskijski
 Language_fa_IR=Persian
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 6d4dc33faef..4f0f03cdd6c 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=Od %s za %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 5715edbd199..39824fca592 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 4b08cea2596..b1bac4988f3 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projekti
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=Novi projekt
 AddProject=Create project
 DeleteAProject=Izbriši projekt
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/hr_HR/receiptprinter.lang b/htdocs/langs/hr_HR/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/hr_HR/receiptprinter.lang
+++ b/htdocs/langs/hr_HR/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/hr_HR/supplier_proposal.lang b/htdocs/langs/hr_HR/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/hr_HR/supplier_proposal.lang
+++ b/htdocs/langs/hr_HR/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index 858613a9e38..f12c77bc363 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 9ac38e8745f..9e2ed75449e 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Partner
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 765a76a81ac..dbfa734d24e 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=Ez az oldal lehetővé teszi, hogy törölje az összes fájlt épített vagy tárolt Dolibarr (ideiglenes fájlokat vagy az összes fájl <b>%s</b> könyvtárban). A szolgáltatás használata nem szükséges. Ez biztosítja a felhasználók számára, akiknek Dolibarr ad otthont, amelyet a szolgáltató, amely nem kínál jogosultságokat törölni fájlokat épített a web szerver.
 PurgeDeleteLogFile=Log fájl törlése <b>%s</b> meg a Syslog modul (nem veszélyezteti a laza adatok)
 PurgeDeleteTemporaryFiles=Töröljön minden ideiglenes fájlokat (nem veszélyezteti a laza adatok)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Összes fájl törlése <b>%s</b> könyvtárban. Az ideiglenes fájlok, hanem adatbázis mentés guba, csatolt fájlok elemek (harmadik fél, számlák, ...) és feltölteni az ECM modul törlődik.
 PurgeRunNow=Tisztíts meg most
 PurgeNothingToDelete=Nincs könyvtár vagy fájl törlése.
@@ -308,7 +309,7 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr jelenlegi verzió
 CallUpdatePage=Lépjen arra az oldalra, amely frissíti az adatbázis szerkezetét és adatok: %s.
 LastStableVersion=Utolsó stabil verzió
-UpdateServerOffline=Update server offline
+UpdateServerOffline=A szerver offline frissítése
 GenericMaskCodes=Megadhat bármilyen számozás maszk. Ebben a maszk, az alábbi címkék is használhatók: <br> <b>{000000}</b> felel meg egy számot, amelyet fogja megnövelni minden %s. Adja meg a nullákat, mint annyi a kívánt méretre a számláló. A számláló tölti nullákkal balról annak érdekében, hogy minél több nullák, mint a maszk. <br> <b>{000000} 000</b> ugyanaz, mint korábban, hanem ellensúlyozza számának megfelelő jobbra a + jel alkalmazzák kezdve az első %s. <br> <b>{000000} @ x</b> ugyanaz, mint korábban, de a számláló lenullázódik, ha havi x-ért (x 1 és 12 között, vagy 0 használni a korai hónapokban a pénzügyi év van megadva a konfiguráció). Ha ezt az opciót használjuk, és az x 2 vagy magasabb, akkor a sorozat nn {} {} vagy {mm yyyy}} {mm is szükség van. <br> <b>{} Dd</b> nap (01 31). <br> <b>{} Mm</b> hónap (01-12). <br> <b>Yy {}, {ÉÉÉÉ}</b> vagy <b>{} y</b> évben több mint 2, 4 vagy 1 számokat. <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 thirdparty type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Az összes többi karakter a maszkban marad érintetlen. <br> A szóközök nem megengedettek. <br>
@@ -985,7 +986,7 @@ SetupDescription5=További bejegyzések kezelése menüben választható paramé
 EventsSetup=Beállítás esemény naplózása
 LogEvents=Biztonsági audit események
 Audit=Könyvvizsgálat
-InfoDolibarr=Infos Dolibarr
+InfoDolibarr=Információk a Dolibarról
 InfoBrowser=Infos Browser
 InfoOS=Infos OS
 InfoWebServer=Infos web server
@@ -997,7 +998,7 @@ BrowserOS=Browser OS
 ListEvents=Események vizsgálata
 ListOfSecurityEvents=Listája Dolibarr biztonsági események
 SecurityEventsPurged=Biztonsági események kitisztítják
-LogEventDesc=Tudod hogy itt a naplózás Dolibarr biztonsági eseményeket. A rendszergazdák láthatja annak tartalmát menün keresztül <b>Rendszereszközök - Audit.</b> Figyelem, ez a funkció fogyasztanak nagy mennyiségű adat az adatbázisban.
+LogEventDesc=Itt tud belépni a Dolibarr eseményeire biztonságosa. A rendszergazdák láthatják annak tartalmát menün keresztül <b>Rendszereszközök - Audit.</b> Figyelem, ez a funkció nagy mennyiségű adatot dolgozhat fel az adatbázisban!
 AreaForAdminOnly=Ezeket a funkciókat lehet használni a <b>felhasználók</b> csak a <b>rendszergazda.</b>
 SystemInfoDesc=Rendszer információk különféle műszaki információkat kapunk a csak olvasható módban, és csak rendszergazdák számára látható.
 SystemAreaForAdminOnly=Ez a terület áll rendelkezésre a felhasználók csak rendszergazda. Egyik Dolibarr engedélyek csökkentheti ezt a határt.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1420,7 +1421,7 @@ SetDefaultBarcodeTypeThirdParties=Alapértelmezett típusú vonalkód használat
 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!
+IsNotADir=ez nem egy könyvtár!
 ##### Syslog #####
 SyslogSetup=Naplók modul beállítása
 SyslogOutput=Naplók kimenetek
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Mindig szerkeszthető
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1703,9 +1705,11 @@ MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
 MailToThirdparty=To send email from thirdparty page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=Ön a legújabb stabil verziót használja!
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index bfb897ccf53..47fa367dbe8 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -58,6 +58,7 @@ Payment=Fizetés
 PaymentBack=vissza fizetési
 Payments=Kifizetések
 PaymentsBack=Kifizetések vissza
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Visszafizetések
 DeletePayment=Fizetés törlése
 ConfirmDeletePayment=Biztosan törölni kívánja ezt a fizetést?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Legyen esedékes a vásárló fizetése
 DisabledBecauseRemainderToPayIsZero=Letiltva, mivel a maradék egyenleg 0.
 PriceBase=Alap ár
 BillStatus=Számla állapota
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Tervezet (érvényesítés szükséges)
 BillStatusPaid=Fizetett
 BillStatusPaidBackOrConverted=Kifizetett vagy kedvezménnyé átalakított 
@@ -134,11 +136,15 @@ ErrorBillNotFound=Számla %s nem létezik
 ErrorInvoiceAlreadyReplaced=Hiba, megpróbálja jóváhagyni a számla helyettesítő számlát %s. De ezt már felváltotta a %s számla.
 ErrorDiscountAlreadyUsed=Hiba, a kedvezmény már használt
 ErrorInvoiceAvoirMustBeNegative=Hiba, a helyetesítő számlátnak negatív összegűnek kell lennie
-ErrorInvoiceOfThisTypeMustBePositive=Hiba, az ilyen típusú számla legyen pozitív összeget
+ErrorInvoiceOfThisTypeMustBePositive=Hiba, az ilyen típusú számlán pozitív összegnek kell szerepelnie
 ErrorCantCancelIfReplacementInvoiceNotValidated=Hiba, nem lehet törölni egy számlát, a helyébe egy másik számlát, amelyet még mindig vázlat
 BillFrom=Feladó
 BillTo=Címzett
 ActionsOnBill=Műveletek a számlán
+RecurringInvoiceTemplate=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=Új számla
 LastBills=Utolsó %s számlák
 LastCustomersBills=Utolsó %s vásárlói számlák
@@ -199,6 +205,7 @@ Rest=Folyamatban
 AmountExpected=Követelt összeget
 ExcessReceived=A felesleges kapott
 EscompteOffered=Árengedmény (kifizetés előtt tartó)
+EscompteOfferedShort=Discount
 SendBillRef=Számla elküldése %s
 SendReminderBillRef=Számla elküldése %s (emlékeztető)
 StandingOrders=Állandó megbízás
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Azonnali
 PaymentConditionRECEP=Azonnali
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index 1956c3f218f..a517a14eec3 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Utolsó %s szerzősédesk
 BoxTitleLastModifiedDonations=Utolsó módosítás adományok %s
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Nem sikerült az RSS-t frissíteni. Az utolsó sikeres frissítés: %s
 LastRefreshDate=Utolsó frissítés
 NoRecordedBookmarks=Nincs könyvjezlő. Kattintson <a href="%s">ide</a> könyvjelző hozzáadásához.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Ügyfél számlák
 ForCustomersOrders=Customers orders
 ForProposals=Javaslatok
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 946d7c2c272..56cbf2a678a 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Szakma ID 3 (SRVC TAX)
 ProfId4IN=Szakma Id 4
 ProfId5IN=Szakma Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Szakma id 1 (RC)
 ProfId2MA=Szakma id 2 (Patente)
 ProfId3MA=Szakma id 3 (IF)
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index c4794ec809a..f2b2415b5d5 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index a1a96a7283d..4963c870dd5 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Nincs
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Módszer
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Letiltás
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang
index 152f4383a2f..897b18b108e 100644
--- a/htdocs/langs/hu_HU/languages.lang
+++ b/htdocs/langs/hu_HU/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanyol (Mexikó)
 Language_es_PY=Spanyol (Paraguay)
 Language_es_PE=Spanyol (Peru)
 Language_es_PR=Spanyol (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Észt
 Language_eu_ES=Baszk
 Language_fa_IR=Perzsa
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 0405a7f8e25..c88a13725ee 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=eMail címzett üres
 WarningNoEMailsAdded=Nincs új a címzettek listájához adható eMail.
 ConfirmValidMailing=Biztos hitelesíteni akarja ezt a levelezést?
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 0e187482878..0b5ade5c845 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -25,8 +25,8 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Adatbási Kapcsolat
 NoTemplateDefined=No template defined for this email type
-NoTranslation=No translation
-NoRecordFound=No record found
+NoTranslation=Nincs fordítás
+NoRecordFound=A rekord nem található
 NoError=Nincs hiba
 Error=Hiba
 Errors=Errors
@@ -37,7 +37,7 @@ ErrorFailedToOpenFile=Nem sikerült a %s fájlt megnyitni
 ErrorCanNotCreateDir=Nem lehet a(z) %s könyvtárat létrehozni
 ErrorCanNotReadDir=Nem sikerült a(z) %s könyvtárat olvasni
 ErrorConstantNotDefined=%s paraméter nincs definiálva
-ErrorUnknown=Unknown error
+ErrorUnknown=Ismeretlen hiba
 ErrorSQL=SQL Hiba
 ErrorLogoFileNotFound='%s' logo fájl nincs meg
 ErrorGoToGlobalSetup=Menj a 'Cég/Alapítván' beállításokhoz a javítás érdekében
@@ -262,7 +262,7 @@ DurationDay=nap
 DurationYears=évek
 DurationMonths=hónapok
 DurationWeeks=hetek
-DurationDays=napok
+DurationDays=nap
 Year=Év
 Month=Hónap
 Week=Hét
@@ -272,8 +272,8 @@ Minute=Perc
 Second=Másoderc
 Years=Évek
 Months=Hónapok
-Days=Napok
-days=napok
+Days=Nap
+days=nap
 Hours=Órák
 Minutes=Percek
 Seconds=Másodpercek
@@ -311,6 +311,7 @@ UnitPriceHT=Egység ár (nettó)
 UnitPriceTTC=Egység ár
 PriceU=E.Á.
 PriceUHT=E.Á. (nettó)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Mennyiség
@@ -321,6 +322,9 @@ AmountTTCShort=Mennyiség (bruttó)
 AmountHT=Mennyiség (nettó)
 AmountTTC=Mennyiség (bruttó)
 AmountVAT=ÁFA mennyiség
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=RE mennyiség
@@ -335,6 +339,7 @@ Percentage=Százalék
 Total=Végösszeg
 SubTotal=Részösszeg
 TotalHTShort=Végösszeg (nettó)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Végösszeg (bruttó)
 TotalHT=Végösszeg (nettó)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Adat
 None=Nincs
 NoneF=Nincs
 Late=Késő
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Kép
 Photos=Képek
 AddPhoto=Kép hozzáadása
@@ -539,6 +545,7 @@ NbOfCustomers=Ügyfelek száma
 NbOfLines=Sorok száma
 NbOfObjects=Objektumok szMa
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Teljes mennyiség
 DateFromTo=%s -től %s -ig
@@ -693,12 +700,13 @@ BySalesRepresentative=Az értékesítési képviselő
 LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
-NoResults=No results
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
+NoResults=Nincs eredmény
+AdminTools=Admin tools
+SystemTools=Rendszereszközök
+ModulesSystemTools=Modul eszközök
+Test=Teszt
+Element=Elem
+NoPhotoYet=Nem érhető el még fénykép
 HomeDashboard=Home summary
 Dashboard=Dashboard
 Deductible=Deductible
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Hétfő
 Tuesday=Kedd
diff --git a/htdocs/langs/hu_HU/printing.lang b/htdocs/langs/hu_HU/printing.lang
index a81355efe38..5ab6dae8db0 100644
--- a/htdocs/langs/hu_HU/printing.lang
+++ b/htdocs/langs/hu_HU/printing.lang
@@ -3,7 +3,7 @@ Module64000Name=Direct Printing
 Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-MenuDirectPrinting=Direct Printing
+MenuDirectPrinting=Direct Printing jobs
 DirectPrint=Direct print
 ModuleDriverSetup=Setup Module Driver
 PrintingDriverDesc=Configuration variables for printing driver.
@@ -14,10 +14,17 @@ NoActivePrintingModuleFound=No active module to print document
 PleaseSelectaDriverfromList=Please select a driver from list.
 PleaseConfigureDriverfromList=Please configure the selected driver from list.
 SetupDriver=Driver setup
-TestDriver=Test
+TestDriver=Teszt
 TargetedPrinter=Targeted printer
 UserConf=Setup per user
 PRINTGCP=Google Cloud Print
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PRINTGCP_TOKEN_REFRESH=Token Refresh Present
+PRINTGCP_TOKEN_EXPIRED=Token Expired
+PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
+PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
@@ -74,3 +81,6 @@ STATE_IPP_none=None
 MEDIA_IPP_stationery=Stationery
 MEDIA_IPP_thermal=Thermal
 IPP_COLOR_print-black=BW Printer
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index eca5b7e0b52..64138027771 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -47,7 +47,7 @@ CardProduct1=Szolgáltatás kártya
 CardContract=Szerződés kártya
 Warehouse=Raktár
 Warehouses=Raktárak
-WarehouseOpened=Warehouse open
+WarehouseOpened=Raktár nyitva
 WarehouseClosed=Raktár zárva
 Stock=Részvény
 Stocks=Részvények
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index a7869c0b6f5..293bab677d5 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projektek
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Mindenki
 PrivateProject=A projekt kapcsolatai
@@ -19,7 +20,7 @@ TasksPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van ko
 TasksDesc=Ez a nézet minden projektet tartalmaz.
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projektek terület
+ProjectsArea=Projects Area
 NewProject=Új projekt
 AddProject=Create project
 DeleteAProject=Projekt törlése
@@ -67,6 +68,7 @@ Activities=Feladatok/aktivitások
 MyActivity=Aktivitásaim
 MyActivities=Feladataim/Aktivitásaim
 MyProjects=Projektjeim
+MyProjectsArea=My projects Area
 DurationEffective=Effektív időtartam
 Progress=Haladás
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/hu_HU/receiptprinter.lang b/htdocs/langs/hu_HU/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/hu_HU/receiptprinter.lang
+++ b/htdocs/langs/hu_HU/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 4d937fb05ca..0fe9a718f06 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -5,10 +5,10 @@ Warehouses=Raktárak
 NewWarehouse=Új raktár
 WarehouseEdit=Raktár módosítása
 MenuNewWarehouse=Új raktár
-WarehouseOpened=Warehouse open
+WarehouseOpened=Raktár nyitva
 WarehouseClosed=Raktár zárva
 WarehouseSource=Forrás raktár
-WarehouseSourceNotDefined=No warehouse defined,
+WarehouseSourceNotDefined=Nincs meghatározva raktár,
 AddOne=Add one
 WarehouseTarget=Cél raktár
 ValidateSending=Törlése jóváhagyása
@@ -16,7 +16,7 @@ CancelSending=Küldés megszakítása
 DeleteSending=Küldés törlése
 Stock=Készlet
 Stocks=Készletek
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Mozgás
 Movements=Mozgások
 ErrorWarehouseRefRequired=Raktár referencia név szükséges
@@ -34,9 +34,10 @@ LastMovements=Utolsó mozgások
 Units=Egységek
 Unit=Egység
 StockCorrection=Jelenlegi készlet
-StockTransfer=Stock transfer
-StockMovement=Átadás
-StockMovements=Készlet átadás
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Készletmozgás
+StockMovements=Készletmozgás
 LabelMovement=Movement label
 NumberOfUnit=Egységek száma
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Mennyiség kiküldése
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Készlet kiküldése
-RuleForStockManagementDecrease=Készlet kerezelés szabály csökkentése
-RuleForStockManagementIncrease=Készlet kerezelés szabály emelése
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Tényleges készlet csökkentése számla/hitel jóváhagyásakor
 DeStockOnValidateOrder=Tényleges készlet csökkentése ügyfél rendelés jóváhagyásakor
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Súlyozott átlag beviteli ár
 AverageUnitPricePMP=Súlyozott átlag beviteli ár
 SellPriceMin=Értékesítés Egységár
-EstimatedStockValueSellShort=Érték eladni
-EstimatedStockValueSell=Érték Eladás
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Készlet becsült értéke
 EstimatedStockValue=Készlet becsült értéke
 DeleteAWarehouse=Raktár törlése
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/hu_HU/supplier_proposal.lang b/htdocs/langs/hu_HU/supplier_proposal.lang
index b49e08a5347..b457c493701 100644
--- a/htdocs/langs/hu_HU/supplier_proposal.lang
+++ b/htdocs/langs/hu_HU/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 8fcb1ddafc8..02a77782b98 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Használd az OpenID-t a belépéshez
 WeeklyHours=Heti munkaóra
 ColorUser=A felhasználó színe
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 01d2d0b98f2..3d9debc061d 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Akun akuntansi
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Perincian
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Perincian pelanggan
 SuppliersVentilation=Perincian pemasok
 TradeMargin=Margin Perdagangan
@@ -46,7 +47,7 @@ UpdateAccount=Modifikasi akun akuntansi
 UpdateMvts=Modifikasi gerakan
 WriteBookKeeping=Mencatat akun di buku besar
 Bookkeeping=Buku besar
-AccountBalanceByMonth=Saldo per bulan
+AccountBalance=Account balance
 
 AccountingVentilation=Perincian Akunting
 AccountingVentilationSupplier=Perincian Akunting Pemasok
@@ -103,6 +104,7 @@ Code_tiers=Pihak ketiga
 Labelcompte=Label Akun
 Sens=Sen
 Codejournal=Jurnal
+NumPiece=Piece number
 
 DelBookKeeping=Hapus catatan buku besar
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 9b290d8f33d..6d776477bae 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -154,6 +154,7 @@ Purge=Perbersihan
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Hapus semua data sementara (Tidak ada resiko data hilang)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Bersihkan sekarang
 PurgeNothingToDelete=Tidak ada direktori atau berkas untuk di hapus
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 41c2cef2375..f46c285705a 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -58,6 +58,7 @@ Payment=Pembayaran
 PaymentBack=Pembayaran kembali
 Payments=Semua pembayaran
 PaymentsBack=Pembayaran kembali
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Dibayar kembali
 DeletePayment=Hapus pembayaran
 ConfirmDeletePayment=Anda yakin untuk menghapus pembayaran ini?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Buat tempo pembayaran ke pelanggan
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Harga dasar
 BillStatus=Status tagihan
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Konsep (harus di validasi)
 BillStatusPaid=Dibayar
 BillStatusPaidBackOrConverted=Dibayar atau dirubah kedalam diskon
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Ada kesalahan, tagihan yang pern
 BillFrom=Dari
 BillTo=Kepada
 ActionsOnBill=Tindak lanjut tagihan
+RecurringInvoiceTemplate=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=Tagihan baru
 LastBills=Tagihan %s terakhir
 LastCustomersBills=Tagihan - tagihan %s terakhir para pelanggan
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 1c9f2730e54..6b8d15fd751 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 2e8fecbab1e..a3ec37ad007 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/id_ID/languages.lang b/htdocs/langs/id_ID/languages.lang
index e8c5b955f14..3949e9f4766 100644
--- a/htdocs/langs/id_ID/languages.lang
+++ b/htdocs/langs/id_ID/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanyol (Mexico)
 Language_es_PY=Spanyol (Paraguay)
 Language_es_PE=Spanyol (Peru)
 Language_es_PR=Spanyol (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonia
 Language_eu_ES=Basque
 Language_fa_IR=Persia
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 5d1399a2048..286f0ab17b9 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 9c10f7bd71c..304fc66821b 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index a53607be2c2..44820da002f 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/id_ID/receiptprinter.lang b/htdocs/langs/id_ID/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/id_ID/receiptprinter.lang
+++ b/htdocs/langs/id_ID/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/id_ID/supplier_proposal.lang b/htdocs/langs/id_ID/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/id_ID/supplier_proposal.lang
+++ b/htdocs/langs/id_ID/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 27afc5f7960..37a80482244 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=Þessi síða leyfir þér að eyða öllum skrám byggð eða geymd hjá Dolibarr (tímabundinn skrá eða allar skrár í <b>möppuna %s ).</b> Að nota þennan eiginleika er ekki nauðsynlegt. Það er skilyrði fyrir notendur sem Dolibarr er hýst af hendi sem býður ekki upp heimildir til að eyða skrá byggð af the vefur framreiðslumaður.
 PurgeDeleteLogFile=Eyða <b>annáll %s </b> er skilgreind fyrir Syslog mát (engin hætta á að missa gögn)
 PurgeDeleteTemporaryFiles=Eyða öllum tímabundnar skrár (engin hætta á að missa gögn)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Eyða öllum skrám í <b>möppunni %s .</b> Tímabundin skrá en einnig skrár sem viðhengi til þættir (þriðja aðila, reikningum, ...) og hlaða inn á ECM mát verður eytt.
 PurgeRunNow=Hreinsa nú
 PurgeNothingToDelete=Engin skrá eða skrá til að eyða.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index c30d9830035..f17e0f3f672 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -58,6 +58,7 @@ Payment=Greiðsla
 PaymentBack=Greiðsla til baka
 Payments=Greiðslur
 PaymentsBack=Greiðslur til baka
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Eyða greiðslu
 ConfirmDeletePayment=Ertu viss um að þú viljir eyða þessari greiðslu?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Greiða vegna viðskiptavina
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Verð stöð
 BillStatus=Invoice stöðu
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Víxill (þarf að vera staðfest)
 BillStatusPaid=Greiddur
 BillStatusPaidBackOrConverted=Greidd eða breytt í afslátt
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Villa, get ekki hætt við reikn
 BillFrom=Frá
 BillTo=Senda á
 ActionsOnBill=Actions reikning
+RecurringInvoiceTemplate=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=Nýr reikningur
 LastBills=Last %s  reikningum
 LastCustomersBills=Last %s  viðskiptavinum reikninga
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Upphæð krafa
 ExcessReceived=Umfram borist
 EscompteOffered=Afsláttur í boði (greiðsla fyrir tíma)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standandi pantanir
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Skjótur
 PaymentConditionRECEP=Skjótur
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index 6a1cc3b4087..d70de3308be 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s  samninga
 BoxTitleLastModifiedDonations=Síðustu %s breytt framlög
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Ekki tókst að hressa RSS hreyfingu. Síðast vel hressa dagsetning: %s
 LastRefreshDate=Síðast endurnýjað dagsetningu
 NoRecordedBookmarks=Engin bókamerki skilgreind. Smelltu <a href="%s">hér</a> til að bæta við bókamerki.
@@ -95,4 +97,4 @@ ForCustomersInvoices=reikninga viðskiptavinar
 ForCustomersOrders=Customers orders
 ForProposals=Tillögur
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 22dca5e2e1a..6f632531e6d 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id Prof. 1 (RC)
 ProfId2MA=Id Prof. 2 (Patente)
 ProfId3MA=Id Prof. 3 (IF)
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index eaaa110585c..4dfe67ba4b4 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index d61321e2b8d..2b2731b366a 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Aðferð
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Slökkva
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/is_IS/languages.lang b/htdocs/langs/is_IS/languages.lang
index 573073631c4..f2ff84bb9bb 100644
--- a/htdocs/langs/is_IS/languages.lang
+++ b/htdocs/langs/is_IS/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spænska (Mexíkó)
 Language_es_PY=Spænska (Paraguay)
 Language_es_PE=Spænska (Peru)
 Language_es_PR=Spænska (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Eistneska
 Language_eu_ES=Basque
 Language_fa_IR=Persneska
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index f3233d02661..ab321e3aee1 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Netfang móttakanda er tóm
 WarningNoEMailsAdded=Engin ný Email að bæta við listann viðtakanda.
 ConfirmValidMailing=Ertu viss um að þú viljir að sannprófa þetta póst?
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 2f8bdc583ed..9d570bc63d2 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit verð (nettó)
 UnitPriceTTC=Eining verðs
 PriceU=UPP
 PriceUHT=UP (nettó)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Upphæð
@@ -321,6 +322,9 @@ AmountTTCShort=Magn (Inc skatt)
 AmountHT=Magn (að frádregnum skatti)
 AmountTTC=Magn (Inc skatt)
 AmountVAT=Upphæð VSK
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Upphæð RE
@@ -335,6 +339,7 @@ Percentage=Prósenta
 Total=Samtals
 SubTotal=Millisamtala
 TotalHTShort=Samtals (nettó)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Samtals (Inc skatt)
 TotalHT=Samtals (að frádregnum skatti)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Gögn
 None=None
 NoneF=None
 Late=Seint
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Mynd augnabliksins
 Photos=Myndir
 AddPhoto=Bæta við mynd
@@ -539,6 +545,7 @@ NbOfCustomers=Fjöldi viðskiptavina
 NbOfLines=Fjöldi lína
 NbOfObjects=Fjöldi hluta
 NbOfReferers=Fjöldi tilvísunaraðilar
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Samtals magn
 DateFromTo=Úr %s  í %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Mánudagur
 Tuesday=Þriðjudagur
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 08e97f0f78a..490088aee9e 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index c4dc6d91e19..ac4e9d1c318 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Verkefni
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Allir
 PrivateProject=Tengiliðir verkefnisins
@@ -19,7 +20,7 @@ TasksPublicDesc=Þetta sýnir öll verkefni og verkefni sem þú ert að fá að
 TasksDesc=Þetta sýnir öll verkefni og verkefni (notandi heimildir veita þér leyfi til að skoða allt).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Verkefni area
+ProjectsArea=Projects Area
 NewProject=Ný verkefni
 AddProject=Create project
 DeleteAProject=Eyða verkefni
@@ -67,6 +68,7 @@ Activities=Verkefni / starfsemi
 MyActivity=Afþreying minn
 MyActivities=verkefni mín / starfsemi
 MyProjects=Verkefnin mín
+MyProjectsArea=My projects Area
 DurationEffective=Árangursrík Lengd
 Progress=Framfarir
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/is_IS/receiptprinter.lang b/htdocs/langs/is_IS/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/is_IS/receiptprinter.lang
+++ b/htdocs/langs/is_IS/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index fab3f38e962..8e4f851afe1 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Hætta við að senda
 DeleteSending=Eyða sendingu
 Stock=Stock
 Stocks=Verðbréf
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Hreyfing
 Movements=Hreyfing
 ErrorWarehouseRefRequired=Lager tilvísun nafn er krafist
@@ -34,9 +34,10 @@ LastMovements=Síðasta hreyfing
 Units=Einingar
 Unit=Unit
 StockCorrection=Rétt lager
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Kauphöll millifærslur
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Fjöldi eininga
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Magn send
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Kauphöll dispatching
-RuleForStockManagementDecrease=Regla fyrir lager stjórnun lækka
-RuleForStockManagementIncrease=Regla fyrir lager stjórnun aukast
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Minnka raunverulegur birgðir á viðskiptavini reikningum / kredit athugasemdir löggilding
 DeStockOnValidateOrder=Minnka raunverulegur birgðir á viðskiptavini pantanir löggilding
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Meðaltal inntak verð
 AverageUnitPricePMP=Meðaltal inntak verð
 SellPriceMin=Selja Unit verð
-EstimatedStockValueSellShort=Gildi til að selja
-EstimatedStockValueSell=Gildi til að selja
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Áætlað virði hlutabréfa
 EstimatedStockValue=Áætlað virði hlutabréfa
 DeleteAWarehouse=Eyða vörugeymsla
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/is_IS/supplier_proposal.lang b/htdocs/langs/is_IS/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/is_IS/supplier_proposal.lang
+++ b/htdocs/langs/is_IS/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index 0a18703a515..35b1898fff7 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 7d8af19cdf3..3379b829a0f 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Account di contabilità
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Margine commerciale
@@ -46,7 +47,7 @@ UpdateAccount=Modifica di un account di contabilità
 UpdateMvts=Modifica di un movimento
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=Contabilità generale
-AccountBalanceByMonth=Salso del conto per mese
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Terza parte
 Labelcompte=Etichetta account
 Sens=Verso
 Codejournal=Giornale
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Formato di esportazione
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Tipi di campi
 Param=Additionnal parameters
 EnabledProduct=Nel prodotto
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index e303ce02ea4..b22c15bcb67 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -154,6 +154,7 @@ Purge=Pulizia
 PurgeAreaDesc=Questa pagina consente di eliminare tutti i file su disco creati da Dolibarr (file temporanei o tutti i file in <b> %s </b>). L'utilizzo di questa funzione non è strettamente necessario.<br> Viene fornita per gli utenti Dolibarr che utilizzano un servizio di hosting che non offre le autorizzazioni per eliminare i file temporanei dai server web.
 PurgeDeleteLogFile=Elimina file di registro (logfile) <b>%s</b> definito nel modulo SySlog (nessun rischio di perdere dati)
 PurgeDeleteTemporaryFiles=Elimina tutti i file temporanei (nessun rischio di perdere dati)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Elimina tutti i file nella directory <b> %s </b>. I file temporanei, ma anche file allegati di elementi (terze parti, fatture, ...) saranno cancellati.
 PurgeRunNow=Procedo all'eliminazione
 PurgeNothingToDelete=Nessuna directory da eliminare.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configurazione della traduzione
 TranslationDesc=LA scelta della lingua visualizzata su schermo può essere modidificata:<br>* Globalmente dal menu <strong>Home - Setup - Display</strong><br>* O per utente dalla linguetta <strong>User display</strong> della scheda utente (cliccare l'icona di login in alto sullo schermo).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Numero totale di moduli attivati: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Devi abilitare almeno un modulo
 ClassNotFoundIntoPathWarning=La classe %s non è stata trovata al percorso PHP indicato
 YesInSummer=Si in estate
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Chiudi anno fiscale
 DeleteFiscalYear=Elimina anno fiscale
 ConfirmDeleteFiscalYear=Vuoi davvero cancellare questo anno fiscale?
 AlwaysEditable=Può essere modificato in qualsiasi momento
+IsHidden=Is not visible
 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=Numero minimo di caratteri maiuscoli
 NbNumMin=Numero minimo di caratteri numerici
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Procedura guidata per creare file di backup del database (dump)
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index ffb4d645387..f8a960391e9 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -58,6 +58,7 @@ Payment=Pagamento
 PaymentBack=Rimborso
 Payments=Pagamenti
 PaymentsBack=Rimborsi
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Rimborsato
 DeletePayment=Elimina pagamento
 ConfirmDeletePayment=Vuoi davvero cancellare questo pagamento?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Emettere il pagamento dovuto al cliente
 DisabledBecauseRemainderToPayIsZero=Disabilitato perché il restante da pagare vale zero
 PriceBase=Prezzo base
 BillStatus=Stato fattura
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Bozza (deve essere convalidata)
 BillStatusPaid=Pagata
 BillStatusPaidBackOrConverted=Rimborsata o convertita in sconto
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Errore, non si può annullare un
 BillFrom=Da
 BillTo=A
 ActionsOnBill=Azioni su fattura
+RecurringInvoiceTemplate=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=Nuova fattura
 LastBills=Ultime %s fatture
 LastCustomersBills=Ultime %s fatture attive
@@ -199,6 +205,7 @@ Rest=In attesa
 AmountExpected=Importo atteso
 ExcessReceived=Ricevuto in eccesso
 EscompteOffered=Sconto offerto (pagamento prima del termine)
+EscompteOfferedShort=Discount
 SendBillRef=Invio della fattura %s
 SendReminderBillRef=Invio della fattura %s (promemoria)
 StandingOrders=Mandati di pagamento
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediato
 PaymentConditionRECEP=Pagamento immediato
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 1f6db80c3d5..ca03e45c3d8 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Ultimi %s contratti
 BoxTitleLastModifiedDonations=Ultime %s donazioni modificate
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Attività generale (fatture, proposte, ordini)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Impossibile aggiornare il feed RSS. Ultimo aggiornamento riuscito: %s
 LastRefreshDate=Data dell'ultimo aggiornamento
 NoRecordedBookmarks=Nessun segnalibro presente
@@ -95,4 +97,4 @@ ForCustomersInvoices=Fatture attive
 ForCustomersOrders=Ordini dei clienti
 ForProposals=Proposte
 LastXMonthRolling=Ultimi %s mesi
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index ec1ca51a48c..832c673726b 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=-
 ProfId4IN=-
 ProfId5IN=-
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=RC
 ProfId2MA=Patente
 ProfId3MA=SE
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index a6cc7ea6d93..0bc8e62306f 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 73677edd775..6abd50e5fc0 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i job di cron
 FileToLaunchCronJobs=Comando per lanciare i job di cron
 CronExplainHowToRunUnix=In ambienti Unix per lanciare il comando ogni 5 minuti dovresti usare la seguente riga di crontab
 CronExplainHowToRunWin=In ambienti Microsoft(tm) Windows per lanciare il comando ogni 5 minuti dovresti usare le operazioni pianificate
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Azioni pianificate
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Nessuno
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Prossima esecuzione
-CronDtLastLaunch=Ultima esecuzione
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequenza
 CronClass=Classe
 CronMethod=Metodo
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=La data di fine non può essere precedente a quella di ini
 CronStatusActiveBtn=Abilita
 CronStatusInactiveBtn=Disattiva
 CronTaskInactive=Questa azione è disabilitata
-CronDtLastResult=Data dell'ultimo risultato
 CronId=Id
 CronClassFile=Classi (filename.class.php)
 CronModuleHelp=Nome della directory del modulo di Dolibarr (funziona anche con moduli di Dolibarr esterni). <BR> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/<u>product</u>/class/product.class.php, il valore da inserire è <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Non posso caricare la classe %s o l'oggetto %s
 UseMenuModuleToolsToAddCronJobs=Andare nel menu "Home - Modules tools - Job list" per vedere e modificare le azioni pianificate.
 TaskDisabled=Lavoro disabilitato
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang
index 47816c7fcb5..8000a5238c0 100644
--- a/htdocs/langs/it_IT/languages.lang
+++ b/htdocs/langs/it_IT/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spagnolo (Messico)
 Language_es_PY=Spagnolo (Paraguay)
 Language_es_PE=Spagnolo (Perù)
 Language_es_PR=Spagnolo (Portorico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estone
 Language_eu_ES=Basco
 Language_fa_IR=Persiano
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 8330dc4f550..1a6e9c2795b 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing validata con successo
 MailUnsubcribe=Cancella sottoscrizione
 Unsuscribe=Cancella sottoscrizione
 MailingStatusNotContact=Non contattare più
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=L'indirizzo del destinatario è vuoto
 WarningNoEMailsAdded=Non sono state aggiunte email da inviare.
 ConfirmValidMailing=Sei sicuro di voler convalidare questo invio?
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 5f26268ccdf..5d42802e08e 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Prezzo unitario (netto)
 UnitPriceTTC=Prezzo unitario (lordo)
 PriceU=P.U.
 PriceUHT=P.U.(netto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Importo
@@ -321,6 +322,9 @@ AmountTTCShort=Importo (IVA inc.)
 AmountHT=Importo (al netto delle imposte)
 AmountTTC=Importo (IVA inclusa)
 AmountVAT=Importo IVA
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Valore tassa 2
 AmountLT2=Valore tassa 3
 AmountLT1ES=Importo RE (Spagna)
@@ -335,6 +339,7 @@ Percentage=Percentuale
 Total=Totale
 SubTotal=Totale parziale
 TotalHTShort=Totale imp.
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Totale (IVA inc.)
 TotalHT=Totale imponibile
 TotalHTforthispage=Totale (al netto delle tasse) per questa pagina
@@ -457,6 +462,7 @@ Datas=Dati
 None=Nessuno
 NoneF=Nessuno
 Late=Tardi
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Immagine
 Photos=Immagini
 AddPhoto=Aggiungi immagine
@@ -539,6 +545,7 @@ NbOfCustomers=Numero di clienti
 NbOfLines=Numero di righe
 NbOfObjects=Numero di oggetti
 NbOfReferers=Numero di riferimenti
+NbOfObjectReferers=Number of refering objects
 Referers=Oggetto di riferimento
 TotalQuantity=Quantità totale
 DateFromTo=Da %s a %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Con collegamento ad un utente specifico
 DeleteAFile=Cancella un file
 ConfirmDeleteAFile=Sei sicuro di voler cancellare questo file
 NoResults=Nessun risultato
+AdminTools=Admin tools
 SystemTools=Strumenti di sistema
 ModulesSystemTools=Strumenti moduli
 Test=Test
@@ -732,7 +740,8 @@ Hello=Ciao
 Sincerely=Cordialmente
 DeleteLine=Elimina riga
 ConfirmDeleteLine=Vuoi davvero eliminare questa riga?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Lunedì
 Tuesday=Martedì
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index ac6526fc1c2..3ddf0e3208f 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Aumenta e Diminuisci le scorte alla modifica del prod
 ComposedProduct=Sottoprodotto
 MinSupplierPrice=Prezzo fornitore minimo
 DynamicPriceConfiguration=Configurazione dinamica dei prezzi
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Variabili globali
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Aggiornamento variabili globali
 GlobalVariableUpdaterType0=Dati JSON
 GlobalVariableUpdaterHelp0=Esegue il parsing dei dati JSON da uno specifico indirizzo URL, VALUE (valore) specifica la posizione di valori rilevanti
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Prezzo predefinito, prezzo reale può d
 WarningSelectOneDocument=Seleziona almeno un documento
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index ce3ecb7809d..1dd9b375f8d 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Id progetto
 ProjectLabel=Etichetta progetto
 Project=Progetto
 Projects=Progetti
+ProjectsArea=Projects Area
 ProjectStatus=Stato del progetto
 SharedProject=Progetto condiviso
 PrivateProject=Contatti del progetto
@@ -19,7 +20,7 @@ TasksPublicDesc=Questa visualizzazione mostra tutti i progetti e i compiti che h
 TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i privilegi per vedere tutto).
 AllTaskVisibleButEditIfYouAreAssigned=Tutti i compiti per questo progetto sono visibili ma è possibile inserire del tempo impiegato solo per compiti a cui sei assegnato. Assegnati un compito per inserire il tempo impiegato in esso.
 OnlyYourTaskAreVisible=Solo le attività a cui sei assegnato sono visibili. Assegnati un compito se si desidera inserire tempo su di esso.
-ProjectsArea=Area progetti
+ProjectsArea=Projects Area
 NewProject=Nuovo progetto
 AddProject=Crea progetto
 DeleteAProject=Elimina un progetto
@@ -67,6 +68,7 @@ Activities=Compiti/operatività
 MyActivity=La mia operatività
 MyActivities=I miei compiti / operatività
 MyProjects=I miei progetti
+MyProjectsArea=My projects Area
 DurationEffective=Durata effettiva
 Progress=Avanzamento
 ProgressDeclared=Avanzamento dichiarato
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Compito assegnato. Inserire i tempi per questo compito d
 IdTaskTime=Tempo compito id
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Progetti aperti da terze parti
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunità importo totale
 OpportunityPonderatedAmount=Opportunità importo ponderato
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/it_IT/receiptprinter.lang b/htdocs/langs/it_IT/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/it_IT/receiptprinter.lang
+++ b/htdocs/langs/it_IT/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index ae6cd4d97f8..be88edb03bf 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Ultimi movimenti
 Units=Unità
 Unit=Unità
 StockCorrection=Variazione manuale scorte
-StockTransfer=Movimento scorte
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Movimento scorte
 StockMovements=Movimenti scorte
 LabelMovement=Etichetta del movimento
diff --git a/htdocs/langs/it_IT/supplier_proposal.lang b/htdocs/langs/it_IT/supplier_proposal.lang
index 6b0ead3056a..76af6ef06fb 100644
--- a/htdocs/langs/it_IT/supplier_proposal.lang
+++ b/htdocs/langs/it_IT/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index fe3c7d00581..b3236ba7f09 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=URL OpenID per il login
 WeeklyHours=Ore settimanali
 ColorUser=Colore dell'utente
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 16a3e645dd3..6eefe716d7e 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=このページでは、Dolibarr（一時ファイルや<b>%s</b>ディレクトリ内のすべてのファイル）によって建てられた、または保存されているすべてのファイルを削除することができます。この機能を使用する必要はありません。それは、そのDolibarr Webサーバーによって構築されたファイルを削除する権限を提供していないプロバイダによってホストされているユーザに対して提供されています。
 PurgeDeleteLogFile=Syslogモジュール（ルーズのデータへのリスク度ゼロ）に定義されたログファイルの<b>%sを</b>削除<b>します。</b>
 PurgeDeleteTemporaryFiles=すべての一時ファイル（ルーズのデータ​​へのリスクなし）を削除
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=ディレクトリ<b>%s</b>内のすべてのファイルを削除します。一時ファイルだけでなく、要素にアタッチされた（第三者請求、...）とECMモジュールにアップロードされたデータベースのバックアップダンプファイルが削除されます。
 PurgeRunNow=今パージ
 PurgeNothingToDelete=削除するディレクトリないか、ファイルNo。
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index da241af7b45..81faae7c54f 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -58,6 +58,7 @@ Payment=支払い
 PaymentBack=戻って支払い
 Payments=支払い
 PaymentsBack=背中の支払い
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=支払いを削除します。
 ConfirmDeletePayment=この支払いを削除してもよろしいですか？
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=顧客のために支払いをする
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=価格ベース
 BillStatus=請求書の状況
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=ドラフト（検証する必要があります）
 BillStatusPaid=有料
 BillStatusPaidBackOrConverted=有料または割引に変換
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=エラーは、ドラフトの
 BillFrom=から
 BillTo=請求する
 ActionsOnBill=請求書上のアクション
+RecurringInvoiceTemplate=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=新しい請求書
 LastBills=最後%sの請求書
 LastCustomersBills=最後%sのお客様の請求書
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=量が主張
 ExcessReceived=過剰は、受信した
 EscompteOffered=提供される割引（用語の前にお支払い）
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=立っている受注
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=即時の
 PaymentConditionRECEP=即時の
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index bd506fbea5f..2774f0478b7 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=最後%s契約
 BoxTitleLastModifiedDonations=最後%sは寄付を変更
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=リフレッシュRSSフラックスに失敗しました。最後に成功し、リフレッシュした日：%s
 LastRefreshDate=最後の更新日
 NoRecordedBookmarks=ブックマークが定義されていません。
@@ -95,4 +97,4 @@ ForCustomersInvoices=顧客の請求書
 ForCustomersOrders=Customers orders
 ForProposals=提案
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index f0a7e244d7f..3acbd85bca7 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=教授はID 3（SRVC税込）
 ProfId4IN=教授はID 4
 ProfId5IN=教授はID 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=ID教授。 1（RC）
 ProfId2MA=ID教授。 2（Patente）
 ProfId3MA=ID教授。 3（IF）
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 57e25d7113f..802c51bb39f 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 1974948372a..b75c8872cb1 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=なし
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=方法
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=無効にする
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index eaa5d04caa4..d4d21533cfc 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=スペイン語（メキシコ）
 Language_es_PY=スペイン語（パラグアイ）
 Language_es_PE=スペイン語（ペルー）
 Language_es_PR=スペイン語（プエルトリコ）
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=エストニア語
 Language_eu_ES=バスク
 Language_fa_IR=ペルシア語
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 62b5d7c7237..ce752ab6b84 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=電子メールの受信者は空です
 WarningNoEMailsAdded=受信者のリストに追加するない新しい電子メール。
 ConfirmValidMailing=あなたはこのメール送信を検証してもよろしいですか？
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 72e8997ad9c..edeeb11563c 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=単価（純額）
 UnitPriceTTC=単価
 PriceU=UP
 PriceUHT=UP（純額）
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=量
@@ -321,6 +322,9 @@ AmountTTCShort=金額（税込）
 AmountHT=額（税引後）
 AmountTTC=金額（税込）
 AmountVAT=金額税
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=量RE
@@ -335,6 +339,7 @@ Percentage=割合
 Total=合計
 SubTotal=小計
 TotalHTShort=合計（純額）
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=合計（税込）
 TotalHT=（税引後）の合計
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=データ
 None=なし
 NoneF=なし
 Late=遅い
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=画像
 Photos=写真
 AddPhoto=画像を追加
@@ -539,6 +545,7 @@ NbOfCustomers=顧客数
 NbOfLines=行数
 NbOfObjects=オブジェクトの数
 NbOfReferers=リファラー数
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=総量
 DateFromTo=%sから%sへ
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=月曜日
 Tuesday=火曜日
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index aa017f962b0..2589def906c 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index e719ceebdbc..e28f9ba30d4 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=プロジェクト
 Projects=プロジェクト
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=皆
 PrivateProject=プロジェクトの連絡先
@@ -19,7 +20,7 @@ TasksPublicDesc=このビューには、読み取りを許可されているす
 TasksDesc=このビューは、すべてのプロジェクトとタスク（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=プロジェクトエリア
+ProjectsArea=Projects Area
 NewProject=新しいプロジェクト
 AddProject=Create project
 DeleteAProject=プロジェクトを削除します。
@@ -67,6 +68,7 @@ Activities=タスク/活動
 MyActivity=私の活動
 MyActivities=私の仕事/活動
 MyProjects=私のプロジェクト
+MyProjectsArea=My projects Area
 DurationEffective=実効デュレーション
 Progress=進捗
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/ja_JP/receiptprinter.lang b/htdocs/langs/ja_JP/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/ja_JP/receiptprinter.lang
+++ b/htdocs/langs/ja_JP/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index a1a8167a262..54b38ecd6a8 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=送信キャンセル
 DeleteSending=送信削除
 Stock=株式
 Stocks=ストック
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=運動
 Movements=動作
 ErrorWarehouseRefRequired=ウェアハウスの参照名を指定する必要があります
@@ -34,9 +34,10 @@ LastMovements=最後の動き
 Units=ユニット
 Unit=ユニット
 StockCorrection=正しい株式
-StockTransfer=Stock transfer
-StockMovement=転送
-StockMovements=株式移転
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=ユニット数
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=数量派遣
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=派遣株式
-RuleForStockManagementDecrease=在庫管理の減少のためのルール
-RuleForStockManagementIncrease=在庫管理の増加のためのルール
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=お客様の請求書/クレジットメモの検証で本物の株式を減少させる
 DeStockOnValidateOrder=お客様の注文検証上の実在庫を減らす
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=加重平均の入力価格
 AverageUnitPricePMP=加重平均の入力価格
 SellPriceMin=販売単価
-EstimatedStockValueSellShort=販売するための値
-EstimatedStockValueSell=販売するための値
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=入力株式価値
 EstimatedStockValue=入力株式価値
 DeleteAWarehouse=倉庫を削除します。
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/ja_JP/supplier_proposal.lang b/htdocs/langs/ja_JP/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/ja_JP/supplier_proposal.lang
+++ b/htdocs/langs/ja_JP/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index d9f1c02eb3a..37a6848ca20 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 9cff117f74a..deca56bf2c1 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index a4f919a6f49..e67ad0ade2d 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/ka_GE/languages.lang b/htdocs/langs/ka_GE/languages.lang
index 27b533c3f2d..bda34ce2299 100644
--- a/htdocs/langs/ka_GE/languages.lang
+++ b/htdocs/langs/ka_GE/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
 Language_fa_IR=Persian
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 4afa461226b..abc26865694 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/ka_GE/receiptprinter.lang b/htdocs/langs/ka_GE/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/ka_GE/receiptprinter.lang
+++ b/htdocs/langs/ka_GE/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/ka_GE/supplier_proposal.lang b/htdocs/langs/ka_GE/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/ka_GE/supplier_proposal.lang
+++ b/htdocs/langs/ka_GE/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 9cff117f74a..deca56bf2c1 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index a4f919a6f49..e67ad0ade2d 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index fc8a369365e..0a85c176b11 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=ವೃತ್ತಿಪರ ಗುರುತಿನ ಸಂಖ್ಯೆ 3 (S
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang
index 27b533c3f2d..bda34ce2299 100644
--- a/htdocs/langs/kn_IN/languages.lang
+++ b/htdocs/langs/kn_IN/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
 Language_fa_IR=Persian
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 4afa461226b..abc26865694 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/kn_IN/receiptprinter.lang b/htdocs/langs/kn_IN/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/kn_IN/receiptprinter.lang
+++ b/htdocs/langs/kn_IN/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/kn_IN/supplier_proposal.lang b/htdocs/langs/kn_IN/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/kn_IN/supplier_proposal.lang
+++ b/htdocs/langs/kn_IN/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 92986278129..08e2d715e21 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index a4f919a6f49..e67ad0ade2d 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/ko_KR/languages.lang b/htdocs/langs/ko_KR/languages.lang
index 20e30dd2630..d08c6b127ae 100644
--- a/htdocs/langs/ko_KR/languages.lang
+++ b/htdocs/langs/ko_KR/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=스페인어 (멕시코)
 Language_es_PY=스페인어 (파라과이)
 Language_es_PE=스페인어 (페루)
 Language_es_PR=스페인어 (푸에르토 리코)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=에스토니아의
 Language_eu_ES=Basku
 Language_fa_IR=페르시아의
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 31336da6c48..acf4ddd773b 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 4a370c93e4e..d5306246da3 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=월요일
 Tuesday=화요일
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/ko_KR/receiptprinter.lang b/htdocs/langs/ko_KR/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/ko_KR/receiptprinter.lang
+++ b/htdocs/langs/ko_KR/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 89c0d812490..0419a285b97 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/ko_KR/supplier_proposal.lang b/htdocs/langs/ko_KR/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/ko_KR/supplier_proposal.lang
+++ b/htdocs/langs/ko_KR/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 7e8e614f0c1..093caa90806 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 76afaa082e3..e550446a5b7 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index a4f919a6f49..e67ad0ade2d 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index f519d822260..f0e0757fb62 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang
index 27b533c3f2d..bda34ce2299 100644
--- a/htdocs/langs/lo_LA/languages.lang
+++ b/htdocs/langs/lo_LA/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
 Language_fa_IR=Persian
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index b42e327e711..fd68e63ae1c 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 3e036b2e10d..3ba3e7dd3bf 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index ff1499ae04c..a0101882980 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/lo_LA/receiptprinter.lang b/htdocs/langs/lo_LA/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/lo_LA/receiptprinter.lang
+++ b/htdocs/langs/lo_LA/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/lo_LA/supplier_proposal.lang b/htdocs/langs/lo_LA/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/lo_LA/supplier_proposal.lang
+++ b/htdocs/langs/lo_LA/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index 77df15016ac..f7ba6e614a6 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 4d6869eecad..002bdbd71bc 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Apskaitos sąskaita
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Schema
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Schemos klientai
 SuppliersVentilation=Schemos tiekėjai
 TradeMargin=Prekybos marža
@@ -46,7 +47,7 @@ UpdateAccount=Apskaitos sąskaitos modifikavimas
 UpdateMvts=Judėjimo modifikavimas
 WriteBookKeeping=Įrašyti sąskaitas Didžiąją knygą
 Bookkeeping=Didžioji knyga
-AccountBalanceByMonth=Sąskaitos balansas pagal mėnesį
+AccountBalance=Account balance
 
 AccountingVentilation=Aapskaitos schema
 AccountingVentilationSupplier=Apskaitos tiekėjo schema
@@ -103,6 +104,7 @@ Code_tiers=Trečioji Šalis
 Labelcompte=Sąskaitos etiketė
 Sens=Sens
 Codejournal=Žurnalas
+NumPiece=Piece number
 
 DelBookKeeping=Panaikinti Didžiosios knygos įrašus
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Suskirstymo kortelė
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 8cf497a73ca..e7e06c220eb 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -154,6 +154,7 @@ Purge=Išvalyti
 PurgeAreaDesc=Šiame puslapyje galite ištrinti visus failus, sudarytus ar saugomus Dolibarr (laikinus arba visus iš <b>%s</b> direktorijos). Naudotis šia funkcija nebūtina. Tai yra numatyta vartotojams, kurių programa Dolibarr valdoma tiekėjo, kuris nesuteikia teisės ištrinti failus sudarytus web serveryje.
 PurgeDeleteLogFile=Ištrinti log failą <b>%s</b> apibrėžtą Syslog moduliui (nėra rizikos prarasti duomenis)
 PurgeDeleteTemporaryFiles=Ištrinti visus laikinus failus (nėra rizikos prarasti duomenis)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Ištrinti visus failus kataloge <b>%s</b>. Laikinieji failai, taip pat duomenų bazės sen backup-ai, pridėti failai (trečios šalys, sąskaitos...) ir įkelti į ECM moduliai bus ištrinti.
 PurgeRunNow=Išvalyti dabar
 PurgeNothingToDelete=Nėra katalogų ar failų trynimui
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Vertimo konfigūracija
 TranslationDesc=Kalbos pasirinkimas, matomas ekrane gali būti pakeistas:<br> * Visuotinai iš meniu <strong>Pagrindinis - Nuostatos - Ekranas</strong><br>* Vartotojui tik iš kortelės <strong>Vartotojo ekranas</strong> iš vartotojo kortelės (spustelėkite "Prisijungti" viršuje ekrano).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Iš viso aktyvių funkcijų modulių <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Jūs turite įjungti bent 1 modulį
 ClassNotFoundIntoPathWarning=Klasė %s nerasta į PHP kelią
 YesInSummer=Taip vasarą
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Uždaryti fiskalinius metus
 DeleteFiscalYear=Panaikinti fiskalinius metus
 ConfirmDeleteFiscalYear=Ar tikrai panaikinti šiuos fiskalinius metus ?
 AlwaysEditable=Visada gali būti redaguojama
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Taikyti matomą aplikacijos vardą (įspėjimas: Jūsų nuosavo vardo nustatymas gali nutraukti automatinio prisijungimo funkciją naudojant DoliDroid mobiliąją aplikaciją)
 NbMajMin=Minimalus didžiųjų simbolių skaičius
 NbNumMin=Minimalus skaitmeninių simbolių skaičius
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Duomenų bazės atsarginės kopijos failo kūrimo vedlys
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 29a97b586af..82a9dc81046 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -58,6 +58,7 @@ Payment=Mokėjimas
 PaymentBack=Mokėjimas atgal (grąžinimas)
 Payments=Mokėjimai
 PaymentsBack=Mokėjimai atgal (grąžinimai)
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Sumokėta atgal (grąžinta)
 DeletePayment=Ištrinti mokėjimą
 ConfirmDeletePayment=Ar tikrai norite ištrinti šį mokėjimą ?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Atlikti mokėjimą klientui
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Kainos bazė
 BillStatus=Sąskaitos-faktūros būklė
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Projektas (turi būti pripažintas galiojančiu)
 BillStatusPaid=Apmokėtas
 BillStatusPaidBackOrConverted=Apmokėtas arba konvertuotas į nuolaidą
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Klaida negalima atšaukti sąska
 BillFrom=Iš
 BillTo=Į
 ActionsOnBill=Veiksmai sąskaitoje-faktūroje
+RecurringInvoiceTemplate=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=Nauja sąskaita-faktūra
 LastBills=Paskutinės %s sąskaitos-faktūros
 LastCustomersBills=Paskutinės %s klientų sąskaitos-faktūros
@@ -199,6 +205,7 @@ Rest=Laukiantis
 AmountExpected=Reikalaujama suma
 ExcessReceived=Gautas perviršis
 EscompteOffered=Siūloma nuolaida (mokėjimas prieš terminą)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Pastovūs užsakymai
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Nedelsiamas
 PaymentConditionRECEP=Nedelsiamas
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index 5848431ce7f..c89c364d27b 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Paskutinės %s sutartys
 BoxTitleLastModifiedDonations=Paskutinės %s pakeistos aukos
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Visuminė veikla (sąskaitos-faktūros, pasiūlymai, užsakymai)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Nepavyko atnaujinti RSS srauto. Paskutinio sėkmingo atnaujinimo data: %s
 LastRefreshDate=Paskutinio atnaujinimo data
 NoRecordedBookmarks=Nėra apibrėžtų žymeklių
@@ -95,4 +97,4 @@ ForCustomersInvoices=Klientų sąskaitos-faktūros
 ForCustomersOrders=Klientų užsakymai
 ForProposals=Pasiūlymai
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 5c813b66e9a..aab3c34277d 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof ID 3 (SRVC TAX)
 ProfId4IN=Prof ID 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Prof ID 1 (RC)
 ProfId2MA=Prof ID 2 (patente)
 ProfId3MA=Prof ID 3 (IF)
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 9e12aef11f8..f944593512d 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 55a9802fe0d..a1b20c46e7c 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Apsaugos raktas URL pradėti cron darbus
 FileToLaunchCronJobs=Komandinė eilutė paleisti cron darbą
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Suplanuoti darbai
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Nė vienas
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Kitas vykdymas
-CronDtLastLaunch=Paskutinis vykdymas
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Metodas
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Pabaigos data negali būti ankstesnė už pradžios datą
 CronStatusActiveBtn=Įjungti
 CronStatusInactiveBtn=Išjungti
 CronTaskInactive=Šis darbas yra išjungtas
-CronDtLastResult=Paskutinio rezultato data
 CronId=ID
 CronClassFile=Klasės (filename.class.php)
 CronModuleHelp=Dolibarr modulio aplanko vardas (taip pat dirba su išorės Dolibarr moduliu). <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/<u>product</u>/class/product.class.php, modulio reikšmė yra <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Nepavyko įkelti klasės %s arba objekto %s
 UseMenuModuleToolsToAddCronJobs=Eikite į meniu "Pagrindinis - Modulių įrankiai - Darbo sąrašas" norėdami peržiūrėti ir redaguoti numatytus darbus.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/lt_LT/languages.lang b/htdocs/langs/lt_LT/languages.lang
index cf72850d8f7..bd7addbe6e5 100644
--- a/htdocs/langs/lt_LT/languages.lang
+++ b/htdocs/langs/lt_LT/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Ispanų (Meksika)
 Language_es_PY=Ispanų (Paragvajus)
 Language_es_PE=Ispanų (Peru)
 Language_es_PR=Ispanų (Puerto Rikas)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estijos
 Language_eu_ES=Baskų
 Language_fa_IR=Persijos
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 5721c2b7cfc..d9f3c972fd8 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-paštas sėkmingai patvirtintas
 MailUnsubcribe=Atsisakyti pasirašymo
 Unsuscribe=Atsisakyti pasirašymo
 MailingStatusNotContact=Daugiau nesikreipti
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=E-laiško gavėjas yra tuščias
 WarningNoEMailsAdded=Nėra naujų e-laiškų pridėjimui į gavėjų sąrašą.
 ConfirmValidMailing=Ar tikrai norite patvirtinti šį e-paštą ?
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index ed08dd68885..e323530081d 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Vieneto kaina (grynoji)
 UnitPriceTTC=Vieneto kaina
 PriceU=U.P.
 PriceUHT=U.P. (grynasis)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (įsk. mokesčius)
 Amount=Suma
@@ -321,6 +322,9 @@ AmountTTCShort=Suma (įskaitant mokesčius)
 AmountHT=Suma (atskaičius mokesčius)
 AmountTTC=Suma (įskaitant mokesčius)
 AmountVAT=Mokesčių suma
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Mokesčių suma 2
 AmountLT2=Mokesčių suma 3
 AmountLT1ES=RE suma
@@ -335,6 +339,7 @@ Percentage=Procentai
 Total=Visas
 SubTotal=Tarpinė suma
 TotalHTShort=Iš viso (grynasis)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Iš viso (įskaitant mokesčius)
 TotalHT=Iš viso (atskaičius mokesčius)
 TotalHTforthispage=Iš viso (atskaičius mokesčius) šiam puslapiui
@@ -457,6 +462,7 @@ Datas=Duomenys
 None=Nė vienas
 NoneF=Nė vienas
 Late=Vėlai
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Nuotrauka
 Photos=Nuotraukos
 AddPhoto=Pridėti nuotrauką
@@ -539,6 +545,7 @@ NbOfCustomers=Klientų skaičius
 NbOfLines=Eilučių skaičius
 NbOfObjects=Objektų skaičius
 NbOfReferers=Perdavėjų skaičius
+NbOfObjectReferers=Number of refering objects
 Referers=Susiję objektai
 TotalQuantity=Visas kiekis
 DateFromTo=Nuo %s į %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Susieta su tam tikro vartotojo adresatu
 DeleteAFile=Ištrinti failą
 ConfirmDeleteAFile=Ar tikrai norite ištrinti failą ?
 NoResults=Nėra rezultatų
+AdminTools=Admin tools
 SystemTools=Sistemos įrankiai
 ModulesSystemTools=Modulių įrankiai
 Test=Bandymas
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Pirmadienis
 Tuesday=Antradienis
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 099020933e2..4cc8704f345 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index f68612c8836..4051bee1307 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Projekto ID
 ProjectLabel=Project label
 Project=Projektas
 Projects=Projektai
+ProjectsArea=Projects Area
 ProjectStatus=Projekto statusas
 SharedProject=Visi
 PrivateProject=Kontaktai projekte
@@ -19,7 +20,7 @@ TasksPublicDesc=Šis vaizdas rodo visus projektus ir užduotis, kuriuos Jums lei
 TasksDesc=Šis vaizdas rodo visus projektus ir užduotis (Jūsų vartotojo teisės leidžia matyti viską).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projektų sritis
+ProjectsArea=Projects Area
 NewProject=Naujas projektas
 AddProject=Sukurti projektą
 DeleteAProject=Ištrinti projektą
@@ -67,6 +68,7 @@ Activities=Užduotys/veikla
 MyActivity=Mano veikla
 MyActivities=Mano užduotys/veikla
 MyProjects=Mano projektai
+MyProjectsArea=My projects Area
 DurationEffective=Efektyvi trukmė
 Progress=Pažanga
 ProgressDeclared=Paskelbta pažanga
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/lt_LT/receiptprinter.lang b/htdocs/langs/lt_LT/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/lt_LT/receiptprinter.lang
+++ b/htdocs/langs/lt_LT/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 655ab6d107c..83194e34f06 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Atšaukti siuntimą
 DeleteSending=Ištrinti siuntimą
 Stock=Atsargos
 Stocks=Atsargos
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Judėjimas
 Movements=Judesiai
 ErrorWarehouseRefRequired=Sandėlio nuorodos pavadinimas yra būtinas
@@ -34,9 +34,10 @@ LastMovements=Paskutiniai judęjimai
 Units=Vienetai
 Unit=Vienetas
 StockCorrection=Koreguoti atsargas
-StockTransfer=Atsargų pervedimas
-StockMovement=Pervedimas
-StockMovements=Atsargų pervedimai
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Judėjimo etiketė
 NumberOfUnit=Vienetų skaičius
 UnitPurchaseValue=Vieneto įsigijimo kaina
@@ -53,8 +54,8 @@ QtyDispatched=Kiekis išsiųstas
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Atsargos siunčiamos
-RuleForStockManagementDecrease=Atsargų valdymo mažinimo taisyklė
-RuleForStockManagementIncrease=Atsargų valdymo didinimo taisyklė
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Mažinti realių atsargų klientų sąskaitų-faktūrų/kreditinių sąskaitų patvirtinimuose
 DeStockOnValidateOrder=Sumažinti realias atsargas klientų užsakymų patvirtinime
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Vidutinė svertinė įvedimo kaina
 AverageUnitPricePMP=Vidutinė svertinė įvedimo kaina
 SellPriceMin=Vieneto pardavimo kaina
-EstimatedStockValueSellShort=Parduodama vertė
-EstimatedStockValueSell=Vertė Pardavimui
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Įvesti atsargų vertę
 EstimatedStockValue=Įvesti atsargų vertę
 DeleteAWarehouse=Ištrinti sandėlį
@@ -113,7 +114,7 @@ AlertOnly= Tik įspėjimai
 WarehouseForStockDecrease=Sandėlis <b>%s</b> bus naudojamos atsargų sumažėjimui
 WarehouseForStockIncrease=Sandėlis <b>%s</b> bus naudojamos atsargų padidėjimui
 ForThisWarehouse=Šiam sandėliui
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Papildymai
 NbOfProductBeforePeriod=Produkto %s kiekis atsargose iki pasirinkto periodo (< %s)
diff --git a/htdocs/langs/lt_LT/supplier_proposal.lang b/htdocs/langs/lt_LT/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/lt_LT/supplier_proposal.lang
+++ b/htdocs/langs/lt_LT/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index 7787f1d7da4..85256e7479a 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Prisijungimui naudoti OpenID
 WeeklyHours=Savaitės valandos
 ColorUser=Vartotojo spalva
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 8bd914d3aa8..ad73c6a1d1f 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=Virsgrāmata
-AccountBalanceByMonth=Konta bilance pa mēnešiem
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Trešās personas
 Labelcompte=Konta nosaukums
 Sens=Sens
 Codejournal=Žurnāls
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Lauka veids
 Param=Papildus parametri
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index d816876361d..f34c9d71991 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -154,6 +154,7 @@ Purge=Tīrīt
 PurgeAreaDesc=Šī lapa ļauj izdzēst visus failus būvēts vai glabā Dolibarr (pagaidu failus vai visus failus <b>%s</b> direktorijā). Izmantojot šo funkciju, nav nepieciešama. Tas ir paredzēts lietotājiem, kuru Dolibarr tiek rīkots sniedzējs, kas nepiedāvā atļaujas, lai dzēstu failus būvēts ar web serveri.
 PurgeDeleteLogFile=Dzēst log failu <b>%s</b> definēti Syslog modulim (nav risks zaudēt datus)
 PurgeDeleteTemporaryFiles=Dzēst visus pagaidu failus (bez riska, lai zaudēt datus)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Dzēst visus failus direktorijā <b>%s</b>. Pagaidu failus un arī datu bāzes rezerves dumpus, pievienotie faili pievienoti elementiem (trešās personas, rēķini, ...) un augšupielādēta ECM modulī tiks dzēsti.
 PurgeRunNow=Tīrīt tagad
 PurgeNothingToDelete=Nav direktorija vai fails ko izdzēst.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Tulkojumu konfigurēšana
 TranslationDesc=Valodu izvēli redzamu uz ekrāna var mainīt: <br> * Globāli no izvēlnes <strong>Mājās - Iestatījumi - Attēlojums</strong> <br> * Lietotājam tikai no sadaļas <strong>lietotāja attēlošanas iestatīšana</strong> lietotāja kartiņā (uzklikšķiniet uz pieteikšanās vārda lapas augšpusē).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Aktivēto moduļu kopskaits: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Jums ir jābūt ieslēgtam vismaz 1 modulim
 ClassNotFoundIntoPathWarning=Klase %s nav atrasta PHP norādītajā ceļā
 YesInSummer=Jā vasarā
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Aizvērt fiskālo gadu
 DeleteFiscalYear=Dzēst fiskālo gadu
 ConfirmDeleteFiscalYear=Vai tiešām vēlaties dzēst fiskālo gadu?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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=Minimālais lielo burtu skaits
 NbNumMin=Minimālais ciparu skaits 
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index c1f1386e8e9..79d2d4b5592 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -58,6 +58,7 @@ Payment=Maksājums
 PaymentBack=Maksājumu atpakaļ
 Payments=Maksājumi
 PaymentsBack=Maksājumi atpakaļ
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Atmaksāts atpakaļ
 DeletePayment=Izdzēst maksājumu
 ConfirmDeletePayment=Vai tiešām vēlaties dzēst šo maksājumu?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Bāzes cena
 BillStatus=Rēķina statuss
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Melnraksts (jāapstiprina)
 BillStatusPaid=Apmaksāts
 BillStatusPaidBackOrConverted=Samaksāta vai pārvērsti atlaidi
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Kļūda, nevar atcelt rēķinu,
 BillFrom=No
 BillTo=Kam
 ActionsOnBill=Pasākumi attiecībā uz rēķinu
+RecurringInvoiceTemplate=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=Jauns rēķins
 LastBills=Pēdējie %s rēķini
 LastCustomersBills=Pēdējie %s klientu rēķini
@@ -199,6 +205,7 @@ Rest=Līdz
 AmountExpected=Pieprasīto summu
 ExcessReceived=Excess saņemti
 EscompteOffered=Piedāvāta atlaide (maksājums pirms termiņa)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Regulārie maksājumi
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Tūlītēja
 PaymentConditionRECEP=Nekavējoties
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index b2f0907bfe1..15f5cebe4ad 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Pēdējie %s līgumi
 BoxTitleLastModifiedDonations=Pēdējie %s labotie ziedojumi
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global darbība (pavadzīmes, priekšlikumi, rīkojumi)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Neizdevās atsvaidzināt RSS plūsmas. Pēdējās veiksmīgs atsvaidzināt datums: %s
 LastRefreshDate=Pēdējais atjaunošanas datums
 NoRecordedBookmarks=Nav definētas grāmatzīmes.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Klientu rēķini
 ForCustomersOrders=Klientu pasūtījumi
 ForProposals=Priekšlikumi
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 4a3209f5cae..23702353303 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (PATENTE)
 ProfId3MA=Id prof. 3 (IF)
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 885e14ea308..61aa4052462 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index ffa6fb9a68b..5a6b6141e13 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Drošības atslēga URL uzsākt cron darbavietas
 FileToLaunchCronJobs=Komandrindas uzsākt cron darbavietas
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Plānotie darbi
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Nav
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Nākošā izpilde
-CronDtLastLaunch=Pēdējā izpilde
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Metode
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Beigu datums nevar būt pirms sākuma datuma
 CronStatusActiveBtn=Ieslēgt
 CronStatusInactiveBtn=Izslēgt
 CronTaskInactive=Šis darbs ir izslēgts
-CronDtLastResult=Pēdējo rezultātu datums
 CronId=Id
 CronClassFile=Klases (filename.class.php)
 CronModuleHelp=Nosaukums Dolibarr moduļa direktoriju (arī strādāt ar ārējo Dolibarr moduli). <BR> Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / <u>produktu</u> / klase / product.class.php, moduļa vērtība ir <i>produkts</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Nevar ielādēt klases %s vai objektu %s
 UseMenuModuleToolsToAddCronJobs=Iet uz izvēlni &quot;Home - moduļi instrumenti - Darbs sarakstu&quot;, lai redzētu un rediģēt plānoto darbu.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang
index 216dad5edb9..2e2710aaf5a 100644
--- a/htdocs/langs/lv_LV/languages.lang
+++ b/htdocs/langs/lv_LV/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spāņu (Meksika)
 Language_es_PY=Spāņu (Paragvaja)
 Language_es_PE=Spāņu (Peru)
 Language_es_PR=Spāņu (Puertoriko)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Igauņu
 Language_eu_ES=Basku
 Language_fa_IR=Persiešu
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 53602e27ae1..e7b79e715d2 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Pasta vēstuļu sūtīšanas veiksmīgi apstiprinā
 MailUnsubcribe=Atrakstīties
 Unsuscribe=Atrakstīties
 MailingStatusNotContact=Nesazināties
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=E-pasta adresāts ir tukšs
 WarningNoEMailsAdded=Nav jaunu e-pasta, lai pievienotu adresāta sarakstā.
 ConfirmValidMailing=Vai jūs tiešām vēlaties, lai apstiprinātu šo pasta vēstuļu sūtīšanas?
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 676f8e8237d..2ed75fca774 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Vienības cena (neto)
 UnitPriceTTC=Vienības cena
 PriceU=UP
 PriceUHT=UP (neto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Summa
@@ -321,6 +322,9 @@ AmountTTCShort=Summa (ar PVN)
 AmountHT=Daudzums (neto pēc nodokļiem)
 AmountTTC=Summa (ar PVN)
 AmountVAT=Nodokļa summa
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Nodokļa summa 2
 AmountLT2=Nodokļa summa 3
 AmountLT1ES=Summa RE
@@ -335,6 +339,7 @@ Percentage=Procentuālā attiecība
 Total=Kopsumma
 SubTotal=Starpsumma
 TotalHTShort=Kopējais (neto)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Pavisam (ar PVN)
 TotalHT=Pavisam (bez PVN)
 TotalHTforthispage=Kopā (bez PVN) šajā lapā
@@ -457,6 +462,7 @@ Datas=Dati
 None=Nav
 NoneF=Nav
 Late=Vēlu
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Attēls
 Photos=Attēli
 AddPhoto=Pievienot attēlu
@@ -539,6 +545,7 @@ NbOfCustomers=Klientu skaits
 NbOfLines=Līniju skaits
 NbOfObjects=Objektu skaits
 NbOfReferers=Skaits referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Atsauces objekti
 TotalQuantity=Kopējais daudzums
 DateFromTo=No %s līdz %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Saistītas ar noteiktu lietotāja kontaktu
 DeleteAFile=Izdzēst failu
 ConfirmDeleteAFile=Vai jūs tiešām vēlaties izdzēst failu
 NoResults=Nav rezultātu
+AdminTools=Admin tools
 SystemTools=Sistēmas rīki
 ModulesSystemTools=Moduļi instrumenti
 Test=Pārbaude
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Pirmdiena
 Tuesday=Otrdiena
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index f55eade0d00..11d04c87efc 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Apakš produkts
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index adaa2c0d502..61f44de697d 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Projekta ID
 ProjectLabel=Projekta nosaukums
 Project=Projekts
 Projects=Projekti
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Visi
 PrivateProject=Kontakti Projekta
@@ -19,7 +20,7 @@ TasksPublicDesc=Šo viedokli iepazīstina visus projektus un uzdevumus, jums ir
 TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projektu sadaļa
+ProjectsArea=Projects Area
 NewProject=Jauns projekts
 AddProject=Izveidot projektu
 DeleteAProject=Dzēst projektu
@@ -67,6 +68,7 @@ Activities=Uzdevumi/aktivitātes
 MyActivity=Manas darbības
 MyActivities=Mani uzdevumi / aktivitātes
 MyProjects=Mani projekti
+MyProjectsArea=My projects Area
 DurationEffective=Efektīvais ilgums
 Progress=Progress
 ProgressDeclared=Deklarētais progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/lv_LV/receiptprinter.lang b/htdocs/langs/lv_LV/receiptprinter.lang
index 8b0ca8befa2..469e76d368d 100644
--- a/htdocs/langs/lv_LV/receiptprinter.lang
+++ b/htdocs/langs/lv_LV/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Printer %s added
 PrinterUpdated=Printer %s updated
 PrinterDeleted=Printeris %s dzēsts
 TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Iestatīt printerus
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 412b7e4b9be..9a65d666ada 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Pēdējās pārvietošanas
 Units=Vienības
 Unit=Vienība
 StockCorrection=Labot krājumus
-StockTransfer=Krājumu pārvietošana
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Krājumu pārvietošana
 StockMovements=Krājumu pārvietošanas
 LabelMovement=Kustību nosaukums
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
index 4065f3cfaea..1cf9277b0d7 100644
--- a/htdocs/langs/lv_LV/supplier_proposal.lang
+++ b/htdocs/langs/lv_LV/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Cenas pieprasījums
 CommRequests=Cenas pieprasījumi
 SearchRequest=Atrast pieprasījumu
 DraftRequests=Pieprasījuma melnraksts
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Pēdējie %s labotie cenas pieprasījumi
 RequestsOpened=Atvērt cenas pieprasījumu
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index 817c25981e5..4634fe2cf94 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Izmantojiet OpenID, lai pieteiktos
 WeeklyHours=Nedēļas stundas
 ColorUser=Lietotāja krāsa
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 9cff117f74a..deca56bf2c1 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index a4f919a6f49..e67ad0ade2d 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/mk_MK/languages.lang b/htdocs/langs/mk_MK/languages.lang
index 9bd2c4e3ff9..0e69807b2ce 100644
--- a/htdocs/langs/mk_MK/languages.lang
+++ b/htdocs/langs/mk_MK/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Шпански (Мексико)
 Language_es_PY=Шпански (Парагвај)
 Language_es_PE=Шпански (Перу)
 Language_es_PR=Шпански (Порто Рико)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Естонскиот
 Language_eu_ES=Баскиската
 Language_fa_IR=Персискиот
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index e4a9de75331..4cb72254e8d 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/mk_MK/receiptprinter.lang b/htdocs/langs/mk_MK/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/mk_MK/receiptprinter.lang
+++ b/htdocs/langs/mk_MK/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/mk_MK/supplier_proposal.lang b/htdocs/langs/mk_MK/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/mk_MK/supplier_proposal.lang
+++ b/htdocs/langs/mk_MK/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index dbea3041e6f..97c27076745 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - en_US - Accounting Expert
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolonneseparator for eksportfil
 ACCOUNTING_EXPORT_DATE=Datoformat for eksportfil
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_PIECE=Eksporter antall enheter
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
 ACCOUNTING_EXPORT_LABEL=Eksporter etikett
 ACCOUNTING_EXPORT_AMOUNT=Eksporter beløp
@@ -30,13 +30,14 @@ BackToChartofaccounts=Return chart of accounts
 Definechartofaccounts=Define a chart of accounts
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
+AccountAccounting=Regnskapskonto
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
-TradeMargin=Trade margin
+TradeMargin=Fortjenestemargin
 Reports=Rapporter
 ByCustomerInvoice=Etter kundefakturaer
 NewAccount=Ny regnskapskonto
@@ -46,9 +47,9 @@ UpdateAccount=Endring av reknskapskonto
 UpdateMvts=Endring av bevegelse
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=Hovedbok
-AccountBalanceByMonth=Kontobalanse etter måned
+AccountBalance=Account balance
 
-AccountingVentilation=Breakdown accounting
+AccountingVentilation=Regnskapsmessig fordelingen
 AccountingVentilationSupplier=Breakdown accounting supplier
 AccountingVentilationCustomer=Breakdown accounting customer
 
@@ -103,6 +104,7 @@ Code_tiers=Tredjepart
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Bevegelse er ikke korrekt balansert. Kredit=%s. Debet=%s
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Bevegelse er ikke korrekt balansert. Kredit=%s. Debet=%s
+
 ##Export Journal Feature
 ExportFormat=Eksportformat
 Prefixname=Prefiks for ekportfil
@@ -163,7 +167,8 @@ Type=Felttyper
 Param=Tilleggsparametre
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 0bb95b98b51..fc8913e3e9a 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -154,6 +154,7 @@ Purge=Utrenskning
 PurgeAreaDesc=Denne siden lar deg slette alle filer opprettet eller lagret av Dolibarr (midlertidige filer eller alle filer i mappen <b>%s</b>). Normalt er det ikke nødvendig å bruke denne funksjonen. Den er laget for brukere som har Dolibarr installert på en delt server, og hvor man ikke har tilgang til å slette filer opprettet av webserveren.
 PurgeDeleteLogFile=Slett loggfil <b>%s</b> definert for Syslog-modul (ingen risiko for å miste data)
 PurgeDeleteTemporaryFiles=Slett alle midlertidige filer (medfører ingen risiko for å miste data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Slett alle filer i mappen <b>%s</b>. Dette vil slette midlertidige filer, database sikkerhetskopier og filer som er lastet opp som vedlegg til elementer (tredjeparter, fakturaer osv. ). Alle filer lastet opp i ECM-modulen vil bli slettet.
 PurgeRunNow=Start utrenskning
 PurgeNothingToDelete=Ingen mapper eller filer å slette.
@@ -362,7 +363,7 @@ HideAnyVATInformationOnPDF=Skjul alle opplysninger knyttet til MVA på genererte
 HideDescOnPDF=Skjul varebeskrivelse på generert PDF
 HideRefOnPDF=Skjul varereferanse på generert PDF
 HideDetailsOnPDF=Skjul varelinjedetaljer i generert PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PlaceCustomerAddressToIsoLocation=Bruk fransk standardposisjon (La Poste) for kundeadresser
 Library=Bibliotek
 UrlGenerationParameters=Parametre for å sikre nettadresser
 SecurityTokenIsUnique=Bruk en unik securekey parameter for hver webadresse
@@ -416,7 +417,7 @@ ConfirmEraseAllCurrentBarCode=Er di sikker på at du vil slette alle gjeldende s
 AllBarcodeReset=Alle strekkode-verdier er blitt slettet
 NoBarcodeNumberingTemplateDefined=Ingen mal for strekkodenummerering er aktivert strekkodemodulen
 NoRecordWithoutBarcodeDefined=Ingen poster uten strekkode.
-EnableFileCache=Enable file cache
+EnableFileCache=Aktiver fil-cache
 
 # Modules
 Module0Name=Brukere & grupper
@@ -500,7 +501,7 @@ Module510Desc=Behandling av ansattes lønn og utbetalinger
 Module520Name=Lån
 Module520Desc=Administrering av lån
 Module600Name=Varselmeldinger
-Module600Desc=Send EMail notifications (triggered by some business events) to third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send epost-varslinger (aktivert av enkelte forretnings-hendelser) til tredjeparter (kan settes for den enkelte tredjepart eller bruk standardoppsett)
 Module700Name=Donasjoner
 Module700Desc=Behandling av donasjoner
 Module770Name=Utgiftsrapporter
@@ -964,7 +965,7 @@ DelaysBeforeWarning=Forsinkelser før varsling
 DelaysOfToleranceBeforeWarning=Forsinkelsestoleranse før varsling
 DelaysOfToleranceDesc=Denne siden lar deg angi antall 'toleransedager' du ønsker før en forsinkelse skal varsles på skjermen med ikonet %s for hvert forsinkede element.
 Delays_MAIN_DELAY_ACTIONS_TODO=Forinkelsestoleranse (i dager) før varsel om planlage handlinger som ikke er utført
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks not yet realised
+Delays_MAIN_DELAY_TASKS_TODO=Forsinkelses-toleranse (i dager) før varsel om ikke utførte planlagte oppgaver
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Forsinkelsestoleranse (i dager) før varsel om ordrer ikke levert
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Forsinkelsestoleranse (i dager) før varsel på leverandørers ordre ennå ikke behandlet
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Forsinkelsestoleranse (i dager) før varsel om tilbud som ikke er lukket
@@ -1089,8 +1090,8 @@ PathDirectory=Mappe
 SendmailOptionMayHurtBuggedMTA=Funksjonen for å sende e-post ved hjelp av metoden "PHP mail direct" vil generere en melding som kanskje ikke oversatt riktig av enkelte e-postservere. Resultatet er at enkelte e-poster ikke kan leses av personer som mottar e-post gjennom disse serverene (f.eks Orange i Frankrike). Dette er ikke et Dolibarr-problem i, heller ikke PHP, men på mottakende e-postserver. Du kan imidlertid legge til alternativet MAIN_FIX_FOR_BUGGED_MTA til 1 i oppsettet, heller enn å endre Dolibarr for å unngå dette. Du kan oppleve problemer med andre servere som følger SMTP-standarden nøyaktig. Den andre løsningen (anbefales) er å bruke metoden "SMTP socket library" som ikke har noen ulemper.
 TranslationSetup=Konfigurasjon de la traduction
 TranslationDesc=Valg av språk som er synlig på skjermen kan endres: <br> * Globalt fra menyen <strong>Hjem - Setup - Display</strong> <br> * For brukeren bare fra kategorien <strong>Bruker visning</strong> av brukerkort (klikk på innlogging på toppen av skjermen).
-TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Totalt antall aktiverte funksjoner <b>moduler:%s</b>
+TranslationOverwriteDesc=Du kan også endre verdier ved å fylle ut/endre følgende tabell. Du må bruke "%s" for språk-kode, "%s" for kilde i filen langs/xx_XX/språk.lang og "%s" for ny oversettelse.
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
 YesInSummer=Ja i sommer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Lukk regnskapsår
 DeleteFiscalYear=Slett regnskapsår
 ConfirmDeleteFiscalYear=Er du sikker på at du vil slette dette regnskapsåret?
 AlwaysEditable=Kan alltid endres
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Tving synlig navn på program (advarsel: Å sette ditt eget navn her kan fjerne autofyll logginn-funksjonen når du bruker DoliDroid mobilapplikasjon)
 NbMajMin=Minste antall store bokstaver
 NbNumMin=Minste antall numeriske tegn
@@ -1664,10 +1666,10 @@ BackupDumpWizard=Veiviser for å bygge database-backup dumpfil
 SomethingMakeInstallFromWebNotPossible=Installasjon av ekstern modul er ikke mulig fra webgrensesnittet på grunn av:
 SomethingMakeInstallFromWebNotPossible2=På grunn av dette, er prosessen for å oppgradere beskrevet her, bare manuelle trinn en privilegert bruker kan gjøre.
 InstallModuleFromWebHasBeenDisabledByFile=Administrator har deaktivert muligheten for å installere eksterne moduler. Administrator må fjerne filen <strong>%s</strong> for å tillate dette.
-ConfFileMuseContainCustom=For å installere en modul må du lagre filene i mappen <strong>%s</strong>. For at Dolibarr skal behandle dette, må du først <strong>conf/conf.php</strong>for å ha opsjonen<br>- <strong>$dolibarr_main_url_root_alt</strong> aktivert med verdien <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> aktivert med <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Fremhev tabellinjer når musen flyttes over
 HighlightLinesColor=Uthev fargen på linjen når musen føres over (holdes tom for ingen uthevning)
-TextTitleColor=Color of page title
+TextTitleColor=Farge på sidetittel
 LinkColor=Farge på lenker
 PressF5AfterChangingThis=Trykk F5 etter å ha endret denne verdien for at endringene skal tre i kraft
 NotSupportedByAllThemes=Vil virke med Eldy-temaet men er ikke støttet av av alle temaer
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Eksempel på beskjed du kan bruke for å annon
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en større utgivelse med mange nye funksjoner både for brukere og utviklere. Du kan hente den fra nedlastningsområdet http://www.dolibarr.org portal (undermappe: Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for en komplett liste over forandringer som er gjort.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en vedlikeholdsversjon, så den inneholder bare bugreparasjoner. Vi anbefaler alle som bruker en eldre versjon om å oppgradere til denne. Som i alle vedlikeholdsversjoner, er det ingen nye funksjoner eller strukturendringer i denne versjonen. Du hente den fra nedlastningsområdet http://www.dolibarr.org portal (underkatalog: Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for en komplett liste over endringer som er gjort.
 MultiPriceRuleDesc=Når alternativet "Flere prisnivået per vare/tjeneste" er på, kan du definere forskjellige priser (ett pr prisnivå) for hvert produkt. For å spare tid, kan du lage en regel som gir pris for hvert nivå autokalkulert i forhold til prisen på første nivå, slik at du bar legger inn en pris for hvert produkt. Denne siden er laget for å spare tid og kan være nyttig hvis prisene for hvert nivå står i forhold til første nivå. Du kan ignorere denne siden i de fleste tilfeller.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index bc629ee6703..ba56d5addf7 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -35,9 +35,9 @@ AllActions= Alle handlinger/oppgaver
 ViewCal=Månedsvisning
 ViewDay=Dagsvisning
 ViewWeek=Ukesvisning
-ViewYear=Year view
+ViewYear=Årsvisning
 ViewPerUser=Visning pr. bruker
-ViewPerType=Per type view
+ViewPerType=Pr. type-visning
 ViewWithPredefinedFilters= Vis med forhåndsdefinerte filtere
 AutoActions= Automatisk utfylling
 AgendaAutoActionDesc= Her angir du hvilke handlinger du ønsker at Dolibarr automatisk skal registrere i agendaen. Hvis du ikke velger noe (forhåndsinnstilt), vil bare manuelle handlinger bli registrert i agendaen.
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 3e619307903..4d3dc2dad5f 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -58,6 +58,7 @@ Payment=Betaling
 PaymentBack=Tilbakebetaling
 Payments=Betalinger
 PaymentsBack=Tilbakebetaling
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Tilbakebetalt
 DeletePayment=Slett betaling
 ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
@@ -73,8 +74,8 @@ PaymentsAlreadyDone=Betalinger allerede utført
 PaymentsBackAlreadyDone=Tilbakebetalinger allerede utført
 PaymentRule=Betalingsregel
 PaymentMode=Betalingsmåte
-IdPaymentMode=Payment type (id)
-LabelPaymentMode=Payment type (label)
+IdPaymentMode=Betalingstype (ID)
+LabelPaymentMode=Betalingstype (etikett)
 PaymentModeShort=Betalingstype
 PaymentTerm=Betalingsbetingelser
 PaymentConditions=Betalingsbetingelser
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Lag purring til kunde
 DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
 PriceBase=Prisgrunnlag
 BillStatus=Fakturastatus
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Kladd (må valideres)
 BillStatusPaid=Betalt
 BillStatusPaidBackOrConverted=Betalt eller konvertert til rabatt
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Feil: Kan ikke kansellere en fak
 BillFrom=Fra
 BillTo=Til
 ActionsOnBill=Handlinger på faktura
+RecurringInvoiceTemplate=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=Ny faktura
 LastBills=Siste %s fakturaer
 LastCustomersBills=Siste %s kundefakturaer
@@ -186,7 +192,7 @@ ShowInvoice=Vis faktura
 ShowInvoiceReplace=Vis erstatningsfaktura
 ShowInvoiceAvoir=Vis kreditnota
 ShowInvoiceDeposit=Vis innskuddsfaktura
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Vis delfaktura
 ShowPayment=Vis betaling
 AlreadyPaid=Allerede betalt
 AlreadyPaidBack=Allerede tilbakebetalt
@@ -199,6 +205,7 @@ Rest=Venter
 AmountExpected=Beløp purret
 ExcessReceived=Overskytende
 EscompteOffered=Rabatt innrømmet (betalt før forfall)
+EscompteOfferedShort=Discount
 SendBillRef=Innsendelse av faktura %s
 SendReminderBillRef=Innsendelse av faktura %s (påminnelse)
 StandingOrders=Faste ordre
@@ -224,7 +231,7 @@ NonPercuRecuperable=Kan ikke dekkes inn
 SetConditions=Angi betalingsbetingelser
 SetMode=Angi betalingsmodus
 Billed=Fakturert
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Gjentagende fakturaer
 RepeatableInvoice=Fakturamal
 RepeatableInvoices=Fakturamaler
 Repeatable=Mal
@@ -273,7 +280,7 @@ HelpAbandonBadCustomer=Dette beløpet er tapsført (dårlig kunde) og betraktes
 HelpAbandonOther=Dette beløpet er tapsført på grunn av feil. (For eksempel feil kunde eller faktura er erstattet av en annen)
 IdSocialContribution=Skatter og avgifter ID
 PaymentId=Betalings-ID
-PaymentRef=Payment ref.
+PaymentRef=Betalings-ref.
 InvoiceId=Faktura-ID
 InvoiceRef=Fakturareferanse
 InvoiceDateCreation=Fakturadato
@@ -302,10 +309,22 @@ LatestRelatedBill=Siste tilknyttede faktura
 WarningBillExist=Advarsel: en eller flere fakturaer finnes allerede
 MergingPDFTool=Verktøy for fletting av PDF 
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-
+PaymentNote=Betalingsnotat
+ListOfPreviousSituationInvoices=Liste over tidligere delfakturaer
+ListOfNextSituationInvoices=Liste over kommende delfakturaer
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Kontant
 PaymentConditionRECEP=Kontant
@@ -414,7 +433,7 @@ NoteListOfYourUnpaidInvoices=Denne listen inneholder kun fakturaer for tredjepar
 RevenueStamp=Stempelmerke
 YouMustCreateInvoiceFromThird=Kun mulig når du lager faktura fra "kunde" i tredjeparter
 PDFCrabeDescription=Fakturamal Crabe. En komplett mal (Støtter MVA, rabatter, betalingsbetingelser, logo, osv...)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
+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.
 MarsNumRefModelDesc1=Returnerer et nummer med formatet %sååmm-nnnn for vanlige fakturaer, %sååmm-nnnn for erstatningsfakturaer, %sååmm-nnnn for innskuddsfakturaer og %sååmm-nnnn for kreditnotaer der åå er året, mm måned og nnnn er en sekvens uten brudd og ingen retur til 0
 TerreNumRefModelError=En faktura som starter med $sååmm finnes allerede og er ikke kompatibel med denne nummereringsmodulen. Du må slette den eller gi den ett nytt navn for å aktivere denne modulen.
@@ -444,11 +463,11 @@ DisabledBecauseFinal=Dette er siste delfaktura
 CantBeLessThanMinPercent=Progresjonen kan ikke ha lavere verdi enn forrige delfaktura
 NoSituations=Ingen  åpne situasjoner
 InvoiceSituationLast=Siste delfaktura
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
+PDFCrevetteSituationNumber=Del N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Delfaktura - TELLER
+PDFCrevetteSituationInvoiceTitle=Delfaktura
+PDFCrevetteDescription=PDF fakturamal Crevette.En komplett mal for delfaktura
+PDFCrevetteSituationInvoiceLine=Del N°%s : Fakt. N°%s på %s
+TotalSituationInvoice=Totalt deler
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+updatePriceNextInvoiceErrorUpdateline=Feil: oppdater pris på fakturalinje: %s
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 2be96bf66f6..ad11e57c441 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Siste %s kontrakter
 BoxTitleLastModifiedDonations=Siste %s endrede donasjoner
 BoxTitleLastModifiedExpenses=Siste %s endrede utgiftsrapporter
 BoxGlobalActivity=Global aktivitet (fakturaer, tilbud, ordrer)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Klarte ikke å oppdatere RSS-strøm. Siste vellykkede oppdatering: %s
 LastRefreshDate=Siste oppdateringsdato
 NoRecordedBookmarks=Ingen bokmerker definert. Trykk <a href="%s">her</a> for å legge til bokmerker.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Kundens fakturaer
 ForCustomersOrders=Kundeordrer
 ForProposals=Tilbud
 LastXMonthRolling=Rullering av de siste %s måneder
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index acd03d3afdf..09774281e1e 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -76,7 +76,7 @@ ProductsCategoryShort=Vare merke/kategori
 MembersCategoryShort=Medlems merke/kategori
 SuppliersCategoriesShort=Levrandørers merker/kategorier
 CustomersCategoriesShort=Kunders merker/kategorier
-ProspectsCategoriesShort=Prospects tags/categories
+ProspectsCategoriesShort=Etiketter/kategorier for prospekter
 CustomersProspectsCategoriesShort=Kunde-/prospektkategorier
 ProductsCategoriesShort=Varenes merker/kategorier
 MembersCategoriesShort=Medlemmers merker/kategorier
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 5bad45d6f64..97a19148e93 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -118,7 +118,7 @@ ProfId3=Profesjonell ID 3
 ProfId4=Profesjonell ID 4
 ProfId5=Profesjonell ID 5
 ProfId6=Profesjonell ID 6
-ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId1AR=Prof ID 1 (CUIT/CUIL)
 ProfId2AR=Prof ID 2 (bruttoinntekter)
 ProfId3AR=-
 ProfId4AR=-
@@ -130,13 +130,13 @@ ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
 ProfId5AT=-
 ProfId6AT=--
-ProfId1AU=Prof Id 1 (ABN)
+ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id 1 (Profesjonelt nummer)
+ProfId1BE=Prof ID 1 (Profesjonelt nummer)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
@@ -150,38 +150,38 @@ ProfId4BR=CPF
 #ProfId6BR=INSS
 ProfId1CH=-
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Føderalt nummer)
-ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId3CH=Prof ID 1 (Føderalt nummer)
+ProfId4CH=Prof ID 2 (Commercial Record number)
 ProfId5CH=-
 ProfId6CH=-
-ProfId1CL=Prof Id 1 (RUT)
+ProfId1CL=Prof ID 1 (RUT)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=Prof Id 1 (RUT)
+ProfId1CO=Prof ID 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId1DE=Prof ID 1 (USt.-IdNr)
 ProfId2DE=Prof ID 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
-ProfId1ES=Prof Id 1 (CIF / NIF)
+ProfId1ES=Prof ID 1 (CIF / NIF)
 ProfId2ES=Prof ID 2 (personnummer)
-ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate nummer)
+ProfId3ES=Prof ID 3 (CNAE)
+ProfId4ES=Prof ID 4 (Collegiate nummer)
 ProfId5ES=-
 ProfId6ES=-
-ProfId1FR=Prof Id 1 (SIREN)
-ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, gammel APE)
-ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId1FR=Prof ID 1 (SIREN)
+ProfId2FR=Prof ID 2 (SIRET)
+ProfId3FR=Prof ID 3 (NAF, gammel APE)
+ProfId4FR=Prof ID 4 (RCS/RM)
 ProfId5FR=Prof Id 5
 ProfId6FR=-
 ProfId1GB=Prof Id 1 (Registreringsnummer)
@@ -190,27 +190,33 @@ ProfId3GB=Prof Id 3 (SIC)
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=Id prof. 1 (RTN)
+ProfId1HN=Prof ID 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=Prof Id 1 (TIN)
+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=-
-ProfId1MA=Id prof. 1 (RC)
-ProfId2MA=Id prof. 2 (patent)
-ProfId3MA=Id prof. 3 (IF)
-ProfId4MA=Id prof. 4 (CNSS)
-ProfId5MA=Id prof. 5 (C.I.C.E.)
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
+ProfId1MA=Prof ID 1 (RC)
+ProfId2MA=Prof ID 2 (patent)
+ProfId3MA=Prof ID 3 (IF)
+ProfId4MA=Prof ID 4 (CNSS)
+ProfId5MA=Prof ID 5 (C.I.C.E.)
 ProfId6MA=-
-ProfId1MX=Prof Id 1 (RFC).
-ProfId2MX=Prof Id 2 (R.. P. IMSS)
-ProfId3MX=Prof Id 3 (Profesjonell lisens)
+ProfId1MX=Prof ID 1 (RFC).
+ProfId2MX=Prof ID 2 (R.. P. IMSS)
+ProfId3MX=Prof ID 3 (Profesjonell lisens)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -220,10 +226,10 @@ ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
 ProfId5NL=-
 ProfId6NL=-
-ProfId1PT=Prof Id 1 (NIPC)
-ProfId2PT=Prof Id 2 (Personnummer)
-ProfId3PT=Prof Id 3 (Commercial Record number)
-ProfId4PT=Prof Id 4 (Conservatory)
+ProfId1PT=Prof ID 1 (NIPC)
+ProfId2PT=Prof ID 2 (Personnummer)
+ProfId3PT=Prof ID 3 (Commercial Record number)
+ProfId4PT=Prof ID 4 (Conservatory)
 ProfId5PT=-
 ProfId6PT=-
 ProfId1SN=RC
@@ -232,16 +238,16 @@ 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)
+ProfId1TN=Prof ID 1 (RC)
+ProfId2TN=Prof ID 2 (Fiscal matricule)
+ProfId3TN=Prof ID 3 (Douane code)
+ProfId4TN=Prof ID 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1RU=Prof Id 1 (OGRN)
-ProfId2RU=Prof Id 2 (INN)
-ProfId3RU=Prof Id 3 (KPP)
-ProfId4RU=Prof Id 4 (OKPO)
+ProfId1RU=Prof ID 1 (OGRN)
+ProfId2RU=Prof ID 2 (INN)
+ProfId3RU=Prof ID 3 (KPP)
+ProfId4RU=Prof ID 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
 VATIntra=Organisasjonsnummer
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 3a4abd26205..d4cc2e0ff2a 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -155,7 +155,7 @@ DepositsAreNotIncluded=- Innskuddsfakturaer er ikke inkludert
 DepositsAreIncluded=- Innskuddsfakturaer er inkludert
 LT2ReportByCustomersInInputOutputModeES=Rapport over tredjepart IRPF
 LT1ReportByCustomersInInputOutputModeES=Rapport etter tredjepart RE
-VATReport=VAT report
+VATReport=MVA rapport
 VATReportByCustomersInInputOutputMode=Rapport over innhentet og betalt MVA etter kunde
 VATReportByCustomersInDueDebtMode=Rapport over innhentet og betalt MVA etter kunde
 VATReportByQuartersInInputOutputMode=Rapport over innhentet og betalt MVA etter sats
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Rapport over utenlandske kunder
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basert på de at to første bokstavene i MVA-nummeret er ulik ditt eget selskaps landskode
 SameCountryCustomersWithVAT=Rapport over nasjonale kunder
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basert på de at to første bokstavene i MVA-nummeret er det samme som ditt eget selskaps landskode
+LinkedFichinter=Link to an intervention
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 831c3a505af..3a213ad80e9 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -16,11 +16,12 @@ KeyForCronAccess=Sikkerhetsnøkkel for URL for å starte cronjobber
 FileToLaunchCronJobs=Kommandolinje for å starte cronjobber
 CronExplainHowToRunUnix=I Unix-miljøer bør du bruke følgende crontab-oppføring for å kjøre kommandolinje hvert 5. minutt
 CronExplainHowToRunWin=I Microsoft(tm) Windows-miljø kan du bruke planlagte oppgaver-verktøyet for å kjøre kommandolinje hvert 5. minutt
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Planlagte jobber
-CronListActive=List of enabled/scheduled jobs
+CronListActive=Liste over aktiverte/planlagte jobber
 CronListInactive=Liste over deaktiverte jobber
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Aktivert og deaktivert
 # Page list
 CronDateLastRun=Siste kjøring
 CronLastOutput=Resultat av forrige kjøring
@@ -36,10 +37,11 @@ CronInfo=Planlagte jobber-modulen gir deg mulighet til å utføre jobber til øn
 CronWaitingJobs=Ventende jobber
 CronTask=Jobb
 CronNone=Ingen
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Ikke før
+CronDtEnd=Ikke etter
 CronDtNextLaunch=Neste kjøring
-CronDtLastLaunch=Siste kjøring
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frekvens
 CronClass=Klasse
 CronMethod=Metode
@@ -52,7 +54,7 @@ CronNoJobs=Ingen registrerte jobber
 CronPriority=Prioritet
 CronLabel=Beskrivelse
 CronNbRun=Antall starter
-CronMaxRun=Max nb. launch
+CronMaxRun=Maks. ant. startes
 CronEach=Alle
 JobFinished=Jobb startet og fullført
 #Page card
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Sluttdato kan ikke være før startdato
 CronStatusActiveBtn=Aktiver
 CronStatusInactiveBtn=Deaktiver
 CronTaskInactive=Denne jobben er deaktivert
-CronDtLastResult=Dato for siste resultat
 CronId=ID
 CronClassFile=Klasser (filnavn.klasse.php)
 CronModuleHelp=Navn på Dolibarr-modul katalogen (også arbeid med ekstern Dolibarr-modul). <BR> For eksempel hente-metode for Dolibarr Product objekt /htdocs/<u>product</u>/class/product.class.php, er verdien av modulen <i>vare</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Kan ikke laste klasse %s eller objekt %s
 UseMenuModuleToolsToAddCronJobs=Gå til meny "Hjem - Modulverktøy - Jobbliste" for å se på og endre planlagte jobber.
 TaskDisabled=Jobb deaktivert
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/nb_NO/deliveries.lang b/htdocs/langs/nb_NO/deliveries.lang
index 9e7b3d97713..3e22cf38d8d 100644
--- a/htdocs/langs/nb_NO/deliveries.lang
+++ b/htdocs/langs/nb_NO/deliveries.lang
@@ -17,9 +17,9 @@ DeleteDeliveryReceiptConfirm=Er du sikker på at du vil slette leveringskvitteri
 DeliveryMethod=Leveringsmåte
 TrackingNumber=Trackingnummer
 DeliveryNotValidated=Levering ikke validert
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+StatusDeliveryCanceled=Kansellert
+StatusDeliveryDraft=Kladd
+StatusDeliveryValidated=Mottatt
 # merou PDF model
 NameAndSignature=Navn og signatur :
 ToAndDate=Til___________________________________ den ____/_____/__________
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index ec49b71123f..cb2867592ce 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -22,7 +22,7 @@ ReviewedByCP=Vil bli gjennomgått av
 DescCP=Beskrivelse
 SendRequestCP=Opprett feriesøknad
 DelayToRequestCP=Søknader må opprettes minst <b>%s dag(er)</b> før ferien skal starte
-MenuConfCP=Balance of leaves
+MenuConfCP=Feriebalanse
 UpdateAllCP=Oppdater ferier
 SoldeCPUser=Feriebalansen er <b>%s</b> dager.
 ErrorEndDateCP=Sluttdato må være senere en startdato
@@ -80,7 +80,7 @@ alreadyCPexist=En feriesøknad er allerede utført for denne perioden
 UserName=Navn
 FirstDayOfHoliday=Første feriedag
 LastDayOfHoliday=Siste feriedag
-BoxTitleLastLeaveRequests=Last %s modified leave requests
+BoxTitleLastLeaveRequests=Siste %s endrede ferieforespørsler
 HolidaysMonthlyUpdate=Månedlig oppdatering
 ManualUpdate=Manuell oppdatering
 HolidaysCancelation=Kansellering av feriesøknader
@@ -140,7 +140,7 @@ HolidaysRefusedBody=Feriesøknaden din for perioden %s til %s er blitt avvist me
 HolidaysCanceled=Kansellert feriesøknad
 HolidaysCanceledBody=Feriesøknaden din for perioden %s til %s er blitt kansellert.
 NewByMonth=Lagt til pr. måned
-Affect=Followed by a counter
-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
+Affect=Etterfulgt av en teller
+FollowedByACounter=1: Denne typen ferie må være etterfulgt av en teller. Telleren økes automatisk eller manuelt, og når ferieforespørselen blir validert, blir den redusert. <br>0: Ikke etterfulgt av en teller
+NoLeaveWithCounterDefined=Det er ikke definert noen ferietyper som trenger en teller
 GoIntoDictionaryHolidayTypes=Gå til <strong>Hjem - Oppsett - Ordlister - Ferietyper</strong> for å sette oppforskjellige typer ferier.
diff --git a/htdocs/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang
index ceceeab3c6b..8607e9da99d 100644
--- a/htdocs/langs/nb_NO/hrm.lang
+++ b/htdocs/langs/nb_NO/hrm.lang
@@ -15,6 +15,6 @@ DictionaryFunction=HRM - Funksjonsliste
 ListOfEmployees=Liste over ansatte
 Employees=Ansatte
 Employee=Ansatt
-Employe=Employe
+Employe=Ansatt
 NewEmployee=Ny ansatt
 EmployeeCard=Arbeidstakerkort
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index 76c5426d5c1..c670d9fc07b 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -54,9 +54,9 @@ PacificNumRefModelDesc1=Gir et nummer med formatet %sååmm-nnnn hvor åå er å
 PacificNumRefModelError=Det finnes allerede et intervensjonskort som starter med  $sååmm, og dette er ikke kompatibelt med denne nummereringsmodellen. Du må fjerne denne for å aktivere denne modellen.
 PrintProductsOnFichinter=Skriv ut varer på intervensjonskortet
 PrintProductsOnFichinterDetails=intervensjoner generert fra ordre
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=Nb of intervention cards
-NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+InterventionStatistics=Statistikk over intervensjoner
+NbOfinterventions=Antall intervensjonskort
+NumberOfInterventionsByMonth=Antall intervensjonskort etter måned (validasjonsdato)
 ##### Exports #####
 InterId=Intervensjons-ID
 InterRef=Intervensjonsref.
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index 9d6a2ca16eb..24050e88558 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -32,10 +32,11 @@ Language_es_MX=Spansk (Mexico)
 Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonsk
 Language_eu_ES=Baskisk
 Language_fa_IR=Persisk
-Language_fi_FI=Finnish
+Language_fi_FI=Finsk
 Language_fr_BE=Fransk (Belgia)
 Language_fr_CA=Fransk (Canada)
 Language_fr_CH=Fransk (Sveits)
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index dc9e5b27033..ae8d9a3afc0 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Utsendelse validert
 MailUnsubcribe=Avmelding
 Unsuscribe=Avmelding
 MailingStatusNotContact=Skal ikke kontaktes flere ganger
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=E-postmottager er ikke oppgitt
 WarningNoEMailsAdded=Ingen ny e-postadresse å legge til mottagerlisten.
 ConfirmValidMailing=Er du sikker på at du vil validere utsendelsen?
@@ -81,7 +82,7 @@ ActivateCheckReadKey=Nøkkel for å kryptere URL'en brukt til "Les kvittering" o
 EMailSentToNRecipients=E-post sendt til %s mottakere.
 XTargetsAdded=<b>%s</b> mottakere lagt til i målliste
 EachInvoiceWillBeAttachedToEmail=Et dokument med standard faktura dokumentmal vil bli opprettet og sendt med hver e-post.
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=Hvis det allerede er opprettet et PDF dokument for fakturaen, vil det bli vedlagt eposten. Hvis ikke vil det ikke bli sendt noen epost. (NB! Kun PDF dokumenter kan legges ved i denne versjonen)
 MailTopicSendRemindUnpaidInvoices=Påminnelse om faktura %s (%s)
 SendRemind=Send påminnelse som e-post
 RemindSent=%s påminnelse(er) sendt
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 3d600b00d33..5235d2182fa 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d. %b %Y %H:%M
 FormatDateHourText=%d. %B %Y %H:%M
 DatabaseConnection=Databasetilkobling
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Ingen maler er opprettet for denne epost-typen
 NoTranslation=Ingen oversettelse
 NoRecordFound=Ingen post funnet
 NoError=Ingen feil
@@ -106,7 +106,7 @@ NotePrivate=Notat (privat)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr er satt opp til å bruke priser med <b>%s</b> desimaler.
 DoTest=Test
 ToFilter=Filter
-NoFilter=No filter
+NoFilter=Ingen filter
 WarningYouHaveAtLeastOneTaskLate=OBS! Du har minst ett forsinket element i listen ovenfor.
 yes=ja
 Yes=Ja
@@ -230,8 +230,8 @@ Now=Nå
 HourStart=Start time
 Date=Dato
 DateAndHour=Dato og tid
-DateToday=Today's date
-DateReference=Reference date
+DateToday=Dagens dato
+DateReference=Referansedato
 DateStart=Startdato
 DateEnd=Sluttdato
 DateCreation=Opprettet den
@@ -311,6 +311,7 @@ UnitPriceHT=Enhetspris (netto)
 UnitPriceTTC=Enhetspris
 PriceU=Pris
 PriceUHT=Pris (netto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net forespurt
 PriceUTTC=U.P. (inkl. avgift)
 Amount=Beløp
@@ -321,6 +322,9 @@ AmountTTCShort=Beløp (inkl. MVA)
 AmountHT=Beløp (eksl. MVA)
 AmountTTC=Beløp (inkl. MVA)
 AmountVAT=MVA beløp
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Beløp MVA 2
 AmountLT2=Beløp MVA 3
 AmountLT1ES=Beløp RE
@@ -335,6 +339,7 @@ Percentage=Prosent
 Total=Totalt
 SubTotal=Subtotal
 TotalHTShort=Totalt (netto)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Totalt (inkl. MVA)
 TotalHT=Totalt (eksl. MVA)
 TotalHTforthispage=Totalt (eks. MVA) for denne siden
@@ -457,6 +462,7 @@ Datas=Data
 None=Ingen
 NoneF=Ingen
 Late=Forsinket
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Bilde
 Photos=Bilder
 AddPhoto=Legg til bilde
@@ -539,6 +545,7 @@ NbOfCustomers=Antall kunder
 NbOfLines=Antall linjer
 NbOfObjects=Antall objekter
 NbOfReferers=Antall referanser
+NbOfObjectReferers=Number of refering objects
 Referers=Henvisende objekter
 TotalQuantity=Total mengde
 DateFromTo=Fra %s til %s
@@ -612,7 +619,7 @@ TotalMan=Totalt
 NeverReceived=Aldri mottatt
 Canceled=Kansellert
 YouCanChangeValuesForThisListFromDictionarySetup=Du kan endre verdier for denne listen fra menyen setup - ordbok
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanSetDefaultValueInModuleSetup=Du kan sette standardverdi for nye poster i Oppsett-modulen
 Color=Farge
 Documents=Tilknyttede filer
 DocumentsNb=Koblede filer (%s)
@@ -694,13 +701,14 @@ LinkedToSpecificUsers=Knyttet til en bestemt brukerkontakt
 DeleteAFile=Slett en fil
 ConfirmDeleteAFile=Er du sikker på at du vil slette filen
 NoResults=Ingen resultater
+AdminTools=Admin tools
 SystemTools=Systemverktøy
 ModulesSystemTools=Modulverktøy
 Test=Test
 Element=Element
 NoPhotoYet=Ingen bilder tilgjengelig ennå
 HomeDashboard=Hjem sammendrag
-Dashboard=Dashboard
+Dashboard=Kontrollpanel
 Deductible=Egenandel
 from=fra
 toward=mot
@@ -732,7 +740,8 @@ Hello=Hei
 Sincerely=Med vennlig hilsen
 DeleteLine=Slett linje
 ConfirmDeleteLine=Er du sikker på at du vil slette denne linjen?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index b65db52bc55..03c6e92edb9 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -35,9 +35,9 @@ MargeBrute=Bruttomargin
 MargeNette=Nettomargin
 MargeType1=Margin på beste leverandørpris
 MargeType2=Margin på gjennomsnittspris (Weighted Average Price - WAP)
-MargeType3=Margin on Cost Price
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
+MargeType3=Marginer på kostpris
+MARGIN_TYPE_DETAILS=Råmargin: Salgspris - Innkjøpspris<br>Nettomargin: Salgspris - Kostpris
+MarginTypeDesc=* Margin på beste kjøpskurs = Salgspris - Beste leverandørpris definert på varekortet<br> * Margin på vektet gjennomsnittlig pris (WAP) = Salgspris - Vektet gjennomsnittspris (WAP) eller beste leverandør pris hvis WAP ennå ikke er definert <br> * Margin på kostpris = Salgspris - Kostpris definert på varekortet, eller WAP hvis kostpris ikke er definert, eller beste leverandør pris hvis WAP ikke er definert
 CostPrice=Kostpris
 BuyingCost=Kostpris
 UnitCharges=Enhets-avgifter
diff --git a/htdocs/langs/nb_NO/oauth.lang b/htdocs/langs/nb_NO/oauth.lang
index b4bde17616d..95c32bc28c5 100644
--- a/htdocs/langs/nb_NO/oauth.lang
+++ b/htdocs/langs/nb_NO/oauth.lang
@@ -8,7 +8,7 @@ TokenDeleted=Nøkkel slettet
 RequestAccess=Klikk her for forespørsel/fornyet adgang og motta ny nøkkel
 DeleteAccess=Klikk her for å slette nøkkel
 UseTheFollowingUrlAsRedirectURI=Bruk følgende URL som redirect-URL når du lager din legitimasjon hos din OAuth tilbyder
-ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
+ListOfSupportedOauthProviders=Legg inn opplysninger fra din OAuth2-leverandør. Kun supporterte OAuth2-leverandører vises her. Dette oppsettet kan bli brukt av andre moduler som trenger OAuth2-autentisering
 OAUTH_GOOGLE_NAME=Api Google
 OAUTH_GOOGLE_ID=Api Google Id
 OAUTH_GOOGLE_SECRET=Api Google Secret
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 9567088363b..95c017d403d 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -82,7 +82,7 @@ OrdersOpened=Ordre å behandle
 NoOpenedOrders=Ingen åpne ordre
 NoOtherOpenedOrders=Ingen andre åpne ordre
 NoDraftOrders=Ingen ordreutkast
-NoOrder=No order
+NoOrder=Ingen ordre
 NoSupplierOrder=Ingen leverandørordre
 OtherOrders=Andre ordre
 LastOrders=Siste %s kundeordre
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index cb683a2ac0f..a58064eb562 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -238,8 +238,8 @@ ToExport=Eksport
 NewExport=Ny eksport
 ##### External sites #####
 ExternalSites=Eksterne nettsteder
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
-WEBSITE_KEYWORDS=Keywords
+WebsiteSetup=Oppsett av website-modulen
+WEBSITE_PAGEURL=Side-URL
+WEBSITE_TITLE=Tittel
+WEBSITE_DESCRIPTION=Beskrivelse
+WEBSITE_KEYWORDS=Nøkkelord
diff --git a/htdocs/langs/nb_NO/paypal.lang b/htdocs/langs/nb_NO/paypal.lang
index 458fcaa1c2a..b96a5398515 100644
--- a/htdocs/langs/nb_NO/paypal.lang
+++ b/htdocs/langs/nb_NO/paypal.lang
@@ -8,7 +8,7 @@ PAYPAL_API_SANDBOX=Test-/sandkasse-modus
 PAYPAL_API_USER=API brukernavn
 PAYPAL_API_PASSWORD=API passord
 PAYPAL_API_SIGNATURE=API signatur
-PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_SSLVERSION=Curl SSL-versjon
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Tilby &quot;integrert&quot betaling; (Kredittkort + Paypal) eller bare &quot;Paypal&quot; 
 PaypalModeIntegral=Integrert
 PaypalModeOnlyPaypal=Kun PayPal
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index d804118670b..8941e97765e 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -252,7 +252,7 @@ UnitPmp=Netto enhet VWAP
 CostPmpHT=Netto total VWAP
 ProductUsedForBuild=Automatisk brukt i produksjon
 ProductBuilded=Produksjon komplett
-ProductsMultiPrice=Products and prices for each price level
+ProductsMultiPrice=Varer og priser for hvert prisnivå
 ProductsOrServiceMultiPrice=Kundepriser (varer og tjenseter, multi-priser)
 ProductSellByQuarterHT=Kvartalsvis omsetning eks. MVA
 ServiceSellByQuarterHT=Kvartalsvis omsetning av tjenester eks. MVA
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Øk/minsk beholdning ved overordnet endring
 ComposedProduct=Sub-vare
 MinSupplierPrice=Minste leverandørpris
 DynamicPriceConfiguration=Dynamisk pris-konfigurering
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Globale variabler
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Oppdatering av globale variabler
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parser JSON data fra angitt URL, VALUE spesifiserer lokasjonen til relevant verdi.
@@ -311,5 +315,6 @@ PropalMergePdfProductChooseFile=Velg PDF-filer
 IncludingProductWithTag=Inkludert vare/tjeneste med merke
 DefaultPriceRealPriceMayDependOnCustomer=Standardpris, virkelig pris avhenger av kunde
 WarningSelectOneDocument=Velg minst ett dokument
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
+DefaultUnitToShow=Enhet
+NbOfQtyInProposals=Antall i tilbud
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index a1932a01bcc..37315060ba2 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Prosjekt-ID
 ProjectLabel=Prosjektetikett
 Project=Prosjekt
 Projects=Prosjekter
+ProjectsArea=Projects Area
 ProjectStatus=Prosjektstatus
 SharedProject=Alle
 PrivateProject=Kontaktpersoner for prosjektet
@@ -14,12 +15,12 @@ ProjectsPublicTaskDesc=Denne visningen presenterer alle prosjekter og oppgaver d
 ProjectsDesc=Denne visningen presenterer alle prosjekter (dine brukertillatelser gir deg tillatelse til å vise alt).
 MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en kontakt for (uansett type).
 OnlyOpenedProject=Kun åpne prosjekter er synlige (prosjektkladder og lukkede prosjekter er ikke synlige).
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Lukkede prosjekter er ikke synlige
 TasksPublicDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese.
 TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukertillatelser gir deg tillatelse til å vise alt).
 AllTaskVisibleButEditIfYouAreAssigned=Alle oppgaver for et slikt prosjekt er synlige, men du kan angi tid bare for oppgaven du er tildelt. Tildel oppgaven til deg hvis du ønsker å legge inn tid på den.
 OnlyYourTaskAreVisible=Kun oppgaver tildelt deg er synlige
-ProjectsArea=Prosjektområde
+ProjectsArea=Projects Area
 NewProject=Nytt prosjekt
 AddProject=Opprett prosjekt
 DeleteAProject=Slett et prosjekt
@@ -30,9 +31,9 @@ OfficerProject=Bas/formann for prosjektet
 LastProjects=Siste %s prosjekter
 AllProjects=Alle prosjekter
 OpenedProjects=Åpnede prosjekter
-OpenedTasks=Opened tasks
+OpenedTasks=Åpnede oppgaver
 OpportunitiesStatusForOpenedProjects=Beløp på muligheter i åpnede prosjekter, etter status
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+OpportunitiesStatusForProjects=Mulighet - beløp på prosjekter etter status
 ProjectsList=Oversikt over prosjekter
 ShowProject=Vis prosjekt
 SetProject=Sett prosjekt
@@ -67,6 +68,7 @@ Activities=Oppgaver/aktiviteter
 MyActivity=Min aktivitet
 MyActivities=Mine oppgaver/aktiviteter
 MyProjects=Mine prosjekter
+MyProjectsArea=My projects Area
 DurationEffective=Effektiv varighet
 Progress=Progresjon
 ProgressDeclared=Erklært progresjon
@@ -132,8 +134,8 @@ TaskModifiedInDolibarr=Oppgave %s endret
 TaskDeletedInDolibarr=Oppgave %s slettet
 OpportunityStatus=Mulighet-status
 OpportunityStatusShort=Tilbudsstatus
-OpportunityProbability=Opportunity probability
-OpportunityProbabilityShort=Opp. probab.
+OpportunityProbability=Mulighet - sannsynlighet
+OpportunityProbabilityShort=Mulig.sans.
 OpportunityAmount=Mulighet beløp
 OpportunityAmountShort=Tilbudsbeløp
 ##### Types de contacts #####
@@ -168,7 +170,7 @@ ProjectsWithThisUserAsContact=Prosjekter med denne brukeren som kontakt
 TasksWithThisUserAsContact=Oppgaver tildelt denne brukeren
 ResourceNotAssignedToProject=Ikke tildelt til prosjekt
 ResourceNotAssignedToTask=Ikke tildelt til oppgave
-ResourceNotAssignedToTheTask=Not assigned to the task
+ResourceNotAssignedToTheTask=Ikke tildelt oppgaven
 AssignTaskToMe=Tildel oppgaven til meg
 AssignTask=Tildel
 ProjectOverview=Oversikt
@@ -183,9 +185,12 @@ TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
 YouCanCompleteRef=Hvis du ønsker å fullføre referansen med litt informasjon (for å bruke det som søkefiltre), er det anbefalt å legge til et - tegn for å skille den, så den automatiske nummereringen fortsatt vil fungere korrekt for neste prosjekt. For eksempel %s-ABC. Du kan også legge søkenøkler til etiketter.
 OpenedProjectsByThirdparties=Prosjekter åpnet av tredjeparter
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Totalbeløp på muligheter
 OpportunityPonderatedAmount=Gjennomsnittsbeløp på muligheter
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
+OpportunityPonderatedAmountDesc=Muligheter - beløp vektet med sannsynlighet
 OppStatusPROSP=Utforskning
 OppStatusQUAL=Kvalifikasjon
 OppStatusPROPO=Tilbud
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index da6877cff7d..2fd4f01e8ab 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -25,7 +25,7 @@ LastModifiedProposals=Sist endrede tilbud %s
 AllPropals=Alle tilbud
 LastProposals=Siste tilbud
 SearchAProposal=Søk i tilbud
-NoProposal=No proposal
+NoProposal=Ingen tilbud
 ProposalsStatistics=Tilbudsstatistikk
 NumberOfProposalsByMonth=Antall tilbud pr måned
 AmountOfProposalsByMonthHT=Tilbudsbeløp pr måned (eksl. MVA)
@@ -63,8 +63,8 @@ DatePropal=Tilbudsdato
 DateEndPropal=Gyldig til
 DateEndPropalShort=Utløpsdato
 ValidityDuration=Gyldighetstid
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Sett status til
+SetAcceptedRefused=Sett akseptert/avvist
 ClassifyBilled=Sett som fakturert
 BuildBill=Lag faktura
 ErrorPropalNotFound=Tilbudet %s ble ikke funnet
@@ -102,4 +102,4 @@ DefaultModelPropalCreate=Standard modellbygging
 DefaultModelPropalToBill=Standardmal når du lukker et tilbud (som skal faktureres)
 DefaultModelPropalClosed=Standardmal når du lukker et tilbud (ufakturert)
 ProposalCustomerSignature=Skriftlig aksept, firmastempel, dato og signatur
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalsStatisticsSuppliers=Statistikk over leverandørtilbud
diff --git a/htdocs/langs/nb_NO/receiptprinter.lang b/htdocs/langs/nb_NO/receiptprinter.lang
index 56da0d77e6d..4f3e03aaa48 100644
--- a/htdocs/langs/nb_NO/receiptprinter.lang
+++ b/htdocs/langs/nb_NO/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Skriver %s lagt til
 PrinterUpdated=Skriver %s oppdater
 PrinterDeleted=Skriver %s slettet
 TestSentToPrinter=Test sendt til skriver %s
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Skriveroppsett
 ReceiptPrinterTemplateDesc=Oppsett av maler
 ReceiptPrinterTypeDesc=Beskrivelse av skrivertype
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index d9cab5693dd..211e81f51b6 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -6,7 +6,7 @@ AllSendings=Alle forsendelser
 Shipment=Levering
 Shipments=Leveringer
 ShowSending=Vis forsendelser
-Receivings=Delivery Receipts
+Receivings=Leveringskvitteringer
 SendingsArea=Leveringsområde
 ListOfSendings=Oversikt over leveringer
 SendingMethod=Leveringsmåte
diff --git a/htdocs/langs/nb_NO/sms.lang b/htdocs/langs/nb_NO/sms.lang
index bf27659e479..9d066b634ba 100644
--- a/htdocs/langs/nb_NO/sms.lang
+++ b/htdocs/langs/nb_NO/sms.lang
@@ -49,6 +49,6 @@ SendSms=Send SMS
 SmsInfoCharRemain=Antall gjenværende tegn
 SmsInfoNumero= (Internasjonal prefix dvs.: +4711223344)
 DelayBeforeSending=Forsinkelse før sending (minutter)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=Ingen sender tilgjengelig. Sjekk oppsett av SMS-leverandør
 SmsNoPossibleRecipientFound=Ingen mål tilgjengelig. Sjekk oppsettet fra din SMS-leverandør.
 
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index eb013a08f0e..91c2a10451e 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Siste bevegelser
 Units=Enheter
 Unit=Enhet
 StockCorrection=Korriger lagerbeholdning
-StockTransfer=Lagerbevegelse
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Lagerbevegelse
 StockMovements=Lagerbevegelser
 LabelMovement=Bevegelse-etikett
diff --git a/htdocs/langs/nb_NO/supplier_proposal.lang b/htdocs/langs/nb_NO/supplier_proposal.lang
index 23319dd4d44..3320b64bbbe 100644
--- a/htdocs/langs/nb_NO/supplier_proposal.lang
+++ b/htdocs/langs/nb_NO/supplier_proposal.lang
@@ -1,16 +1,17 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Leverandørtilbud
 supplier_proposalDESC=Håndter prisforespørsler til leverandører
-SupplierProposalShort=Supplier proposals
-SupplierProposalNew=New request
+SupplierProposalShort=Leverandørtilbud
+SupplierProposalNew=Ny forespørsel
 CommRequest=Prisforespørsel
 CommRequests=Prisforespørsel
 SearchRequest=Finn en forspørsel
 DraftRequests=Forespørsel-kladder
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Siste %s modifiserte prisforespørsler
 RequestsOpened=Åpne prisforespørsler
 SupplierProposalArea=Område for leverandørtilbud
-SupplierProposalShort=Supplier proposals
+SupplierProposalShort=Leverandørtilbud
 SupplierProposals=Leverandørtilbud
 NewAskPrice=Ny prisforspørsel
 NewAsk=Ny forespørsel
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index b8637f0b19d..1f024844a29 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -31,7 +31,7 @@ TripNDF=Informasjon om reiseregning
 PDFStandardExpenseReports=Standardmal for å generere PDF av reiseregning
 ExpenseReportLine=Linje i reiseregningen
 TF_OTHER=Annet
-TF_TRIP=Transportation
+TF_TRIP=Transport
 TF_LUNCH=Lunsj
 TF_METRO=Trikk/bybane
 TF_TRAIN=Tog
@@ -99,5 +99,5 @@ ConfirmSaveTrip=Er du sikker på at du vil validere denne reiseregningen?
 NoTripsToExportCSV=Ingen reiseregning å eksportere for denne perioden
 ExpenseReportPayment=Betaling av utgiftsrapport
 
-ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToApprove=Utgiftsrapporter for godkjenning
 ExpenseReportsToPay=Utgiftsrapport å betale
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 1ed018ef6f7..83ede89dec9 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -121,4 +121,5 @@ OpenIDURL=OpenID URL
 LoginUsingOpenID=Bruk OpenID til å logge inn
 WeeklyHours=Uketimer
 ColorUser=Farge på bruker
-DisabledInMonoUserMode=Disabled in maintenance mode
+DisabledInMonoUserMode=Deaktivert i vedlikeholds-modus
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
new file mode 100644
index 00000000000..8b29553040b
--- /dev/null
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_EXPORT_SEPARATORCSV=Kolom scheidingsteken voor exporteren naar bestand
+ACCOUNTING_EXPORT_DATE=Datum formaat voor exporteren naar bestand
+ACCOUNTING_EXPORT_PIECE=Exporteren van het aantal stukken
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporteren met globaal account
+ACCOUNTING_EXPORT_LABEL=Exporteer het label
+ACCOUNTING_EXPORT_AMOUNT=Exporteer het bedrag
+ACCOUNTING_EXPORT_DEVISE=Exporteer de munt
+Selectformat=Selecteer het formaat voor het bestand
+ACCOUNTING_EXPORT_PREFIX_SPEC=Geef de prefix voor het bestand
+Menuaccount=Accounts boekhouding
+Menuthirdpartyaccount=Derde partij accounts
+ConfigAccountingExpert=Configuratie van de module boekhouding expert
+Journaux=Dagboeken
+JournalFinancial=Financiële dagboeken
+Modelcsv=Model van een export
+OptionsDeactivatedForThisExportModel=Voor dit export model zijn de opties gedeactiveerd.
+Selectmodelcsv=Selecteer een model van export
+Modelcsv_CEGID=Export naar CEGID Expert
+BackToChartofaccounts=Geef kaart van accounts terug
+Definechartofaccounts=Definieer een kaart van accounts
+Selectchartofaccounts=Selecteer een kaart van accounts
+Addanaccount=Voeg een boekhouder account toe
+AccountAccounting=Boekhouder account
+AccountAccountingSuggest=Boekhouder account voorstel
+Ventilation=Uitsplitsing
+CustomersVentilation=Uitsplitsen klanten
+SuppliersVentilation=Uitsplitsen leveranciers
+TradeMargin=Handelsmarge
+Reports=Rapporten
+ByCustomerInvoice=Bij klant facturen
+CreateMvts=Aanmaken verplaatsing
+UpdateAccount=Wijziging van een boekhoudingsaccount
+UpdateMvts=Wijziging van een verplaatsing
+WriteBookKeeping=Noteren van accounts in het grootboek
+Bookkeeping=Grootboek
+AccountingVentilation=Uitsplitsing boekhouding
+AccountingVentilationSupplier=Uitsplitsing leveranciersaccount
+AccountingVentilationCustomer=Uitsplitsing klantaccount
+CAHTF=Totaal leveranciersaankoop voor BTW
+InvoiceLines=Te controleren factuurlijnen
+InvoiceLinesDone=Gecontroleerde lijnen van de factuur
+IntoAccount=Gecontroleerd in de boekhouding account
+Ventilate=Controleren
+VentilationAuto=Automatische uitsplitsing
+Processing=Verwerken
+EndProcessing=Einde van het verwerkingsprocess
+AnyLineVentilate=Nog lijnen te controleren
+SelectedLines=Geselecteerde lijnen
+Lineofinvoice=Factuur lijn
+VentilatedinAccount=Succesvol gecontroleerd in de boekhouding account
+NotVentilatedinAccount=Niet gecontroleerd in de boekhouding account
+ACCOUNTING_SEPARATORCSV=Kolom splitser in exporteren naar bestand
+ACCOUNTING_LIMIT_LIST_VENTILATION=Nummer van uit te splitsen elementen om te tonen per pagina (maximum aanbevolen : 50)
diff --git a/htdocs/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang
new file mode 100644
index 00000000000..b78b8e6ef18
--- /dev/null
+++ b/htdocs/langs/nl_BE/banks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - banks
+RejectCheckDate=Datum de cheque was teruggekeerd
+CheckRejectedAndInvoicesReopened=Teruggekeerde cheque en factuur heropend
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index 68cf7bf2b23..3f34d7e8e7f 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -1,17 +1,25 @@
 # Dolibarr language file - Source file is en_US - bills
 BillsCustomers=Klantenfacturen
+PaymentModeShort=Betalingsmanier
+CreateCreditNote=Aanmaak krediet nota
 BillStatusDraft=Conceptfactuur (moet worden gevalideerd)
 BillShortStatusClosedUnpaid=Afgesloten
 CustomersDraftInvoices=Klantenconceptfacturen
 RemainderToBill=Nog te factureren
 DateMaxPayment=Te betalen vóór
 GlobalDiscount=Globale korting
+PaymentRef=Betalingsref.
 CloneInvoice=Kopieer factuur
+AmountPaymentDistributedOnInvoice=Te betalen bedrag verdeeld over de factuur
+PaymentNote=Betalingsnota
 PaymentTypeVIR=Overschrijving
 PaymentTypeShortVIR=Overschrijving
 PaymentTypeTIP=Interbancaire betaling
 PaymentTypeShortTIP=Interbancaire betaling
 PaymentTypeTRA=Wissel
 PaymentTypeShortTRA=Wissel
+ChequeMaker=Cheque / Transfer uitvoerder
+DepositId=Id storting
 ShowUnpaidAll=Bekijk alle onbetaalde facturen
+MarsNumRefModelDesc1=Geeft een getal terug in de vorm van %syymm-nnnn voor standaard facturen, %syymm-nnnn voor vervangingsfacturen, %syymm-nnnn voor betalingsfacturen en %syymm-nnnn voor kredietnota's waar yy is jaar, mm is maand en nnnn is een volgnummer zonder onderbreking en die niet terug op 0 komt.
 TypeContact_facture_external_BILLING=Klant contact
diff --git a/htdocs/langs/nl_BE/boxes.lang b/htdocs/langs/nl_BE/boxes.lang
new file mode 100644
index 00000000000..320099acc6a
--- /dev/null
+++ b/htdocs/langs/nl_BE/boxes.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxTitleLastModifiedExpenses=Laatst %s aangepaste uitgaven rapporten
diff --git a/htdocs/langs/nl_BE/cashdesk.lang b/htdocs/langs/nl_BE/cashdesk.lang
new file mode 100644
index 00000000000..71480b735d5
--- /dev/null
+++ b/htdocs/langs/nl_BE/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+DolibarrReceiptPrinter=Dolibarr Ontvangsten Printer
diff --git a/htdocs/langs/nl_BE/categories.lang b/htdocs/langs/nl_BE/categories.lang
new file mode 100644
index 00000000000..8039995fdd0
--- /dev/null
+++ b/htdocs/langs/nl_BE/categories.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - categories
+ProspectsCategoriesShort=Vooruitzicht labels/categorien
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index e90f5061348..a1e5cc0c23f 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -1,6 +1,9 @@
 # Dolibarr language file - Source file is en_US - companies
 RegisteredOffice=Maarschappelijke zetel
+StateShort=Staat
 PhoneShort=Telefoonnummer
+LocalTax1IsUsed=Gebruik tweede BTW
+LocalTax2IsUsed=Gebruik derde BTW
 LocalTax2ES=Personenbelasting
 TypeLocaltax2ES=Personenbelasting Type
 ProfId6=Professionele ID 6
@@ -15,13 +18,17 @@ ProfId2TN=Prof. id 2 (Fiscale inschrijving)
 CompanyHasCreditNote=Deze afnemer heeft nog creditnota's of eerdere stortingen voor <b> %s %s</b>
 CustomerAbsoluteDiscountAllUsers=Openstaand kortingsbedrag (toegekend aan alle gebruikers)
 CustomerAbsoluteDiscountMy=Mijn openstaand kortingsbedrag (toegekend aan uzelf)
+CustomerCodeShort=Klant code
+SupplierCodeShort=Leverancier code
 ContactForOrders=Contactpersoon opdrachten
 ContactForProposals=Contactpersoon offertes
 ContactForContracts=Contactpersoon contracten
 ContactForInvoices=Contactpersoon facturen
 ErrorVATCheckMS_UNAVAILABLE=Controle niet mogelijk. Controledienst wordt niet verleend door lidstaat (%s).
+ContactOthers=Ander
 StatusProspect2=Contact lopende
 BillingContact=Contactpersoon facturatie
+ImportDataset_company_4=Derde partij/Verkoopsverantwoordelijke (Affecteert verkoopsverantwoordelijke gebruikers naar bedrijven)
 YouMustCreateContactFirst=U dient voor de Klant eerst contactpersonen met een e-mailadres in te stellen, voordat u kennisgevingen per e-mail kunt sturen.
 ProductsIntoElements=Lijst van producten/diensten in %s
 SearchThirdparty=Zoek een derde partij
diff --git a/htdocs/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang
index b1d19502f39..97eadd98abc 100644
--- a/htdocs/langs/nl_BE/compta.lang
+++ b/htdocs/langs/nl_BE/compta.lang
@@ -16,6 +16,12 @@ NewSocialContribution=Nwe soc. bijdr./bel.
 ContributionsToPay=Te betalen sociale bijdragen/belastingen
 AccountancyTreasuryArea=Overzicht kas/boekhouding
 PaymentSocialContribution=Sociale bijdrage/belasting betaling
+newLT1Payment=Nieuwe BTW 2 betaling
+newLT2Payment=Nieuwe BTW 3 betaling
+LT1Payment=BTW 2 betaling
+LT1Payments=BTW 2 betalingen
+LT2Payment=BTW 3 betaling
+LT2Payments=BTW 3 betalingen
 VATRefund=BTW teruggave
 Refund=Teruggave
 CustomerAccountancyCodeShort=Klantcode
diff --git a/htdocs/langs/nl_BE/contracts.lang b/htdocs/langs/nl_BE/contracts.lang
new file mode 100644
index 00000000000..2e1ed665705
--- /dev/null
+++ b/htdocs/langs/nl_BE/contracts.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsSubscriptions=Contracten/Abonnementen
+NewContractSubscription=Nieuwe contracten/abonnementen
diff --git a/htdocs/langs/nl_BE/cron.lang b/htdocs/langs/nl_BE/cron.lang
new file mode 100644
index 00000000000..b23b4921f7e
--- /dev/null
+++ b/htdocs/langs/nl_BE/cron.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=Lijst van geactiveerde/geplande taken
+EnabledAndDisabled=Geactiveerd en gedeactiveerd
+CronDtStart=Niet voor
+CronDtEnd=Niet na
+CronMaxRun=Max. te starten aantal
diff --git a/htdocs/langs/nl_BE/deliveries.lang b/htdocs/langs/nl_BE/deliveries.lang
new file mode 100644
index 00000000000..d57f155d805
--- /dev/null
+++ b/htdocs/langs/nl_BE/deliveries.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - deliveries
+DeliveryStateSaved=Leveringstoestand bewaard
+StatusDeliveryCanceled=Geannuleerd
+StatusDeliveryDraft=Concept
+StatusDeliveryValidated=Ontvangen
diff --git a/htdocs/langs/nl_BE/errors.lang b/htdocs/langs/nl_BE/errors.lang
new file mode 100644
index 00000000000..0530bb76d67
--- /dev/null
+++ b/htdocs/langs/nl_BE/errors.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorBadFormatValueList=De waarde uit de lijst kan niet meer dan 1 komma bevatten :  <u>%s</u>, maar op zijn minst een : key,value
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Verkeerde Definition Of Menu Array in de Module Descriptor (verkeerde waarde voor referentie fk_menu)
+ErrorSavingChanges=Er is een fout opgetreden tijdens het wegschrijven van de veranderingen
+WarningPasswordSetWithNoAccount=Een paswoord is aanwezig voor deze gebruiker. Alhoewel, geen gebruikers account werd aangemaakt. Dus dit paswoord is bewaard maar kan niet gebruikt worden om in te loggen in Dolibarr. Het kan zij dat het gebruikt wordt door een externe module/interface maar indien je het niet nodig acht om een login noch paswoord te definiëren voor een gebruiker,  kan je de optie "Manage a login for each member" deactiveren van de Member module setup. Indien je een login dient te begeren maar zonder paswoord, dan kun je dit veld leeg laten om deze waarschuwing te vermijden. Nota: Email kan ook gebruikt worden als login indien het lid gekoppeld is aan een gebruiker.
+WarningTooManyDataPleaseUseMoreFilters=Te veel gegevens (meer dan %s lijnen). Gebruik meer filters of zet deze constante %s op een hogere limiet.
diff --git a/htdocs/langs/nl_BE/exports.lang b/htdocs/langs/nl_BE/exports.lang
new file mode 100644
index 00000000000..7cafb9ea569
--- /dev/null
+++ b/htdocs/langs/nl_BE/exports.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - exports
+DataLoadedWithId=Alle gegevens worden geladen met de volgende import id: <b>%s</b>
+FilterableFields=Filterbare velden
diff --git a/htdocs/langs/nl_BE/ftp.lang b/htdocs/langs/nl_BE/ftp.lang
new file mode 100644
index 00000000000..df4c0ad6757
--- /dev/null
+++ b/htdocs/langs/nl_BE/ftp.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - ftp
+ChooseAFTPEntryIntoMenu=Kies een FTP toegang in het menu...
+FailedToGetFile=Mislukt om de bestanden te ontvangen %s
diff --git a/htdocs/langs/nl_BE/holiday.lang b/htdocs/langs/nl_BE/holiday.lang
new file mode 100644
index 00000000000..86d8f37a7b4
--- /dev/null
+++ b/htdocs/langs/nl_BE/holiday.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - holiday
+MenuConfCP=Balans van de verloven
+BoxTitleLastLeaveRequests=Laatst %s gewijzigde verlofaanvragen
+Affect=Opgevolgd door een teller
+FollowedByACounter=1: Dit type van verlof moet worden opgevolgd door een teller. De teller wordt manueel vermeerderd of automatisch wanneer een verlof is goedgekeurd, de teller wordt verminderd .<br>0: Niet opgevolgd door een teller.
+NoLeaveWithCounterDefined=Er zijn geen verlof types gedefinieerd dat moet opgevolgd worden door een teller
diff --git a/htdocs/langs/nl_BE/hrm.lang b/htdocs/langs/nl_BE/hrm.lang
new file mode 100644
index 00000000000..e6cdc2bc537
--- /dev/null
+++ b/htdocs/langs/nl_BE/hrm.lang
@@ -0,0 +1,17 @@
+# Dolibarr language file - Source file is en_US - hrm
+HRM_EMAIL_EXTERNAL_SERVICE=Email om de HRM externe service te verhinderen
+Establishments=Inrichtingen
+Establishment=Inrichting
+NewEstablishment=Nieuwe inrichting
+DeleteEstablishment=Verwijderen inrichting
+ConfirmDeleteEstablishment=Weet U zeker dat U deze inrichting wilt verwijderen ?
+OpenEtablishment=Open inrichting
+CloseEtablishment=Sluit inrichting
+DictionaryDepartment=HRM - afdelingen lijst
+DictionaryFunction=HRM - Functielijst
+ListOfEmployees=Lijst van werknemers
+Employees=Werknemers
+Employee=Werknemer
+Employe=Werk
+NewEmployee=Nieuwe werknemer
+EmployeeCard=Werknemerskaart
diff --git a/htdocs/langs/nl_BE/install.lang b/htdocs/langs/nl_BE/install.lang
index e78c9ab36ea..d68a385e8d3 100644
--- a/htdocs/langs/nl_BE/install.lang
+++ b/htdocs/langs/nl_BE/install.lang
@@ -1,6 +1,8 @@
 # Dolibarr language file - Source file is en_US - install
 LastStepDesc=<strong>Laatste stap:</strong> Definieer hier de login en het wachtwoord die u wilt gebruiken om verbinding te maken software. Niet los dit als het is de rekening voor alle anderen te beheren.
 ShowEditTechnicalParameters=Klik hier om verder gevorderde parameters te zien of aan te passen. (expert instellingen)
+WarningUpgrade=Opgelet:\nHeb je een database backup uitgevoerd ?\nDit wordt ten zeerste aanbevolen: wegens fouten in de database systemen (vb mysql version 5.5.40/41/42/43), kunnen bepaalde gegevens verloren gaan tijdens dit proces, voer daarom eerst een complete dump uit van je database voor je start met de migratie opdracht.\n\nKlik op OK om de migratie te starten...
 ErrorDatabaseVersionForbiddenForMigration=Uw database versie is %s en heeft een kritieke bug die gegevensverlies veroorzaakt als je structuur verandering uitvoert op uw database, welke gedaan worden door het migratieproces. Voor deze reden, zal de migratie niet worden toegestaan ​​totdat u uw database upgrade naar een hogere versie (lijst van gekende versies met bug: %s).
 MigrationDeliveryAddress=Werk de afleveringsadressen voor verzending bij
 MigrationCategorieAssociation=Overzetten van categoriën
+MigrationReloadModule=Herladen van de module  %s
diff --git a/htdocs/langs/nl_BE/interventions.lang b/htdocs/langs/nl_BE/interventions.lang
new file mode 100644
index 00000000000..d8bddf1b454
--- /dev/null
+++ b/htdocs/langs/nl_BE/interventions.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - interventions
+InterventionsArea=Interventieruimte
+DraftFichinter=Concept interventie
+LastModifiedInterventions=Laatste %s gewijzigde interventies
+InterId=Interventie id
+InterRef=Interventie ref.
+InterDateCreation=Datum aanmaak interventie
+InterDuration=Duur interventie
+InterStatus=Status interventie
+InterNote=Nota interventie
+InterLineId=Lijn id interventie
+InterLineDate=Lijn datum interventie
+InterLineDuration=Lijn duur interventie
+InterLineDesc=Lijn omschrijving interventie
diff --git a/htdocs/langs/nl_BE/languages.lang b/htdocs/langs/nl_BE/languages.lang
new file mode 100644
index 00000000000..a27973f1fde
--- /dev/null
+++ b/htdocs/langs/nl_BE/languages.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_fi_FI=Fins
diff --git a/htdocs/langs/nl_BE/link.lang b/htdocs/langs/nl_BE/link.lang
new file mode 100644
index 00000000000..345419a6f3d
--- /dev/null
+++ b/htdocs/langs/nl_BE/link.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - link
+URLToLink=URL naar link
diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang
index 37898888bec..5b573422ee8 100644
--- a/htdocs/langs/nl_BE/mails.lang
+++ b/htdocs/langs/nl_BE/mails.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - Source file is en_US - mails
 MailCard=EMailings kaart
+OnlyPDFattachmentSupported=Indien het PDF document reeds was gegeneerd voor de factuur, dan zal het bijgevoegd worden aan de email. Indien niet, dan wordt er geen email verstuurd (Noteer ook, dat alleen PDF facturen zijn ondersteund als bijlage in massa versturen van emails in deze versie).
+AllRecipientSelected=Alle derde partijen geselecteerd en indien een email was actief.
+ResultOfMailSending=Resultaat van massa EMail versturen
+NbSelected=Nr geselecteerd
+NbIgnored=Nr genegeerd
+NbSent=Nr verstuurd
+MailingModuleDescContactsByCategory=Contacten/adressen van derde partijen (per categorie)
 LastMailings=Laatste %s E-mailings
 SearchAMailing=Zoek een E-mailing
 SendMailing=Verzend E-mailing
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 14b7bdbf69a..d994dd44cd0 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -19,7 +19,29 @@ FormatDateHourShort=%d-%m-%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
+NoTemplateDefined=Geen model gedefinieerd voor dit email type
+Errors=Fouten
+NotAuthorized=U bent niet toegelaten om dat te doen.
+NoFilter=Geen filter
+DateCreationShort=Aanmaak datum
+SupplierProposalUHT=U.P. net is hiervoor nodig
+YouCanSetDefaultValueInModuleSetup=Je kan de standaard waarde gebruiken wanneer je een nieuw record plaatst in de module setup
+SetLinkToAnotherThirdParty=Link naar een derde partij
+SelectAction=Selecteer actie
 ShowTransaction=Toon transactie op bankrekening
 Deny=Weigeren
 Denied=Geweigerd
 Sincerely=Met vriendelijke groeten
+DeleteLine=Verwijder lijn
+ConfirmDeleteLine=Weet u zeker dat u deze lijn wilt verwijderen?
+Select2NotFound=Geen resultaten gevonden
+Select2LoadingMoreResults=Laden van meer resultaten...
+Select2SearchInProgress=Zoeken is aan de gang...
+SearchIntoThirdparties=Derde partijen
+SearchIntoProductsOrServices=Producten of diensten
+SearchIntoCustomerInvoices=Klant facturen
+SearchIntoSupplierInvoices=Leverancier facturen
+SearchIntoCustomerOrders=Klant bestellingen
+SearchIntoCustomerProposals=Klant voorstellen
+SearchIntoSupplierProposals=Leverancier voorstellen
+SearchIntoExpenseReports=Uitgaven rapporten
diff --git a/htdocs/langs/nl_BE/margins.lang b/htdocs/langs/nl_BE/margins.lang
new file mode 100644
index 00000000000..c70ad984649
--- /dev/null
+++ b/htdocs/langs/nl_BE/margins.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - margins
+ForceBuyingPriceIfNull=Gebruik de koop/kost prijs als verkoopsprijs indien niet gedefinieerd
+ForceBuyingPriceIfNullDetails=Indien koop/kost prijs niet gedefinieerd is, en deze optie is "ON", dan zal de marge nul zijn op deze lijn (koop/kost prijs = verkoopsprijs), anderzijds ("OFF"), marge zal gelijk zijn aan het gesuggereerde voorstel.
+MARGIN_TYPE_DETAILS=Ruwe marge : Verkoopsprijs - Aankoop prijs <br>Netto marge : Verkoopsprijs - Kost prijs
+MarginTypeDesc=* Marge op de beste koop prijs = Verkoopsprijs - Beste gedefinieerde leveranciersprijs op productkaart<br>* Marge op de gewogen gemiddelde prijs (WAP) = Verkoopsprijs - Gewogen gemiddelde prijs van het product (WAP) of de beste leveranciersprijs indien WAP nog niet gedefinieerd werd<br>* Marge op kost prijs = Verkoopsprijs - kost prijs gedefinieerd op product kaart of WAP indien kost prijs niet gedefinieerd was, of beste leveranciersprijs indien WAP nog niet gedefinieerd is
diff --git a/htdocs/langs/nl_BE/orders.lang b/htdocs/langs/nl_BE/orders.lang
index 7df0a9efab4..d0fc27f8563 100644
--- a/htdocs/langs/nl_BE/orders.lang
+++ b/htdocs/langs/nl_BE/orders.lang
@@ -13,10 +13,14 @@ OrdersToProcess=Nog te verwerken klantenbestellingen
 SuppliersOrdersToProcess=Nog te verwerken leveranciersbestellingen
 StatusOrderDraftShort=Ontwerp bestelling
 StatusOrderSentShort=In uitvoering
+StatusOrderDelivered=Geleverd
+StatusOrderBilledShort=Gefactureerd
+StatusOrderBilled=Gefactureerd
 UnvalidateOrder=Maak validatie bestelling ongedaan
 OrderReopened=Bestelling %s heropend
 NoOpenedOrders=Geen lopende bestellingen
 NoOtherOpenedOrders=Geen andere lopende bestellingen
+NoOrder=Geen order
 NoSupplierOrder=Geen aankooporder
 ClassifyBilled=Wijzig Status naar "gefactureerd"
 DraftSuppliersOrders=Voorlopige Leveranciersorder
diff --git a/htdocs/langs/nl_BE/other.lang b/htdocs/langs/nl_BE/other.lang
index 9e429fc0b9a..a4484026286 100644
--- a/htdocs/langs/nl_BE/other.lang
+++ b/htdocs/langs/nl_BE/other.lang
@@ -1,5 +1,9 @@
 # Dolibarr language file - Source file is en_US - other
 Notify_COMPANY_CREATE=Third party aangemaakt
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nHierbij vindt U de factuur __REF__\n\n__PERSONALIZED__Met oprechte groeten\n\n__SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe willen U waarschuwen dat deze factuur  __REF__ nog nog niet werd betaald. Hierbij kunt U, als herinnering, de factuur opnieuw terug vinden in bijlage .\n\n__PERSONALIZED__ met oprechte groeten\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nHierbij vindt U de prijs offerte  __ASKREF__\n\n__PERSONALIZED__Met oprechte groeten\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nHierbij vindt U de factuur __REF__\n\n__PERSONALIZED__Met oprechte groeten\n\n__SIGNATURE__
 FileIsTooBig=Bestanden zijn te groot
 ContractValidatedInDolibarr=Contract %s goedgekeurd
 ContractCanceledInDolibarr=Contract %s geannuleerd
diff --git a/htdocs/langs/nl_BE/sms.lang b/htdocs/langs/nl_BE/sms.lang
new file mode 100644
index 00000000000..2dc43871418
--- /dev/null
+++ b/htdocs/langs/nl_BE/sms.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - sms
+SmsNoPossibleSenderFound=Geen doel beschikbaar. Controleer instellingen van uw SMS-aanbieder.
diff --git a/htdocs/langs/nl_BE/supplier_proposal.lang b/htdocs/langs/nl_BE/supplier_proposal.lang
new file mode 100644
index 00000000000..b232c5a1bfd
--- /dev/null
+++ b/htdocs/langs/nl_BE/supplier_proposal.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Leverancier voorstellen
+SupplierProposals=Leverancier voorstellen
+SupplierProposalStatusBilled=Gefactureerd
+SupplierProposalStatusDraftShort=Concept
+SupplierProposalStatusBilledShort=Gefactureerd
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index ee2a84c1e37..9e1431c88eb 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index b99cddd5496..e37f6bd3914 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -154,6 +154,7 @@ Purge=Leegmaken
 PurgeAreaDesc=Deze pagina maakt het u mogelijk alle bestanden gemaakt of opgeslagen door Dolibarr te verwijderen (tijdelijke bestanden en / of alle bestanden in de map<b> %s</b>). Het gebruik van deze functie is niet noodzakelijk. Het is bedoeld voor gebruikers waarbij Dolibarr gehost wordt door een provider die geen rechten geeft voor het verwijderen van bestanden gemaakt door de webserver.
 PurgeDeleteLogFile=Verwijder het logbestand <b>%s</b> aangemaakt door de Syslog module (Geen risico op verlies van gegevens)
 PurgeDeleteTemporaryFiles=Verwijder alle tijdelijke bestanden (Geen risico op verlies van gegevens)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Verwijder alle bestanden in de map <b>%s.</b>. Tijdelijke bestanden, maar ook databasebackupbestanden, bijlagen van elementen (derde partijen, facturen, etc) en bestanden geüpload naar de ECM-module zullen verwijderd worden.
 PurgeRunNow=Nu opschonen
 PurgeNothingToDelete=Geen map of bestand om te verwijderen.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature om e-mails met behulp van methode "PHP ma
 TranslationSetup=Instelling van de taal
 TranslationDesc=Keuze taal zichtbaar op het scherm kan worden gewijzigd: <br> * Wereldwijd van <strong>Home-menu - Instellingen - Scherm</strong> <br> * Voor de gebruiker enkel van het tabblad <strong>Gebruiker weergave</strong> van de gebruiker kaart (klik op login op de top van het scherm).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Totaal aantal geactiveerde  <b>modules: %s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Je moet minstens 1 module aktiveren
 ClassNotFoundIntoPathWarning=Classe %s niet gevonden in PHP pad
 YesInSummer=Ja in de zomer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Sluit boekjaar
 DeleteFiscalYear=Verwijder het boekjaar
 ConfirmDeleteFiscalYear=Weet u zeker dat u dit boekjaar wilt verwijderen?
 AlwaysEditable=Kan altijd worden bewerkt
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Forceer zichtbare naam van de toepassing (waarschuwing: het instellen van uw eigen naam hier kan het automatisch aanvullen van de inlog functie breken wanneer gebruik wordt van de mobiele applicatie DoliDroid)
 NbMajMin=Minimum aantal hoofdletters
 NbNumMin=Minimum aantal numerieke tekens
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard om database backup dump bestand op te bouwen
 SomethingMakeInstallFromWebNotPossible=Installatie van externe module is niet mogelijk via de webinterface om de volgende reden:
 SomethingMakeInstallFromWebNotPossible2=Om deze reden, is het upgrade process hier beschreven alleen in handmatige stappen door een bevoorrechte gebruiker te doen.
 InstallModuleFromWebHasBeenDisabledByFile=Installeren van externe module van toepassing is uitgeschakeld door uw beheerder. Je moet hem vragen om het bestand <strong>%s</strong>  te verwijderen om deze functie mogelijk te maken.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index b71f0d99c5b..c0df0c14ad4 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -58,6 +58,7 @@ Payment=Betaling
 PaymentBack=Terugbetaling
 Payments=Betalingen
 PaymentsBack=Terugbetalingen
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Terugbetaald
 DeletePayment=Betaling verwijderen
 ConfirmDeletePayment=Weet u zeker dat u deze betaling wilt verwijderen?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in
 DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan nul
 PriceBase=Basisprijs
 BillStatus=Factuurstatus
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Concept (moet worden gevalideerd)
 BillStatusPaid=Betaald
 BillStatusPaidBackOrConverted=Betaald of omgezet in een korting
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Fout, kan een factuur niet annul
 BillFrom=Van
 BillTo=Geadresseerd aan
 ActionsOnBill=Acties op factuur
+RecurringInvoiceTemplate=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=Nieuwe factuur
 LastBills=Laatste %s facturen
 LastCustomersBills=Laatste %s afnemersfacturen
@@ -199,6 +205,7 @@ Rest=Hangende
 AmountExpected=Gevorderde bedrag
 ExcessReceived=Overbetaling
 EscompteOffered=Korting aangeboden (betaling vóór termijn)
+EscompteOfferedShort=Discount
 SendBillRef=Stuur factuur %s
 SendReminderBillRef=Stuur factuur %s (herinnering)
 StandingOrders=Doorlopende opdrachten
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Direct
 PaymentConditionRECEP=Direct
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index 5568e626cf0..f07541a3dc9 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Laatste %s contracten
 BoxTitleLastModifiedDonations=Laatst gewijzigd %s donaties
 BoxTitleLastModifiedExpenses=Laatste %s bewerkte onkostendeclaratie
 BoxGlobalActivity=Globale activiteit (facturen, offertes, bestellingen)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Bijwerken van de RSS feed is mislukt. Laatste succesvolle bijwerkingsdatum: %s
 LastRefreshDate=Laatste bijwerkingsdatum
 NoRecordedBookmarks=Geen weblinks ingesteld. Klik <a href="%s">weblinks</a> aan om deze toe te voegen.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Afnemersfacturen
 ForCustomersOrders=Klantenbestellingen
 ForProposals=Zakelijke voorstellen / Offertes
 LastXMonthRolling=De laatste %s maand overschrijdende
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index c0886b10acb..aec04f92738 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof-id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 836f23c2685..7e93f2d0e0b 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 2df039ec714..b3fcaa38d5f 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Commando regel om cron jobs uit te voeren
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Geplande taken
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Geen
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Volgende uitvoering
-CronDtLastLaunch=Laatste uitvoering
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Methode
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Deactiveren
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Kan klasse %s of object %s niet laden
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
index c306e43b6ab..3f5744b9603 100644
--- a/htdocs/langs/nl_NL/languages.lang
+++ b/htdocs/langs/nl_NL/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spaans (Mexico)
 Language_es_PY=Spaans (Paraguay)
 Language_es_PE=Spaans (Peru)
 Language_es_PR=Spaans (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estlands
 Language_eu_ES=Bask
 Language_fa_IR=Perzisch
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 4b139f8c102..c082367bb71 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Emailing succesvol gevalideerd
 MailUnsubcribe=Uitschrijven
 Unsuscribe=Uitschrijven
 MailingStatusNotContact=Niet meer contacten
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=E-mailadres ontvanger is leeg
 WarningNoEMailsAdded=Geen nieuw E-mailadres aan de lijst van ontvangers toe te voegen.
 ConfirmValidMailing=Weet u zeker dat u deze EMailing wilt valideren?
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 9f5c016e2da..3059788ed2a 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Eenheidsprijs (netto)
 UnitPriceTTC=Eenheidsprijs (bruto)
 PriceU=E.P.
 PriceUHT=EP (netto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Aanvraag
 PriceUTTC=U.P. (inc. belasting)
 Amount=Hoeveelheid
@@ -321,6 +322,9 @@ AmountTTCShort=Bedrag met BTW
 AmountHT=Bedrag (exclusief BTW)
 AmountTTC=Bedrag (incl. BTW)
 AmountVAT=Bedrag BTW
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Bedrag tax 2
 AmountLT2=Bedrag tax 3
 AmountLT1ES=Bedrag RE
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Totaal
 SubTotal=Subtotaal
 TotalHTShort=Totaal excl. BTW
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Totaal incl. BTW
 TotalHT=Totaal excl. BTW
 TotalHTforthispage=Totaal (na belastingen) voor deze pagina
@@ -457,6 +462,7 @@ Datas=Gegevens
 None=Geen
 NoneF=Geen
 Late=Vertraagd
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Afbeelding
 Photos=Afbeeldingen
 AddPhoto=Afbeelding toevoegen
@@ -539,6 +545,7 @@ NbOfCustomers=Aantal afnemers
 NbOfLines=Aantal regels
 NbOfObjects=Aantal objecten
 NbOfReferers=Aantal verwijzingen
+NbOfObjectReferers=Number of refering objects
 Referers=Verwijzende objecten
 TotalQuantity=Totale hoeveelheid
 DateFromTo=Van %s naar %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Gekoppeld aan een bepaalde gebruiker contact
 DeleteAFile=Een bestand verwijderen
 ConfirmDeleteAFile=Weet u zeker dat u van het wissen van bestand
 NoResults=Geen resultaten
+AdminTools=Admin tools
 SystemTools=Systeem tools
 ModulesSystemTools=Modules gereedschappen
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hallo
 Sincerely=Oprecht
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Maandag
 Tuesday=Dinsdag
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 4978ace696b..acdd3e7c936 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Verhogen/verlagen voorraad bij de ouder verandering
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum leverancier prijs
 DynamicPriceConfiguration=Dynamische prijs configuratie
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Globale variabelen
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Globale variabele aanpassers
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Ontleedt JSON gegevens van opgegeven URL, VALUE bepaalt de locatie van de relevante waarde,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 2daa6db0ed1..dd210b1124d 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projecten
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Iedereen
 PrivateProject=Contacten van het project
@@ -19,7 +20,7 @@ TasksPublicDesc=Deze weergave toont alle projecten en taken die u mag inzien.
 TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staan het u toe alles in te zien).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projectenoverzicht
+ProjectsArea=Projects Area
 NewProject=Nieuw project
 AddProject=Nieuw project
 DeleteAProject=Project verwijderen
@@ -67,6 +68,7 @@ Activities=Taken / activiteiten
 MyActivity=Mijn activiteit
 MyActivities=Mijn taken / activiteiten
 MyProjects=Mijn projecten
+MyProjectsArea=My projects Area
 DurationEffective=Effectieve duur
 Progress=Voortgang
 ProgressDeclared=Ingegeven voorgang
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/nl_NL/receiptprinter.lang b/htdocs/langs/nl_NL/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/nl_NL/receiptprinter.lang
+++ b/htdocs/langs/nl_NL/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index ec3e676fc3f..1319093d888 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Annuleer verzending
 DeleteSending=Verwijder verzending
 Stock=Voorraad
 Stocks=Voorraden
-StocksByLotSerial=Voorraad door lot/serienummer
+StocksByLotSerial=Stocks by lot/serial
 Movement=Mutatie
 Movements=Mutaties
 ErrorWarehouseRefRequired=Magazijnreferentienaam is verplicht
@@ -34,9 +34,10 @@ LastMovements=Laatste mutaties
 Units=Eenheden
 Unit=Eenheid
 StockCorrection=Voorraadcorrectie
-StockTransfer=Voorraadbeweging
-StockMovement=Voorraadmutatie
-StockMovements=Voorraadmutaties
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Bewegingslabel
 NumberOfUnit=Aantal eenheden
 UnitPurchaseValue=Eenheidsprijs
@@ -53,8 +54,8 @@ QtyDispatched=Hoeveelheid verzonden
 QtyDispatchedShort=Aantal verzonden
 QtyToDispatchShort=Aantal te verzenden
 OrderDispatch=Voorraadverzending
-RuleForStockManagementDecrease=Regel voor voorraadbeheerafname
-RuleForStockManagementIncrease=Regel voor voorraadbeheertoename
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Verlaag de echte voorraad na het valideren van afnemersfacturen / creditnota's
 DeStockOnValidateOrder=Verlaag de echte voorraad na het valideren van opdrachten
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Magazijnen en producten (met detail per lot/ser
 AverageUnitPricePMPShort=Gewogen gemiddelde inkoopprijs
 AverageUnitPricePMP=Gewogen gemiddelde inkoopprijs
 SellPriceMin=Verkopen Prijs per Eenheid
-EstimatedStockValueSellShort=Waarde te verkopen
-EstimatedStockValueSell=Waarde voor verkopen
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Geschatte voorraadwaarde
 EstimatedStockValue=Geschatte voorraadwaarde
 DeleteAWarehouse=Verwijder een magazijn
@@ -113,7 +114,7 @@ AlertOnly= Enkel waarschuwingen
 WarehouseForStockDecrease=De voorraad van magazijn <b>%s</b> zal verminderd worden
 WarehouseForStockIncrease=De voorraad van magazijn <b>%s</b> zal verhoogd worden
 ForThisWarehouse=Voor dit magazijn
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Bevoorradingen
 NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s)
diff --git a/htdocs/langs/nl_NL/supplier_proposal.lang b/htdocs/langs/nl_NL/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/nl_NL/supplier_proposal.lang
+++ b/htdocs/langs/nl_NL/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index 70242075b7b..8b61c231a47 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Gebruik OpenID om in te loggen
 WeeklyHours=Uren per week
 ColorUser=Kleur van de gebruiker
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 04c7511ed58..9a78c352d35 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Konto księgowe
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Awaria
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Podział klientów
 SuppliersVentilation=Dostawcy Breakdown
 TradeMargin=Marża handlowa
@@ -46,7 +47,7 @@ UpdateAccount=Modyfikacja konta księgowego
 UpdateMvts=Modyfikacja przesunięcia
 WriteBookKeeping=Konta rekord w księdze głównej
 Bookkeeping=Księga główna
-AccountBalanceByMonth=Stan konta na miesiąc
+AccountBalance=Account balance
 
 AccountingVentilation=Rachunkowości podział
 AccountingVentilationSupplier=Dostawca rachunkowości podział
@@ -103,6 +104,7 @@ Code_tiers=Kontrahent
 Labelcompte=Konto Wytwórnia
 Sens=Sens
 Codejournal=Dziennik
+NumPiece=Piece number
 
 DelBookKeeping=Usuń wpisy z księgi głównej
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Karta Podział
 GeneralLedgerIsWritten=Operacje zostały zapisane w głównej księdze
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 9080a5b5135..85b9d49ba3c 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -154,6 +154,7 @@ Purge=Czyszczenie
 PurgeAreaDesc=Ta strona pozwala na usunięcie wszystkich plików zbudowanych lub przechowywanych przez Dolibarr (pliki tymczasowe lub wszystkie pliki w <b>katalogu %s).</b> Korzystanie z tej funkcji nie jest konieczne. Zalecana jest dla użytkowników, których aplikacja Dolibarr jest hostowana przez usługodawcę nie zezwalającego na usuwanie plików utworzonych przez serwer WWW.
 PurgeDeleteLogFile=Usuwanie <b>pliku rejestru %s</b> zdefiniowanego dla modułu Syslog (nie ma ryzyka utraty danych)
 PurgeDeleteTemporaryFiles=Usuń wszystkie pliki tymczasowe (nie ma ryzyka utraty danych)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Usuń wszystkie pliki w <b>katalogu %s.</b> Pliki tymczasowe, jak również kopie zapasowe baz danych oraz pliki dołączone do elementów (kontrahencji, faktury ...) i przesłane do modułu ECM zostaną usunięte.
 PurgeRunNow=Czyść teraz
 PurgeNothingToDelete=Nie ma katalogu lub pliku do usunięcia.
@@ -416,7 +417,7 @@ ConfirmEraseAllCurrentBarCode=Czy na pewno chcesz usunąć wszystkie bieżące w
 AllBarcodeReset=Wszystkie wartości zostały usunięte z kodem kreskowym
 NoBarcodeNumberingTemplateDefined=Nie szablonu numeracji kodów kreskowych włączona w konfiguracji modułu kodów kreskowych.
 NoRecordWithoutBarcodeDefined=Brak zapisu bez wartości kodów kreskowych zdefiniowane.
-EnableFileCache=Enable file cache
+EnableFileCache=Włącz cache plików
 
 # Modules
 Module0Name=Użytkownicy i grupy
@@ -979,7 +980,7 @@ Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancja opóźnienia (liczba dni) przed
 Delays_MAIN_DELAY_EXPENSEREPORTS=Opóźnienie tolerancji (w dniach) przed wpisu do zestawienia wydatków do zatwierdzenia
 SetupDescription1=Wszystkie parametry dostępne w konfiguracji obszaru pozwalają na konfigurację Dolibarr przed rozpoczęciem jej używania.
 SetupDescription2=2 Najważniejsze kroki konfiguracji są 2 pierwszych w lewym menu, oznacza to, firmy / fundacji stronie konfiguracji i instalacji modułów strony:
-SetupDescription3=<b>Firma / fundacji</b> konfiguracji jest wymagane, ponieważ wkład informacje są wykorzystywane na Dolibarr wyświetla Dolibarr i zmiany zachowań (na przykład na funkcje związane z danym kraju).
+SetupDescription3=Parametry w menu <a href="%s">Konfiguracja -> Firma/Fundacja</a> są wymagane ponieważ informacje wejściowe są wykorzystywane w widokach Dolibarr i modyfikują środowisko Dolibarr (na przykład zasoby odnoszące się do kraju prowadzenia działalności).
 SetupDescription4=<b>Moduły</b> konfiguracji jest wymagane, ponieważ Dolibarr nie jest proste ERP / CRM, ale suma kilku modułów, wszystkie mniej lub bardziej niezależne. To dopiero po aktywacji modułów jesteś interesująca, widać cechy pojawiły się w Dolibarr menu.
 SetupDescription5=Inne pozycje menu zarządzają opcjonalnymi parametrami.
 EventsSetup=Konfiguracja dzienników zdarzeń
@@ -1006,7 +1007,7 @@ DisplayDesc=Możesz wybrać każdego z parametrów związanych z wyglądem i Dol
 AvailableModules=Dostępne moduły
 DeprecatedModules=Przestarzałe moduły
 ToActivateModule=Aby uaktywnić modules, przejdź na konfigurację Powierzchnia.
-SessionTimeOut=Godzina dla sesji
+SessionTimeOut=Limit czasu dla sesji
 SessionExplanation=Numer ten gwarantuje, że sesja nigdy nie wygaśnie przed upływem tego opóźnienia. Ale PHP sessoin zarządzania nie zawsze gwarantują, że sesja wygasa po tym terminie: Ten problem występuje, jeśli system do czyszczenia Wikisłowniku sesji jest uruchomiony. <br> Uwaga: nie szczególności systemu wewnętrznej PHP będzie czyste sesji każdy <b>temat %s / %s</b> dostępu, ale tylko podczas dostępu przez innych sesji.
 TriggersAvailable=Dostępne wyzwala
 TriggersDesc=Wyzwalacze są pliki, które będą modyfikować zachowania Dolibarr pracy po skopiowaniu do katalogu <b>htdocs / includes / wyzwala.</b> One zrealizowane nowych działań, uaktywnionego Dolibarr na imprezy (utworzenie nowej spółki, zatwierdzania faktur, ...).
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Funkcja wysłać maile za pomocą metody "PHP poc
 TranslationSetup=Konfiguracja de la traduction
 TranslationDesc=Wybór języka widoczne na ekranie mogą być modyfikowane: <br> * Globalnie z menu <strong>Start - Ustawienia - Wyświetlacz</strong> <br> * Dla użytkowników tylko z <strong>wyświetlaczem</strong> karta <strong>użytkownika</strong> karty użytkownika (kliknij zaloguj się na górze ekranu).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Łączna liczba aktywowanych modułów <b>funkcji:% s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musisz przynajmniej umożliwić 1 moduł
 ClassNotFoundIntoPathWarning=Klasa% s nie znaleziono na drodze PHP
 YesInSummer=Tak w lecie
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Blisko rok obrotowy
 DeleteFiscalYear=Usuń rok obrotowy
 ConfirmDeleteFiscalYear=Czy na pewno usunąć ten rok podatkowy?
 AlwaysEditable=Zawsze może być edytowany
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Wymusza widoczną nazwę aplikacji (ostrzeżenie: ustawienie własnej nazwy tutaj może złamać Autouzupełnianie funkcji logowania przy użyciu DoliDroid aplikację mobilną)
 NbMajMin=Minimalna liczba wielkich liter
 NbNumMin=Minimalna liczba znaków numerycznych
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Konfigurator wykonywania kopii zapasowej bazy danych
 SomethingMakeInstallFromWebNotPossible=Instalacja zewnętrznych modułów za pomocą interfejsu sieciowego nie jest możliwa z powodu następujących przyczyn:
 SomethingMakeInstallFromWebNotPossible2=Z tego powodu, proces uaktualnienia tutaj opisany jest jednie krokiem manualnym, który wykonać może uprawniony użytkownik.
 InstallModuleFromWebHasBeenDisabledByFile=Instalacja zewnętrznych modułów z poziomu aplikacji została wyłączona przez administratora. Musisz poprosić go o usunięcie pliku <strong>%s</strong> aby włączyć odpowiednią funkcję.
-ConfFileMuseContainCustom=Instalacja zewnętrznego modułu z poziomu aplikacji, zapisuje pliki w katlogu <strong>%s</strong>. Abu katalog ten był przetwarzany przez Dolibarr, musisz skonfigurować Twój plik <strong>conf/conf.php</strong>by w opcji <br>- <strong>$dolibarr_main_url_root_alt</strong> ustawić wartość <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> ustawić wartość <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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=Color of highlight line when mouse move passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Przykład wiadomości można użyć, aby ogło
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP i CRM% s jest dostępna. Wersja% s jest głównym wydaniu z wielu nowych funkcji dla użytkowników i deweloperów. Można go pobrać z pobierania obszarze http://www.dolibarr.org Portal (podkatalogów wersji stabilnej). Możesz przeczytać <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> do pełnej listy zmian.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP i CRM% s jest dostępna. Wersja% s jest wersja konserwacji, dlatego zawiera tylko poprawki robaki. Polecamy wszystkim, korzystasz ze starszej wersji uaktualnienia do tego. W każdym wydaniu konserwacji, bez nowych funkcji, ani zmiany struktury danych jest obecna w tej wersji. Można go pobrać z pobierania obszarze http://www.dolibarr.org Portal (podkatalogów wersji stabilnej). Możesz przeczytać <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> do pełnej listy zmian.
 MultiPriceRuleDesc=Gdy opcja "Kilka poziom cen na produkt / usługę" jest włączone, można zdefiniować różne ceny (jeden na poziomie cen) dla każdego produktu. Aby zaoszczędzić czas, można wprowadzić tutaj rządzić mieć cenę każdego poziomu autocalculated według ceny pierwszym poziomie, więc trzeba będzie wprowadzić tylko cenę za pierwszego poziomu na każdym produkcie. Ta strona jest tutaj, aby zaoszczędzić czas i może być przydatne tylko wtedy, jeśli ceny każdego poziomó są w stosunku do pierwszego poziomu. Można zignorować tę stronę w większości przypadków.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 6dfa732558e..fb986b94ace 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -58,6 +58,7 @@ Payment=Płatność
 PaymentBack=Zwrot płatności
 Payments=Płatności
 PaymentsBack=Zwroty płatności
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Spłacona
 DeletePayment=Usuń płatności
 ConfirmDeletePayment=Czy na pewno chcesz usunąć tę płatność?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Dokonaj płatności dla klienta
 DisabledBecauseRemainderToPayIsZero=Nieaktywne, ponieważ upływająca nieopłacona kwota wynosi zero
 PriceBase=Cena podstawowa
 BillStatus=Status faktury
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Projekt (musi zostać zatwierdzone)
 BillStatusPaid=Płatność
 BillStatusPaidBackOrConverted=Płatność lub konwersja do zniżki
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Błąd, nie można anulować fak
 BillFrom=Od
 BillTo=Do
 ActionsOnBill=Działania na fakturze
+RecurringInvoiceTemplate=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=Nowa faktura
 LastBills=Ostatnia %s faktur
 LastCustomersBills=Ostatnia %s odbiorców faktur
@@ -199,6 +205,7 @@ Rest=W oczekiwaniu
 AmountExpected=Kwota twierdził
 ExcessReceived=Trop Peru
 EscompteOffered=Rabat oferowane (płatność przed kadencji)
+EscompteOfferedShort=Discount
 SendBillRef=Złożenie faktury% s
 SendReminderBillRef=Złożenie faktury% s (przypomnienie)
 StandingOrders=Zlecenia stałe
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Niezwłocznie
 PaymentConditionRECEP=Niezwłocznie
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index 6ee6e6ec623..1c2d929367c 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Ostatnich %s użytkowników
 BoxTitleLastFicheInter=Ostatnich %s zmodyfikowanych interwencji
 BoxTitleOldestUnpaidCustomerBills=Najstarszych %s niezapłaconych faktur klienta
 BoxTitleOldestUnpaidSupplierBills=Najstarszych %s niezapłaconych faktur dostawcy
-BoxTitleCurrentAccounts=Otwórz bilanse kont
+BoxTitleCurrentAccounts=Bilans otwartych kont
 BoxTitleSalesTurnover=Obrót sprzedaży
 BoxTitleTotalUnpaidCustomerBills=Niezapłacone faktury klienta
 BoxTitleTotalUnpaidSuppliersBills=Niezapłacone faktury dostawcy
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Ostatni %s kontrakt
 BoxTitleLastModifiedDonations=Ostatnich %s modyfikowanch darowizn
 BoxTitleLastModifiedExpenses=Ostatnie %s modyfikowane raporty kosztów
 BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Nie można odświeżyć RSS. Ostatnie udane odświeżenie dnia: %s
 LastRefreshDate=Ostatnia data odświeżania
 NoRecordedBookmarks=Brak zdefiniowanych zakładek
@@ -95,4 +97,4 @@ ForCustomersInvoices=Faktury Klientów
 ForCustomersOrders=Zamówienia klientów
 ForProposals=Oferty
 LastXMonthRolling=Ostnich %s w ubiegłym miesiącu 
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 98cd4e7be2e..7a5fae3b733 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof ID 3
 ProfId4IN=Prof ID 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (IF)
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 98cc3cae0bc..a353641f02a 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Raport o klientach zagranicznych
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Oparty na dwóch pierwszych literach numeru VAT EU, które się różnią od kodu kraju , gdzie zarejetrowana jest Twoja firma.
 SameCountryCustomersWithVAT=Raport o klientach krajowych
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Oparty na dwóch pierwszych literach numeru VAT EU, które są takie same jak kod kraju, gdzie zarejetrowana jest Twoja firma.
+LinkedFichinter=Link to an intervention
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index 7e197417484..bf09e6f8e1e 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Klucz zabezpieczeń dla URL, aby uruchomić cron
 FileToLaunchCronJobs=Linia poleceń do uruchamiania zadań crona
 CronExplainHowToRunUnix=W środowisku Unix należy użyć następującego wpisu crontab, aby uruchomić wiersz poleceń co 5 minut
 CronExplainHowToRunWin=W środowisku Microsoft Windows(tm) można użyć narzędzia  Zaplanowane zadania, aby uruchomić linię poleceń co 5 minut
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Zaplanowane zadania
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Żaden
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Kolejne wykonanie
-CronDtLastLaunch=Ostatnie wykonanie
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Częstotliwość
 CronClass=Klasa
 CronMethod=Metoda
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Data zakończenia nie może być wcześniejsza niż data r
 CronStatusActiveBtn=Włączone
 CronStatusInactiveBtn=Wyłączone
 CronTaskInactive=To zadanie jest wyłączone
-CronDtLastResult=Data ostanich wyników
 CronId=ID
 CronClassFile=Klasy (filename.class.php)
 CronModuleHelp=Nazwa Dolibarr katalogu modułu (także współpracować z zewnętrznym modułem Dolibarr). <BR> Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów / htdocs / /class/product.class.php <u>produktu,</u> wartość modułu jest <i>produktem</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Nie można załadować klasy s% lub obiektu %s
 UseMenuModuleToolsToAddCronJobs=Wejdź w menu "Home - modułów narzędzi - Lista zadań", aby zobaczyć i edytować zaplanowane zadania.
 TaskDisabled=Zadanie wyłączone
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/pl_PL/deliveries.lang b/htdocs/langs/pl_PL/deliveries.lang
index f24035f276a..939793eecdf 100644
--- a/htdocs/langs/pl_PL/deliveries.lang
+++ b/htdocs/langs/pl_PL/deliveries.lang
@@ -18,7 +18,7 @@ DeliveryMethod=Metoda dostawy
 TrackingNumber=Numer przesyłki
 DeliveryNotValidated=Dostawa nie zatwierdzona
 StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
+StatusDeliveryDraft=Projekt
 StatusDeliveryValidated=Received
 # merou PDF model
 NameAndSignature=Nazwisko i podpis:
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index f130dbed0d6..e1092d7dce2 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Hiszpański (Meksyk)
 Language_es_PY=Hiszpański (Paragwaj)
 Language_es_PE=Hiszpański (Peru)
 Language_es_PR=Hiszpański (Portoryko)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estoński
 Language_eu_ES=Baskijski
 Language_fa_IR=Perski
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 7a4521783e8..6c8f7534a67 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Mailing pomyślnie zweryfikowany
 MailUnsubcribe=Wypisz
 Unsuscribe=Wypisz
 MailingStatusNotContact=Nie kontaktuj się więcej
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Odbiorca maila jest pusty
 WarningNoEMailsAdded=Brak nowych wiadomości mail, aby dodać adres do listy.
 ConfirmValidMailing=Czy na pewno chcesz potwierdzić tego maila?
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index aeeb2017513..3426e710f47 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Cena jednostkowa (netto)
 UnitPriceTTC=Cena jednostkowa
 PriceU=cen/szt.
 PriceUHT=cen/szt (netto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=UP netto Wnioskowana
 PriceUTTC=Podatek należny/naliczony
 Amount=Ilość
@@ -321,6 +322,9 @@ AmountTTCShort=Kwota (zawierająca VAT)
 AmountHT=Kwota (netto bez podatku)
 AmountTTC=Kwota (zawierająca VAT)
 AmountVAT=Kwota podatku VAT
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Wartość podatku 2
 AmountLT2=Wartość podatku 3
 AmountLT1ES=Kwota RE
@@ -335,6 +339,7 @@ Percentage=Procentowo
 Total=Razem
 SubTotal=Po podliczeniu
 TotalHTShort=Suma (netto)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Ogółem (z VAT)
 TotalHT=Razem (po odliczeniu podatku)
 TotalHTforthispage=Razem (po odliczeniu podatku) dla tej strony
@@ -457,6 +462,7 @@ Datas=Dane
 None=Żaden
 NoneF=Żaden
 Late=Późno
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Obraz
 Photos=Obrazy
 AddPhoto=Dodaj obraz
@@ -539,6 +545,7 @@ NbOfCustomers=Liczba klientów
 NbOfLines=Liczba linii
 NbOfObjects=Liczba obiektów
 NbOfReferers=Liczba stron odsyłających
+NbOfObjectReferers=Number of refering objects
 Referers=Liczba objektów
 TotalQuantity=Całkowita ilość
 DateFromTo=Z %s do %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Podpięty do kontaktu współużytkownika
 DeleteAFile=Usuń plik
 ConfirmDeleteAFile=Czy na pewno chcesz usunąć ten plik?
 NoResults=Brak wyników
+AdminTools=Admin tools
 SystemTools=Narzędzia systemowe
 ModulesSystemTools=Narzędzia modułów
 Test=Test
@@ -732,7 +740,8 @@ Hello=Witam
 Sincerely=Z poważaniem
 DeleteLine=Usuń linię
 ConfirmDeleteLine=Jesteś pewny, że chcesz usunąć tą linię?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Poniedziałek
 Tuesday=Wtorek
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 51149d9d8c8..d41aabc3fde 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Wzrost / spadek akcji na zmiany dominującej
 ComposedProduct=Pod-Produkt
 MinSupplierPrice=Cena minimalna dostawca
 DynamicPriceConfiguration=Dynamiczna konfiguracja cena
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Zmienne globalne
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Globalne zmienne updaters
 GlobalVariableUpdaterType0=Danych JSON
 GlobalVariableUpdaterHelp0=Analizuje dane JSON z określonego adresu URL, wartość określa położenie odpowiedniej wartości,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Domyślna cena, realna cena może zale
 WarningSelectOneDocument=Proszę zaznaczyć co najmniej jeden dokument
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 35301d5cf61..a10ba439e5d 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Projekt Id
 ProjectLabel=Etykieta projektu
 Project=Project
 Projects=Projekty
+ProjectsArea=Projects Area
 ProjectStatus=Status projektu
 SharedProject=Wszyscy
 PrivateProject=Kontakty z projektu
@@ -19,7 +20,7 @@ TasksPublicDesc=Ten widok przedstawia wszystkie projekty i zadania, które może
 TasksDesc=Ten widok przedstawia wszystkie projekty i zadania (twoje uprawnienia mają dostępu do wglądu we wszystko).
 AllTaskVisibleButEditIfYouAreAssigned=Wszystkie zadania dla tego projektu są widoczne, ale możesz wprowadzić czas tylko dla zadań, które są do ciebie przypisane. Przypisz zadanie do siebie jeżeli chcesz wprowadzić czas.
 OnlyYourTaskAreVisible=Tylko zadania do których jesteś przypisany są widoczne. Przypisz zadanie do siebie jeżeli chcesz wpisać w nim czas.
-ProjectsArea=Obszar projektów
+ProjectsArea=Projects Area
 NewProject=Nowy projekt
 AddProject=Tworzenie projektu
 DeleteAProject=Usuń projekt
@@ -67,6 +68,7 @@ Activities=Zadania / aktywności
 MyActivity=Moja aktywność
 MyActivities=Moje zadania / aktywności
 MyProjects=Moje projekty
+MyProjectsArea=My projects Area
 DurationEffective=Efektywny czas trwania
 Progress=Postęp
 ProgressDeclared=Deklarowany postęp
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Zadanie przypisanie. Wprowadzenie czasu na zadanie powin
 IdTaskTime=Id razem zadaniem
 YouCanCompleteRef=Jeśli chcesz, aby zakończyć ref z niektórych informacji (do wykorzystania go jako filtrów wyszukiwania), jest zaleciły, aby dodać - znak go oddzielić, więc automatyczne numerowanie będzie nadal działać poprawnie dla kolejnych projektów. Na przykład% s-ABC. Możesz też wolą, aby dodać klucze wyszukiwania na etykiecie.
 OpenedProjectsByThirdparties=Projekty otwarte przez kontahentów
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Szanse Całkowita ilość
 OpportunityPonderatedAmount=Ilość możliwości ważone
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/pl_PL/receiptprinter.lang b/htdocs/langs/pl_PL/receiptprinter.lang
index 7a29a405387..cfa705fb25b 100644
--- a/htdocs/langs/pl_PL/receiptprinter.lang
+++ b/htdocs/langs/pl_PL/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Drukarka %s dodana
 PrinterUpdated=Drukarka %s zaktualizowana
 PrinterDeleted=Drukarka %s usunięta
 TestSentToPrinter=Test wysyłania do drukarki %s
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Ustawienia drukarek
 ReceiptPrinterTemplateDesc=Ustawienia szablonów
 ReceiptPrinterTypeDesc=Opis typu drukarki przyjęciowej
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 9a51d3b9635..f04b43834c6 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Ostatnie ruchy
 Units=Jednostki
 Unit=Jednostka
 StockCorrection=Korekta zapasu
-StockTransfer=Transfer zapasu
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Przeniesienie zapasu
 StockMovements=Przesunięcia zapasu
 LabelMovement=Etykieta Ruch
diff --git a/htdocs/langs/pl_PL/supplier_proposal.lang b/htdocs/langs/pl_PL/supplier_proposal.lang
index b1c490eafbe..cfce2f50ad8 100644
--- a/htdocs/langs/pl_PL/supplier_proposal.lang
+++ b/htdocs/langs/pl_PL/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Zapytanie o cenę
 CommRequests=Zapytania o cenę
 SearchRequest=Znajdź zapytanie
 DraftRequests=Projekt zapytania
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=W ostatnim% s zmodyfikowane żądania cenowe
 RequestsOpened=Otwórz zapytanie o cenę
 SupplierProposalArea=Obszar ofert dostawcy
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 49e38501785..7ad7168e8bc 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Użyj do logowania OpenID
 WeeklyHours=Tygodniowy czas
 ColorUser=Kolor użytkownik
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index e8e2cce1634..65a273293f6 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -23,7 +23,6 @@ CreateMvts=Criar movimento
 UpdateAccount=Modificação de uma conta contábil
 UpdateMvts=Modificação de um movimento
 WriteBookKeeping=Registo das contas em contabilidade geral
-AccountBalanceByMonth=Saldo da conta por mês
 AccountingVentilation=Cancelar contabilidade
 AccountingVentilationSupplier=Cancelar fornecedor de contabilidade
 AccountingVentilationCustomer=Cancelar contabilidade de cliente
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 599641a05ee..048d5f8be49 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -910,7 +910,6 @@ PathDirectory=Diretório
 SendmailOptionMayHurtBuggedMTA=Função para envios de correspondência usando o método "PHP mail direct" irá gerar uma mensagem na correspondência que pode não estar corretamente analisada por algum servidor de recepção de correspondência. Resultando que essa correspondência não pode ser lida pela pessoa hostiada por essa plataforma bugada. É caso de alguns provedores de internet (Ex: Orange na França). Isso não é um problema para o Dolibarr nem dentro PHP mas para servidor receptor de correspondência. Você pode contudo adicionar a opção MAIN_FIX_FOR_BUGGED_MTA para 1 dentro da configuração, outra modificação do Dolibarr para evitar isso. Contudo você pode sofrer problemas com outros servidores que respeitão estritamente os padrões SMTP. A outra solução (RECOMENDADA) é usar o método "SMTP socket library" que não tem desvantagens.
 TranslationSetup=Configurações de tradução
 TranslationDesc=Escolha a língua visivel na sua tela que pode ser modificada:<br>* Global no menu <strong>Home->Configuração->Aparência</strong><br>* Para somente usuário pela tab <strong>Aparência de usuário</strong> no cartão do usuário (clique no login no topo da tela).
-TotalNumberOfActivatedModules=Número total de funções do módulo: <b>%s</b>
 YouMustEnableOneModule=Você pelo menos deve ativar 1 módulo
 ClassNotFoundIntoPathWarning=Classe %s não achado dentro o caminho PHP
 YesInSummer=Sim em verão
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 870e1bc00f8..4df1ffe9537 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -27,7 +27,6 @@ CronWaitingJobs=Esperando empregos
 CronTask=Trabalho
 CronNone=Nenhum
 CronDtNextLaunch=Proxima execuçao
-CronDtLastLaunch=Ultima execuçao
 CronFrequency=Freqüência
 CronClass=Classe
 CronMethod=Metodo
@@ -52,7 +51,6 @@ CronErrEndDateStartDt=Data fim nao pode ser antes da data do inicio
 CronStatusActiveBtn=Ativar
 CronStatusInactiveBtn=Desativar
 CronTaskInactive=Este trabalho foi desativado
-CronDtLastResult=Data ultimo resultado
 CronClassFile=Classe (nomearquivo.class.php)
 CronModuleHelp=Nome do diretório do módulo Dolibarr (também trabalha com módulo Dolibarr externo). Por exemplo para buscar método do objeto Dolibarr Product /htdocs/<u>produto</u>/class/product.class.php, o valor do módulo é o <i>produto</i>
 CronClassFileHelp=O nome do arquivo a ser carregado.<BR>Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/classe/<u>product.class.php</u>, o valor do nome do arquivo de classe é <i>product.class.php</i>
diff --git a/htdocs/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang
index 9a257cb3adc..220ffd571c9 100644
--- a/htdocs/langs/pt_BR/languages.lang
+++ b/htdocs/langs/pt_BR/languages.lang
@@ -16,7 +16,6 @@ Language_en_IN=Ingles (India)
 Language_en_NZ=Ingles (Nova Zelandia)
 Language_en_SA=Ingles (Arabia Saudita)
 Language_en_US=Ingles (Estados Unidos)
-Language_es_BO=Espanhol (Bolívia)
 Language_es_CO=Espanhol (Colômbia)
 Language_es_MX=Espanhol (Mexico)
 Language_et_EE=Estone
@@ -37,6 +36,5 @@ Language_pl_PL=Polones
 Language_pt_BR=Portugues (Brasil)
 Language_pt_PT=Portugues
 Language_ru_UA=Russo (Ukrania)
-Language_sr_RS=Sérvio
 Language_zh_CN=Chines
 Language_zh_TW=Chines (Tradicional)
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index 51ddb650977..79e730f3a76 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -15,7 +15,6 @@ CancelSending=Cancelar Envio
 DeleteSending=Eliminar Envio
 Stock=Estoque
 Stocks=Estoques
-StocksByLotSerial=Estoque por lot / serial
 ErrorWarehouseRefRequired=Nome de referência do armazenamento é necessária
 ErrorWarehouseLabelRequired=A etiqueta do armazenamento é obrigatória
 CorrectStock=Corrigir Estoque
@@ -23,8 +22,6 @@ ListOfWarehouses=Lista de armazenamento
 StocksArea=Area de estoque
 NumberOfDifferentProducts=Número de produtos diferentes
 StockCorrection=Correção estoque
-StockTransfer=Banco de transferência
-StockMovements=Movimentos de estoque
 LabelMovement=Etiqueta Movimento
 UnitPurchaseValue=Preço de compra da unidade
 TotalStock=Total em estoque
@@ -36,8 +33,6 @@ IndependantSubProductStock=Estoque de produtos e estoque subproduto são indepen
 QtyDispatchedShort=Qtde despachou
 QtyToDispatchShort=Qtde de expedição
 OrderDispatch=Recepção de estoques
-RuleForStockManagementDecrease=Regra de Administração de decrementos de estoque
-RuleForStockManagementIncrease=Regra de Administração de incrementos de estoque
 DeStockOnBill=Diminuir ações reais em clientes validação facturas / notas de crédito
 DeStockOnValidateOrder=Decrementar os estoques físicos sobre os pedidos
 DeStockOnShipment=Diminuir o estoque real na validação do envio
@@ -92,7 +87,6 @@ SelectProductWithNotNullQty=Selecione pelo menos um produto com um qty não nulo
 WarehouseForStockDecrease=Os arquivos serão utilizados para redução estoque
 WarehouseForStockIncrease=O arquivos serão utilizados para aumento de
 ForThisWarehouse=Para este armazenamento
-ReplenishmentStatusDesc=Esta é uma lista de todos os produtos com um estoque menor do que o estoque desejado (ou inferior ao valor de alerta se checkbox "alerta apenas" estiver marcada), e sugerir-lhe para criar ordens de fornecedor para preencher a diferença.
 ReplenishmentOrdersDesc=Esta é uma lista de todas as ordens de fornecedor abertos, incluindo os produtos pré-definidos. Apenas abriu pedidos com produtos pré-definidos, de modo ordens que podem afetar os estoques, são visíveis aqui.
 Replenishments=Reconstituições
 NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado
@@ -110,7 +104,6 @@ StockMustBeEnoughForShipment=Nível de estoque deve ser suficiente para adiciona
 MovementLabel=Rótulo de Movimento
 InventoryCode=Código de movimento ou de inventário
 IsInPackage=Contido em pacote
-ShowWarehouse=Mostrar armazém
 MovementCorrectStock=Da correção para o produto %s
 MovementTransferStock=Da transferência de produto %s em um outro armazém
 WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Armazém de origem deve ser definido aqui quando o módulo "lote do produto" está ativo. Ele será usado para listar quais lotes/seriais estão disponíveis para produtos que exigem lotes/seriais para o movimento. Se você quiser enviar produtos de diferentes armazéns, basta fazer o envio em várias etapas.
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 20a0ce1a32b..a049469f262 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Conta contabilistica
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Separação
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Separação de Cliente
 SuppliersVentilation=Separação de Fornecedor
 TradeMargin=Margem de distribuição
@@ -46,7 +47,7 @@ UpdateAccount=Modificação de conta contabilistica
 UpdateMvts=modificação de movimento
 WriteBookKeeping=Gravar conta em contabilidade geral
 Bookkeeping=Contabilidade geral
-AccountBalanceByMonth=Balanço de contas mensal
+AccountBalance=Account balance
 
 AccountingVentilation=contabilidade desagregada
 AccountingVentilationSupplier=Contabilidade desagregada de Fornecedor
@@ -103,6 +104,7 @@ Code_tiers=Terceiros
 Labelcompte=Etiqueta de conta
 Sens=Sentido
 Codejournal=Diário
+NumPiece=Piece number
 
 DelBookKeeping=Apagar os registos em Contabilidade geral
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Carta de desagregação
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 8120c645912..77296c82eab 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -154,6 +154,7 @@ Purge=Limpar
 PurgeAreaDesc=Esta página permite eliminar todos os ficheiros criados ou Gravados pelo ERP/CRM (Ficheiros temporários ou todos os ficheiros da pasta <b>%s</b>). O uso desta função não é necessária. Proporciona-se para os utilizadores que albergam o ERP/CRM no servidor que oferece as permissões de eliminação de ficheiros salvaguardados pelo servidor Web.
 PurgeDeleteLogFile=Apagar <b>ficheiro %s</b> definido para o módulo Syslog (sem risco de perderem os dados)
 PurgeDeleteTemporaryFiles=Eliminar todos os ficheiros temporários (sem perigo de perca de dados)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os ficheiros da pasta <b>%s</b>. Ficheiros temporários e Ficheiros anexados a elementos (Terceiros, facturas, etc.) serão eliminados.
 PurgeRunNow=Purgar Agora
 PurgeNothingToDelete=Nenhuma pasta a eliminar
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuração da tradução
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total de módulos de funcionalidades ativos: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo
 ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho PHP
 YesInSummer=Sim no verão
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Fechar ano fiscal
 DeleteFiscalYear=Apagar ano fiscal
 ConfirmDeleteFiscalYear=Tem a certeza de que deseja apagar este ano fiscal?
 AlwaysEditable=Pode ser sempre editado
+IsHidden=Is not visible
 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=Número máximo de carateres maiúsculos
 NbNumMin=Número mínimod de carateres numéricos
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 02591b2bec9..3b82848bd67 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -58,6 +58,7 @@ Payment=pagamento
 PaymentBack=Reembolso
 Payments=pagamentos
 PaymentsBack=Reembolsos
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Devolver Pagamento
 DeletePayment=Eliminar o pagamento
 ConfirmDeletePayment=Está seguro de querer eliminar este pagamento?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Realizar pagamento de recibos à cliente
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=preço base
 BillStatus=Estado da factura
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=rascunho (a Confirmar)
 BillStatusPaid=paga
 BillStatusPaidBackOrConverted=Reembolsada o convertida em redução
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma fac
 BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Acções sobre a factura
+RecurringInvoiceTemplate=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=Nova factura
 LastBills=as %s últimas facturas
 LastCustomersBills=as %s últimas facturas a clientes
@@ -199,6 +205,7 @@ Rest=Pendente
 AmountExpected=Montante reclamado
 ExcessReceived=Recebido em excesso
 EscompteOffered=Desconto (Pronto pagamento)
+EscompteOfferedShort=Discount
 SendBillRef=Submissão da fatura %s
 SendReminderBillRef=Submissão da fatura %s (lembrete)
 StandingOrders=Débitos Directos
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Pronto Pagamento
 PaymentConditionRECEP=Pronto Pagamento
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index be14c5915b7..7498992b26e 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Últimos contratos
 BoxTitleLastModifiedDonations=%s Última modificação doações
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Atividade Global (faturas, propostas, encomendas)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Erro ao  refresh fluxo RSS. data do último refresh: %s
 LastRefreshDate=Data última actualização
 NoRecordedBookmarks=Não existem favoritos pessoais. Click aqui para adicionar.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Facturas de Clientes
 ForCustomersOrders=Encomendas de clientes
 ForProposals=Orçamentos
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 761328702a5..d23914fb451 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof ID 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (IF)
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index c267997dd68..3ba74ffb91a 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index b3b6c1d965b..33c07029ca9 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Tarefas agendadas
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Nenhuma
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Próximo execução
-CronDtLastLaunch=Última execução
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Método
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=A data de fim não pode ser anterior à data de início
 CronStatusActiveBtn=Activar
 CronStatusInactiveBtn=Desactivar
 CronTaskInactive=Esta tarefa está desactivada
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Aceda a "Home - Ferramentas dos Módulos" para visualizar e editar as tarefas agendadas.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang
index e6326732953..fb68e1b0112 100644
--- a/htdocs/langs/pt_PT/languages.lang
+++ b/htdocs/langs/pt_PT/languages.lang
@@ -23,25 +23,26 @@ Language_en_US=Inglês (Estados Unidos)
 Language_en_ZA=Inglês (África do Sul)
 Language_es_ES=Espanhol
 Language_es_AR=Espanhol (Argentina)
-Language_es_BO=Spanish (Bolivia)
+Language_es_BO=Espanhol (Bolívia)
 Language_es_CL=Espanhol (Chile)
-Language_es_CO=Spanish (Colombia)
+Language_es_CO=Espanhol (Colombia)
 Language_es_DO=Espanhol (República Dominicana)
 Language_es_HN=Espanhol (Honduras)
 Language_es_MX=Espanhol (México)
 Language_es_PY=Espanhol (Paraguai)
 Language_es_PE=Espanhol (Peru)
 Language_es_PR=Espanhol (Porto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estónio
 Language_eu_ES=Basco
 Language_fa_IR=Persa
-Language_fi_FI=Finnish
+Language_fi_FI=Finlandês
 Language_fr_BE=Francês (Bélgica)
 Language_fr_CA=Francês (Canadá)
 Language_fr_CH=Francês (Suíça)
 Language_fr_FR=Francês
 Language_fr_NC=Francês (Nova Caledónia)
-Language_fy_NL=Frisian
+Language_fy_NL=Frísio
 Language_he_IL=Hebreu
 Language_hr_HR=Croata
 Language_hu_HU=Húngaro
@@ -71,7 +72,7 @@ Language_sv_SV=Sueco
 Language_sv_SE=Sueco
 Language_sq_AL=Albanês
 Language_sk_SK=Eslovaco
-Language_sr_RS=Serbian
+Language_sr_RS=Sérvio
 Language_sw_SW=Kiswahili
 Language_th_TH=Tailandês
 Language_uk_UA=Ucraniano
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index a284b02a0f2..a00fc66ee31 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Mailing validado com sucesso
 MailUnsubcribe=Cancelar Subscrição
 Unsuscribe=Cancelar Subscrição
 MailingStatusNotContact=Não efectuar mais contatos
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=A direcção do destinatario está vazia
 WarningNoEMailsAdded=nenhum Novo e-mail a Adicionar à lista destinatarios.
 ConfirmValidMailing=Confirma a validação do mailing?
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 6890cffdc5b..03966fe92be 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Preço Base (base)
 UnitPriceTTC=Preço Unitário
 PriceU=P.U.
 PriceUHT=P.U. (base)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Montante
@@ -321,6 +322,9 @@ AmountTTCShort=Montante (IVA inc.)
 AmountHT=Montante (base)
 AmountTTC=Montante (IVA inc.)
 AmountVAT=Montante do IVA
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Valor do IVA 2
 AmountLT2=Valor do IVA 3
 AmountLT1ES=Montante RE
@@ -335,6 +339,7 @@ Percentage=Percentagem
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Montante base
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (IVA inc.)
 TotalHT=Total
 TotalHTforthispage=Total (liquido de imposto) para esta página
@@ -457,6 +462,7 @@ Datas=Dados
 None=Nenhum
 NoneF=Nenhuma
 Late=Atraso
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Foto
 Photos=Fotos
 AddPhoto=Adicionar foto
@@ -539,6 +545,7 @@ NbOfCustomers=Numero de Clientes
 NbOfLines=Numeros de Linhas
 NbOfObjects=Numero de Objectos
 NbOfReferers=Numero de Referências
+NbOfObjectReferers=Number of refering objects
 Referers=Referências a objetos
 TotalQuantity=Quantidade Total
 DateFromTo=De %s a %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Associado ao contacto de um utilizador
 DeleteAFile=Apagar um Ficheiro
 ConfirmDeleteAFile=Tem a certeza que querer eliminar este ficheiro?
 NoResults=Sem resultados
+AdminTools=Admin tools
 SystemTools=Ferramentas do sistema
 ModulesSystemTools=Módulos de ferramentas
 Test=Teste
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 01ebb41329c..e3432adb5ad 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Variáveis globais
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=Dados JSON
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index c7fdc8dc933..3569cd2b7a8 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Id. do Projeto
 ProjectLabel=Project label
 Project=Projeto
 Projects=Projetos
+ProjectsArea=Projects Area
 ProjectStatus=Estado do projeto
 SharedProject=Toda a Gente
 PrivateProject=Contactos do projeto
@@ -19,7 +20,7 @@ TasksPublicDesc=Esta visualização apresenta todos os projetos e tarefas que es
 TasksDesc=Esta visualização apresenta todos os projetos e tarefas (as suas permissões de utilizador concedem-lhe permissão para ver tudo).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Área de Projetos
+ProjectsArea=Projects Area
 NewProject=Novo Projeto
 AddProject=Criar Projeto
 DeleteAProject=Apagar um Projeto
@@ -67,6 +68,7 @@ Activities=Tarefas/Atividades
 MyActivity=A Minha Atividade
 MyActivities=As Minhas Tarefas/Atividades
 MyProjects=Os Meus Projetos
+MyProjectsArea=My projects Area
 DurationEffective=Duração Efetiva
 Progress=Progresso
 ProgressDeclared=Progresso declarado
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/pt_PT/receiptprinter.lang b/htdocs/langs/pt_PT/receiptprinter.lang
index 0601b8d8306..9ebd1113269 100644
--- a/htdocs/langs/pt_PT/receiptprinter.lang
+++ b/htdocs/langs/pt_PT/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Adicionada a impressora %s
 PrinterUpdated=Atualizada a impressora %s
 PrinterDeleted=Eliminada a impressora %s
 TestSentToPrinter=Teste Enviado para a Impressora %s
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Setup of printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 8cd3570c8ba..75998fb2abf 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancelar Envío
 DeleteSending=Eliminar Envío
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movimento
 Movements=Movimentos
 ErrorWarehouseRefRequired=O nome de referencia do armazem é obrigatório
@@ -34,9 +34,10 @@ LastMovements=Últimos movimentos
 Units=Unidades
 Unit=Unidade
 StockCorrection=Correcção stock
-StockTransfer=Stock transfer
-StockMovement=Transferencia
-StockMovements=Movimentos de stock
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Número de peças
 UnitPurchaseValue=Preço de compra Unitário
@@ -50,11 +51,11 @@ EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Criar existencias automáticamente na criação de um utilizador
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantidade desagregada
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
+QtyDispatchedShort=Qt. despachada
+QtyToDispatchShort=Qt. a despachar
 OrderDispatch=Recepção de stocks
-RuleForStockManagementDecrease=Regra de Gestão de decrementos de stock
-RuleForStockManagementIncrease=Regra de Gestão de incrementos de stock
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrementar os stocks físicos sobre as facturas/recibos
 DeStockOnValidateOrder=Decrementar os stocks físicos sobre os pedidos
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Média dos preços de entrada
 AverageUnitPricePMP=Média dos preços de entrada
 SellPriceMin=Vendendo Preço unitário
-EstimatedStockValueSellShort=Valor para vender
-EstimatedStockValueSell=Valor para vender
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Valor estimado de stock
 EstimatedStockValue=Valor estimado de stock
 DeleteAWarehouse=Excluir um armazém
@@ -113,7 +114,7 @@ AlertOnly= Só Alertas
 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=Para este armazém
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
@@ -129,9 +130,9 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
-InventoryCode=Movement or inventory code
+InventoryCode=Movimento ou código do inventário
 IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
+ShowWarehouse=Mostrar armazém
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/pt_PT/supplier_proposal.lang b/htdocs/langs/pt_PT/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/pt_PT/supplier_proposal.lang
+++ b/htdocs/langs/pt_PT/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index c562eb19d1a..6b922af3a7a 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Utilizar OpenID para iniciar a sessão
 WeeklyHours=Horas semanais
 ColorUser=Cor do utilizador
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 2a8dc162b96..d38057db986 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Cont contabil
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Ventilare
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Ventilare clienţi
 SuppliersVentilation=Ventilare furnizori
 TradeMargin=Marjă comercială
@@ -46,7 +47,7 @@ UpdateAccount=Modificare cont contabil
 UpdateMvts=Modificare mişcare
 WriteBookKeeping=Înregistrare contabilă in Cartea Mare
 Bookkeeping=Cartea Mare
-AccountBalanceByMonth=Sold pe luni
+AccountBalance=Account balance
 
 AccountingVentilation=Ventilare contabilă
 AccountingVentilationSupplier=Ventilare contabila furnizor
@@ -103,6 +104,7 @@ Code_tiers=Terţ
 Labelcompte=Etichetă cont
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Şterge înregistrări din Cartea Mare
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Fişă Ventilare
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Formatul de export
 Prefixname=Prefixul  fișierului export
@@ -163,7 +167,8 @@ Type=Tip campuri
 Param=Parametrii suplimentari
 EnabledProduct=În produse
 EnabledTiers=In third party
-EnabledVat=In TVA-
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index a0ae12d6f2d..6ad10fce78e 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -154,6 +154,7 @@ Purge=Curăţenie
 PurgeAreaDesc=Această pagină vă permite să ştergeţi toate fişierele construit sau stocate de către Dolibarr (fişiere temporare sau toate fişierele în <b>directorul %s).</b> Folosind această facilitate nu este necesar. Este prevăzut pentru utilizatorii ale căror Dolibarr este găzduit de un furnizor care nu oferă permisiuni pentru a şterge fişierele construit de către serverul de web.
 PurgeDeleteLogFile=Ştergere jurnal <b>fişier %s</b> definite pentru Syslog modul (fără riscul de a pierde date)
 PurgeDeleteTemporaryFiles=Ştergeţi toate fişierele temporare (fără riscul de a pierde date)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Ştergeţi toate fişierele în <b>directorul %s.</b> Fisiere temporare, dar de asemenea, fişierele ataşate la elemente (terţe părţi, facturi, ...) şi a trimis în modul ECM vor fi şterse.
 PurgeRunNow=Elimină acum
 PurgeNothingToDelete=Niciun director sau fişier de şters.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Functionalitate pentru a trimite mesaje utilizân
 TranslationSetup=Configurarea traducerii
 TranslationDesc=Alegerea limbiilor vizibile pe ecran pot fi modificate: <br> * La nivel global din meniul <strong>Home - Configurare - Afişare</strong> <br> * Pe utilizator numai ,la Tabul  <strong>Afișare utilizator</strong> al fişei de utilizator (click pe login din partea de sus a ecranului).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Numărul total al modulelor funcţionale activate: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Trebuie activat cel puţin 1 modul
 ClassNotFoundIntoPathWarning=Clasa %s negăsită în calea PHP
 YesInSummer=Da în vară
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Închide an fiscal
 DeleteFiscalYear=Şterge an fiscal
 ConfirmDeleteFiscalYear=Sigur  doriţi să ştergeţi acest an fiscal  ?
 AlwaysEditable=Permite a fi editat mereu
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Forțează numele vizibil al aplicare (avertisment: setarea propriul nume aici poate duce la eliminarea facilitaţii de conectare automată atunci când se utilizează aplicația mobilă DoliDroid)
 NbMajMin=Numărul minim al caracterelor majuscule
 NbNumMin=Numărul minim al caracterelor minuscule
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 7417bc42ba6..be8bed41489 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -58,6 +58,7 @@ Payment=Plată
 PaymentBack=Plată Return
 Payments=Plăţi
 PaymentsBack=Plaţi Return
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Returnat
 DeletePayment=Ştergere plată
 ConfirmDeletePayment=Sunteţi sigur că doriţi să ştergeţi această plată?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Introduceţi o plată return a unui credit note de la
 DisabledBecauseRemainderToPayIsZero=Dezactivată  pentru că restul de plată este zero
 PriceBase=Preţul de bază
 BillStatus=Status Factura
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Schiţă (de validat)
 BillStatusPaid=Platite
 BillStatusPaidBackOrConverted=Platite sau convertite în reducere
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o fact
 BillFrom=De la
 BillTo=La
 ActionsOnBill=Evenimente pe factura
+RecurringInvoiceTemplate=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=Factură nouă
 LastBills=Ultimele %s facturi
 LastCustomersBills=Ultimele %s facturi clienţi
@@ -199,6 +205,7 @@ Rest=Creanţă
 AmountExpected=Suma reclamată
 ExcessReceived=Primit în plus
 EscompteOffered=Discount  oferit ( plată înainte de termen)
+EscompteOfferedShort=Discount
 SendBillRef=Trimitere factura %s
 SendReminderBillRef=Trimitere factura %s ( reamintire)
 StandingOrders=Ordine de plată
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Imediat
 PaymentConditionRECEP=Imediat
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index 7e0253476aa..f85ef68c9ea 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Ultimele  %s  contracte
 BoxTitleLastModifiedDonations=Ultimele %s  donaţii modificate 
 BoxTitleLastModifiedExpenses=Ultimele %s rapoarte cheltuieli modificare 
 BoxGlobalActivity=Activitate globală ( facturi, oferte, comenzi)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Eşec la reîmprospătarea fluxului RSS. Ultima reîmprospătare reuşită la data: %s
 LastRefreshDate=Ultima dată reîmprospătare
 NoRecordedBookmarks=Niciun marcaj definit.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Facturi clienţi
 ForCustomersOrders=Comenzi clienți
 ForProposals=Oferte comerciale
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index bfcf084e5bb..ed45b6fc4db 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -30,8 +30,8 @@ ThirdPartyContact=Contact Terţ
 StatusContactValidated=Status Contact
 Company=Societate
 CompanyName=Nume  societate
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias name
+AliasNames=Alias nume (comercial, marca inregistrata, ...)
+AliasNameShort=Nume Alias
 Companies=Societăţi
 CountryIsInEEC=Ţara este în interiorul Comunităţii Economice Europene
 ThirdPartyName=Nume Terţ
@@ -69,7 +69,7 @@ Country=Ţară
 CountryCode=Cod ţară
 CountryId=ID Ţara
 Phone=Telefon
-PhoneShort=Phone
+PhoneShort=Telefon
 Skype=Skype
 Call=Apel
 Chat=Chat
@@ -88,10 +88,10 @@ VATIsNotUsed=Nu utilizează TVA-ul
 CopyAddressFromSoc=Completaţi adresa cu adresa terţului
 NoEmailDefined=Nu există email definit
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
+LocalTax1IsUsed=Utilizează taxa secundă
 LocalTax1IsUsedES= RE este utilizat
 LocalTax1IsNotUsedES= RE nu este utilizat
-LocalTax2IsUsed=Use third tax
+LocalTax2IsUsed=Utilizează taxa treia
 LocalTax2IsUsedES= IRPF este utilizat
 LocalTax2IsNotUsedES= IRPF nu este utilizat
 LocalTax1ES=RE
@@ -124,9 +124,9 @@ ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Prof Id 1 (USt.-IdNr)
-ProfId2AT=Prof Id 2 (USt.-Nr)
-ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId1AT=Prof Id-ul 1 (USt.-IdNr)
+ProfId2AT=Prof Id-ul 2 (USt.-NR)
+ProfId3AT=Prof Id-ul 3 (Handelsregister-Nr.)
 ProfId4AT=-
 ProfId5AT=-
 ProfId6AT=-
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id-ul 3
 ProfId4IN=Id-ul prof. univ 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. univ. 1 (RC)
 ProfId2MA=Id prof. univ. 2 (Patente)
 ProfId3MA=Id prof. univ. 3 (IF)
@@ -286,8 +292,8 @@ PersonalInformations=Informaţii personale
 AccountancyCode=Cod Contabilitate
 CustomerCode=Cod Client
 SupplierCode=Cod Furnizor
-CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+CustomerCodeShort=Cod Client
+SupplierCodeShort=Cod Furnizor 
 CustomerAccount=Client
 SupplierAccount=Cont Furnizor
 CustomerCodeDesc=Cod Client,  unic pentru toţi clienţii
@@ -342,7 +348,7 @@ ProspectLevel=Prospect potenţial
 ContactPrivate=Privat
 ContactPublic=Partajat
 ContactVisibility=Vizibilitate
-ContactOthers=Other
+ContactOthers=Altele
 OthersNotLinkedToThirdParty=Alţii, nelegate la un terţ
 ProspectStatus=Statut Prospect
 PL_NONE=Niciunul
@@ -386,7 +392,7 @@ ExportDataset_company_2=Contacte şi atribute
 ImportDataset_company_1=Terţi (societăţi / fundaţii/ persoane fizice)  şi atribute
 ImportDataset_company_2=Contacte / Adrese(ale terţilor sau nu) şi atribute
 ImportDataset_company_3=Coordonate bancare
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_4=Terti /reprezentanti Vanzari (Afecteaza reprezentantii vanzari utilizato de companie )
 PriceLevel=Nivel de Pret
 DeliveriesAddress=Adrese de livrare
 DeliveryAddress=Adresă de livrare
@@ -418,7 +424,7 @@ UniqueThirdParties=Total terţi unici
 InActivity=Deschis
 ActivityCeased=Închis
 ActivityStateFilter=Statut Activitate
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=Ultimele produse / servicii in %s
 CurrentOutstandingBill=Facturi in suspensie curente
 OutstandingBill=Max. pentru facturi in suspensie
 OutstandingBillReached=Max. atins pentru facturi in suspensie
@@ -427,8 +433,8 @@ LeopardNumRefModelDesc=Codul este liber fîrî verificare. Acest cod poate fi mo
 ManagingDirectors=Nume Manager(i) nume (CEO, director, preşedinte...)
 SearchThirdparty=Caută  terţ
 SearchContact=Caută contact
-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 so you will be able to delete the duplicate one.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+MergeOriginThirdparty=Duplica terț (terț dorit să-l ștergeți)
+MergeThirdparties=Imbina terti
+ConfirmMergeThirdparties=Sigur doriți să îmbinați acesti terți? Toate obiectele legate (facturi, comenzi, ...), vor fi mutate terțul curent, astfel încât vei fi capabil sa ștergeti pe cea duplicat.
+ThirdpartiesMergeSuccess=Tertii au fost imbinati
+ErrorThirdpartiesMerge=A apărut o eroare laștergerea terților. Vă rugăm să verificați logurile. Modificările au fost anulate.
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index d9f463b8f40..76c0d5e1465 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
index 457c5132a7b..02c3bf09b7f 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -23,7 +23,7 @@ ContractsSubscriptions=Contracte / Abonamente
 ContractsAndLine=Contracte și linie contracte
 Contract=Contract
 ContractLine=Linie contract
-Closing=Closing
+Closing=Inchide
 NoContracts=Niciun contract
 MenuServices=Servicii
 MenuInactiveServices=Servicii inactive
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index d672c50f019..0616c0dc98e 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron
 FileToLaunchCronJobs=Linie de comandă pentru lansare joburi cron
 CronExplainHowToRunUnix=Pe mediul Unix veţi  utiliza instrumentul crontab pentru a  rula urmatoarea  linia de comanda la fiecare 5 minute
 CronExplainHowToRunWin=Pe mediul Microsoft(tm) Windows puteţi utiliza instrumentul Scheduled task pentru a rula linia de comanda la fiecare 5 minute
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Joburi programate
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Niciunul
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Urmatoarea execuţie
-CronDtLastLaunch=Ultima execuţie
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frecvenţă
 CronClass=Clasa
 CronMethod=Metoda
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Data de sfârşit nu poate fi înaintea datei de început
 CronStatusActiveBtn=Activare
 CronStatusInactiveBtn=Dezactivare
 CronTaskInactive=Acest post este dezactivat
-CronDtLastResult=Data ultimului rezultat
 CronId=Id
 CronClassFile=Clase (filename.class.php)
 CronModuleHelp=Numele directorului modulului Dolibarr( de asemenea lucrează cu module externe Dolibarr).<BR>De exemplu să aducă metoda de obiect Produs Dolibarr  /htdocs/<u>product</u>/class/product.class.php,valoarea modulului este <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Nu pot încărca clasa %s sau  obiectul %s
 UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Instrumentele modulelor - Lista de job-uri'' pentru a vedea și edita job-urile programate.
 TaskDisabled=Job dezactivat
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
index 73df3adba18..9f102b6a212 100644
--- a/htdocs/langs/ro_RO/languages.lang
+++ b/htdocs/langs/ro_RO/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spaniolă (Mexic)
 Language_es_PY=Spaniolă (Paraguay)
 Language_es_PE=Spaniolă (Peru)
 Language_es_PR=Spaniolă (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estoniană
 Language_eu_ES=Basc
 Language_fa_IR=Persană
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 588d7f37b34..0c22c10d400 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMail validat cu succes
 MailUnsubcribe=Dezabonare
 Unsuscribe=Dezabonare
 MailingStatusNotContact=Nu mă mai contacta
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Email destinatar este gol
 WarningNoEMailsAdded=Nu nou e-mail pentru a adăuga şi a destinatarului, listă.
 ConfirmValidMailing=Sunteţi sigur că doriţi pentru a valida acest email?
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 576b6c13d45..9159581dae9 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Preț unitar (net)
 UnitPriceTTC=Preț unitar
 PriceU=UP
 PriceUHT=UP (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Valoare
@@ -321,6 +322,9 @@ AmountTTCShort=Valoare (inc. taxe)
 AmountHT=Valoare (net)
 AmountTTC=Valoare (inc. taxe)
 AmountVAT=Valoare  TVA
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Valoare taxă 2
 AmountLT2=Valoare taxă 3
 AmountLT1ES=Valoare  RE
@@ -335,6 +339,7 @@ Percentage=Procentaj
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net )
 TotalHTforthispage=Total (net din taxe) pentru această pagină
@@ -457,6 +462,7 @@ Datas=Date
 None=Niciunul
 NoneF=Niciunul
 Late=Întârziat
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Foto
 Photos=Fotografii
 AddPhoto=Adauga Foto
@@ -539,6 +545,7 @@ NbOfCustomers=Număr clienţi
 NbOfLines=Număr linii
 NbOfObjects=Număr obiecte
 NbOfReferers=Număr referinţe
+NbOfObjectReferers=Number of refering objects
 Referers=Obiecte referite
 TotalQuantity=Cantitatea totală
 DateFromTo=De la %s la %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Link către un contact utilizator particular
 DeleteAFile=Şterge  fişier
 ConfirmDeleteAFile=Sigur  doriţi să ştergeţi fişierul
 NoResults=Niciun Rezultat
+AdminTools=Admin tools
 SystemTools=Instrumente Sistem
 ModulesSystemTools=Module Instrumente
 Test=Test
@@ -732,7 +740,8 @@ Hello=Salut
 Sincerely=Cu sinceritate
 DeleteLine=Şterge linie
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Luni
 Tuesday=Marţi
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 028a4e59371..dd4f5559bba 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -67,12 +67,12 @@ ShipProduct=Expediază produs
 CreateOrder=Crează Comanda
 RefuseOrder=Refuză comanda
 ApproveOrder=Aprobă  comanda
-Approve2Order=Approve order (second level)
+Approve2Order=Aprobă  comanda ( nivel doi )
 ValidateOrder=Validează comanda
 UnvalidateOrder=Devalidează comandă
 DeleteOrder=Şterge comada
 CancelOrder=Anulează comanda
-OrderReopened= Order %s Reopened
+OrderReopened= Comanda %s redeschisa
 AddOrder=Crează comanda
 AddToMyOrders=Adaugă la comenzile mele
 AddToOtherOrders=Adauga la alte comenzi
@@ -82,8 +82,8 @@ OrdersOpened=Comenzi de procesat
 NoOpenedOrders=Nu sunt  comenzi deschise
 NoOtherOpenedOrders=Nu sunt alte comenzi deschise
 NoDraftOrders=Nicio comandă  schiţă
-NoOrder=No order
-NoSupplierOrder=No supplier order
+NoOrder=Nicio comandă
+NoSupplierOrder=Nicio comandă furnizor
 OtherOrders=Alte comenzi
 LastOrders=Ultimele %s comenzi clienți
 LastCustomerOrders=Ultimele %s comenzi clienți
@@ -110,7 +110,7 @@ ClassifyShipped=Clasează livrată
 ClassifyBilled=Clasează facturată
 ComptaCard=Fişă Contabilitate
 DraftOrders=Comenzi schiţă
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Comenzi Furnizori schita
 RelatedOrders=Comenzi reatasate
 RelatedCustomerOrders=Related customer orders
 RelatedSupplierOrders=Related supplier orders
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 8fa4a6916c7..2f16c109df4 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Mărește/micșorează stoc pe schimbări sintetice
 ComposedProduct=Sub-produs
 MinSupplierPrice=Preţ minim furnizor
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 44fa8b02221..497b42cec70 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -5,6 +5,7 @@ ProjectId=ID proiect
 ProjectLabel=Project label
 Project=Proiect
 Projects=Proiecte
+ProjectsArea=Projects Area
 ProjectStatus=Statut Proiect
 SharedProject=Toată lumea
 PrivateProject=Contacte  proiect
@@ -19,7 +20,7 @@ TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile  c
 TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Proiecte
+ProjectsArea=Projects Area
 NewProject=Proiect nou
 AddProject=Creare proiect
 DeleteAProject=Şterge  proiect
@@ -67,6 +68,7 @@ Activities=Activităţi / Taskuri
 MyActivity=Activităţile mele
 MyActivities=Activităţile / Taskurile mele
 MyProjects=Proiectele mele
+MyProjectsArea=My projects Area
 DurationEffective=Durata efectivă
 Progress=Progres
 ProgressDeclared=Progres calculat
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/ro_RO/receiptprinter.lang b/htdocs/langs/ro_RO/receiptprinter.lang
index 985ac4fd6dc..883213b023c 100644
--- a/htdocs/langs/ro_RO/receiptprinter.lang
+++ b/htdocs/langs/ro_RO/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Imprimanta %s adaugata
 PrinterUpdated=Imprimanta %s actualizata
 PrinterDeleted=Imprimanta %s ştearsă
 TestSentToPrinter=Test trimis la  Imprimanta %s
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Setup of printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 02586da4f68..876be40c5d7 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Ultimele mişcări
 Units=Unităţi
 Unit=Unitate
 StockCorrection=Corectează stoc
-StockTransfer=Transfer stoc
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Transfer stoc
 StockMovements=Transferuri stoc
 LabelMovement=Etichetă transfer
diff --git a/htdocs/langs/ro_RO/supplier_proposal.lang b/htdocs/langs/ro_RO/supplier_proposal.lang
index 6264cfa7775..1e19f83ffbe 100644
--- a/htdocs/langs/ro_RO/supplier_proposal.lang
+++ b/htdocs/langs/ro_RO/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Cerere Preţ
 CommRequests=Cereri Preţ 
 SearchRequest=Cauta o cerere
 DraftRequests=Cereri schiţă
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Oferte Furnizori
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index 97dc9c290d4..6f0f42dee54 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Utilizați OpenID pentru login
 WeeklyHours=Ore saptămânale
 ColorUser=Culoarea utilizatorului
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index b78f8850913..f7a8bb5b52a 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Бухгалтерский счёт
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Распределение клиентов
 SuppliersVentilation=Распределение поставщиков
 TradeMargin=Торговая наценка
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Записать счета в главную книгу
 Bookkeeping=Главная книга
-AccountBalanceByMonth=Баланс счёта по месяцам
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Контрагент
 Labelcompte=Метка бухгалтерского счёта
 Sens=Sens
 Codejournal=Журнал
+NumPiece=Piece number
 
 DelBookKeeping=Удалить записи главной книги
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 5164fbef73c..7b6b1c271f6 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -154,6 +154,7 @@ Purge=Очистить
 PurgeAreaDesc=Эта страница позволяет удалить все файлы, созданные или сохраненные Dolibarr (временные файлы или все файлы в каталоге <b>%s</b>). Использование этой функции не является необходимым. Она предоставляется для пользователей, у кого Dolibarr размещается на хостине провайдера, который не дает права удалять файлы созданные веб-сервером.
 PurgeDeleteLogFile=Удалить файл журнала <b>%s</b>, определенный для модуля системного журнала (нет риска потерять данные)
 PurgeDeleteTemporaryFiles=Удалить все временные файлы (нет риска потерять данные)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в каталоге <b>%s</b>. Временные файлы, автоархивы базы данных, а также файлы, прикрепленные к элементам (третьими сторонами, счета-фактуры, ...) и загруженные в модуль ECM будут удалены.
 PurgeRunNow=Очистить сейчас
 PurgeNothingToDelete=Нет директории или файла для удаления
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Настройка перевода
 TranslationDesc=Выбор языка, видимого на экране, может быть изменен:<br>* Глобально из меню <strong>Главная - Настройка - Display</strong><br>* Только для пользователя <strong>User display</strong> карточки пользователя (нажмите на Логин вверху экрана).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Полное количество активированных функций модулей: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Вы должны включить минимум 1 модуль
 ClassNotFoundIntoPathWarning=Класс %s не найден по PHP пути
 YesInSummer=Да летом
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Закрыть финансовый год
 DeleteFiscalYear=Удалить финансовый год
 ConfirmDeleteFiscalYear=Вы точно хотите удалить этот финансовый год?
 AlwaysEditable=Всегда может быть отредактировано
+IsHidden=Is not visible
 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=Минимальное количество символов в врехнем регистре
 NbNumMin=Минимальное количество цифр
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Мастер создания резервной копии б
 SomethingMakeInstallFromWebNotPossible=Установка внешних модулей через веб-интерфейс не возможна по следующей причине:
 SomethingMakeInstallFromWebNotPossible2=По этой причине, описанный здесь процесс апрейгда  - это только шаги, которые может выполнить пользователь с соответствующими правами доступа.
 InstallModuleFromWebHasBeenDisabledByFile=Установка внешних модулей из приложения отключена вашим администратором. Вы должны попросить его удалить файл <strong>%s</strong>, чтобы использовать эту функцию.
-ConfFileMuseContainCustom=Установка внешнего модуля из приложения сохраняет файлы модуля в папке <strong>%s</strong>. Для использования этой папке в системе  Dolibarr вы должны настроить  <strong>conf/conf.php</strong>  с использованием этой функции<br>-<strong>$dolibarr_main_url_root_alt</strong> со значением <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> со значением <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 96853f4d5b0..7079db1bf2e 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -58,6 +58,7 @@ Payment=Платеж
 PaymentBack=Возврат платежа
 Payments=Платежи
 PaymentsBack=Возвраты платежа
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Возврат платежа
 DeletePayment=Удалить платеж
 ConfirmDeletePayment=Вы уверены, что хотите удалить этот платеж?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Произвести платеж за счет Пок
 DisabledBecauseRemainderToPayIsZero=Отключено, потому что оставшаяся оплата нулевая
 PriceBase=Ценовая база
 BillStatus=Статус счета-фактуры
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (должен быть подтвержден)
 BillStatusPaid=Оплачен
 BillStatusPaidBackOrConverted=Оплачен или конвертирован в скидку
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Ошибка, невозможн
 BillFrom=Продавец
 BillTo=Покупатель
 ActionsOnBill=Действия со счетом-фактурой
+RecurringInvoiceTemplate=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=Новый счёт
 LastBills=Последние %s счетов-фактур
 LastCustomersBills=Последние %s счетов-фактур Покупателям
@@ -199,6 +205,7 @@ Rest=В ожидании
 AmountExpected=Заявленная сумма
 ExcessReceived=Полученный излишек
 EscompteOffered=Предоставлена скидка (за досрочный платеж)
+EscompteOfferedShort=Discount
 SendBillRef=Представление счёта %s
 SendReminderBillRef=Представление счёта %s (напоминание)
 StandingOrders=Регламенты
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Немедленно
 PaymentConditionRECEP=Немедленно
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index d56271c6ef1..906aebee993 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Последние %s договоров
 BoxTitleLastModifiedDonations=Последние %s измененных пожертвований
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Глобальная активность (фактуры, предложения, заказы)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Не удалось обновить RSS-поток. Дата последнего успешного обновления: %s
 LastRefreshDate=Дата последнего обновления
 NoRecordedBookmarks=Закладки не созданы.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Счета-фактуры Покупателей
 ForCustomersOrders=Заказы клиентов
 ForProposals=Предложения
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index b9c03948f71..321395a5c14 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Проф Id 3
 ProfId4IN=Проф Id 4
 ProfId5IN=Проф Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id проф. 1 (RC)
 ProfId2MA=Id проф. 2 (Patente)
 ProfId3MA=Id проф. 3 (IF)
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index f8064abbbe0..8d34a1b3aef 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index 4a27d73f5f5..976e2909e49 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Ключ безопасности для запуска зап
 FileToLaunchCronJobs=Командная строка для запуска запланированных заданий. 
 CronExplainHowToRunUnix=В системах Unix-like вы должны задать crontab для выполнения команды каждые 5 минут.
 CronExplainHowToRunWin=В Майкрософт Windows &copy; вы должны использовать Планировщик для запуска команды каждые 5 минут. 
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Запланированные задания
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Никакой
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Следующий запуск
-CronDtLastLaunch=Последний запуск
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Метод
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Дата окончания не может быть ра
 CronStatusActiveBtn=Включено
 CronStatusInactiveBtn=Выключать
 CronTaskInactive=Задание отключено
-CronDtLastResult=Дата последнего выполнения
 CronId=ID
 CronClassFile=Классы (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Планировщик
 CronCannotLoadClass=Невозможно загрузить класс %s или объект %s
 UseMenuModuleToolsToAddCronJobs=Используйте меню "Главная - Настройки модулей -Список заданий"  для просмотра и редактирования запланированных заданий. 
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index fcc4391e9a8..50836a63f1e 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Испанский (Мексика)
 Language_es_PY=Испанский (Парагвай)
 Language_es_PE=Испанский (Перу)
 Language_es_PR=Испанский (Пуэрто-Рико)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Эстонский
 Language_eu_ES=Баскский
 Language_fa_IR=Персидский
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index f62ad7407c1..c1060dd72ac 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Электронная почта успешно п
 MailUnsubcribe=Отказаться от рассылки
 Unsuscribe=Отказаться от рассылки
 MailingStatusNotContact=Не писать
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Email получателя пуста
 WarningNoEMailsAdded=Нет новых сообщений, чтобы добавить в список получателей.
 ConfirmValidMailing=Вы уверены, что хотите проверить этот адрес?
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index a78159d0e4c..93a36669177 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Цена за единицу (нетто)
 UnitPriceTTC=Цена за единицу
 PriceU=Цена ед.
 PriceUHT=Цена ед. (нетто)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Сумма
@@ -321,6 +322,9 @@ AmountTTCShort=Сумма (вкл-я налог)
 AmountHT=Сумма (без налога)
 AmountTTC=Сумма (вкл-я налог)
 AmountVAT=Сумма НДС
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Сумма налога 2
 AmountLT2=Сумма налога 3
 AmountLT1ES=Сумма RE
@@ -335,6 +339,7 @@ Percentage=Процент
 Total=Всего
 SubTotal=Итого
 TotalHTShort=Всего (без налога)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Всего (вкл-я налог)
 TotalHT=Всего (без налога)
 TotalHTforthispage=Итог (с вычетом налогов) для этой страницы
@@ -457,6 +462,7 @@ Datas=Данные
 None=Никакой
 NoneF=Никакой
 Late=Поздно
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Изображение
 Photos=Изображения
 AddPhoto=Добавить изображение
@@ -539,6 +545,7 @@ NbOfCustomers=Количество клиентов
 NbOfLines=Количество строк
 NbOfObjects=Количество объектов
 NbOfReferers=Количество реферралов
+NbOfObjectReferers=Number of refering objects
 Referers=Ссылающиеся объекты
 TotalQuantity=Общее количество
 DateFromTo=С %s по %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Связан с особым контактом польз
 DeleteAFile=Удалить файл
 ConfirmDeleteAFile=Вы уверены, что хотите удалить файл?
 NoResults=Нет результатов
+AdminTools=Admin tools
 SystemTools=Системные инструменты
 ModulesSystemTools=Настройки модулей
 Test=Тест
@@ -732,7 +740,8 @@ Hello=Здравствуйте
 Sincerely=С уважением,
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Понедельник
 Tuesday=Вторник
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 102d773a728..44e2092a3cb 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Увеличение / уменьшение запа
 ComposedProduct=Под-товар
 MinSupplierPrice=Минимальная цена поставщика
 DynamicPriceConfiguration=Настройка динамического ценообразования
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Глобальные переменные
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Обновители глобальных переменных
 GlobalVariableUpdaterType0=Данные JSON
 GlobalVariableUpdaterHelp0=Анализирует данные JSON из указанной ссылки,  VALUE определяет местоположение соответствующего значения,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 41c92af7b5e..6687b192491 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -5,6 +5,7 @@ ProjectId=ID Проекта
 ProjectLabel=Project label
 Project=Проект
 Projects=Проекты
+ProjectsArea=Projects Area
 ProjectStatus=Статус проекта
 SharedProject=Общий проект
 PrivateProject=Контакты проекта
@@ -19,7 +20,7 @@ TasksPublicDesc=Эта точка зрения представляет всех
 TasksDesc=Эта точка зрения представляет всех проектов и задач (разрешений пользователей предоставить вам разрешение для просмотра всего).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Проекты области
+ProjectsArea=Projects Area
 NewProject=Новый проект
 AddProject=Создать проект
 DeleteAProject=Удаление проекта
@@ -67,6 +68,7 @@ Activities=Задачи / мероприятия
 MyActivity=Наша деятельность
 MyActivities=Мои задачи / мероприятия
 MyProjects=Мои проекты
+MyProjectsArea=My projects Area
 DurationEffective=Эффективная длительность
 Progress=Прогресс
 ProgressDeclared=Заданный ход выполнения проекта
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/ru_RU/receiptprinter.lang b/htdocs/langs/ru_RU/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/ru_RU/receiptprinter.lang
+++ b/htdocs/langs/ru_RU/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 0f220287dce..46b2ae017cd 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Отменить отправку
 DeleteSending=Удалить отправку
 Stock=Фондовый
 Stocks=Акции
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Движение
 Movements=Перевозкой
 ErrorWarehouseRefRequired=Склад ссылкой зовут требуется
@@ -34,9 +34,10 @@ LastMovements=Последние движения
 Units=Единицы
 Unit=Единица
 StockCorrection=Правильно запас
-StockTransfer=Перевод остатков
-StockMovement=Трансфер
-StockMovements=Фондовый переводы
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Отметка о перемещении
 NumberOfUnit=Количество единиц
 UnitPurchaseValue=Себестоимость единицы
@@ -53,8 +54,8 @@ QtyDispatched=Количество направил
 QtyDispatchedShort=Кол-во отправлено
 QtyToDispatchShort=Кол-во на отправку
 OrderDispatch=Приказ диспетчерского
-RuleForStockManagementDecrease=Правило для управления запасами сокращение
-RuleForStockManagementIncrease=Правило для управления запасами увеличить
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Снижение реальных запасов на счета / кредитных нот
 DeStockOnValidateOrder=Снижение реальных запасов по заказам записки
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Средняя цена входного
 AverageUnitPricePMP=Средняя цена входного
 SellPriceMin=Продажа Цена за штуку
-EstimatedStockValueSellShort=Значение продать
-EstimatedStockValueSell=Значение для продажи
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Ориентировочная стоимость товарно-материальных запасов
 EstimatedStockValue=Ориентировочная стоимость товарно-материальных запасов
 DeleteAWarehouse=Удалить склад
@@ -113,7 +114,7 @@ AlertOnly= Только предупреждения
 WarehouseForStockDecrease=Склад <b>%s</b> будет использован для уменьшения остатка
 WarehouseForStockIncrease=Склад <b>%s</b> будет использован для увеличения остатка
 ForThisWarehouse=Для этого склада
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Пополнения
 NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s)
diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang
index d1512b93070..b96f039ac86 100644
--- a/htdocs/langs/ru_RU/supplier_proposal.lang
+++ b/htdocs/langs/ru_RU/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 01011db4032..0b8ae1f8f54 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Использовать OpenID для входа
 WeeklyHours=Часов в неделю
 ColorUser=Цвет пользователя
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 2f91614f5ca..8915209d1bd 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Rozpis
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Rozpis zákazníkov
 SuppliersVentilation=Rozpis dodávateľov
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index f00d46acd4a..4ebf090c666 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -154,6 +154,7 @@ Purge=Očistiť
 PurgeAreaDesc=Táto stránka vám umožňuje odstrániť všetky súbory postavené alebo uložené Dolibarr (dočasné súbory alebo všetky súbory v adresári <b>%s).</b> Pomocou tejto funkcie nie je nutné. Je k dispozícii pre užívateľov, ktorých Dolibarr je hostiteľom poskytovateľa, ktorý neposkytuje oprávnenie na odstránenie súborov postavenej na webový server.
 PurgeDeleteLogFile=Odstránenie súboru denníka <b>%s</b> definované pre Syslog modul (žiadne riziko pre voľné dát)
 PurgeDeleteTemporaryFiles=Odstráňte všetky dočasné súbory (žiadne riziko voľné dáta)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Odstráňte všetky súbory v adresári <b>%s.</b> Dočasné súbory, ale aj zálohovanie databázy skládky, súbory pripojené k prvkom (tretie strany, faktúry, ...) a vkladajú do modulu ECM, budú vymazané.
 PurgeRunNow=Vyčistiť teraz
 PurgeNothingToDelete=Žiadny adresár alebo súbor, ktorý chcete odstrániť.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Konfigurácia de la traduction
 TranslationDesc=Voľba jazyka viditeľné na obrazovke možno meniť: <br> * Globálne z menu <strong>Domov - Nastavenia - Zobrazenie</strong> <br> * Pre užívateľov iba zo <strong>zobrazenia</strong> na karte <strong>Užívateľské</strong> užívateľského karty (kliknite na prihlásení v hornej časti obrazovky).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Celkový počet aktivovaných funkcií modulov: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povoliť aspoň jeden modul
 ClassNotFoundIntoPathWarning=Trieda %s nenašli cestu do PHP
 YesInSummer=Áno v lete
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 0a2397809f2..5b9119ab8be 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -58,6 +58,7 @@ Payment=Platba
 PaymentBack=Platba späť
 Payments=Platby
 PaymentsBack=Platby späť
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Platené späť
 DeletePayment=Odstrániť platby
 ConfirmDeletePayment=Ste si istí, že chcete zmazať túto platbu?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Vykonať platbu zo strany zákazníka
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Cena základnej
 BillStatus=Stav faktúry
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Návrh (musí byť overená)
 BillStatusPaid=Platený
 BillStatusPaidBackOrConverted=Platené alebo prevedené na zľavu
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Chyba, nemožno zrušiť, ak fak
 BillFrom=Z
 BillTo=Na
 ActionsOnBill=Akcie na faktúre
+RecurringInvoiceTemplate=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=Nová faktúra
 LastBills=Posledný %s faktúry
 LastCustomersBills=Posledné %s zákazníkom faktúry
@@ -199,6 +205,7 @@ Rest=Až do
 AmountExpected=Nárokovanej čiastky
 ExcessReceived=Nadbytok obdržal
 EscompteOffered=Zľava ponúkol (platba pred semestra)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Trvalé príkazy
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Bezprostredný
 PaymentConditionRECEP=Bezprostredný
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index 5e09b949176..6b6622ab3da 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Posledný %s zmluvy
 BoxTitleLastModifiedDonations=Posledné %s upravené dary
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Globálna aktivita (faktúry, návrhy, objednávky)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Nepodarilo sa obnoviť RSS toku. Posledný úspešný refresh Dátum: %s
 LastRefreshDate=Posledný obnovovacia dáta
 NoRecordedBookmarks=Žiadne záložky definované.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Zákazníci faktúry
 ForCustomersOrders=Zákazníci objednávky
 ForProposals=Návrhy
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 4470ad92aec..dd3884213f5 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof ID 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (IF)
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 912f864a7ce..5a7e1710544 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index a60773c38b4..c99a76add26 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Bezpečnostný kľúč pre URL spustiť cron
 FileToLaunchCronJobs=Príkazový riadok spustiť cron
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Naplánované úlohy
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Nikto
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Ďalšie prevedenie
-CronDtLastLaunch=Posledná poprava
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Metóda
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Dátum ukončenia nemôže byť pred dátumom začatia
 CronStatusActiveBtn=Umožniť
 CronStatusInactiveBtn=Zakázať
 CronTaskInactive=Táto úloha je zakázaný
-CronDtLastResult=Posledný výsledok Dátum
 CronId=Id
 CronClassFile=Triedy (filename.class.php)
 CronModuleHelp=Názov adresára modulu Dolibarr (tiež pracovať s externým modulom Dolibarr). <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / <u>produktu</u> / trieda / product.class.php, hodnota modulu je <i>produkt</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Nemožno načítať triedu alebo objekt %s %s
 UseMenuModuleToolsToAddCronJobs=Choďte do menu &quot;Home - Moduly náradie - Zoznam úloh&quot; vidieť a upravovať naplánované úlohy.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang
index c77b526ccfb..2f987861ba8 100644
--- a/htdocs/langs/sk_SK/languages.lang
+++ b/htdocs/langs/sk_SK/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Španielčina (Mexiko)
 Language_es_PY=Španielčina (Paraguaj)
 Language_es_PE=Španielčina (Peru)
 Language_es_PR=Španielčina (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estónčina
 Language_eu_ES=Basque
 Language_fa_IR=Perzština
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 4c71385635c..d51b3154ec0 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-mailom úspešne overená
 MailUnsubcribe=Odhlásiť
 Unsuscribe=Odhlásiť
 MailingStatusNotContact=Nedotýkajte sa už
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Príjemca e-mailu je prázdny
 WarningNoEMailsAdded=Žiadne nové Email pridať do zoznamu príjemcov.
 ConfirmValidMailing=Ste si istí, že chcete overiť túto e-mailom?
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index d6820ac2df7..5e33cf1c57c 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Jednotková cena (bez DPH)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Množstvo
@@ -321,6 +322,9 @@ AmountTTCShort=Čiastka (s DPH)
 AmountHT=Suma (bez DPH)
 AmountTTC=Čiastka (s DPH)
 AmountVAT=Čiastka dane
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Čiastka dane z 2
 AmountLT2=Čiastka dane 3
 AmountLT1ES=Množstvo RE
@@ -335,6 +339,7 @@ Percentage=Percento
 Total=Celkový
 SubTotal=Medzisúčet
 TotalHTShort=Celkom (bez DPH)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Celkom (s DPH)
 TotalHT=Celkom (bez dane)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Údaje
 None=Nikto
 NoneF=Nikto
 Late=Neskoro
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Obrázok
 Photos=Obrázky
 AddPhoto=Pridať obrázok
@@ -539,6 +545,7 @@ NbOfCustomers=Počet zákazníkov
 NbOfLines=Počet riadkov
 NbOfObjects=Počet objektov
 NbOfReferers=Počet Odkazovače
+NbOfObjectReferers=Number of refering objects
 Referers=Prepojené objekty
 TotalQuantity=Celkové množstvo
 DateFromTo=Od %s na %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=V súvislosti s konkrétnym kontakte s užívateľom
 DeleteAFile=Odstránenie súboru
 ConfirmDeleteAFile=Ste si istí, že chcete zmazať súbor
 NoResults=Žiadne výsledky
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Moduly náradie
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Pondelok
 Tuesday=Utorok
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 79c986688e7..63f6bdc9f32 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index c44ca23370e..5345598f90e 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projekty
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Všetci
 PrivateProject=Kontakty na projekte
@@ -19,7 +20,7 @@ TasksPublicDesc=Tento názor predstavuje všetky projekty a úlohy, ktoré sú p
 TasksDesc=Tento názor predstavuje všetky projekty a úlohy (vaše užívateľské oprávnenia udeliť oprávnenie k nahliadnutiu všetko).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projekty oblasť
+ProjectsArea=Projects Area
 NewProject=Nový projekt
 AddProject=Create project
 DeleteAProject=Odstránenie projektu
@@ -67,6 +68,7 @@ Activities=Úlohy / aktivity
 MyActivity=Moja činnosť
 MyActivities=Moje úlohy / činnosti
 MyProjects=Moje projekty
+MyProjectsArea=My projects Area
 DurationEffective=Efektívny čas
 Progress=Pokrok
 ProgressDeclared=Deklarovaná pokrok
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/sk_SK/receiptprinter.lang b/htdocs/langs/sk_SK/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/sk_SK/receiptprinter.lang
+++ b/htdocs/langs/sk_SK/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 088017dd05c..a6111db3c2e 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Zrušiť odoslanie
 DeleteSending=Zmazať odoslanie
 Stock=Zásoba
 Stocks=Zásoby
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Pohyb
 Movements=Pohyby
 ErrorWarehouseRefRequired=Referenčné meno skladu je povinné
@@ -34,9 +34,10 @@ LastMovements=Posledné pohyby
 Units=Jednotky
 Unit=Jednotka
 StockCorrection=Opraviť zásoby
-StockTransfer=Stock prenos
-StockMovement=Preniesť
-StockMovements=Skladové prevody
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Pohyb štítok
 NumberOfUnit=Počet jednotiek
 UnitPurchaseValue=Jednotková kúpna cena
@@ -53,8 +54,8 @@ QtyDispatched=Množstvo odoslané
 QtyDispatchedShort=Odoslané množstvo
 QtyToDispatchShort=Množstvo na odoslanie
 OrderDispatch=Stock dispečing
-RuleForStockManagementDecrease=Pravidlo pre zníženie riadenie zásob
-RuleForStockManagementIncrease=Pravidlo pre zvýšenie riadenie zásob
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Pokles reálnej zásoby na zákazníkov faktúr / dobropisov validácia
 DeStockOnValidateOrder=Pokles reálnej zásoby na zákazníkov objednávky validáciu
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Vážený priemer cien vstupov
 AverageUnitPricePMP=Vážený priemer cien vstupov
 SellPriceMin=Predajná jednotka Cena
-EstimatedStockValueSellShort=Hodnota k predaju
-EstimatedStockValueSell=Hodnota predávať
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Vstupná hodnota zásob
 EstimatedStockValue=Vstupná hodnota zásob
 DeleteAWarehouse=Odstránenie skladu
@@ -113,7 +114,7 @@ AlertOnly= Upozornenie iba
 WarehouseForStockDecrease=Skladová <b>%s</b> budú použité pre zníženie skladom
 WarehouseForStockIncrease=Skladová <b>%s</b> budú použité pre zvýšenie stavu zásob
 ForThisWarehouse=Z tohto skladu
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Splátky
 NbOfProductBeforePeriod=Množstvo produktov %s na sklade, než zvolené obdobie (&lt;%s)
diff --git a/htdocs/langs/sk_SK/supplier_proposal.lang b/htdocs/langs/sk_SK/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/sk_SK/supplier_proposal.lang
+++ b/htdocs/langs/sk_SK/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index 24c31fcf295..3255c7a9eae 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Použiť OpenID pre prihlásenie
 WeeklyHours=Počet hodín za týžden
 ColorUser=Farba priradená užívateľovi
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index b9b6196e163..392c7679229 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Računovodstvo račun
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Pregled
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Pregled kupcev
 SuppliersVentilation=Pregled dobaviteljev
 TradeMargin=Trgovska marža
@@ -46,7 +47,7 @@ UpdateAccount=Sprememba obračunskega računa
 UpdateMvts=Sprememba pretoka
 WriteBookKeeping=Evidenčnih računov v glavno knjigo
 Bookkeeping=Glavna knjiga
-AccountBalanceByMonth=Stanje na računu po mesecu
+AccountBalance=Account balance
 
 AccountingVentilation=Pregled računov
 AccountingVentilationSupplier=Pregled računov dobaviteljev
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Račun Label
 Sens=Sens
 Codejournal=Revija
+NumPiece=Piece number
 
 DelBookKeeping=Izbriši zapise v glavno knjigo
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Kartica pregleda
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index f8dfa575bda..2c265f17b15 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -154,6 +154,7 @@ Purge=Počisti
 PurgeAreaDesc=Ta stran omogoča brisanje vseh datotek, ki jih je kreiral in shranil program Dolibarr (začasne datoteke ali vse datoteke v mapi <b>%s</b>). Uporaba te funkcije ni potrebna. Namenjena je uporabnikom, katerih Dolibarr gostuje pri ponudniku, ki ne dovoljuje brisanja datotek, ki jih je kreiral web strežnik.
 PurgeDeleteLogFile=Izbris log datoteke <b>%s</b>, ki jo je kreiral modul Syslog (ni tveganja izgube podatkov)
 PurgeDeleteTemporaryFiles=Izbris vseh začasnih datotek (ni tveganja izgube podatkov)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Izbris vseh datotek v mapi <b>%s</b>. Začasne datoteke, kot tudi datoteke, ki so pripete elementom (partnerji, fakture, ...) in naložene v modul ECM, se bodo izbrisale.
 PurgeRunNow=Počisti zdaj
 PurgeNothingToDelete=Ni map ali datotek za brisanje.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Funkcija za pošiljanje pošte z uporabo metode "
 TranslationSetup=Konfiguracija prevoda
 TranslationDesc=Izbira na zaslonu vidnega jezika se lahko spremeni:<br>* Globalno preko menija <strong>Domov - Nastavitve - Prikaz</strong><br>* Samo za uporabnike preko zavihka <strong>Nastavitev zaslona uporabnika</strong> (klik na login na vrhu ekrana).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Skupno število aktiviranih modulov za lastnosti: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Omogočiti morate vsaj 1 modul
 ClassNotFoundIntoPathWarning=Ratzred %s ni najedn na poti PHP
 YesInSummer=Da poleti
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Zapri fiskalno leto
 DeleteFiscalYear=Izbriši fiskalno leto
 ConfirmDeleteFiscalYear=Ali zares želite izbrisati to fiskalni leto?
 AlwaysEditable=Lahko je vedno urejeno
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Prisilni prikaz imena aplikacije (opozorilo: če tukaj nastavite vaše lastno ime, lahko prekinete funkcijo avtomatskega vnosa uporabniškega imena pri uporabi mobilne aplikacije DoliDroid)
 NbMajMin=Minimalno število velikih črk
 NbNumMin=Minimalno število cifer
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Čarovnik za ustvarjanje datoteke z varnostnimi kopijami podatk
 SomethingMakeInstallFromWebNotPossible=Instalacija eksternega modula s spletnega vmesnika ni možna zaradi naslednjega razloga:
 SomethingMakeInstallFromWebNotPossible2=Zaradi tega razloga je tukaj opisan postopek samo ročnih korakov, ki jih lahko naredi le uporabnik z dovoljenjem.
 InstallModuleFromWebHasBeenDisabledByFile=Instalacijo zunanjega modula iz aplikacije je onemogočil vaš administrator. Prositi ga morate, naj odstrani datoteko <strong>%s</strong>, da bi omogočil to funkcijo.
-ConfFileMuseContainCustom=Instalacija eksternega modula iz aplikacije shrani datoteke modula v mapo <strong>%s</strong>. da bi Dolibarr procesiral to mapo, morate nastaviti vaš <strong>conf/conf.php</strong> tako, da bo opcija<br>- <strong>$dolibarr_main_url_root_alt</strong> omogočena z vrednostjo <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> pa z vrednostjo <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Osvetli vrstice tabele, preko katerih je šla miška
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index bc269b79893..62f7735e936 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -58,6 +58,7 @@ Payment=Plačilo
 PaymentBack=Vrnitev plačila
 Payments=Plačila
 PaymentsBack=Vrnitev plačil
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Vrnjeno plačilo
 DeletePayment=Brisanje plačila
 ConfirmDeletePayment=Ali zares želite zbrisati to plačilo ?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Vnesi rok plačila za kupca
 DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je neplačan opomin enako nič
 PriceBase=Osnova cene
 BillStatus=Status računa
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Osnutek (potrebna potrditev)
 BillStatusPaid=Plačano
 BillStatusPaidBackOrConverted=Plačano ali spremenjeno v popust
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Napaka, ne morete preklicati ra
 BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na računu
+RecurringInvoiceTemplate=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=Nov račun
 LastBills=Zadnjih %s računov
 LastCustomersBills=Zadnjih %s računov za kupce
@@ -199,6 +205,7 @@ Rest=Na čakanju
 AmountExpected=Reklamiran znesek
 ExcessReceived=Prejet presežek
 EscompteOffered=Ponujen popust (plačilo pred rokom)
+EscompteOfferedShort=Discount
 SendBillRef=Oddaja račuuna %s
 SendReminderBillRef=Oddaja računa %s (opomin)
 StandingOrders=Trajniki
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Takoj
 PaymentConditionRECEP=Takoj
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index b2c9763ac0f..e0420989e86 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Zadnjih %s pogodb
 BoxTitleLastModifiedDonations=Zadnjih %s spremenjenih donacij
 BoxTitleLastModifiedExpenses=Zadnjih %s spremenjenih poročil o stroških
 BoxGlobalActivity=Globalna aktivnost (računi, ponudbe, naročila)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Neuspešna osvežitev RSS fluxa. Datum zadnje uspešne osvežitve: %s
 LastRefreshDate=Datum zadnje osvežitve
 NoRecordedBookmarks=Ni definiranih zaznamkov.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Računi za kupce
 ForCustomersOrders=Naročila kupcev
 ForProposals=Ponudbe
 LastXMonthRolling=Obrat zadnjih %s mesecev
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index e939edb40bb..19742a134f5 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN==
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA==
 ProfId2MA==
 ProfId3MA==
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 21fca394666..9d0a7c3ed68 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index a564a315fea..272174ec988 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Nič
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Metoda
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Omogočeno
 CronStatusInactiveBtn=Onemogoči
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/sl_SI/languages.lang b/htdocs/langs/sl_SI/languages.lang
index daa1b3c0928..56d09528220 100644
--- a/htdocs/langs/sl_SI/languages.lang
+++ b/htdocs/langs/sl_SI/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Španščina (Mehika)
 Language_es_PY=Španski (Paragvaj)
 Language_es_PE=Španski (Peru)
 Language_es_PR=Španščina (Portoriko)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonski
 Language_eu_ES=Basque
 Language_fa_IR=Perzijščina
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 8472f326559..7578e11c3f2 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-pošiljanje uspešno potrjeno
 MailUnsubcribe=Odjava
 Unsuscribe=Odjava
 MailingStatusNotContact=Ne kontaktiraj več
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Prejemnik ni določen
 WarningNoEMailsAdded=Nobenega novega e-sporočila ni za dodajanje na prejemnikov seznam.
 ConfirmValidMailing=Ali zares želite potrditi to e-sporočilo ?
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index abc4c41153d..117d0333d52 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Cena enote (neto)
 UnitPriceTTC=Cena enote
 PriceU=C.E.
 PriceUHT=C.E. (neto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=Zahtevana neto cena na enoto C.E.
 PriceUTTC=C.E. (z davkom)
 Amount=Znesek
@@ -321,6 +322,9 @@ AmountTTCShort=Znesek (z DDV)
 AmountHT=Znesek (neto)
 AmountTTC=Znesek (z DDV)
 AmountVAT=Znesek DDV
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Znesek davka 2
 AmountLT2=Znesek davka 3
 AmountLT1ES=Znesek RE
@@ -335,6 +339,7 @@ Percentage=Procent
 Total=Skupaj
 SubTotal=Delna vsota
 TotalHTShort=Skupaj (neto)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Skupaj (z DDV)
 TotalHT=Skupaj (neto)
 TotalHTforthispage=Skupaj (brez davka) za to stran
@@ -457,6 +462,7 @@ Datas=Podatki
 None=Nič
 NoneF=Nič
 Late=Prekoračeno
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Slika
 Photos=Slike
 AddPhoto=Dodaj sliko
@@ -539,6 +545,7 @@ NbOfCustomers=Število kupcev
 NbOfLines=Število vrstic
 NbOfObjects=Število predmetov
 NbOfReferers=Število posrednikov
+NbOfObjectReferers=Number of refering objects
 Referers=Referenčni objekti
 TotalQuantity=Skupna količina
 DateFromTo=Od %s do %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Povezano z določenim kontaktom uporabnika
 DeleteAFile=Izbriši datoteko
 ConfirmDeleteAFile=Ali zares želite izbrisati datoteko
 NoResults=Ni rezultata
+AdminTools=Admin tools
 SystemTools=Sistemska orodja
 ModulesSystemTools=Orodja za module
 Test=Test
@@ -732,7 +740,8 @@ Hello=Pozdravljeni
 Sincerely=S spoštovanjem
 DeleteLine=Izbriši vrstico
 ConfirmDeleteLine=Ali zares želite izbrisati to vrstico ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Ponedeljek
 Tuesday=Torek
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index f9b234dd55c..649bad86247 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Povečanje/znmanjšanje zaloge pri spremembi nadrejen
 ComposedProduct=Pod-proizvod
 MinSupplierPrice=Najnižja cena dobavitelja
 DynamicPriceConfiguration=Dimnamična konfiguracija cene
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Globalne spremenljivke
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Posodobitve globalnih spremenljivk
 GlobalVariableUpdaterType0=JSON podatki
 GlobalVariableUpdaterHelp0=Razčleni JSON podatke iz specifičnega URL, VALUE določa lokacijo ustrezne vrednosti,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Privzeta cena, dejanska cena je odvisna
 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...
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index c28a0182cbe..7a468c1702c 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Id projekta
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projekti
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Projekti v skupni rabi
 PrivateProject=Privatni projekti
@@ -19,7 +20,7 @@ TasksPublicDesc=Ta pogled predstavlja vse projekte in naloge, za katere imate do
 TasksDesc=Ta pogled predstavlja vse projekte in naloge (vaše uporabniško dovoljenje vam omogoča ogled vseh).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Področje projektov
+ProjectsArea=Projects Area
 NewProject=Nov projekt
 AddProject=Ustvari projekt
 DeleteAProject=Izbriši projekt
@@ -67,6 +68,7 @@ Activities=Naloge/aktivnosti
 MyActivity=Moje aktivnosti
 MyActivities=Moje naloge/aktivnosti
 MyProjects=Moji projekti
+MyProjectsArea=My projects Area
 DurationEffective=Efektivno trajanje
 Progress=Napredek
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/sl_SI/receiptprinter.lang b/htdocs/langs/sl_SI/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/sl_SI/receiptprinter.lang
+++ b/htdocs/langs/sl_SI/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 4e627a209b5..23a785761e1 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Prekliči pošiljko
 DeleteSending=Izbriši pošiljko
 Stock=Zaloga
 Stocks=Zaloge
-StocksByLotSerial=Zaloga po lotu/serijski številki
+StocksByLotSerial=Stocks by lot/serial
 Movement=Gibanje
 Movements=Gibanja
 ErrorWarehouseRefRequired=Obvezno je referenčno ime skladišča
@@ -34,9 +34,10 @@ LastMovements=Zadnje spremembe
 Units=Enote
 Unit=Enota
 StockCorrection=Popravek zaloge
-StockTransfer=Prenos zaloge
-StockMovement=Prenos
-StockMovements=Prenosi zaloge
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Označitev premika
 NumberOfUnit=Število enot
 UnitPurchaseValue=Nabavna cena enote
@@ -53,8 +54,8 @@ QtyDispatched=Odposlana količina
 QtyDispatchedShort=Odposlana količina
 QtyToDispatchShort=Količina za odpošiljanje
 OrderDispatch=Dobavljena naročila
-RuleForStockManagementDecrease=Pravilo za upravljanje zmanjšanja zalog
-RuleForStockManagementIncrease=Pravilo za upravljanje povečanja zalog
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Zmanjšanje dejanske zaloge po potrditvi fakture/dobropisa (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
 DeStockOnValidateOrder=Zmanjšanje dejanske zaloge po potrditvi naročila (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
 DeStockOnShipment=Zmanjšanje dejanske zaloge po potrditvi odpreme
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Skladišča in proizvodi (s podrobnostmi o lotu
 AverageUnitPricePMPShort=Uravnotežena povprečna vhodna cena
 AverageUnitPricePMP=Uravnotežena povprečna vhodna cena
 SellPriceMin=Prodajna cena za enoto
-EstimatedStockValueSellShort=Prodajna vrednost
-EstimatedStockValueSell=Prodajna vrednost
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Ocenjena vrednost zaloge
 EstimatedStockValue=Ocenjena vrednost zaloge
 DeleteAWarehouse=Zbriši skladišče
@@ -113,7 +114,7 @@ AlertOnly= Samo opozorila
 WarehouseForStockDecrease=Skladiščee <b>%s</b> bo uporabljeno za zmanjšanje zaloge
 WarehouseForStockIncrease=Skladišče <b>%s</b> bo uporabljeno za povečanje zaloge
 ForThisWarehouse=Za to skladišče
-ReplenishmentStatusDesc=To je seznam vseh proizvodov z nižjo zalogo od želene (ali nižje od opozorilne vrednosti, če je označen kvadratek "samo opozorilo"), in nasvet za ustvarjanje naročila pri dobavitelju za popolnitev razlike.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=To je seznam vseh odprtih naročil pri dobavitelju vključno z vnaprej določenimi proizvodi. Vidna so samo odprta naročila z vnaprej določenimi proizvodi, torej naročila, ki lahko vplivajo na zalogo.
 Replenishments=Obnovitve
 NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s)
diff --git a/htdocs/langs/sl_SI/supplier_proposal.lang b/htdocs/langs/sl_SI/supplier_proposal.lang
index 8da85ad7968..38c285a0e0e 100644
--- a/htdocs/langs/sl_SI/supplier_proposal.lang
+++ b/htdocs/langs/sl_SI/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index 285098aef95..de08b9292c8 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Uporabi OpenID za prijavo
 WeeklyHours=Tedenske ure
 ColorUser=Barve uporabnika
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 9cff117f74a..deca56bf2c1 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index a4f919a6f49..e67ad0ade2d 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang
index 27b533c3f2d..bda34ce2299 100644
--- a/htdocs/langs/sq_AL/languages.lang
+++ b/htdocs/langs/sq_AL/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
 Language_fa_IR=Persian
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 7e948280d90..6c1c5d4d111 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/sq_AL/receiptprinter.lang b/htdocs/langs/sq_AL/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/sq_AL/receiptprinter.lang
+++ b/htdocs/langs/sq_AL/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/sq_AL/supplier_proposal.lang b/htdocs/langs/sq_AL/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/sq_AL/supplier_proposal.lang
+++ b/htdocs/langs/sq_AL/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index f426e9cc9f2..4e08d052dff 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - en_US - Accounting Expert
 ACCOUNTING_EXPORT_SEPARATORCSV=Separator kolona datoteke za izvoz
 ACCOUNTING_EXPORT_DATE=Format datuma datoteke za izvoz
-ACCOUNTING_EXPORT_PIECE=Broj delova za izvoz
+ACCOUNTING_EXPORT_PIECE=Izvezi broj delova
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Izvoz sa globalnim računom
-ACCOUNTING_EXPORT_LABEL=Izvoz oznake
+ACCOUNTING_EXPORT_LABEL=Izvezi oznaku
 ACCOUNTING_EXPORT_AMOUNT=Izvezi sumu
-ACCOUNTING_EXPORT_DEVISE=Export the devise
+ACCOUNTING_EXPORT_DEVISE=Izvezi izvod
 Selectformat=Odaberi format datoteke
 ACCOUNTING_EXPORT_PREFIX_SPEC=Naznači prefix datoteci
 
 Accounting=Računovodstvo
 Globalparameters=Globalni parametri
 Menuaccount=Računovodstveni nalozi
-Menuthirdpartyaccount=Ostali računi
+Menuthirdpartyaccount=Računi subjekta
 MenuTools=Alati
 
-ConfigAccountingExpert=Konfigurisanje eksperta računovodstvenog modula
+ConfigAccountingExpert=Konfigurisanje mogula računovodstveni ekspert
 Journaux=Izveštaji
 JournalFinancial=Finansijski izveštaji
 Exports=Izvozi
@@ -34,39 +34,40 @@ AccountAccounting=Računovodstveni nalog
 AccountAccountingSuggest=Predlog računovodstvenog naloga
 Ventilation=Presek
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Presek kupaca
 SuppliersVentilation=Presek dobavljača
 TradeMargin=Trgovinske marže
 Reports=Izveštaji
 ByCustomerInvoice=Po računima kupaca
-NewAccount=Novi knjigovodstveni račun
+NewAccount=Novi računovodstveni nalog
 Create=Kreiraj
-CreateMvts=Kreiraj prenos
+CreateMvts=Kreiraj promet
 UpdateAccount=Izmena računovodstvenog naloga
-UpdateMvts=Izmena prenosa
+UpdateMvts=Izmena prometa
 WriteBookKeeping=Snimanje računa u glavnoj knjizi
 Bookkeeping=Glavna knjiga
-AccountBalanceByMonth=Mesečno stanje računa
+AccountBalance=Account balance
 
 AccountingVentilation=Računovodstveni presek
-AccountingVentilationSupplier=Presek računa dobavljača
-AccountingVentilationCustomer=Presek računa kupca
+AccountingVentilationSupplier=Presek računovostva dobavljača
+AccountingVentilationCustomer=Presek računovodstva kupca
 
 CAHTF=Ukupna nabavka bez PDV-a
-InvoiceLines=Linije računa za kontrolu
-InvoiceLinesDone=Kontrolisane linije računa
-IntoAccount=Kontrolisati u knjižnom nalogu
+InvoiceLines=Linije faktura za kontrolu
+InvoiceLinesDone=Kontrolisane linije faktura
+IntoAccount=Kontrolisati u računovodstvenom nalogu
 
-Ventilate=Kontrola
+Ventilate=Kontroliši
 VentilationAuto=Automatski presek
 
 Processing=Obrada
 EndProcessing=Kraj obrade
-AnyLineVentilate=Neka linija za kontrolu
+AnyLineVentilate=Bilo koja linija za kontrolu
 SelectedLines=Izabrane linije
-Lineofinvoice=Linija računa
-VentilatedinAccount=Kontrola uspešna u obračunskom računu
-NotVentilatedinAccount=Nije kontrolisano u obračunskom računu
+Lineofinvoice=Linija faktura
+VentilatedinAccount=Uspešno prekontrolisano uračunovdstvenom nalogu
+NotVentilatedinAccount=Nije prekontrolisano u računovodstvenom nalogu
 
 ACCOUNTING_SEPARATORCSV=Separator kolona u datoteci za izvoz
 
@@ -74,12 +75,12 @@ ACCOUNTING_LIMIT_LIST_VENTILATION=Broj elemenata predviđeni za presek po strani
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Započni sortiranje stranica za presek "Predvidjeno za presek" na osnovu najnovijih elemenata
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Započni sortiranje stranica za presek "Presek" na osnovu najnovijih elemenata
 
-AccountLength=Dužina obračunskih računa prikazanih u Dolibarru
-AccountLengthDesc=Funkcija omogućava pretvaranje dužine obračunskog računa zamenom razmaka nultim znakom . Ova funkcija utiče samo na prikaz, ne modifikuje obračunske račune registrovane u Dolibaru . Za izvoz , ova funkcija je potrebno da bude kompatibilna sa određenim softverom .
-ACCOUNTING_LENGTH_DESCRIPTION=Dužina prikaza opisa proizvoda i usluga na spisku (Najbolje = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Dužina prikaza forme opisa proizvoda i usluga na spisku (Najbolje = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+AccountLength=Dužina računovodstvenih naloga prikazanih u Dolibarru
+AccountLengthDesc=Funkcija omogućava pretvaranje dužine računovdstvenog naloga zamenom razmaka nultim znakom . Ova funkcija utiče samo na prikaz, ne modifikuje računovdstvene naloge registrovane u Dolibaru . Za izvoz , ova funkcija je potrebno da bude kompatibilna sa određenim softverom .
+ACCOUNTING_LENGTH_DESCRIPTION=Dužina za prikaz opisa proizvoda i usluga na spisku (Najbolje = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Dužina za prikaz forme opisa naloga proizvoda i usluga na spisku (Najbolje = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Dužina opštih naloga
+ACCOUNTING_LENGTH_AACCOUNT=Dužina računa subjekta
 
 ACCOUNTING_SELL_JOURNAL=Izveštaj prodaje
 ACCOUNTING_PURCHASE_JOURNAL=Izveštaj nabavke
@@ -90,10 +91,10 @@ ACCOUNTING_SOCIAL_JOURNAL=Izveštaj društvenih aktivnosti
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Račun prometa
 ACCOUNTING_ACCOUNT_SUSPENSE=Račun čekanja
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Prodazumevani račuvodstveni nalog za kupljene proizvode (ukoliko nije definisan u tabeli proizvoda)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Podrazumevani računovodstveni nalog za prodate proizvode (ukoliko nije definisan u tabeli proizvoda)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Podrazumevani računovodstveni nalog za kupljene usluge (ukoliko nije definisan u tabeli usluga)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Podrazumevani račuvodstveni nalog za prodate uslugue (ukoliko nije definisan u tabeli usluga)
 
 Doctype=Tip dokumenta
 Docdate=Datum
@@ -103,58 +104,61 @@ Code_tiers=Treće lice
 Labelcompte=Oznaka računa
 Sens=Sens
 Codejournal=Izveštaj
+NumPiece=Piece number
 
-DelBookKeeping=Brisanje evidencije glavne knjige
+DelBookKeeping=Obriši evidenciju glavne knjige
 
 DescSellsJournal=Izveštaj prodaje
 DescPurchasesJournal=Izveštaj nabavke
 FinanceJournal=Finansijski izveštaji
-DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescFinanceJournal=Finansijski izveštaji uključujući sve vrste uplata preko bankovnog računa
 
-CashPayment=Cash Payment
+CashPayment=Gotovinsko plaćanje
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Uplata dobavljača po fakturi
+CustomerInvoicePayment=Uplata kupca po fakturi
 
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Račun subjekta
 
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=Nov promet
+NumMvts=Broj prometa
+ListeMvts=Lista prometa
+ErrorDebitCredit=Debit i Kredit ne smeju imati vrednost u isto vreme
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=Izlistaj račune subjekta
+DescThirdPartyReport=Ovde konsultuj listu kupaca i dobavljača i njihove računovodstvene naloge
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Lista računovodstvenih naloga
 
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
+Pcgversion=Verzija plana
+Pcgtype=Klasa računa
+Pcgsubtype=Pod klasom računa
+Accountparent=Koren računa
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
-TotalVente=Total turnover before tax
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilCustomer=Konsultuj ovde godišnji računovodstveni presek faktura kupaca
+TotalVente=Ukupni obrt pre poreza
+TotalMarge=Ukupna prodajna marža
+DescVentilDoneCustomer=Konsultuj ovde listu linija faktura kupaca i njihovih računovodstvenih naloga
+DescVentilTodoCustomer=Prekontroliši linije faktura kupaca sa računovodstvenim nalogom
+ChangeAccount=Izmeni računovodstveni nalog sa linijama odabranim od strane naloga:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Konsultuj ovde godišnju računovdstveni presek predračuna dobavljača
+DescVentilTodoSupplier=Prekontroliši linije faktura dobavljača sa računovdstvenim nalogom
+DescVentilDoneSupplier=Konslutuj ovde listu linija faktura dobavljača i njihovih računovdstvenih naloga
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Odobri automatski
+
+ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete opbrisati ovaj računovodstveni nalog, jer  je u upotrebi
+MvtNotCorrectlyBalanced=Transakcija nema dobar balans. Credit = %s. Debit = %s
+FicheVentilation=Kartica preseka
+GeneralLedgerIsWritten=Operacije su zapisane u glavnoj knjizi
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Transakcija nema dobar balans. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
-GeneralLedgerIsWritten=Operations are written in the general ledger
 
 ##Export Journal Feature
-ExportFormat=Format eksport
-Prefixname=Prefit eksportovanog fajla
-Separate=Separator za eksport
+ExportFormat=Format eksporta
+Prefixname=Prefiks datoteke za izvoz
+Separate=Separator za izvoz
 Textframe=Okvir tekstualne vrednosti
 Headercol=Imena kolona u začelju
 Fieldname=Ime polja
@@ -162,13 +166,14 @@ Headername=Ime u začelju
 Type=Tip polja
 Param=Dodatni parametri
 EnabledProduct=U Proizvodima
-EnabledTiers=In third party
-EnabledVat=U PDV
+EnabledTiers=U subjektu
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+InitAccountancy=Započinjanje računovodstva
+InitAccountancyDesc=Ova stranica se može upotrebiti da inicializuje računovodstveni nalog proizvoda i usluga koji nemaju definisan računovodstveni nalog za prodaju i kupovinu. Proveri pre nego da se podešavanje modula računovodstva završi.
+Options=Opcije
+OptionModeProductSell=Vrsta prodaje
+OptionModeProductBuy=Vrsta kupovine
+OptionModeProductSellDesc=Prikaži sve proizvode bez računovodstvenog naloga definisanog za prodaju.
+OptionModeProductBuyDesc=Prikaži sve proizvode bez računovodstvenog naloga definisanog za kupovinu
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index b5e0e011553..cdcb95252f3 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -14,19 +14,19 @@ FilesUpdated=Updated Files
 FileCheckDolibarr=Check Dolibarr Files Integrity
 XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=Sesija ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself).
+SessionSaveHandler=Rukovalac čuvanja sesije
+SessionSavePath=Lokalizacija smeštanja sesije
+PurgeSessions=Čišćenje sesije
+ConfirmPurgeSessions=Da li stvarno želiš da obrišeš sve sesije? To će diskonektovati sve korisnike (osim tebe).
 NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list 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 session
-WebUserGroup=Web server user/group
-NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
-HTMLCharset=Charset for generated HTML pages
+LockNewSessions=Zaključaj nove konekcije
+ConfirmLockNewSessions=Da li stvarno želiš da ograničiš sva nove Dolibarr povezivanja na sebe. Samo korisnici sa <b>%s</b>  će moći da se povežu nakon toga.
+UnlockNewSessions=Ukloni 
+YourSession=Vaša sesija
+Sessions=Korisnička sesija
+WebUserGroup=Web server korisnik/grupa
+NoSessionFound=Vaš PHP ne dozvoljava izlistavanje aktivnih sesija. Direktorijum korišćen za čuvanje sesija (<b>%s</b>) je možda zaštićen (Npr., po dozvolama OS-a ili po PHP direktivi open_basedir).
+HTMLCharset=Format za generisanje HTML strane
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
 WarningModuleNotActive=Module <b>%s</b> must be enabled
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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=Boja kojom će linija biti označena kada se mišem pređe preko nje (ostavite prazno kako linija ne bi bila označena)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Primer poruke koju možete koristiti da biste
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s je dostupan. Verzija %s je major verzija sa novim funkcionalnostima za korisnike i programere. Možete je preuzeti iz download sekcije na http://www.dolibarr.org portalu (folder Stable versions). Možete pročitati <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> za kompletu listu izmena.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s je dostupan. Verzija %s je maintenance verzija i sadrži samo ispravke bugova. Svakome ko koristi stariju verziju preporučujemo da je ažurira. Kao i svaka maintenance verzija, ona ne sadrži nove funkcionalnosti, niti izmene struktura podataka. Možete je preuzeti iz download sekcije na http://www.dolibarr.org portalu (folder Stable versions). Možete pročitati <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> za kompletu listu izmena.
 MultiPriceRuleDesc=Kada je uključena opcija "Više nivoa cene za proizvod/uslugu", možete definisati različite cene za svaki proizvod (po jednu za svaki nivo cene). Da biste uštedeli vreme, ovde možete uneti pravilo za automatsko računanje cene na svim nivoima na osnovu cene koju unesete za prvi nivo. Ova strana ima za cilj da uštedi Vaše vreme i može biti korisna samo ukoliko su cene za svaki od nivoa u funkciji s prvim nivoom cene. U većini slučajeva možete ignorisati ovu stranu.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sr_RS/agenda.lang b/htdocs/langs/sr_RS/agenda.lang
index 4d12755fb6b..15af03649ed 100644
--- a/htdocs/langs/sr_RS/agenda.lang
+++ b/htdocs/langs/sr_RS/agenda.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
+IdAgenda=ID događaj
 Actions=Događaji
 ActionsArea=Opseg događaja (akcije i zadaci)
 Agenda=Agenda
@@ -7,17 +7,17 @@ Agendas=Agende
 Calendar=Kalendar
 Calendars=Kalendari
 LocalAgenda=Interni kalendar
-ActionsOwnedBy=Event owned by
+ActionsOwnedBy=Događaj u vlasništvu
 AffectedTo=Dodeljeno
 DoneBy=Urađeno
-Event=Event
+Event=Događaj
 Events=Događaj
 EventsNb=Broj događaja
 MyEvents=Moji događaji
 OtherEvents=Drugi događaji
 ListOfActions=Lista događaja
 Location=Lokacija
-EventOnFullDay=Event on all day(s)
+EventOnFullDay=Dogadaj svim danima
 SearchAnAction= Potraži događaj/zadatak
 MenuToDoActions=Svi nezavršeni događaji
 MenuDoneActions=Svi završeni događaji
@@ -27,34 +27,34 @@ ListOfEvents=Lista događaja (interni kalendar)
 ActionsAskedBy=Događaje prijavio
 ActionsToDoBy=Događaji dodeljeni
 ActionsDoneBy=Događaje završio
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
-ActionAssignedTo=Event assigned to
+ActionsForUser=Događaji za korisnike
+ActionsForUsersGroup=Događaji za sve korisnike grupe
+ActionAssignedTo=Događaj dodeljen 
 AllMyActions= Svi moji događaji/zadaci
 AllActions= Svi događaji/zadaci
 ViewCal=Mesečni pregled
 ViewDay=Dnevni pregled
 ViewWeek=Nedeljni pregled
-ViewYear=Year view
-ViewPerUser=Per user view
-ViewPerType=Per type view
+ViewYear=Godišnji pregled
+ViewPerUser=Pregled po korisniku
+ViewPerType=Pregled po tipu
 ViewWithPredefinedFilters= Pogledaj po unpred zadatim filterima
 AutoActions= Automatsko popunjavanje
 AgendaAutoActionDesc= Definiši ovde događaje za koje želiš da Dolibarr automatski kreira događaj u agendi. Ukoliko ništa nije označeno (), samo manuelne akcije će biti uključene u agendi.
 AgendaSetupOtherDesc= Ova stranica omogućava izvoz vaših Dolibarr događaja u eksterni kalendar (thunderbird, google kalendar, ...)
-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
+AgendaExtSitesDesc=Ova stranica omogućava da odabereš eksterni kalendar čije događaje ćeš videti u Dolibarr agendi.
+ActionsEvents=Događaji za koje će Dolibarr da kreira akciju u agendi automatski
 PropalValidatedInDolibarr=Ponuda %s je potvrđena
 InvoiceValidatedInDolibarr=Faktura %s je potvrđena
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Faktura %s je potvđena od strane POS
 InvoiceBackToDraftInDolibarr=Faktura %s je vraćena na nacrt
 InvoiceDeleteDolibarr=Faktura %s je obrisana
 OrderValidatedInDolibarr=Račun %s je potvrđen
-OrderDeliveredInDolibarr=Order %s classified delivered
-OrderCanceledInDolibarr=Račun %s je otkazan
-OrderBilledInDolibarr=Order %s classified billed
+OrderDeliveredInDolibarr=Narudžbina %s označena kao dostavljena
+OrderCanceledInDolibarr=Račun %s je poništen
+OrderBilledInDolibarr=Narudžbina %s označena kao naplaćena
 OrderApprovedInDolibarr=Račun %s je odobren
-OrderRefusedInDolibarr=Order %s refused
+OrderRefusedInDolibarr=Narudžbina %s je odbijena.
 OrderBackToDraftInDolibarr=Račun %s je vraćen na nacrt
 ProposalSentByEMail=Komercijalna ponuda %s  poslata mejlom
 OrderSentByEMail=Račun klijenta %s poslat mejlom
@@ -62,8 +62,8 @@ InvoiceSentByEMail=Faktura klijenta %s poslata mejlom
 SupplierOrderSentByEMail=Račun dobavljača %s poslat mejlom
 SupplierInvoiceSentByEMail=Faktura dobavljača %s poslata mejlom
 ShippingSentByEMail=Isporuka %s poslata mejlom
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
+ShippingValidated= Isporuka %s je potvrđena
+InterventionSentByEMail=Intervencija %s poslata mejlo
 NewCompanyToDolibarr= Subjekt kreiran
 DateActionPlannedStart= Planirani početak
 DateActionPlannedEnd= Planirani kraj
@@ -71,38 +71,38 @@ DateActionDoneStart= Stvarni početak
 DateActionDoneEnd= Stvarni kraj
 DateActionStart= Početak
 DateActionEnd= Kraj
-AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions1=Možete dodati i sledeće parametre da filtrirate rezultat:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
-AgendaShowBirthdayEvents=Show birthday's contacts
-AgendaHideBirthdayEvents=Hide birthday's 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)
+AgendaShowBirthdayEvents=Prikaži rođendan kontakta
+AgendaHideBirthdayEvents=Sakri rođendan kontakta
+Busy=Zauzet
+ExportDataset_event1=Spisak događaja iz agende
+DefaultWorkingDays=Već utvrđen period radnih dana u nedelji (Primer: 1-5, 1-6)
+DefaultWorkingHours=Već utvrđeni broj radnih sati u danu (Primer: 9-18)
 # External Sites ical
-ExportCal=Export calendar
-ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
-ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
-ExtSiteUrlAgenda=URL to access .ical file
-ExtSiteNoLabel=No Description
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
+ExportCal=Izvezi kalendar
+ExtSites=Uvezi eksterni kalendar
+ExtSitesEnableThisTool=Prikaži eksterni kalendar (definisan u opštim podešavanjima) u agendi. Ne utiče na eksterni kalendar definisan od strane korisnika.
+ExtSitesNbOfAgenda=Broj kalendara
+AgendaExtNb=Kalendar broj %s
+ExtSiteUrlAgenda=URL za pristup .ical datoteke
+ExtSiteNoLabel=Nema opisa
+WorkingTimeRange=Period radnog vremena
+WorkingDaysRange=Period radnih dana
 VisibleTimeRange=Vidljiv vremenski period
 VisibleDaysRange=Vidljiv vremenski period
-AddEvent=Create event
-MyAvailability=My availability
-ActionType=Event type
-DateActionBegin=Start event date
-CloneAction=Clone event
-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
+AddEvent=Kreiraj događaj
+MyAvailability=Moja dostupnost
+ActionType=Tip događaja
+DateActionBegin=Početak događaja
+CloneAction=Kloniraj događaj
+ConfirmCloneEvent=Da li ste sigurni da želite da klonirate događaj  <b>%s</b> ?
+RepeatEvent=Ponovi događaj
+EveryWeek=Svake nedelje
+EveryMonth=Svakog meseca
+DayOfMonth=Dan u mesecu
+DayOfWeek=Dan u nedelji
+DateStartPlusOne=Početak + 1 sat
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index f464b2757fa..c7c8bc70274 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -1,172 +1,172 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Bank
-Banks=Banks
-MenuBankCash=Bank/Cash
-MenuSetupBank=Bank/Cash setup
-BankName=Bank name
-FinancialAccount=Account
-FinancialAccounts=Accounts
-BankAccount=Bank account
-BankAccounts=Bank accounts
-ShowAccount=Show Account
-AccountRef=Financial account ref
-AccountLabel=Financial account label
-CashAccount=Cash account
-CashAccounts=Cash accounts
-MainAccount=Main account
-CurrentAccount=Current account
-CurrentAccounts=Current accounts
-SavingAccount=Savings account
-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
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
-BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
-Withdrawals=Withdrawals
-Withdrawal=Withdrawal
-AccountStatement=Account statement
-AccountStatementShort=Statement
-AccountStatements=Account statements
-LastAccountStatements=Last account statements
-Rapprochement=Reconciliate
-IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
-BankAccountCountry=Account country
-BankAccountOwner=Account owner name
-BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
-CreateAccount=Create account
-NewAccount=New account
-NewBankAccount=New bank account
-NewFinancialAccount=New financial account
-MenuNewFinancialAccount=New financial account
-NewCurrentAccount=New current account
-NewSavingAccount=New savings account
-NewCashAccount=New cash account
-EditFinancialAccount=Edit account
-AccountSetup=Financial accounts setup
-SearchBankMovement=Search bank movement
-Debts=Debts
-LabelBankCashAccount=Bank or cash label
-AccountType=Account type
-BankType0=Savings account
-BankType1=Current or credit card account
-BankType2=Cash account
-IfBankAccount=If bank account
-AccountsArea=Accounts area
-AccountCard=Account card
-DeleteAccount=Delete account
-ConfirmDeleteAccount=Are you sure you want to delete this account ?
-Account=Account
-ByCategories=By categories
-ByRubriques=By categories
-BankTransactionByCategories=Bank transactions by categories
-BankTransactionForCategory=Bank transactions for category <b>%s</b>
-RemoveFromRubrique=Remove link with category
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category ?
-ListBankTransactions=List of bank transactions
-IdTransaction=Transaction ID
-BankTransactions=Bank transactions
-SearchTransaction=Search transaction
-ListTransactions=List transactions
-ListTransactionsByCategory=List transaction/category
-TransactionsToConciliate=Transactions to reconcile
-Conciliable=Can be reconciled
-Conciliate=Reconcile
-Conciliation=Reconciliation
-ConciliationForAccount=Reconcile this account
-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
-StatusAccountOpened=Open
-StatusAccountClosed=Closed
-AccountIdShort=Number
-EditBankRecord=Edit record
-LineRecord=Transaction
-AddBankRecord=Add transaction
-AddBankRecordLong=Add transaction manually
-ConciliatedBy=Reconciled by
-DateConciliating=Reconcile date
-BankLineConciliated=Transaction reconciled
-CustomerInvoicePayment=Customer payment
-CustomerInvoicePaymentBack=Customer payment back
-SupplierInvoicePayment=Supplier payment
-WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social/fiscal tax payment
-FinancialAccountJournal=Financial account journal
-BankTransfer=Bank transfer
-BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same 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 waiting for deposit
-ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
-DeleteTransaction=Delete transaction
-ConfirmDeleteTransaction=Are you sure you want to delete this transaction ?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions
-BankMovements=Movements
-CashBudget=Cash budget
-PlannedTransactions=Planned transactions
-Graph=Graphics
-ExportDataset_banque_1=Bank transactions and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=Transaction on the other account
-TransactionWithOtherAccount=Account transfer
-PaymentNumberUpdateSucceeded=Payment number updated succesfully
-PaymentNumberUpdateFailed=Payment number could not be updated
-PaymentDateUpdateSucceeded=Payment date update succesfully
-PaymentDateUpdateFailed=Payment date could not be updated
-Transactions=Transactions
-BankTransactionLine=Bank transaction
-AllAccounts=All bank/cash accounts
-BackToAccount=Back to account
-ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into 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 conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-BankDashboard=Bank accounts summary
-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 ?
-StartDate=Start date
-EndDate=End date
+Bank=Banka
+Banks=Banke
+MenuBankCash=Banka/Gotovina
+MenuSetupBank=Banka/ Podešavanje gotovine
+BankName=Ime banke
+FinancialAccount=Račun
+FinancialAccounts=Računi
+BankAccount=Račun u banci
+BankAccounts=Računi u banci
+ShowAccount=Prikaži račun
+AccountRef=Finansijski račun referenca
+AccountLabel=Oznaka finansijskog računa
+CashAccount=Gotovinski račun
+CashAccounts=Gotovinski računi
+MainAccount=Glavni račun
+CurrentAccount=Trenutni račun
+CurrentAccounts=Trenutni računi
+SavingAccount=Štedni račun
+SavingAccounts=Štedni računi
+ErrorBankLabelAlreadyExists=Oznaka finansijskog računa već postoji
+BankBalance=Stanje
+BankBalanceBefore=Stanje pre
+BankBalanceAfter=Stanje posle
+BalanceMinimalAllowed=Najmanje dozvoljeno stanje
+BalanceMinimalDesired=Najmanje zeljeno stanje
+InitialBankBalance=Početno stanje
+EndBankBalance=Kranje stanje
+CurrentBalance=Trenutno stanje
+FutureBalance=Buduće stanje
+ShowAllTimeBalance=Prikaži stanje od početka
+AllTime=Od početka
+Reconciliation=Poravnanje
+RIB=Broj bankovnog računa
+IBAN=IBAN broj
+IbanValid=IBAN je važeći
+IbanNotValid=IBAN je ne važeći
+BIC=BIC/SWIFT broj
+SwiftValid=BIC/SWIFT je važeći
+SwiftNotValid=BIC/SWIFT je ne važeći
+StandingOrders=Trajni nalozi
+StandingOrder=Trajni nalog
+Withdrawals=Podizanja
+Withdrawal=Podizanje
+AccountStatement=Izvod
+AccountStatementShort=Izvod
+AccountStatements=Izvodi
+LastAccountStatements=Poslednji izvod
+Rapprochement=Poravnati
+IOMonthlyReporting=Mesečno izveštavanje
+BankAccountDomiciliation=Adresa računa
+BankAccountCountry=Država računa
+BankAccountOwner=Ime vlasnika računa
+BankAccountOwnerAddress=Adresa vlasnika računa
+RIBControlError=Provera integriteta vrednosti nije uspela. To znači da informacije za ovaj broj računa ili su nepotpune ili pogrešna (proverite državu, brojeve i IBAN)
+CreateAccount=Kreiraj račun
+NewAccount=Novi račun
+NewBankAccount=Nov bankovni račun
+NewFinancialAccount=Nov finansijski račun
+MenuNewFinancialAccount=Nov finansijski račun
+NewCurrentAccount=Nov trenutni račun
+NewSavingAccount=Nov štedni račun
+NewCashAccount=Nov gotovinski račun
+EditFinancialAccount=Izmeni račun
+AccountSetup=Podešavanje finasijskog računa
+SearchBankMovement=Pretraži bankovni promet
+Debts=Dug
+LabelBankCashAccount=Bankovna ili gotovinska oznaka
+AccountType=Tip računa
+BankType0=Štedni račun
+BankType1=Trenutni ili račun kreditne kartice
+BankType2=Gotovinski račun
+IfBankAccount=Ako bankovni račun
+AccountsArea=Oblast računa
+AccountCard=Kartica računa
+DeleteAccount=Obriši račun
+ConfirmDeleteAccount=Da li ste sigurni da želite da obrišete ovaj račun?
+Account=Račun
+ByCategories=Po kategorijama
+ByRubriques=Po kategorijama
+BankTransactionByCategories=Bankovne transakcije po kategorijama
+BankTransactionForCategory=Bankovne transakcije za kategoriju <b>%s</b>
+RemoveFromRubrique=Ukloni link sa kategorijom
+RemoveFromRubriqueConfirm=Da li ste sigurni da želite da uklonite link između ove transakcije i kategorije?
+ListBankTransactions=Lista bankovnih transakcija
+IdTransaction=ID transakcije
+BankTransactions=Bankovne transakcije
+SearchTransaction=Pretraži transakciju
+ListTransactions=Lista trasakcija
+ListTransactionsByCategory=Lista transakcija / kategorija
+TransactionsToConciliate=Transakcije za poravnanje
+Conciliable=Ne može se poravnati
+Conciliate=Poravnati
+Conciliation=Poravnanje
+ConciliationForAccount=Poravnaj ovaj račun
+IncludeClosedAccount=Uključi zatvorene račune
+OnlyOpenedAccount=Samo otvoreni računi
+AccountToCredit=Kreditni račun
+AccountToDebit=Debitni račun
+DisableConciliation=Onemogući poravnanje za ovaj račun
+ConciliationDisabled=Opcija poravnanja onemogućena
+StatusAccountOpened=Otvoreno
+StatusAccountClosed=Zatvoreno
+AccountIdShort=Broj
+EditBankRecord=Izmeni zapis
+LineRecord=Transakcija
+AddBankRecord=Dodaj transakciju
+AddBankRecordLong=Dodaj transakciju ručno
+ConciliatedBy=Poravnjaj sa
+DateConciliating=Datum poravnanja
+BankLineConciliated=Transakcije poravnane
+CustomerInvoicePayment=Uplata kupca
+CustomerInvoicePaymentBack=Refundiranje kupcu
+SupplierInvoicePayment=Refundiranje dobavaljaču
+WithdrawalPayment=Povraćaj uplate
+SocialContributionPayment=Uplate poreza/doprinosa
+FinancialAccountJournal=Finansijski izveštaji
+BankTransfer=Bankovni prenos
+BankTransfers=Bankovni prenosi
+TransferDesc=Prenosom sa jednog računa na drugi, Dolibarr će napraviti dva zapisa (debitni na računu porekla i kreditni na ciljanom računu iste vrednosti). Ista oznaka i datum će biti upotrebljen za ovu transakciju.
+TransferFrom=Od
+TransferTo=Za
+TransferFromToDone=Prenos od  <b>%s</b> to <b>%s</b> of <b>%s</b> %s je zabeležen.
+CheckTransmitter=Otpremnik
+ValidateCheckReceipt=Potvrdi ovaj ček?
+ConfirmValidateCheckReceipt=Da li ste sigurni da želite da potvrdite ovaj ček, nakon toga izmene nisu moguće?
+DeleteCheckReceipt=Obrišite ovaj ček?
+ConfirmDeleteCheckReceipt=Da li ste sigurni da želite da obrišete ovaj račun?
+BankChecks=Bankovni ček
+BankChecksToReceipt=Čekovi na čekanju za unovčenje
+ShowCheckReceipt=Prikaži unovčen ček
+NumberOfCheques=Br. čeka
+DeleteTransaction=Obriši transakciju
+ConfirmDeleteTransaction=Da li ste sigurni da želite da obrišete ovu trasnakciju?
+ThisWillAlsoDeleteBankRecord=Ovo će takođe obrisati generisanu bankovnu transakciju
+BankMovements=Promene
+CashBudget=Novčani budžet
+PlannedTransactions=Planirane transakcije
+Graph=Grafike
+ExportDataset_banque_1=Bankovne transkacije i izvod računa
+ExportDataset_banque_2=Depozitni isečak
+TransactionOnTheOtherAccount=Transakcije na drugom računu
+TransactionWithOtherAccount=Prenos na računu
+PaymentNumberUpdateSucceeded=Broj uplate uspešno izmenjen
+PaymentNumberUpdateFailed=Broj uplate ne može biti izmenjen
+PaymentDateUpdateSucceeded=Datum uplate uspešno izmenjen
+PaymentDateUpdateFailed=Datum uplate ne može biti izmenjen
+Transactions=Transakcija
+BankTransactionLine=Bankovna transakcija
+AllAccounts=Svi bankovni/gotovinski računi
+BackToAccount=Nazad na račun
+ShowAllAccounts=Prikaži za sve račune
+FutureTransaction=Transakcije u budućnosti. Ne postoji način za izmirenje.
+SelectChequeTransactionAndGenerate=Obeleži/filtriraj čekove da ih uključite u unovčene čekove i kliknite na "Kreiraj"
+InputReceiptNumber=Odaberi izvod iz banke povezan sa poravnanjem. Upotrebi sledeću numeričku vrednost: YYYYMM or YYYYMMDD
+EventualyAddCategory=Na kraju, definišite kategoriju u koju želite da klasifikujete izveštaje
+ToConciliate=Poravnati?
+ThenCheckLinesAndConciliate=Potom, označite prikazane linije u izvodu i klinkite
+BankDashboard=Rezime bankovnih računa
+DefaultRIB=Podrazumevani BAN
+AllRIB=Svi BAN
+LabelRIB=BAN oznaka
+NoBANRecord=Nema BAN izveštaja
+DeleteARib=Obriši BAN izveštaj
+ConfirmDeleteRib=Da li ste sigurni da želite da obrišete ova BAN izveštaj ?
+StartDate=Datum početka
+EndDate=Datum završetka
 RejectCheck=Vraćen ček
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+ConfirmRejectCheck=Da li ste sigurni da želite da označite ovaj ček kao odbijen?
 RejectCheckDate=Datum vraćanja čeka
 CheckRejected=Vraćen ček
 CheckRejectedAndInvoicesReopened=Ček vraćen i faktura ponovo otvorena
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 203830a62c9..e7e17ef5683 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -58,6 +58,7 @@ Payment=Plaćanje
 PaymentBack=Refundiranje
 Payments=Plaćanja
 PaymentsBack=Refundiranja
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Refundirano
 DeletePayment=Obriši plaćanje
 ConfirmDeletePayment=Da li ste sigurni da želite da obrišete ovo plaćanje?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Uplatiti zbog kupca
 DisabledBecauseRemainderToPayIsZero=Onemogući jer je preostali iznos nula
 PriceBase=Osnovna cena
 BillStatus=Status računa
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Nacrt (treba da se potvrdi)
 BillStatusPaid=Plaćeno
 BillStatusPaidBackOrConverted=Plaćeno, ili konvertovano u popust
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Greška! Ne možete otkazati ra
 BillFrom=Od
 BillTo=Za
 ActionsOnBill=Akcije nad računom
+RecurringInvoiceTemplate=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=Novi račun
 LastBills=Poslednji %s računi
 LastCustomersBills=Poslednji %s računi kupaca
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index 8cdcccf6f7f..84e63514dce 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -1,98 +1,100 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLastRssInfos=Rss information
-BoxLastProducts=Last %s products/services
-BoxProductsAlertStock=Products in stock alert
-BoxLastProductsInContract=Last %s contracted products/services
-BoxLastSupplierBills=Last supplier's invoices
-BoxLastCustomerBills=Last customer's invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices
-BoxLastProposals=Last commercial proposals
-BoxLastProspects=Last modified prospects
-BoxLastCustomers=Last modified customers
-BoxLastSuppliers=Last modified suppliers
-BoxLastCustomerOrders=Last customer orders
-BoxLastValidatedCustomerOrders=Last validated customer orders
-BoxLastBooks=Last books
-BoxLastActions=Last actions
-BoxLastContracts=Last contracts
-BoxLastContacts=Last contacts/addresses
-BoxLastMembers=Last members
-BoxFicheInter=Last interventions
-BoxCurrentAccounts=Open accounts balance
-BoxSalesTurnover=Sales turnover
-BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
-BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
-BoxTitleLastBooks=Last %s recorded books
-BoxTitleNbOfCustomers=Number of clients
-BoxTitleLastRssInfos=Last %s news from %s
-BoxTitleLastProducts=Last %s modified products/services
-BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Last %s customer orders
-BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
-BoxTitleLastSuppliers=Last %s recorded suppliers
-BoxTitleLastCustomers=Last %s recorded customers
-BoxTitleLastModifiedSuppliers=Last %s modified suppliers
-BoxTitleLastModifiedCustomers=Last %s modified customers
-BoxTitleLastCustomersOrProspects=Last %s customers or prospects
-BoxTitleLastPropals=Last %s proposals
-BoxTitleLastModifiedPropals=Last %s modified proposals
-BoxTitleLastCustomerBills=Last %s customer's invoices
-BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
-BoxTitleLastSupplierBills=Last %s supplier's invoices
-BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
-BoxTitleLastModifiedProspects=Last %s modified prospects
-BoxTitleLastProductsInContract=Last %s products/services in a contract
-BoxTitleLastModifiedMembers=Last %s members
-BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Open accounts balances
-BoxTitleSalesTurnover=Sales turnover
-BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
-BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
-BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
-BoxMyLastBookmarks=My last %s bookmarks
-BoxOldestExpiredServices=Oldest active expired services
-BoxLastExpiredServices=Last %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Last %s actions to do
-BoxTitleLastContracts=Last %s contracts
-BoxTitleLastModifiedDonations=Last %s modified donations
-BoxTitleLastModifiedExpenses=Poslednjih %s izmenjenih izveštaja troškova
-BoxGlobalActivity=Global activity (invoices, proposals, orders)
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
-LastRefreshDate=Last 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 customer's orders
-NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoRecordedSupplierInvoices=No recorded supplier's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's 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 supplier orders
-BoxTitleLatestSupplierOrders=Last %s supplier orders
-BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
-NoSupplierOrder=No recorded supplier order
-BoxCustomersInvoicesPerMonth=Customer invoices per month
-BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-BoxCustomersOrdersPerMonth=Customer orders per month
-BoxSuppliersOrdersPerMonth=Supplier orders per month
-BoxProposalsPerMonth=Proposals per month
-NoTooLowStockProducts=No product under the low stock limit
-BoxProductDistribution=Products/Services distribution
-BoxProductDistributionFor=Distribution of %s for %s
-ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
-LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+BoxLastRssInfos=Rss Informacija
+BoxLastProducts=Poslednji %s proizvod/usluga
+BoxProductsAlertStock=Proizvod u zalihama upozorenja
+BoxLastProductsInContract=Poslednji %s ugovoreni proizvod/usluga
+BoxLastSupplierBills=Poslednja faktura dobavljača
+BoxLastCustomerBills=Poslednja faktura kupca
+BoxOldestUnpaidCustomerBills=Najstarija neplaćena faktura klijenta
+BoxOldestUnpaidSupplierBills=Najstarija neplaćena faktura dobavljača
+BoxLastProposals=Poslednja komercijalna ponuda
+BoxLastProspects=Poslednje modifikovani prospekt
+BoxLastCustomers=Poslednje modifikovani klijent
+BoxLastSuppliers=Poslednje modifikovani dobavljač
+BoxLastCustomerOrders=Poslednja narudžbina klijenta
+BoxLastValidatedCustomerOrders=Poslednje potvrđene narudžbine klijenta
+BoxLastBooks=Poslednje knjige
+BoxLastActions=Poslednje akcije
+BoxLastContracts=Poslednji ugovori
+BoxLastContacts=Poslednji kontakt/adresa
+BoxLastMembers=Poslednji članovi
+BoxFicheInter=Poslednje intervencije
+BoxCurrentAccounts=Otvoreno stanje računa
+BoxSalesTurnover=Obrt prodaje
+BoxTotalUnpaidCustomerBills=Sve neplaćane fakture klijenta
+BoxTotalUnpaidSuppliersBills=Sve neplaćene fakture dobavljača
+BoxTitleLastBooks=Poslednje  %s  zabeležena knjiga
+BoxTitleNbOfCustomers=Broj klijenta
+BoxTitleLastRssInfos=Poslednja %s  vest od %s
+BoxTitleLastProducts=Poslednje %s izmenjen proizvod/usluga 
+BoxTitleProductsAlertStock=Proizvod u zalihama upozorenja
+BoxTitleLastCustomerOrders=Poslednja %s narudžbina klijenta
+BoxTitleLastModifiedCustomerOrders=Poslednje %s izmenjene narudžbine klijenata
+BoxTitleLastSuppliers=Poslednje %s zabeležen dobavljač
+BoxTitleLastCustomers=Poslednje %s zabeležen klijent
+BoxTitleLastModifiedSuppliers=Poslednje %s izmenjen dobavljač
+BoxTitleLastModifiedCustomers=Poslednje %s izmenje klijent
+BoxTitleLastCustomersOrProspects=Poslednji %s klijent ili prospekt
+BoxTitleLastPropals=Poslednja %s ponuda
+BoxTitleLastModifiedPropals=Poslednje %s izmenjene ponude
+BoxTitleLastCustomerBills=Poslednja %s faktura klijenta
+BoxTitleLastModifiedCustomerBills=Poslednje %s izmenjene fakture klijenta
+BoxTitleLastSupplierBills=Poslednja %s faktura dobavljača
+BoxTitleLastModifiedSupplierBills=Poslednje %s izmenje fakture dobavljača
+BoxTitleLastModifiedProspects=Poslednji %s izmenjen prospekt
+BoxTitleLastProductsInContract=Poslednji %s proizvod/ugluga u ugovoru
+BoxTitleLastModifiedMembers=Poslednji %s članovi
+BoxTitleLastFicheInter=Poslednji %s izmenjea intervencija
+BoxTitleOldestUnpaidCustomerBills=Najstarija %s neplaćena faktura klijenta
+BoxTitleOldestUnpaidSupplierBills=Najstarija %s neplaćena faktura dobavljača
+BoxTitleCurrentAccounts=Otvorena stanja računa
+BoxTitleSalesTurnover=Obrt prodaje
+BoxTitleTotalUnpaidCustomerBills=Neplaćene fakture klijenta
+BoxTitleTotalUnpaidSuppliersBills=Neplaćene fakture dobavljača
+BoxTitleLastModifiedContacts=Poslednje %s izemenjen kontakt/adresa
+BoxMyLastBookmarks=Moje poslednje %s zabeleške
+BoxOldestExpiredServices=Najstarije aktivne istekle usluge
+BoxLastExpiredServices=Poslednji %s najstariji kontakt sa aktivnom isteklom uslugom
+BoxTitleLastActionsToDo=Poslednja %s akcija da se uredi
+BoxTitleLastContracts=Poslednji %s ugovor
+BoxTitleLastModifiedDonations=Poslednje %s  modifikovana donacija
+BoxTitleLastModifiedExpenses=Poslednje %s modifikovani izveštaj troškova
+BoxGlobalActivity=Opšta aktivnost (fakture, ponude, narudžbine)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
+FailedToRefreshDataInfoNotUpToDate=Nije uspeo refresh RSS fluksa. Poslednji datum uspešnog refresh-a:  %s
+LastRefreshDate=Poslednji datum refresh-a
+NoRecordedBookmarks=Nema definisane zabeleške
+ClickToAdd=Kliknu ovde da dodaš.
+NoRecordedCustomers=Nema zabeleženog klijenta
+NoRecordedContacts=Nema zabeleženog kontakta
+NoActionsToDo=Nema akcije da se uradi
+NoRecordedOrders=Nema zabeležene narudžbine klijenta
+NoRecordedProposals=Nema ponude zabeležene
+NoRecordedInvoices=Nema zabeležene fakture klijenta
+NoUnpaidCustomerBills=Nema neplaćane fakture klijenta
+NoRecordedSupplierInvoices=Nema zabeleženih faktura dobavljača
+NoUnpaidSupplierBills=Nema neplaćenih faktura dobavljača
+NoModifiedSupplierBills=Nema zabeleženih faktura dobavljača
+NoRecordedProducts=Nema  zabeleženih proizvoda/usluga
+NoRecordedProspects=Nema zabeleženog prospekta
+NoContractedProducts=Nema ugovora za proizvode/usluge
+NoRecordedContracts=Nema zabeleženog ugovora
+NoRecordedInterventions=Nema zabeležene intervencije
+BoxLatestSupplierOrders=Najnovije narudžbine dobavljača
+BoxTitleLatestSupplierOrders=Poslednja %s narudžbina dobavljača
+BoxTitleLatestModifiedSupplierOrders=Poslednje %s  izmenjene narudžbine dobavljača
+NoSupplierOrder=Nema zabeležene narudžbine dobavljača
+BoxCustomersInvoicesPerMonth=Fakture klijenata na mesečnom nivou
+BoxSuppliersInvoicesPerMonth=Fakture dobavljača na mesečnom nivou
+BoxCustomersOrdersPerMonth=Narudžbine klijenata na mesečnom nivou
+BoxSuppliersOrdersPerMonth=Narudžbine dobavljača na mesečnom nivou
+BoxProposalsPerMonth=Ponude na mesečnom nivou
+NoTooLowStockProducts=Nema proizvoda ispod donjeg limita zaliha
+BoxProductDistribution=Distribucija proizvoda/usluga
+BoxProductDistributionFor=Distribucija %s  za  %s
+ForCustomersInvoices=Fakture klijenata
+ForCustomersOrders=Narudžbine klijenata
+ForProposals=Ponude
+LastXMonthRolling=Poslednje mesečni %s izveštaj
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index c65b29c848c..3666b09ddaa 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -1,41 +1,41 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Point of sale
-CashDesk=Point of sale
-CashDesks=Point of sales
-CashDeskBank=Bank account
-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
-CashdeskDashboard=Point of sale access
-ShoppingCart=Shopping cart
-NewSell=New sell
-BackOffice=Back office
-AddThisArticle=Add this article
-RestartSelling=Go back on sell
-SellFinished=Sell finished
-PrintTicket=Print ticket
-NoProductFound=No article found
-ProductFound=product found
-ProductsFound=products found
-NoArticle=No article
-Identification=Identification
-Article=Article
-Difference=Difference
-TotalTicket=Total ticket
-NoVAT=No VAT for this sale
-Change=Excess received
-CalTip=Click to view the calendar
-CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
-BankToPay=Charge Account
-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 use POS need to have permission to edit stock.
+CashDeskMenu=Maloprodaja
+CashDesk=Maloprodaja
+CashDesks=Maloprodaje
+CashDeskBank=Bankovni račun
+CashDeskBankCash=Bankovni račun (gotovinski)
+CashDeskBankCB=Bankovni račun (kartica)
+CashDeskBankCheque=Bankovni račun (ček)
+CashDeskWarehouse=Magacini
+CashdeskShowServices=Prodajne usluge
+CashDeskProducts=Proizvodi
+CashDeskStock=Zalihe
+CashDeskOn=na
+CashDeskThirdParty=Subjekt
+CashdeskDashboard=Trenutak pristupa prodaji
+ShoppingCart=Korpa za kupovinu
+NewSell=Nova prodaja
+BackOffice=Finansijska služba
+AddThisArticle=Dodaj ovaj artikal
+RestartSelling=Vrati se nazad na prodaju
+SellFinished=Prodaja završena
+PrintTicket=Štampaj kartu
+NoProductFound=Artikal nije pronađen
+ProductFound=proizvod pronađen
+ProductsFound=proizvodi pronađeni
+NoArticle=Nema artikla
+Identification=Identifikacija
+Article=Artikal
+Difference=Razlika
+TotalTicket=Ukupna karta
+NoVAT=Nema PIB za ovu prodaju
+Change=VIšak primljen
+CalTip=Klinkite da vidite kalendar
+CashDeskSetupStock=Zatržili ste da smanjite zalihe na kreiranoj fakturi ali magacin za ovno nije definisan<br>Izmeni podešavanja modula zaliha ili odaberi magacin
+BankToPay=Naplati račun
+ShowCompany=Prikaži firmu
+ShowStock=Prikaži magacin
+DeleteArticle=Kliknite da uklonite ovaj atikal
+FilterRefOrLabelOrBC=Pretraži (Ref/Oznaku)
+UserNeedPermissionToEditStockToUsePos=Zatražili ste da smanjite zalihe na kreiranoj fakturi, tako da korisnik koji koristi POS mora da zatraži dozvolu da izmeni zalihe.
 DolibarrReceiptPrinter=Dolibarr štampač računa
diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
index ccf22bb5003..a9c1338aea2 100644
--- a/htdocs/langs/sr_RS/categories.lang
+++ b/htdocs/langs/sr_RS/categories.lang
@@ -1,112 +1,112 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-TheCategorie=The tag/category
-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=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-ThirdPartyCategoriesArea=Third parties tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-MainCats=Main tags/categories
-SubCats=Subcategories
-CatStatistics=Statistics
-CatList=List of tags/categories
-AllCats=All tags/categories
-ViewCat=View tag/category
-NewCat=Add tag/category
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-ValidateFields=Validate the fields
-NoSubCat=No subcategory.
-SubCatOf=Subcategory
-FoundCats=Found tags/categories
-FoundCatsForName=Tags/categories found for the name :
-FoundSubCatsIn=Subcategories found in the tag/category
-ErrSameCatSelected=You selected the same tag/category several times
-ErrForgotCat=You forgot to choose the tag/category
-ErrForgotField=You forgot to inform the fields
-ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a tag/category?
-ImpossibleAddCat=Impossible to add the tag/category
-ImpossibleAssociateCategory=Impossible to associate the tag/category to
-WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added successfully.
-ProductIsInCategories=Product/service is linked to following tags/categories
-SupplierIsInCategories=Third party is linked to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following suppliers 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
-SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NoneCategory=None
-NotCategorized=Without tag/category
-CategoryExistsAtSameLevel=This category already exists with this ref
-ReturnInProduct=Back to product/service card
-ReturnInSupplier=Back to supplier card
-ReturnInCompany=Back to customer/prospect card
-ContentsVisibleByAll=The contents will be visible by all
-ContentsVisibleByAllShort=Contents visible by all
-ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Tags/categories tree
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/category
-RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-ThisCategoryHasNoProduct=This category does not contain any product.
-ThisCategoryHasNoSupplier=This category does not contain any supplier.
-ThisCategoryHasNoCustomer=This category does not contain any customer.
-ThisCategoryHasNoMember=This category does not contain any member.
-ThisCategoryHasNoContact=This category does not contain any contact.
-AssignedToCustomer=Assigned to a customer
-AssignedToTheCustomer=Assigned to the customer
-InternalCategory=Internal category
-CategoryContents=Tag/category contents
-CategId=Tag/category id
-CatSupList=List of supplier 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
-CatProdLinks=Links between products/services and tags/categories
-CatMemberLinks=Links between members and tags/categories
-DeleteFromCat=Remove from tags/category
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
+Rubrique=Naziv/Kategorija
+Rubriques=Naziv/Kategorije
+categories=nazivi/kategorije
+TheCategorie=naziv/kategorija
+NoCategoryYet=Naziv/kategorija nije kreirana za ovaj tip
+In=U
+AddIn=Dodaj u
+modify=izmeni
+Classify=Klasifikuj
+CategoriesArea=Oblast naziva/kategorije
+ProductsCategoriesArea=Oblast naziva/kategorije proizvoda/usluge
+SuppliersCategoriesArea=Oblast naziva/kategorije dobavljača
+CustomersCategoriesArea=Oblast naziva/kategorije dobavljača
+ThirdPartyCategoriesArea=Oblast naziva/kategorije subjekta
+MembersCategoriesArea=Oblast naziva/kategorije članova
+ContactsCategoriesArea=Oblast naziva/kategorija kontakata
+MainCats=Glavni nazivi/kategorije
+SubCats=Podkategorije
+CatStatistics=Statistike
+CatList=Lista naziva/kategorija
+AllCats=Svi nazivi/kategorije
+ViewCat=Vidi naziv/kategoriju
+NewCat=Dodaj naziv/kategoriju
+NewCategory=Nov naziv/kategorija
+ModifCat=Izmeni naziv/kategoriju
+CatCreated=Kreiran naziv/kategorija
+CreateCat=Kreiraj naziv/kategoriju
+CreateThisCat=Kreiraj ovaj naziv/kategoriju
+ValidateFields=Potvrdi ova polja
+NoSubCat=Nema sabkategoriju
+SubCatOf=Sabkategorija
+FoundCats=Pronađi naziv/kategoriju
+FoundCatsForName=Naziv/kategorije pronađene za ime : 
+FoundSubCatsIn=Subkategorije pronađene u nazivu/kategoriji
+ErrSameCatSelected=Odabrali ste isto nazivu/kategoriju više puta
+ErrForgotCat=Zaboravili ste da odabarete naziv/kategoriju
+ErrForgotField=Zaboravili ste da obavestite polja
+ErrCatAlreadyExists=Ovo ime je već u upotrebi
+AddProductToCat=Dodati ovaj proizvod nazivu/kategoriji?
+ImpossibleAddCat=Nemoguće je da se doda naziv/kategorija
+ImpossibleAssociateCategory=Nemoguće je povezati naziv/kategoriju sa 
+WasAddedSuccessfully=<b>%s</b> dodato uspešno.
+ObjectAlreadyLinkedToCategory=Element je već povezan sa ovim nazivom/kategorijom.
+CategorySuccessfullyCreated=Ovaj naziv/kategorija %s je dodata uspešno.
+ProductIsInCategories=Proizvod/usluga je povezana sa sledećim nazivom/kategorijom
+SupplierIsInCategories=Subjekt je povezan sa sledećim nazivom/kategorijom dobavljača
+CompanyIsInCustomersCategories=Ovaj subjekt je povezan sa sledećim nazivom/kategorijom kupca/prospekta
+CompanyIsInSuppliersCategories=Ovaj subjekt je povezan sa sledećim nazivom/kategorijom dobavljača
+MemberIsInCategories=Ovaj član je povezan sa sledećim nazivom/kategorijom člana
+ContactIsInCategories=Ovaj kontakt je povezan sa sledećim nazivom/kategorijom kontakata
+ProductHasNoCategory=Ovaj proizvod/usluga nije ni u jednom nazivu/kategoriji
+SupplierHasNoCategory=Ovaj dobavljač nije ni u jednom nazivu/kategoriji
+CompanyHasNoCategory=Ovaj subjekt nije u jednom nazivu/kategoriji
+MemberHasNoCategory=Ovaj član nije u ni u jednom nazivu/kategoriji
+ContactHasNoCategory=Ovaj kontakt nije ni u jednom nazivu/kategoriji
+ClassifyInCategory=Dodaj u naziv/kategoriji
+NoneCategory=Nema
+NotCategorized=Bez naziva/kategorije
+CategoryExistsAtSameLevel=Ova kategorija već postoji za ovu referencu
+ReturnInProduct=Nazad na karticu proizvoda/usluga
+ReturnInSupplier=Nazad na karticu dobavljača
+ReturnInCompany=Nazada na karticu kupca/prospekta
+ContentsVisibleByAll=Ovi sadržaji će biti vidljivi svima
+ContentsVisibleByAllShort=Sadržaji vidljivi svima
+ContentsNotVisibleByAllShort=Sadržaji koji nisu vidljivi svima
+CategoriesTree=Naziv/kategorija drvo
+DeleteCategory=Obriši naziv/kategoriju
+ConfirmDeleteCategory=Da li ste sigurni da želite da obrišete ovaj naziv/kategoriju?
+RemoveFromCategory=Ukloni link sa nazivom/kategorijom
+RemoveFromCategoryConfirm=Da li ste sigurni da želite da ukolinite link transakcije iz naziva/kategorije?
+NoCategoriesDefined=Nema definisanog naziva/kategorije
+SuppliersCategoryShort=Nazv/kategorija dobavljača
+CustomersCategoryShort=Naziv/kategorija kupca
+ProductsCategoryShort=Naziv/kategorija proizvoda
+MembersCategoryShort=Naziv/kategorija članova
+SuppliersCategoriesShort=Nazivi/kategorije dobavljača
+CustomersCategoriesShort=Nazivi/kategorije kupaca
+ProspectsCategoriesShort=Naziv/kategorija prospekta
+CustomersProspectsCategoriesShort=Kategorije kup./prosp.
+ProductsCategoriesShort=Nazivi/kategorije proizvoda
+MembersCategoriesShort=Nazivi/kategorije članova
+ContactCategoriesShort=Naziv/kategorija kontakata
+ThisCategoryHasNoProduct=Ova kategorija ne sadrži nijedan proizvod.
+ThisCategoryHasNoSupplier=Ova kategorija ne sadrži nijednog dobavljača.
+ThisCategoryHasNoCustomer=Ova kategorija ne sadrži nijednog kupca.
+ThisCategoryHasNoMember=Ova kategorija ne sadrži nijednog člana.
+ThisCategoryHasNoContact=Ova kategorija ne sadrži nijedan kontakt.
+AssignedToCustomer=Dodeljeno kupcu.
+AssignedToTheCustomer=Dodeljeno određenom kupcu
+InternalCategory=Unutrašnja kategorija
+CategoryContents=Sadržaj naziva/kategorije
+CategId=ID naziva/kategorije
+CatSupList=Lista naziva/kategorija dobavljača
+CatCusList=Lista naziva/kategorija kupca/prospekta
+CatProdList=Lista naziva/kategorija proizvoda
+CatMemberList=Lista naziva/kategorija članova
+CatContactList=Lista naziva/kategorija kontakata
+CatSupLinks=Povezanost između dobavljača i naziva/kategorija
+CatCusLinks=Povezanost između kupaca/prospekta i naziva/kategorija
+CatProdLinks=Povezanost između proizvoda/usluga i naziva/kategorija
+CatMemberLinks=Povezanost između članova i naziva/kategorija
+DeleteFromCat=Ukloni iz naziva/kategorije
+DeletePicture=Obriši sliku
+ConfirmDeletePicture=Potvrdite brisanje slike?
+ExtraFieldsCategories=Komplementarni atributi
+CategoriesSetup=TPodešavanje naziva/kategorija
+CategorieRecursiv=Poveži sa nadređenim nazivom/kategorijom automatski
+CategorieRecursivHelp=Ako aktiviran, proizvod će takođe biti povezan sa nadređenom kategorijom pri dodavanju u sabkategoriju
+AddProductServiceIntoCategory=Dodaj sledeći proizvod/uslugu
+ShowCategory=Prikaži naziv/kategoriju
+ByDefaultInList=Podrazumevano u listi
diff --git a/htdocs/langs/sr_RS/commercial.lang b/htdocs/langs/sr_RS/commercial.lang
index e419f4a51eb..43dc73b2265 100644
--- a/htdocs/langs/sr_RS/commercial.lang
+++ b/htdocs/langs/sr_RS/commercial.lang
@@ -1,97 +1,97 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commercial
-CommercialArea=Commercial area
-CommercialCard=Commercial card
-CustomerArea=Customers area
-Customer=Customer
-Customers=Customers
-Prospect=Prospect
-Prospects=Prospects
+Commercial=Komercijala
+CommercialArea=Komercijalna zona
+CommercialCard=Komercijalna kartica
+CustomerArea=Klijent zona
+Customer=Klijent
+Customers=Klijenti
+Prospect=Prospekt
+Prospects=Prospekti
 DeleteAction=Obriši događaj
 NewAction=Novi događaj
 AddAction=Kreiraj događaj
 AddAnAction=Kreiraj događaj
-AddActionRendezVous=Create a Rendez-vous event
-Rendez-Vous=Rendezvous
+AddActionRendezVous=Kreiraj sastanak
+Rendez-Vous=Sastanak
 ConfirmDeleteAction=Da li ste sigurni da želite da obrišete ovaj događaj?
-CardAction=Event card
-PercentDone=Percentage complete
-ActionOnCompany=Task about company
-ActionOnContact=Task about contact
-TaskRDV=Meetings
-TaskRDVWith=Meeting with %s
-ShowTask=Show task
-ShowAction=Show event
-ActionsReport=Events report
-ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative
-SalesRepresentative=Sales representative
-SalesRepresentatives=Sales representatives
-SalesRepresentativeFollowUp=Sales representative (follow-up)
-SalesRepresentativeSignature=Sales representative (signature)
-CommercialInterlocutor=Commercial interlocutor
-ErrorWrongCode=Wrong code
-NoSalesRepresentativeAffected=No particular sales representative assigned
-ShowCustomer=Show customer
-ShowProspect=Show prospect
-ListOfProspects=List of prospects
-ListOfCustomers=List of customers
-LastDoneTasks=Last %s completed tasks
-LastRecordedTasks=Last recorded tasks
-LastActionsToDo=Last %s oldest actions not completed
-DoneAndToDoActionsFor=Completed and To do events for %s
-DoneAndToDoActions=Completed and To do events
-DoneActions=Completed events
-DoneActionsFor=Completed events for %s
-ToDoActions=Incomplete events
-ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
-StatusNotApplicable=Not applicable
-StatusActionToDo=To do
-StatusActionDone=Complete
-MyActionsAsked=Events I have recorded
-MyActionsToDo=Events I have to do
-MyActionsDone=Events assigned to me
-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
-DateActionPlanned=Date event planned for
-DateActionDone=Date event done
-ActionAskedBy=Event reported by
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Event done by
-ActionUserAsk=Reported by
-ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%.
-ActionAC_TEL=Phone call
-ActionAC_FAX=Send fax
-ActionAC_PROP=Send proposal by mail
-ActionAC_EMAIL=Send 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 customer order by mail
-ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
-ActionAC_OTH=Other
-ActionAC_OTH_AUTO=Other (automatically inserted events)
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
-Stats=Sales statistics
-CAOrder=Sales volume (validated orders)
-FromTo=from %s to %s
-MargeOrder=Margins (validated orders)
-RecapAnnee=Summary of the year
-NoData=There is no data
-StatusProsp=Prospect status
-DraftPropals=Draft commercial proposals
-SearchPropal=Search a commercial proposal
-CommercialDashboard=Commercial summary
+CardAction=Kartica događaja
+PercentDone=Procenat završetka
+ActionOnCompany=Zadatak o kompaniji
+ActionOnContact=Zadatak o kontaktu
+TaskRDV=Sastanci
+TaskRDVWith=Sastanak sa %s
+ShowTask=Prikaži zadatak
+ShowAction=Prikaži događaj
+ActionsReport=Izveštaj događaja
+ThirdPartiesOfSaleRepresentative=Subjekt sa predstvanikom prodaje
+SalesRepresentative=Predstavnik prodaje
+SalesRepresentatives=Predstavnici prodaje
+SalesRepresentativeFollowUp=Predstavnik prodaja (kratak opis)
+SalesRepresentativeSignature=Predstavnik prodaje (potpis)
+CommercialInterlocutor=Komercijalni sagovornik
+ErrorWrongCode=Pogrešan kod
+NoSalesRepresentativeAffected=Nijedan određeni predstavnik prodaje nije dodeljen
+ShowCustomer=Prikaži klijenta
+ShowProspect=Prikaži prospekta
+ListOfProspects=Lista prospekta
+ListOfCustomers=Lista klijenata
+LastDoneTasks=Poslednje %s završeni zadatak
+LastRecordedTasks=Poslednji zabeleženi zadaci
+LastActionsToDo=Poslednja %s najstarija ne završena akcija
+DoneAndToDoActionsFor=Završeni i zadaci na čekanju za  %s
+DoneAndToDoActions=Završeni i događaji na čekanju
+DoneActions=Završeni događaji
+DoneActionsFor=Završeni događaji za %s
+ToDoActions=Nezavršeni događaji
+ToDoActionsFor=Nezavršeni događaji za  %s
+SendPropalRef=Prijem komercijalne ponude %s
+SendOrderRef=Prijem narudžbine %s
+StatusNotApplicable=Nije primenjivo
+StatusActionToDo=Na čekanju
+StatusActionDone=Završeno
+MyActionsAsked=Događaji koje sam ja zabeležio/la
+MyActionsToDo=Dogođaji su mi na čekanju
+MyActionsDone=Događaji koji su mi dodeljeni
+StatusActionInProcess=U toku
+TasksHistoryForThisContact=Događaji za ovaj kontakt
+LastProspectDoNotContact=Ne kontaktiraj
+LastProspectNeverContacted=Nikad kontaktiran
+LastProspectToContact=Za kontaktiranje
+LastProspectContactInProcess=Kontakt u toku
+LastProspectContactDone=Kontakt završen
+DateActionPlanned=Datum događaja planiran za 
+DateActionDone=Datum događaja završen
+ActionAskedBy=Događaj prijavio
+ActionAffectedTo=Događaj dodeljen
+ActionDoneBy=Događaj uradio
+ActionUserAsk=Prijavio
+ErrorStatusCantBeZeroIfStarted=Ako polje  '<b>Date done</b>' je popunjeno,  akcija je započeta (ili završena), tako da polje'<b>Status</b>' ne može biti 0%%.
+ActionAC_TEL=Telefonski poziv
+ActionAC_FAX=Posalji faksom
+ActionAC_PROP=Pošalji ponudu mejlom
+ActionAC_EMAIL=Pošalji mejl
+ActionAC_RDV=Sastanci
+ActionAC_INT=Intervencija na lokaciji
+ActionAC_FAC=Pošalji fakturu klijentu na mejl
+ActionAC_REL=Pošalji fakturu klijentu na mejl (podsetnik)
+ActionAC_CLO=Zatvori
+ActionAC_EMAILING=Pošalji grupni mejl
+ActionAC_COM=Pošalji narudžbinu klijenta mejlom
+ActionAC_SHIP=Pošalji isporuku mejlom
+ActionAC_SUP_ORD=Pošalji narudžbinu dobavljača mejlom
+ActionAC_SUP_INV=Pošalji fakturu dobavljača mejlom
+ActionAC_OTH=Drugo
+ActionAC_OTH_AUTO=Drugo (automatski uneti događaji)
+ActionAC_MANUAL=Ručno uneti događaji
+ActionAC_AUTO=Automatski uneti događaji
+Stats=Statistika prodaje
+CAOrder=Volumen prodaje (potvrđene narudžbine)
+FromTo=od %s do %s
+MargeOrder=Marže (potvrđene narudžbine)
+RecapAnnee=Godišnji rezime
+NoData=Nema podataka
+StatusProsp=Status prospekta
+DraftPropals=Nacrt komercijalne ponude
+SearchPropal=Pretraga komercijalne ponude
+CommercialDashboard=Komercijalna suma
 NoLimit=Bez limita
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 5f562808806..583a65b05ef 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -48,13 +48,13 @@ ThirdPartyType=Tip subjekta
 Company/Fundation=Kompanija/Fondacija
 Individual=Fizičko lice
 ToCreateContactWithSameName=Automatski napraviti fizičko lice sa istim informacijama
-ParentCompany=Parent company
-Subsidiary=Subsidiary
-Subsidiaries=Subsidiaries
-NoSubsidiary=No subsidiary
+ParentCompany=Osnovna kompanija
+Subsidiary=Poslovnica
+Subsidiaries=SubsidiariesPoslovnice
+NoSubsidiary=Nema poslovnice
 ReportByCustomers=Izveštaj po klijentima
 ReportByQuarter=Izveštaj po kursu
-CivilityCode=Civility code
+CivilityCode=Prijavni kod
 RegisteredOffice=Registrovane kancelarije
 Lastname=Prezime
 Firstname=Ime
@@ -104,7 +104,7 @@ WrongCustomerCode=Kod klijenta nije validan
 WrongSupplierCode=Kod dobavljača nije validan
 CustomerCodeModel=Model koda klijenta
 SupplierCodeModel=Model koda dobavljača
-Gencod=Bar code
+Gencod=Bar kod
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 07e66064298..5dfdda493cd 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -155,7 +155,7 @@ DepositsAreNotIncluded=- Računi depozita nisu uključeni
 DepositsAreIncluded=- Računi depozita su uključeni
 LT2ReportByCustomersInInputOutputModeES=Izveštaj po subjektu IRPF
 LT1ReportByCustomersInInputOutputModeES=Izveštaj po RE subjektima
-VATReport=VAT report
+VATReport=PDV izveštaj
 VATReportByCustomersInInputOutputMode=Izveštaj po prihodovanom i isplaćenom PDV-u po subjektu 
 VATReportByCustomersInDueDebtMode=Izveštaj po prihodovanom i isplaćenom PDV-u po subjektu
 VATReportByQuartersInInputOutputMode=Izveštaj po nivou prihodovanog i isplaćenog PDV-u po subjektu 
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Izveštaj stranih klijenata
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Zasnovan na prva dva slova PDV broja različitog od ISO koda zemlje Vaše kompanije
 SameCountryCustomersWithVAT=Izveštaj nacionalnih klijenata
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Zasnovan na prva dva slova PDV broja identičnog ISO kodu zemlje Vaše kompanije
+LinkedFichinter=Link to an intervention
diff --git a/htdocs/langs/sr_RS/cron.lang b/htdocs/langs/sr_RS/cron.lang
index 9f8596b8054..adc5faa1507 100644
--- a/htdocs/langs/sr_RS/cron.lang
+++ b/htdocs/langs/sr_RS/cron.lang
@@ -16,11 +16,12 @@ KeyForCronAccess=Security key za URL za izvršenje cron operacija
 FileToLaunchCronJobs=Komandna linija za izvršenje cron operacija
 CronExplainHowToRunUnix=U Unix okruženju možete koristiti crontab za izvršenje komandne linije svakih 5 minuta
 CronExplainHowToRunWin=U Windows okruženju možete koristiti Scheduled task tools za izvršenje komandne linije svakih 5 minuta
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Planirane operacije
-CronListActive=List of enabled/scheduled jobs
+CronListActive=Lista aktivnih/planiranih poslova
 CronListInactive=Lista deaktiviranih operacija
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Aktivno i neaktivno
 # Page list
 CronDateLastRun=Poslednje izvršenje
 CronLastOutput=Output poslednjeg izvršenja
@@ -36,10 +37,11 @@ CronInfo=Modul planiranih aktivnosti omogućava izvršenje planirane aktivnosti
 CronWaitingJobs=Operacije na čekanju
 CronTask=Operacija
 CronNone=Nema
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Ne pre
+CronDtEnd=Ne posle
 CronDtNextLaunch=Sledeće izvršenje
-CronDtLastLaunch=Prethdno izvršenje
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frekvencija
 CronClass=Klasa
 CronMethod=Metoda
@@ -52,7 +54,7 @@ CronNoJobs=Nema prijavljenih operacija
 CronPriority=Prioritet
 CronLabel=Opis
 CronNbRun=Br. izvršenja
-CronMaxRun=Max nb. launch
+CronMaxRun=Maksimalni broj izvršenja
 CronEach=Svakih
 JobFinished=Operacija je izvršena
 #Page card
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Kraj ne može biti pre početka
 CronStatusActiveBtn=Aktiviraj
 CronStatusInactiveBtn=Deaktiviraj
 CronTaskInactive=Operacije je deaktivirana
-CronDtLastResult=Datum poslednjeg rezultata
 CronId=Id
 CronClassFile=Klase (filename.class.php)
 CronModuleHelp=Naziv Dolibarr modul foldera (radi i sa eksternim Dolibarr modulima). <BR> Na primer za fetch metodu Dolibarr Product objekta /htdocs/<u>product</u>/class/product.class.php, vrednost modula je <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Nemoguće učitati klasu %s ili objekat %s
 UseMenuModuleToolsToAddCronJobs=Otvorite "Home - Alati modula - Lista aktivnosti" da biste videli i izmenili listu planiranih aktivnosti.
 TaskDisabled=Operacija deaktivirana
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/sr_RS/deliveries.lang b/htdocs/langs/sr_RS/deliveries.lang
index 1f43891068a..2af455b3501 100644
--- a/htdocs/langs/sr_RS/deliveries.lang
+++ b/htdocs/langs/sr_RS/deliveries.lang
@@ -17,9 +17,9 @@ DeleteDeliveryReceiptConfirm=Da li ste sigurni da želite da obrišete prijemnic
 DeliveryMethod=Način isporuke
 TrackingNumber=Referenca isporuke
 DeliveryNotValidated=Isporuka nije odobrena
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+StatusDeliveryCanceled=Poništeno
+StatusDeliveryDraft=Nacrt
+StatusDeliveryValidated=Primljeno
 # merou PDF model
 NameAndSignature=Ime i potpis:
 ToAndDate=Za___________________________________ dana ____/_____/__________
diff --git a/htdocs/langs/sr_RS/exports.lang b/htdocs/langs/sr_RS/exports.lang
index 974d86827d3..ed1a9c452b4 100644
--- a/htdocs/langs/sr_RS/exports.lang
+++ b/htdocs/langs/sr_RS/exports.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Oblast exporta
-ImportArea=Oblaz importa
-NewExport=Novi export
-NewImport=Novi import
+ExportsArea=Oblast izvoza
+ImportArea=Oblast uvoza
+NewExport=Novi izvoz
+NewImport=Novi uvoz
 ExportableDatas=Podaci koji se mogu exportovati
 ImportableDatas=Podaci koji se mogu importovati
 SelectExportDataSet=Izaberte podatke za export...
diff --git a/htdocs/langs/sr_RS/help.lang b/htdocs/langs/sr_RS/help.lang
index 1bbd6e94f03..0cb01a49a03 100644
--- a/htdocs/langs/sr_RS/help.lang
+++ b/htdocs/langs/sr_RS/help.lang
@@ -1,28 +1,28 @@
 # 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:
-ClickHere=Click here
-HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source 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+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-MakeADonation=Help Dolibarr project, make a donation
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+CommunitySupport=Forum/Wiki podrške
+EMailSupport=Email podrška
+RemoteControlSupport=Online real time / remote podrška
+OtherSupport=Druga podrška
+ToSeeListOfAvailableRessources=Da biste kontaktirali/videli raspoložive resurse:
+ClickHere=Klikni ovde
+HelpCenter=Help centar
+DolibarrHelpCenter=Dolibarr help centar i podrška
+ToGoBackToDolibarr=U suprotnom, kliknite <a href="%s">ovde da otvorite Dolibarr</a>
+TypeOfSupport=Izvor podrške
+TypeSupportCommunauty=Community (besplatno)
+TypeSupportCommercial=Komercijalna
+TypeOfHelp=Tip
+NeedHelpCenter=Potrebna Vam je pomoć ili podrška?
+Efficiency=Efikasnost
+TypeHelpOnly=Samo pomoć
+TypeHelpDev=Pomoć+Razvoj
+TypeHelpDevForm=Pomoć+Razvoj+Obuka
+ToGetHelpGoOnSparkAngels1=Neke kompanije mogu pružiti bržu (nekada i trenutnu) i efikasniju online podršku ukoliko preuzmu kontrolu nad Vašim računarom. Ovakva podrška je dostupna na <b>%s</b> web sajtu:
+ToGetHelpGoOnSparkAngels3=Takođe možete konsultovati listu dostupnih Dolibarr eksperata - za to kliknite na dugme
+ToGetHelpGoOnSparkAngels2=Ponekad nema dostupnih kompanija u trenutku kada vršite pretragu. Zato nemojte zaboraviti da promenite filter da biste potražili "sve dostupnosti". Bićete u mogućnosti da pošaljete više zahteva.
+BackToHelpCenter=U suprotnom, kliknite ovde da otvorite <a href="%s">naslovnu stranu help centra</a>.
+LinkToGoldMember=Možete pozvati jednog od preselektovanih eksperata za Dolibarr na Vašem jeziku (%s) tako što ćete kliknuti njegov Widget (status i maksimalna cena su automatski ažurirani):
+PossibleLanguages=Podržani jezici
+MakeADonation=Pomozite Dolibarr projektu, donirajte
+SubscribeToFoundation=Pomozite Dolibarr projektu, učlanite se u fondaciju
+SeeOfficalSupport=Za zvaničnu Dolibarr podršku na Vašem jeziku: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/sr_RS/holiday.lang b/htdocs/langs/sr_RS/holiday.lang
index d73ce6a5d05..7d4740b6b5a 100644
--- a/htdocs/langs/sr_RS/holiday.lang
+++ b/htdocs/langs/sr_RS/holiday.lang
@@ -22,7 +22,7 @@ ReviewedByCP=Revidiraće
 DescCP=Opis
 SendRequestCP=Kreiraj zahtev za odsustvo
 DelayToRequestCP=Zahtevi za odsustvo moraju biti kreirani makar <b>%s dan(a)</b> pre odsustva.
-MenuConfCP=Balance of leaves
+MenuConfCP=Balans odsustva
 UpdateAllCP=Ažuriraj odsustva
 SoldeCPUser=Broj slobodnih dana je <b>%s</b>.
 ErrorEndDateCP=Morate selektovati kraj posle početka.
@@ -80,7 +80,7 @@ alreadyCPexist=Zahtev za odsustvo već postoji za ovaj period.
 UserName=Ime
 FirstDayOfHoliday=Prvi dan odmora
 LastDayOfHoliday=Poslednji dan odmora
-BoxTitleLastLeaveRequests=Last %s modified leave requests
+BoxTitleLastLeaveRequests=Poslednji %s izmenjeni zahtev za odsustvo
 HolidaysMonthlyUpdate=Mesečno ažuriranje
 ManualUpdate=Ručno ažuriranje
 HolidaysCancelation=Napusti otkazivanje zahteva
diff --git a/htdocs/langs/sr_RS/interventions.lang b/htdocs/langs/sr_RS/interventions.lang
index 78f3756baff..d692d43058e 100644
--- a/htdocs/langs/sr_RS/interventions.lang
+++ b/htdocs/langs/sr_RS/interventions.lang
@@ -54,9 +54,9 @@ PacificNumRefModelDesc1=Vraća broj u formatu %syymm-nnnn gde je yy godina, mm m
 PacificNumRefModelError=Kartica intervencije sa početkom $syymm već postoji i nije kompatibina sa ovim modelom sekvence. Uklonite je ili je preimenujte da biste aktivirali ovaj modul.
 PrintProductsOnFichinter=Štampaj proizvode sa kartice intervencije
 PrintProductsOnFichinterDetails=Intervencije generisane iz narudžbina
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=Nb of intervention cards
-NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+InterventionStatistics=Statistika intervencija
+NbOfinterventions=Broj kartica intervencije
+NumberOfInterventionsByMonth=Broj kartica intervencije na mesečnom nivou (datum potvrde)
 ##### Exports #####
 InterId=Id intervencije
 InterRef=Ref. intervencije
diff --git a/htdocs/langs/sr_RS/languages.lang b/htdocs/langs/sr_RS/languages.lang
index 3029e0bffd0..e5563fa95a9 100644
--- a/htdocs/langs/sr_RS/languages.lang
+++ b/htdocs/langs/sr_RS/languages.lang
@@ -1,81 +1,82 @@
 # Dolibarr language file - Source file is en_US - languages
 
 Language_ar_AR=Arapski
-Language_ar_SA=Arabic
+Language_ar_SA=Arapski
 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_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_HN=Spanish (Honduras)
-Language_es_MX=Spanish (Mexico)
-Language_es_PY=Spanish (Paraguay)
-Language_es_PE=Spanish (Peru)
-Language_es_PR=Spanish (Puerto Rico)
-Language_et_EE=Estonian
+Language_bg_BG=ugarski
+Language_bs_BA=Bosanski
+Language_ca_ES=Katalonski
+Language_cs_CZ=Češki
+Language_da_DA=Danski
+Language_da_DK=Danski
+Language_de_DE=Nemački
+Language_de_AT=Nemački (Austrija)
+Language_de_CH=Nemački (Švajcarska)
+Language_el_GR=Grčki
+Language_en_AU=Engleski (Australija)
+Language_en_CA=Engleski (Kanada)
+Language_en_GB=Engleski (UK)
+Language_en_IN=Engleski (Indija)
+Language_en_NZ=Engleski (Novi Zeland)
+Language_en_SA=Engleski (Saudijska Arabija)
+Language_en_US=Engleski (US)
+Language_en_ZA=Engleski (Južna Afrika)
+Language_es_ES=Španski
+Language_es_AR=Španski (Argentina)
+Language_es_BO=Španski (Bolivija)
+Language_es_CL=Špnski (Čile)
+Language_es_CO=Španski (Kolumbija)
+Language_es_DO=Španski (Dominikanska Republika)
+Language_es_HN=Španski (Honduras)
+Language_es_MX=Španski (Meksiko)
+Language_es_PY=Španski (Paragvaj)
+Language_es_PE=Španski (Peru)
+Language_es_PR=Španski (Porto Riko)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estonski
 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_fa_IR=Persijski
+Language_fi_FI=Finski
+Language_fr_BE=Francuski (Belgija)
+Language_fr_CA=Francuski (Kanada)
+Language_fr_CH=Francuski (Švajcarska)
+Language_fr_FR=Francuski
+Language_fr_NC=Francuski (Nova Kaledonija)
+Language_fy_NL=Frisijski
+Language_he_IL=Hebrejski
+Language_hr_HR=Hrvatski
+Language_hu_HU=Mađarski
+Language_id_ID=Indonežanski
+Language_is_IS=Islanđanski
+Language_it_IT=Italijanski
+Language_ja_JP=Japanski
+Language_ka_GE=Gruzijski
 Language_kn_IN=Kannada
-Language_ko_KR=Korean
+Language_ko_KR=Koreanski
 Language_lo_LA=Lao
-Language_lt_LT=Lithuanian
-Language_lv_LV=Latvian
-Language_mk_MK=Macedonian
-Language_nb_NO=Norwegian (Bokmål)
-Language_nl_BE=Dutch (Belgium)
-Language_nl_NL=Dutch (Netherlands)
-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_lt_LT=Litvanski
+Language_lv_LV=Litvanski
+Language_mk_MK=Makedonski
+Language_nb_NO=Norveški (Bokmal)
+Language_nl_BE=Holandski (Belgija)
+Language_nl_NL=Holandski (Holandija)
+Language_pl_PL=Poljski
+Language_pt_BR=Portugalski (Brazil)
+Language_pt_PT=Portugalski
+Language_ro_RO=Rumunski
+Language_ru_RU=Ruski
+Language_ru_UA=Ruski (Ukrajina)
+Language_tr_TR=Turski
+Language_sl_SI=Slovenački
+Language_sv_SV=Švedski
+Language_sv_SE=Švedski
+Language_sq_AL=Albanski
+Language_sk_SK=Slovački
+Language_sr_RS=Srpski
 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_th_TH=Tai
+Language_uk_UA=Ukrajinski
+Language_uz_UZ=Uzbekistanski
+Language_vi_VN=Vijetnamski
+Language_zh_CN=Kineski
+Language_zh_TW=Kineski (Tradicionalni)
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index 053c24d80ab..d6f8c5050ca 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Emailing uspešno odobren
 MailUnsubcribe=Otkaži
 Unsuscribe=Otkaži
 MailingStatusNotContact=Ne kontaktirati više
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Primalac nije unet
 WarningNoEMailsAdded=Nema novih mail-ova za dodavanje listi primalaca
 ConfirmValidMailing=Da li ste sigurni da želite da odobrite ovaj emailing ?
@@ -81,7 +82,7 @@ ActivateCheckReadKey=Ključ za enkripciju URL-a u funkcionalnostima "Pregled Ra
 EMailSentToNRecipients=Mail poslat %s primalaca.
 XTargetsAdded=<b>%s</b> primalaca su dodati na listu
 EachInvoiceWillBeAttachedToEmail=Dokument sa default fakturom će biti kreiran i priložen svakom mailu.
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=Ako je PDF dokumet već generisan za fakturu, biće dodat u prilog mejla. Ako ne, mejl neće biti poslat (takođe, imajte na umu da samo fakture u PDFu se mogu poslati u prilogu grupnih mejlova u ovoj verziji)
 MailTopicSendRemindUnpaidInvoices=Podsetnik za račun %s (%s)
 SendRemind=Pošalji podsetnik emailom
 RemindSent=%s podsetnik(a) poslato
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 64312e45f61..b67f3c2ade2 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Konekcija sa bazom
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Nema definisanog šablona za ovaj tip mejla
 NoTranslation=Nema prevoda
 NoRecordFound=Nema rezultata
 NoError=Nema greške
@@ -106,7 +106,7 @@ NotePrivate=Beleška (privatna)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr je podešen da zaokružuje cene na <b>%s</b> decimala.
 DoTest=Test
 ToFilter=Filter
-NoFilter=No filter
+NoFilter=Nema filtera
 WarningYouHaveAtLeastOneTaskLate=Upozorenje, imate barem jedan element koji kasni.
 yes=da
 Yes=Da
@@ -230,8 +230,8 @@ Now=Sada
 HourStart=Vreme početka
 Date=Datum
 DateAndHour=Datum i vreme
-DateToday=Today's date
-DateReference=Reference date
+DateToday=Današnji datum
+DateReference=Referentni datum
 DateStart=Početak
 DateEnd=Kraj
 DateCreation=Datum kreacije
@@ -311,6 +311,7 @@ UnitPriceHT=Jedinična cena (neto)
 UnitPriceTTC=Jedinična cena
 PriceU=J.C.
 PriceUHT=J.C. (neto)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=Potrebna je Neto J.C. 
 PriceUTTC=J.C. (bruto)
 Amount=Iznos
@@ -321,6 +322,9 @@ AmountTTCShort=Iznos (bruto)
 AmountHT=Iznos (neto)
 AmountTTC=Iznos (bruto)
 AmountVAT=Iznos poreza
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Iznos poreza 2
 AmountLT2=Iznos poreza 3
 AmountLT1ES=Iznos RE
@@ -335,6 +339,7 @@ Percentage=Procenat
 Total=Total
 SubTotal=Zbir
 TotalHTShort=Ukupno (neto)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Ukupno (bruto)
 TotalHT=Ukupno (neto)
 TotalHTforthispage=Ukupno (neto) za ovu stranu
@@ -457,6 +462,7 @@ Datas=Podaci
 None=Ništa
 NoneF=Ništa
 Late=Kasni
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Slika
 Photos=Slike
 AddPhoto=Dodaj sliku
@@ -539,6 +545,7 @@ NbOfCustomers=Broj klijenata
 NbOfLines=Broj linija
 NbOfObjects=Broj objekata
 NbOfReferers=Broj referenata
+NbOfObjectReferers=Number of refering objects
 Referers=Referentirajući objekti
 TotalQuantity=Ukupna količina
 DateFromTo=Od %s do %s
@@ -612,7 +619,7 @@ TotalMan=Celo
 NeverReceived=Nije primljena
 Canceled=Otkazano
 YouCanChangeValuesForThisListFromDictionarySetup=Možete izmeniti vrednosti ove liste iz menija podešavanja - rečnik
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanSetDefaultValueInModuleSetup=Možete postaviti podrazumevane vrednosti pri kreiranju novog zapisa u modul podešavanja
 Color=Boja
 Documents=Povezani fajlovi
 DocumentsNb=Povezani fajlovi (%s)
@@ -694,13 +701,14 @@ LinkedToSpecificUsers=Povezano sa kontaktom korisnika
 DeleteAFile=Obriši fajl
 ConfirmDeleteAFile=Da li ste sigurni da želite da obrišete fajl
 NoResults=Nema rezultata
+AdminTools=Admin tools
 SystemTools=Sistemski alati
 ModulesSystemTools=Alati modua
 Test=Test
 Element=Element
 NoPhotoYet=Još nema slika
 HomeDashboard=Pregled početne
-Dashboard=Dashboard
+Dashboard=Kontrolna tabla
 Deductible=Može se odbiti
 from=od
 toward=ka
@@ -732,7 +740,8 @@ Hello=Zdravo
 Sincerely=Srdačan pozdrav
 DeleteLine=Obriši red
 ConfirmDeleteLine=Da li ste sigurni da želite da obrišete ovaj red?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Ponedeljak
 Tuesday=Utorak
diff --git a/htdocs/langs/sr_RS/margins.lang b/htdocs/langs/sr_RS/margins.lang
index e275c578bed..b0955cba671 100644
--- a/htdocs/langs/sr_RS/margins.lang
+++ b/htdocs/langs/sr_RS/margins.lang
@@ -35,9 +35,9 @@ MargeBrute=Bruto marža
 MargeNette=Neto marža
 MargeType1=Marža na najpovoljniju cenu dobavljača
 MargeType2=Marža na prosečnu cenu (PC)
-MargeType3=Margin on Cost Price
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
+MargeType3=Marža na cenu koštanja
+MARGIN_TYPE_DETAILS=Bruto marža : Prodajna cena - Kupovna cena<br>Neto marža : Prodajna cena - Cena koštanja
+MarginTypeDesc=* Marža na najbolju kupovnu cenu = Prodajna cena - Najbolja cena dobavljača definisana na kartici proizvoda<br>* Marža na izračunatu prosečnu cenu (WAP) = Prodajna cena - Proivod izračun na osnovu prosečne cene  (WAP)  ili najbolja cena dobavljača ako WAP nije još definisan<br>* Marža na cenu koštanja = Prodajna cena definisana na kratici proizvoda ili WAP ako cena koštanja nije definisana, ili najbolja cena dobavjlača ako WAP nije još definisan
 CostPrice=Cena koštanja
 BuyingCost=Cena koštanja
 UnitCharges=Unitarni troškovi
diff --git a/htdocs/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
index 59e78f8bb72..e15c8ac60ed 100644
--- a/htdocs/langs/sr_RS/orders.lang
+++ b/htdocs/langs/sr_RS/orders.lang
@@ -82,7 +82,7 @@ OrdersOpened=Narudžbine za obradu
 NoOpenedOrders=Nema otvorenih narudžbina
 NoOtherOpenedOrders=Nema drugih otvorenih narudžbina
 NoDraftOrders=Nema drafg narudžbina
-NoOrder=No order
+NoOrder=Nema narudžbine
 NoSupplierOrder=Nema narudžbine dobavjača
 OtherOrders=Druge narudžbine
 LastOrders=Poslednjih %s klijentovih narudžbina
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 108ca3870db..13bea5f528c 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -238,8 +238,8 @@ ToExport=Export
 NewExport=Novi export
 ##### External sites #####
 ExternalSites=Eksterni sajtovi
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
-WEBSITE_KEYWORDS=Keywords
+WebsiteSetup=Podešavanja modula sajta
+WEBSITE_PAGEURL=URL stranice
+WEBSITE_TITLE=Naslov
+WEBSITE_DESCRIPTION=Opis
+WEBSITE_KEYWORDS=Ključne reči
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 9bc971ae2fb..a92601d5d0c 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -252,7 +252,7 @@ UnitPmp=Neto jedinični VWAP
 CostPmpHT=Neto ukupni VWAP
 ProductUsedForBuild=Potrošnja u produkciji
 ProductBuilded=Proizvodnja je završena
-ProductsMultiPrice=Products and prices for each price level
+ProductsMultiPrice=Proizvodi i cene za svaki nivo cene
 ProductsOrServiceMultiPrice=Cene klijenata (proizvoda ili usluga, multi-cene)
 ProductSellByQuarterHT=Tromesečni obrt proizvoda pre poreza
 ServiceSellByQuarterHT=Tromesečni obrt usluga pre poreza
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Povećaj/Smanji zalihu na matičnoj promeni
 ComposedProduct=Pod-proizvod
 MinSupplierPrice=Minimalna cena dobavljača
 DynamicPriceConfiguration=Dinamička konfiguracija cene
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Globalne promenljive
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Ažuriranje globalnih promenljivih
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Čita JSON podatke sa naznačenog URL-a, VALUE označava lokaciju vrednosti,
@@ -311,5 +315,6 @@ PropalMergePdfProductChooseFile=Selektiraj PDF fajlove
 IncludingProductWithTag=Uključivanje proizvoda/usluge sa tagom
 DefaultPriceRealPriceMayDependOnCustomer=Default cena, realna cena može zavisiti od klijenta
 WarningSelectOneDocument=Molimo izaberite barem jedan dokument
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
+DefaultUnitToShow=Jedinica
+NbOfQtyInProposals=Količina u prilikama
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 3bff129a731..2b164234162 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -5,6 +5,7 @@ ProjectId=ID projekta
 ProjectLabel=Naziv projekta
 Project=Projekat
 Projects=Projekti
+ProjectsArea=Projects Area
 ProjectStatus=Status projekta
 SharedProject=Svi
 PrivateProject=Kontakti projekta
@@ -14,12 +15,12 @@ ProjectsPublicTaskDesc=Ovaj ekran prikazuje sve projekte ili zadatke za koje ima
 ProjectsDesc=Ovaj ekran prikazuje sve projekte (Vaš korisnik ima pravo pregleda svih informacija)
 MyTasksDesc=Ovaj ekran prikazuj projekte ili zadatke za koje ste definisani kao kontakt (bilo kog tipa).
 OnlyOpenedProject=Vidljivi su samo otvoreni projekti (draft i zatvoreni projekti nisu vidljivi)
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Zatvoreni projekti nisu vidljivi
 TasksPublicDesc=Ovaj ekran prikazuje sve projekte ili zadatke za koje imate pravo pregleda.
 TasksDesc=Ovaj ekran prikazuje sve projekte i zadatke (Vaš korisnik ima pravo pregleda svih informacija)
 AllTaskVisibleButEditIfYouAreAssigned=Svi zadaci za takav projekat su vidljivi, ali možete uneti vreme samo za zadatke koji su Vam dodeljeni. Ukoliko želite da unesete vreme za zadatak, morate ga dodeliti sebi.
 OnlyYourTaskAreVisible=Samo zadaci koji su Vam dodeljeni su vidljivi. Dodelite sebi zadatak ukoliko želite da unesete vreme za njega.
-ProjectsArea=Oblast projekata
+ProjectsArea=Projects Area
 NewProject=Novi projekat
 AddProject=Kreiraj projekat
 DeleteAProject=Obriši projekat
@@ -30,9 +31,9 @@ OfficerProject=Referentni projekat
 LastProjects=Poslednjih %s projekata
 AllProjects=Svi projekti
 OpenedProjects=Otvoreni projekti
-OpenedTasks=Opened tasks
+OpenedTasks=Otvoreni zadaci
 OpportunitiesStatusForOpenedProjects=Iznos prilika u otvorenim projektima po statusu
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+OpportunitiesStatusForProjects=Količina prilika projekata na osnovu statusa
 ProjectsList=Lista projekata
 ShowProject=Prikaži projekat
 SetProject=Postavi projekat
@@ -67,6 +68,7 @@ Activities=Zadaci/aktivnosti
 MyActivity=Moja aktivnost
 MyActivities=Moji zadaci/aktivnosti
 MyProjects=Moji projekti
+MyProjectsArea=My projects Area
 DurationEffective=Efektivno trajanje
 Progress=Napredovanje
 ProgressDeclared=Prijavljeni napredak
@@ -132,8 +134,8 @@ TaskModifiedInDolibarr=Zadatak %s je izmenjen
 TaskDeletedInDolibarr=Zadatak %s je obrisan
 OpportunityStatus=Status prilike
 OpportunityStatusShort=Status prilike
-OpportunityProbability=Opportunity probability
-OpportunityProbabilityShort=Opp. probab.
+OpportunityProbability=Verovatnoća prilike
+OpportunityProbabilityShort=Verv. pril.
 OpportunityAmount=Iznos prilike
 OpportunityAmountShort=Iznos prilike
 ##### Types de contacts #####
@@ -168,7 +170,7 @@ ProjectsWithThisUserAsContact=Projekti sa ovim korisnikom u kontaktima
 TasksWithThisUserAsContact=Zadaci ovog korisnika
 ResourceNotAssignedToProject=Nije dodeljen projektu
 ResourceNotAssignedToTask=Nije dodeljen zadatku
-ResourceNotAssignedToTheTask=Not assigned to the task
+ResourceNotAssignedToTheTask=Nije dodeljen zadatku
 AssignTaskToMe=Dodeli zadatak meni
 AssignTask=Dodeli
 ProjectOverview=Pregled
@@ -183,9 +185,12 @@ TaskAssignedToEnterTime=Zadatak je dodeljen. Unos vremena za ovaj zadatak je omo
 IdTaskTime=Id vremena zadatka
 YouCanCompleteRef=Ukoliko želite da kompletirate referencu informacijama (da je koristite sa filterima pretrage), preporučivo da ih razdvojite simbolom - kako bi automatsko numerisanje i dalje moglo da funkcioniše. Npr. %s-ABC. Takođe može biti korisno dodati ključne reč u naziv.
 OpenedProjectsByThirdparties=Otvoreni projekti po subjektima
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Ukupan iznos prilika
 OpportunityPonderatedAmount=Prosečni iznos prilika
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
+OpportunityPonderatedAmountDesc=Količina prilika na osnovu verovatnoće
 OppStatusPROSP=Prospekcija
 OppStatusQUAL=Kvalifikacija
 OppStatusPROPO=Ponuda
diff --git a/htdocs/langs/sr_RS/propal.lang b/htdocs/langs/sr_RS/propal.lang
index a54fc8c6eac..692aed4e457 100644
--- a/htdocs/langs/sr_RS/propal.lang
+++ b/htdocs/langs/sr_RS/propal.lang
@@ -25,7 +25,7 @@ LastModifiedProposals=Poslednjih %s izmenjenih ponuda
 AllPropals=Sve ponude
 LastProposals=Poslednje ponude
 SearchAProposal=Potraži ponudu
-NoProposal=No proposal
+NoProposal=Nema ponude
 ProposalsStatistics=Statistike komercijalnih ponuda
 NumberOfProposalsByMonth=Broj po mesecu
 AmountOfProposalsByMonthHT=Svota po mesecu (neto)
@@ -63,8 +63,8 @@ DatePropal=Datum ponude
 DateEndPropal=Kraj validnosti
 DateEndPropalShort=Kraj
 ValidityDuration=Trajanje validnosti
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Postavi status na
+SetAcceptedRefused=Postavi prihvaćen/odbijen
 ClassifyBilled=Označi kao naplaćenu
 BuildBill=Kreiraj račun
 ErrorPropalNotFound=Ponuda %s nije pronađena
@@ -102,4 +102,4 @@ DefaultModelPropalCreate=Kreacija default modela
 DefaultModelPropalToBill=Default model prilikom zatvaranja komercijalne ponude (za naplatu)
 DefaultModelPropalClosed=Default model prilikom zatvaranja komercijalne ponude (nenaplaćen)
 ProposalCustomerSignature=Pismeno odobrenje, pečat kompanije, datum i potpis
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalsStatisticsSuppliers=Statistika ponuda dobvljača
diff --git a/htdocs/langs/sr_RS/sendings.lang b/htdocs/langs/sr_RS/sendings.lang
index 8c585607f8a..33ad352bdab 100644
--- a/htdocs/langs/sr_RS/sendings.lang
+++ b/htdocs/langs/sr_RS/sendings.lang
@@ -6,7 +6,7 @@ AllSendings=Sve isporuke
 Shipment=Isporuka
 Shipments=Isporuke
 ShowSending=Prikaži isporuke
-Receivings=Delivery Receipts
+Receivings=Računi isporuke
 SendingsArea=Oblast isporuka
 ListOfSendings=Lista isporuka
 SendingMethod=Način isporuke
diff --git a/htdocs/langs/sr_RS/sms.lang b/htdocs/langs/sr_RS/sms.lang
index 756a81595e6..f860daad6a7 100644
--- a/htdocs/langs/sr_RS/sms.lang
+++ b/htdocs/langs/sr_RS/sms.lang
@@ -49,6 +49,6 @@ SendSms=Pošalji SMS
 SmsInfoCharRemain=Broj preostalih karaktera
 SmsInfoNumero= (internacionalni format npr: +33899701761)
 DelayBeforeSending=Odloženo slanje (u minutima)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=Nema dostpunog pošiljaoca. Proveri podešavanja za vaš SMS provajder.
 SmsNoPossibleRecipientFound=Nema definisanog targeta. Proverite podešavanja Vašeg SMS provajdera.
 
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index c1e4f868f11..e4965ae7057 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Poslednji prometi
 Units=Jedinice
 Unit=Jedinica
 StockCorrection=Ispravna zaliha
-StockTransfer=Kretanje zaliha
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Kretanje zaliha
 StockMovements=Kretanja zaliha
 LabelMovement=Naziv prometa
diff --git a/htdocs/langs/sr_RS/trips.lang b/htdocs/langs/sr_RS/trips.lang
index bb0c9957370..6b27921ce29 100644
--- a/htdocs/langs/sr_RS/trips.lang
+++ b/htdocs/langs/sr_RS/trips.lang
@@ -31,7 +31,7 @@ TripNDF=Informacije o trošku
 PDFStandardExpenseReports=Standardni template za generisanje PDF dokumenta o trošku
 ExpenseReportLine=Linija troška
 TF_OTHER=Ostalo
-TF_TRIP=Transportation
+TF_TRIP=Prevoz
 TF_LUNCH=Ručak
 TF_METRO=Metro
 TF_TRAIN=Voz
@@ -99,5 +99,5 @@ ConfirmSaveTrip=Da li ste sigurni da želite da odobrite ovaj trošak ?
 NoTripsToExportCSV=Nema troškova za ovaj period.
 ExpenseReportPayment=Isplata troška
 
-ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToApprove=Izveštaj trškova za odobrenje
 ExpenseReportsToPay=Troškovi zaisplatu
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index 698abd6e674..44ca931c16a 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -121,4 +121,5 @@ OpenIDURL=OpenID UR
 LoginUsingOpenID=Uloguj se sa OpenID-em
 WeeklyHours=Nedeljni broj sati
 ColorUser=Boja korisnika
-DisabledInMonoUserMode=Disabled in maintenance mode
+DisabledInMonoUserMode=Onemogućeno u modu održavanja
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 0a8ac5f25de..206c185d44b 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Redovisningskonto
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Fördelning
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Fördelning kunder
 SuppliersVentilation=Fördelning leverantörerna
 TradeMargin=Handelsmarginal
@@ -46,7 +47,7 @@ UpdateAccount=Ändring av ett redovisningskonto
 UpdateMvts=Ändring av en rörelse
 WriteBookKeeping=Record konton i huvudboken
 Bookkeeping=Huvudbok
-AccountBalanceByMonth=Saldo per månad
+AccountBalance=Account balance
 
 AccountingVentilation=Uppdelning redovisning
 AccountingVentilationSupplier=Uppdelning redovisnings leverantör
@@ -103,6 +104,7 @@ Code_tiers=Tredjeparts
 Labelcompte=Etikett konto
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Ta bort posterna i huvudboken
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Uppdelning kort
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index c3ce4441aaf..f5425f3fef0 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -154,6 +154,7 @@ Purge=Rensa
 PurgeAreaDesc=Den här sidan kan du radera alla byggda filer eller lagras av Dolibarr (temporära filer eller samtliga filer i <b>%s</b> katalog). Med den här funktionen är inte nödvändig. Den är till för användare vars Dolibarr drivs av en leverantör som inte erbjuder behörighet att ta bort filer som byggdes av webbservern.
 PurgeDeleteLogFile=Ta bort loggfilen <b>%s</b> definieras för Syslog-modul (ingen risk att förlora data)
 PurgeDeleteTemporaryFiles=Ta bort alla tillfälliga filer (ingen risk att förlora data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Ta bort alla filer i katalogen <b>%s.</b> Temporära filer utan även säkerhetskopiering av databaser soptippar, filer som bifogats till element (tredje part, fakturor ...) och in i det ECM-modulen kommer att raderas.
 PurgeRunNow=Rensa nu
 PurgeNothingToDelete=Ingen katalog eller fil att ta bort.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Funktion för att skicka e-post med hjälp av met
 TranslationSetup=Konfigurera översättning
 TranslationDesc=Val av språk visas på skärmen kan ändras: <br> * Globalt från menyn <strong>Hem - Inställningar - Display</strong> <br> * För användaren endast från fliken <strong>Användar visning</strong> av användarkort (klicka på inloggning på toppen av skärmen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Totalt antal aktiverade <b>funktionsmoduler:% s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Minst 1 modul måste aktiveras
 ClassNotFoundIntoPathWarning=Klass %s inte funnen i PHP-sökvägen
 YesInSummer=Ja, under sommaren
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close räkenskapsår
 DeleteFiscalYear=Radera räkenskapsår
 ConfirmDeleteFiscalYear=Är du säker på att du vill ta bort detta verksamhetsår?
 AlwaysEditable=Kan alltid redigeras
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Tvinga synliga namn ansökan (varning: ställa ditt eget namn här kan bryta funktionen Autofyll inloggning när du använder DoliDroid mobil applikation)
 NbMajMin=Minsta antal versaler
 NbNumMin=Minsta antal numeriska tecken
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Guiden för att bygga databas backup dumpfilen
 SomethingMakeInstallFromWebNotPossible=Installation av extern modul är inte möjligt från webbgränssnittet av följande skäl:
 SomethingMakeInstallFromWebNotPossible2=Av denna anledning, för att processen uppgradering, som beskrivs här är endast manuell steg en privilegierad användare kan göra.
 InstallModuleFromWebHasBeenDisabledByFile=Installation av extern modul från ansökan har inaktiverats av administratören. Du måste be honom att ta bort <strong>filen% s</strong> för att tillåta denna funktion.
-ConfFileMuseContainCustom=Installera en extern modul från ansökan spara modul filer till <strong>katalogen% s.</strong> Att ha den här katalogen behandlas av Dolibarr, måste du ställa in din <strong>conf / conf.php</strong> att ha alternativ <br> - <strong>$ Dolibarr_main_url_root_alt</strong> aktiverat för att <strong>värde dolibarr_main_url_root_alt = "/ custom"</strong> <br> - <strong>$ Dolibarr_main_document_root_alt</strong> aktiverat för att värdet <strong>"% s / anpassade"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Markera tabelllinjer när musen flytta passerar över
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index fae57a93197..a6192007c74 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -58,6 +58,7 @@ Payment=Betalning
 PaymentBack=Betalning tillbaka
 Payments=Betalningar
 PaymentsBack=Betalningar tillbaka
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Återbetald
 DeletePayment=Radera betalning
 ConfirmDeletePayment=Är du säker på att du vill ta bort denna betalning?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Gör betalning till kunden
 DisabledBecauseRemainderToPayIsZero=Inaktiverad pga återstående obetalt är noll
 PriceBase=Prisbasbelopp
 BillStatus=Faktura status
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Utkast (måste valideras)
 BillStatusPaid=Betald
 BillStatusPaidBackOrConverted=Betalats eller omvandlas till rabatt
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Fel, kan inte avbryta en faktura
 BillFrom=Från
 BillTo=Fakturamottagare
 ActionsOnBill=Åtgärder mot faktura
+RecurringInvoiceTemplate=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=Ny faktura
 LastBills=Senaste %s fakturor
 LastCustomersBills=Senaste %s kunder fakturor
@@ -199,6 +205,7 @@ Rest=Avvaktande
 AmountExpected=Yrkade beloppet
 ExcessReceived=Överskott fått
 EscompteOffered=Rabatterna (betalning innan terminen)
+EscompteOfferedShort=Discount
 SendBillRef=Inlämning av faktura %s
 SendReminderBillRef=Inlämning av faktura %s (påminnelse)
 StandingOrders=Stående order
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Omedelbar
 PaymentConditionRECEP=Omedelbar
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index f504e36df71..e8446214fcd 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Senaste %s kontrakt
 BoxTitleLastModifiedDonations=Sista %s modifierad donationer
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global aktivitet (fakturor, förslag, order)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Misslyckades med att uppdatera RSS-flöde. Senaste framgångsrika uppdatera datum: %s
 LastRefreshDate=Senaste uppdateringen datum
 NoRecordedBookmarks=Inga bokmärken definieras. Klicka <a href="%s">här</a> för att lägga till bokmärken.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Kundens fakturor
 ForCustomersOrders=Kund beställningar
 ForProposals=Förslag
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 0279518375f..980e6ce44c7 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patent)
 ProfId3MA=Id prof. 3 (IF)
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 3242cb2b8f5..f00c4c4c04d 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index a7311652ab2..0350d2cb02f 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Säkerhetsnyckel för URL för att lansera cron-jobb
 FileToLaunchCronJobs=Kommandorad för att starta cron jobb
 CronExplainHowToRunUnix=I en Unix-miljö bör följande rad läggas i crontab så kommandot exekveras var 5:e minut.
 CronExplainHowToRunWin=I Microsoft(tm) Windows-miljö kan schemalagd aktivitet användas för att exekvera kommandoraden var 5:e minut
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Schemalagda jobb
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Ingen
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Nästa exekvering
-CronDtLastLaunch=Senaste exekvering
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Metod
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Slutdatum kan inte vara före startdatum
 CronStatusActiveBtn=Aktivera
 CronStatusInactiveBtn=Inaktivera
 CronTaskInactive=Det här jobbet är avaktiverat
-CronDtLastResult=Senaste resultatet datum
 CronId=Id
 CronClassFile=Klasser (filename.class.php)
 CronModuleHelp=Namn på Dolibarr modul katalog (även arbeta med extern Dolibarr modul). <BR> För exemple att hämta metod för Dolibarr Produkt objektet / htdocs / <u>produkt</u> /class/product.class.php, värdet av modulen är <i>produkten</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Det går inte att läsa in klassen% s eller objekt% s
 UseMenuModuleToolsToAddCronJobs=Gå in på menyn "Home - Moduler verktyg - Job list" för att se och redigera schemalagda jobb.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang
index 093bc45650e..f77bcdd9ad9 100644
--- a/htdocs/langs/sv_SE/languages.lang
+++ b/htdocs/langs/sv_SE/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanska (Mexiko)
 Language_es_PY=Spanska (Paraguay)
 Language_es_PE=Spanska (Peru)
 Language_es_PR=Spanska (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estniska
 Language_eu_ES=Baskiska
 Language_fa_IR=Persiska
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index d0731e634cf..eac20c7b243 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=E-post validerades
 MailUnsubcribe=Avanmälan
 Unsuscribe=Avanmälan
 MailingStatusNotContact=Kontakta inte längre
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=E-postmottagare är tom
 WarningNoEMailsAdded=Inga nya E-posta lägga till mottagarens lista.
 ConfirmValidMailing=Är du säker på att du vill godkänna denna e-post?
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 7db0810aae7..cbc7e24719a 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Pris per enhet (netto)
 UnitPriceTTC=Pris per enhet
 PriceU=Styckpris
 PriceUHT=St.pris(net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Belopp
@@ -321,6 +322,9 @@ AmountTTCShort=Belopp (inkl. moms)
 AmountHT=Belopp (netto efter skatt)
 AmountTTC=Belopp (inkl. moms)
 AmountVAT=Belopp moms
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Belopp skatt 2
 AmountLT2=Belopp skatt 3
 AmountLT1ES=Belopp RE
@@ -335,6 +339,7 @@ Percentage=Procent
 Total=Summa
 SubTotal=Delsumma
 TotalHTShort=Summa (netto)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Summa (inkl. moms)
 TotalHT=Totalt (netto)
 TotalHTforthispage=Summa (exkl. skatt) för denna sida
@@ -457,6 +462,7 @@ Datas=Data
 None=Ingen
 NoneF=Ingen
 Late=Sent
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Bild
 Photos=Bilder
 AddPhoto=Lägg till bild
@@ -539,6 +545,7 @@ NbOfCustomers=Antal kunder
 NbOfLines=Antal rader
 NbOfObjects=Antal objekt
 NbOfReferers=Antal hänvisningsadresserna
+NbOfObjectReferers=Number of refering objects
 Referers=Hänvisnings objekt
 TotalQuantity=Total kvantitet
 DateFromTo=Från %s till %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Länkad till särskild användarekontakt
 DeleteAFile=Radera fil
 ConfirmDeleteAFile=Är du säker på att du vill radera fil
 NoResults=Inga resultat
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modulverktyg
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 61575792ec7..f9d737e4c83 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index b47527ed2f3..9c91293a4cc 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Projekt Id
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projekt
+ProjectsArea=Projects Area
 ProjectStatus=Projektstatus
 SharedProject=Alla
 PrivateProject=Kontakter av projekt
@@ -19,7 +20,7 @@ TasksPublicDesc=Denna uppfattning presenterar alla projekt och uppgifter som du
 TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din användarbehörighet tillåta dig att visa allt).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projekt område
+ProjectsArea=Projects Area
 NewProject=Nytt projekt
 AddProject=Skapa projekt
 DeleteAProject=Ta bort ett projekt
@@ -67,6 +68,7 @@ Activities=Uppgifter / aktiviteter
 MyActivity=Min verksamhet
 MyActivities=Mina uppgifter / aktiviteter
 MyProjects=Mina projekt
+MyProjectsArea=My projects Area
 DurationEffective=Effektiv längd
 Progress=Framsteg
 ProgressDeclared=Förklarades framsteg
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/sv_SE/receiptprinter.lang b/htdocs/langs/sv_SE/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/sv_SE/receiptprinter.lang
+++ b/htdocs/langs/sv_SE/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 986097678b9..966821c8e9e 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Avbryt sändning
 DeleteSending=Radera sändning
 Stock=Lager
 Stocks=Lager
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Förändring
 Movements=Förändringar
 ErrorWarehouseRefRequired=Lagrets referensnamn krävs
@@ -34,9 +34,10 @@ LastMovements=Senaste förändringar
 Units=Enheter
 Unit=Enhet
 StockCorrection=Rätt lager
-StockTransfer=Lageröverföring
-StockMovement=Överföring
-StockMovements=Överföringar mellan lager
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Etikett för förändring
 NumberOfUnit=Antal enheter
 UnitPurchaseValue=Inköpspris per enhet
@@ -53,8 +54,8 @@ QtyDispatched=Sänd kvantitet
 QtyDispatchedShort=Antal skickade
 QtyToDispatchShort=Antal att skicka
 OrderDispatch=Stock avsändning
-RuleForStockManagementDecrease=Regel för lagerminskning
-RuleForStockManagementIncrease=Regel för lagerökning
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Minska befintligt lager vid validering av kundfakturor / kreditnotor
 DeStockOnValidateOrder=Minska befintligt lager vid validering av kundorder
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Vägt genomsnittligt inpris
 AverageUnitPricePMP=Vägt genomsnittligt inpris
 SellPriceMin=Säljpris per styck
-EstimatedStockValueSellShort=Värde att sälja
-EstimatedStockValueSell=Värde att sälja
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Uppskattat lagervärde
 EstimatedStockValue=Uppskattat lagervärde
 DeleteAWarehouse=Ta bort ett lager
@@ -113,7 +114,7 @@ AlertOnly= Endast larm
 WarehouseForStockDecrease=Lager <b>%s</b> kommer att användas för lagerminskning
 WarehouseForStockIncrease=Lager <b>%s</b> kommer att användas för lagerökning
 ForThisWarehouse=För detta lager
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Påfyllningar
 NbOfProductBeforePeriod=Antal av produkt %s i lager före vald period (< %s)
diff --git a/htdocs/langs/sv_SE/supplier_proposal.lang b/htdocs/langs/sv_SE/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/sv_SE/supplier_proposal.lang
+++ b/htdocs/langs/sv_SE/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index ff99e7de4d9..1c326bf0671 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Logga in med OpenID
 WeeklyHours=Vecko timmar
 ColorUser=Färg på användaren
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 9cff117f74a..deca56bf2c1 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index a4f919a6f49..e67ad0ade2d 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang
index 7379033bbdf..877229841d7 100644
--- a/htdocs/langs/sw_SW/languages.lang
+++ b/htdocs/langs/sw_SW/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Kihispania (Mexico)
 Language_es_PY=Kihispania (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Kihispania (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
 Language_fa_IR=Kiajemi
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 4afa461226b..abc26865694 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 4a4976f4a74..69fb12b1a59 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=บัญชีการบัญชี
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=การเสีย
 
+MenuAccountancy=Accountancy
 CustomersVentilation=รายละเอียดของลูกค้า
 SuppliersVentilation=ซัพพลายเออร์ที่พังทลาย
 TradeMargin=อัตรากำไรขั้นต้นการค้า
@@ -46,7 +47,7 @@ UpdateAccount=การเปลี่ยนแปลงของบัญชี
 UpdateMvts=การปรับเปลี่ยนของการเคลื่อนไหว
 WriteBookKeeping=บันทึกในบัญชีแยกประเภททั่วไป
 Bookkeeping=บัญชีแยกประเภททั่วไป
-AccountBalanceByMonth=ยอดเงินในบัญชีโดย
+AccountBalance=Account balance
 
 AccountingVentilation=รายละเอียดบัญชี
 AccountingVentilationSupplier=รายละเอียดผู้จัดจำหน่ายบัญชี
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=บัญชีฉลาก
 Sens=ซองส์
 Codejournal=วารสาร
+NumPiece=Piece number
 
 DelBookKeeping=ลบบันทึกบัญชีแยกประเภททั่วไป
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=บัตรพังทลาย
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 2c3db5e6a4c..9d895d55391 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -154,6 +154,7 @@ Purge=ล้าง
 PurgeAreaDesc=หน้านี้ช่วยให้คุณสามารถลบไฟล์ทั้งหมดที่สร้างขึ้นหรือจัดเก็บโดย Dolibarr <b>(ไฟล์ชั่วคราวหรือไฟล์ทั้งหมดในไดเรกทอรี% s)</b> การใช้คุณลักษณะนี้ไม่จำเป็น มันมีไว้สำหรับผู้ใช้ที่มี Dolibarr เป็นเจ้าภาพโดยผู้ให้บริการที่ไม่ได้มีสิทธิ์ในการลบไฟล์ที่สร้างขึ้นโดยเว็บเซิร์ฟเวอร์
 PurgeDeleteLogFile=<b>ลบแฟ้มบันทึก% s</b> กำหนดไว้สำหรับโมดูล Syslog (ความเสี่ยงข้อมูลหลวมไม่ได้)
 PurgeDeleteTemporaryFiles=ลบไฟล์ชั่วคราวทั้งหมด (ไม่มีความเสี่ยงที่จะสูญเสียข้อมูล)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=<b>ลบไฟล์ทั้งหมดในไดเรกทอรี%</b> s แฟ้มชั่วคราว แต่ยังทิ้งการสำรองฐานข้อมูลไฟล์ที่แนบมากับองค์ประกอบ (บุคคลที่สาม, ใบแจ้งหนี้, ... ) และอัปโหลดลงในโมดูล ECM จะถูกลบออก
 PurgeRunNow=ล้างในขณะนี้
 PurgeNothingToDelete=ไม่มีไดเรกทอรีหรือไฟล์ที่จะลบ
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=คุณสมบัติที่จะส่
 TranslationSetup=การกำหนดค่า de la traduction
 TranslationDesc=ทางเลือกของภาษาที่ปรากฏบนหน้าจอสามารถปรับเปลี่ยนได้: <br> * <strong>ทั่วโลกจากที่บ้านเมนู - การติดตั้ง - จอแสดงผล</strong> <br> * <strong>สำหรับผู้ใช้เท่านั้นจากแท็บการแสดงผลผู้ใช้บัตรผู้ใช้</strong> (คลิกที่เข้าสู่ระบบที่ด้านบนของหน้าจอ)
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=<b>จำนวนโมดูลเปิดใช้งานคุณลักษณะ:% s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=คุณต้องเปิดการใช้งานอย่างน้อย 1 โมดูล
 ClassNotFoundIntoPathWarning=คลาส% s ไม่พบเ​​ข้ามาในเส้นทาง PHP
 YesInSummer=ใช่ในช่วงฤดู​​ร้อน
@@ -1640,6 +1641,7 @@ CloseFiscalYear=ปิดปีงบประมาณ
 DeleteFiscalYear=ลบปีงบประมาณ
 ConfirmDeleteFiscalYear=คุณแน่ใจที่จะลบปีงบประมาณนี้หรือไม่?
 AlwaysEditable=มักจะสามารถแก้ไขได้
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=บังคับให้มองเห็นชื่อของโปรแกรม (คำเตือน: การตั้งชื่อของคุณเองที่นี่อาจแบ่งคุณลักษณะเข้าสู่ระบบอัตโนมัติเมื่อใช้โปรแกรม DoliDroid มือถือ)
 NbMajMin=จำนวนขั้นต่ำของอักขระตัวพิมพ์ใหญ่
 NbNumMin=จำนวนขั้นต่ำของตัวละครที่เป็นตัวเลข
@@ -1664,7 +1666,7 @@ BackupDumpWizard=ตัวช่วยสร้างการสร้างแ
 SomethingMakeInstallFromWebNotPossible=การติดตั้งโมดูลภายนอกเป็นไปไม่ได้จากอินเตอร์เฟซเว็บด้วยเหตุผลต่อไปนี้:
 SomethingMakeInstallFromWebNotPossible2=ด้วยเหตุนี้กระบวนการอัพเกรดอธิบายไว้ที่นี่เป็นเพียงไม่กี่ก้าวคู่มือผู้ใช้สิทธิพิเศษที่สามารถทำ
 InstallModuleFromWebHasBeenDisabledByFile=ติดตั้งโมดูลภายนอกจากโปรแกรมที่ได้รับการปิดใช้งานโดยผู้ดูแลระบบ <strong>คุณต้องขอให้เขาลบไฟล์% s</strong> เพื่อให้คุณลักษณะนี้
-ConfFileMuseContainCustom=<strong>การติดตั้งโมดูลภายนอกจากโปรแกรมบันทึกไฟล์โมดูลลงในไดเรกทอรี%</strong> s จะมีไดเรกทอรีนี้ประมวลผลโดย Dolibarr คุณต้องติดตั้ง <strong>conf / conf.php</strong> ของคุณจะมีตัวเลือก <br> - <strong>$ dolibarr_main_url_root_alt</strong> การใช้งานมูลค่า <strong>$ dolibarr_main_url_root_alt = "/ กำหนดเอง"</strong> <br> - <strong>$ dolibarr_main_document_root_alt</strong> การใช้งานค่า <strong>"% s / กำหนดเอง"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=เน้นเส้นตารางเมื่อเลื่อนเมาส์ผ่านไป
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index e5ee71ce648..014b7f7d5c7 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -58,6 +58,7 @@ Payment=การชำระเงิน
 PaymentBack=การชำระเงินกลับ
 Payments=วิธีการชำระเงิน
 PaymentsBack=การชำระเงินกลับ
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=จ่ายคืน
 DeletePayment=ลบการชำระเงิน
 ConfirmDeletePayment=คุณแน่ใจหรือว่าต้องการลบการชำระเงินนี้?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=ชำระเงินเนื่องจากล
 DisabledBecauseRemainderToPayIsZero=ปิดใช้งานเนื่องจากค้างชำระที่เหลือเป็นศูนย์
 PriceBase=ฐานราคา
 BillStatus=สถานะใบแจ้งหนี้
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
 BillStatusPaid=ต้องจ่าย
 BillStatusPaidBackOrConverted=การชำระเงินหรือแปลงเป็นส่วนลด
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=ข้อผิดพลาด
 BillFrom=จาก
 BillTo=ไปยัง
 ActionsOnBill=การดำเนินการในใบแจ้งหนี้
+RecurringInvoiceTemplate=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=ใบแจ้งหนี้ใหม่
 LastBills=ใบแจ้งหนี้% s ล่าสุด
 LastCustomersBills=% ล่าสุดของใบแจ้งหนี้ลูกค้า
@@ -199,6 +205,7 @@ Rest=ที่รอดำเนินการ
 AmountExpected=จำนวนเงินที่อ้างว่า
 ExcessReceived=ส่วนเกินที่ได้รับ
 EscompteOffered=ส่วนลดที่นำเสนอ (ชำระเงินก่อนที่จะยาว)
+EscompteOfferedShort=Discount
 SendBillRef=ส่งใบแจ้งหนี้% s
 SendReminderBillRef=การส่งใบแจ้งหนี้ s% (เตือน)
 StandingOrders=ยืนคำสั่งซื้อ
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=ทันทีทันใด
 PaymentConditionRECEP=ทันทีทันใด
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index 3e2805106be..8bde8427330 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=สัญญา% s ล่าสุด
 BoxTitleLastModifiedDonations=% ของเงินบริจาคล่าสุดมีการปรับเปลี่ยน
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=กิจกรรมทั่วโลก (ใบแจ้งหนี้, ข้อเสนอ, การสั่งซื้อ)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=ล้มเหลวในการฟื้นฟูการไหลของ RSS วันรีเฟรชประสบความสำเร็จล่าสุด:% s
 LastRefreshDate=วันรีเฟรชล่าสุด
 NoRecordedBookmarks=บุ๊คมาร์คไม่มีกำหนด
@@ -95,4 +97,4 @@ ForCustomersInvoices=ใบแจ้งหนี้ลูกค้า
 ForCustomersOrders=คำสั่งซื้อของลูกค้า
 ForProposals=ข้อเสนอ
 LastXMonthRolling=สุดท้าย% s กลิ้งเดือน
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index b013fd409fc..fcfe9e9deac 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=ศหมายเลข 3 (SRVC ภาษี)
 ProfId4IN=ศหมายเลข 4
 ProfId5IN=Id ศ 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=ศ Id 1 (RC)
 ProfId2MA=ศ Id 2 (Patente)
 ProfId3MA=ศ Id 3 (IF)
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index d657b4cf85c..c1187d6fe80 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=ลูกค้าต่างประเทศ
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=ขึ้นอยู่กับตัวอักษรสองตัวแรกของหมายเลข VAT แตกต่างจากรหัสประเทศ บริษัท ของคุณเอง
 SameCountryCustomersWithVAT=ลูกค้าแห่งชาติรายงาน
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=ขึ้นอยู่กับตัวอักษรสองตัวแรกของหมายเลข VAT เป็นเช่นเดียวกับรหัสประเทศ บริษัท ของคุณเอง
+LinkedFichinter=Link to an intervention
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 0ce8796ead7..e2f960369be 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=กุญแจสำคัญในการรักษาค
 FileToLaunchCronJobs=บรรทัดคำสั่งที่จะเปิดตัวงาน cron
 CronExplainHowToRunUnix=ในสภาพแวดล้อมระบบปฏิบัติการยูนิกซ์ที่คุณควรใช้ crontab รายการต่อไปนี้เพื่อเรียกใช้บรรทัดคำสั่งแต่ละ 5 นาที
 CronExplainHowToRunWin=ไมโครซอฟท์ (TM) ของ Windows environement คุณสามารถใช้เครื่องมือการจัดตารางงานที่จะเรียกใช้บรรทัดคำสั่งแต่ละ 5 นาที
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=งานที่กำหนดเวลาไว้
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=ไม่
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=การดำเนินการต่อไป
-CronDtLastLaunch=การดำเนินการที่ผ่านมา
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=ความถี่
 CronClass=ชั้น
 CronMethod=วิธี
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=วันที่สิ้นสุดไม่สาม
 CronStatusActiveBtn=เปิดใช้งาน
 CronStatusInactiveBtn=ปิดการใช้งาน
 CronTaskInactive=งานนี้ถูกปิดใช้งาน
-CronDtLastResult=วันที่ผลล่าสุด
 CronId=Id
 CronClassFile=การเรียนการสอน (filename.class.php)
 CronModuleHelp=ชื่อของไดเรกทอรีโมดูล Dolibarr (ยังทำงานร่วมกับโมดูล Dolibarr ภายนอก) <BR> สำหรับ exemple สามารถดึงข้อมูลวิธีการ Dolibarr วัตถุสินค้า / htdocs / <u>ผลิตภัณฑ์</u> /class/product.class.php <i>ค่าของโมดูลเป็นผลิตภัณฑ์</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=ไม่สามารถโหลดระดับ s% หรือวัตถุ% s
 UseMenuModuleToolsToAddCronJobs=ไปลงในเมนู "หน้าหลัก - เครื่องมือ Modules - รายชื่องาน" เพื่อดูและแก้ไขงานที่กำหนดไว้
 TaskDisabled=ปิดการใช้งาน
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/th_TH/languages.lang b/htdocs/langs/th_TH/languages.lang
index f44182490e7..69beb254558 100644
--- a/htdocs/langs/th_TH/languages.lang
+++ b/htdocs/langs/th_TH/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=สเปน (เม็กซิโก)
 Language_es_PY=สเปน (ปารากวัย)
 Language_es_PE=เสปน (เปรู)
 Language_es_PR=สเปน (เปอร์โตริโก)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=เอสโตเนีย
 Language_eu_ES=ชาวแบสค์
 Language_fa_IR=เปอร์เซีย
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index faf7859bcc0..3852b0bf172 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=ตรวจสอบการส่งอีเม
 MailUnsubcribe=ยกเลิก
 Unsuscribe=ยกเลิก
 MailingStatusNotContact=ไม่ติดต่ออีกต่อไป
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=ผู้รับอีเมล์เป็นที่ว่างเปล่า
 WarningNoEMailsAdded=ไม่มีอีเมล์ใหม่เพื่อเพิ่มรายชื่อของผู้รับ
 ConfirmValidMailing=คุณแน่ใจหรือว่าต้องการตรวจสอบการส่งอีเมลนี้หรือไม่?
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index ebdf50a0aee..8b86cdd3126 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=ราคาต่อหน่วย (สุทธิ)
 UnitPriceTTC=ราคาต่อหน่วย
 PriceU=UP
 PriceUHT=UP (สุทธิ)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=UP (รวมภาษี).
 Amount=จำนวน
@@ -321,6 +322,9 @@ AmountTTCShort=จํานวนเงิน (รวมภาษี).
 AmountHT=จำนวนเงิน (สุทธิจากภาษี)
 AmountTTC=จํานวนเงิน (รวมภาษี).
 AmountVAT=จํานวนเงินภาษี
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=จำนวนเงินภาษี 2
 AmountLT2=จำนวนเงินภาษี 3
 AmountLT1ES=จำนวน RE
@@ -335,6 +339,7 @@ Percentage=ร้อยละ
 Total=ทั้งหมด
 SubTotal=ไม่ทั้งหมด
 TotalHTShort=รวม (สุทธิ)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=รวม (รวมภาษี).
 TotalHT=รวม (สุทธิจากภาษี)
 TotalHTforthispage=รวม (สุทธิจากภาษี) สำหรับหน้านี้
@@ -457,6 +462,7 @@ Datas=ข้อมูล
 None=ไม่
 NoneF=ไม่
 Late=สาย
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=ภาพ
 Photos=รูปภาพ
 AddPhoto=เพิ่มรูปภาพ
@@ -539,6 +545,7 @@ NbOfCustomers=จำนวนของลูกค้า
 NbOfLines=จำนวนของเส้น
 NbOfObjects=จำนวนของวัตถุ
 NbOfReferers=จำนวนการอ้างอิง
+NbOfObjectReferers=Number of refering objects
 Referers=หมายวัตถุ
 TotalQuantity=ปริมาณรวม
 DateFromTo=จาก% s% s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=เชื่อมโยงกับการติดต
 DeleteAFile=ลบไฟล์
 ConfirmDeleteAFile=คุณแน่ใจหรือว่าต้องการที่จะลบไฟล์
 NoResults=ไม่มีผลลัพธ์
+AdminTools=Admin tools
 SystemTools=เครื่องมือของระบบ
 ModulesSystemTools=เครื่องมือโมดูล
 Test=ทดสอบ
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=วันจันทร์
 Tuesday=วันอังคาร
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 4ba0976e575..3a6a95b720e 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=เพิ่มขึ้น / ลดลงหุ้
 ComposedProduct=สินค้าย่อย
 MinSupplierPrice=ผู้จัดจำหน่ายราคาขั้นต่ำ
 DynamicPriceConfiguration=การกำหนดค่าราคาแบบไดนามิก
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=ตัวแปรทั่วโลก
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=อัพเดทตัวแปรทั่วโลก
 GlobalVariableUpdaterType0=ข้อมูล JSON
 GlobalVariableUpdaterHelp0=แยกวิเคราะห์ข้อมูล JSON จาก URL ที่ระบุมูลค่าระบุตำแหน่งของค่าที่เกี่ยวข้อง
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=ราคาเริ่มต้นร
 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...
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index c0e1b913f90..e4e93bafbfb 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Id โครงการ
 ProjectLabel=Project label
 Project=โครงการ
 Projects=โครงการ
+ProjectsArea=Projects Area
 ProjectStatus=สถานะของโครงการ
 SharedProject=ทุกคน
 PrivateProject=รายชื่อของโครงการ
@@ -19,7 +20,7 @@ TasksPublicDesc=มุมมองนี้นำเสนอทุกโคร
 TasksDesc=มุมมองนี้นำเสนอทุกโครงการและงาน (สิทธิ์ผู้ใช้ของคุณอนุญาตให้คุณสามารถดูทุกอย่าง)
 AllTaskVisibleButEditIfYouAreAssigned=งานทั้งหมดสำหรับโครงการดังกล่าวจะมองเห็นได้ แต่คุณสามารถใส่เพียงครั้งเดียวสำหรับงานที่คุณจะได้รับมอบหมายใน มอบหมายงานให้คุณถ้าคุณต้องการที่จะป้อนเวลากับมัน
 OnlyYourTaskAreVisible=งานเดียวที่คุณจะได้รับมอบหมายในการมองเห็นได้ มอบหมายงานให้คุณถ้าคุณต้องการที่จะป้อนเวลากับมัน
-ProjectsArea=พื้นที่โครงการ
+ProjectsArea=Projects Area
 NewProject=โครงการใหม่
 AddProject=สร้างโครงการ
 DeleteAProject=ลบโครงการ
@@ -67,6 +68,7 @@ Activities=งาน / กิจกรรม
 MyActivity=กิจกรรมของฉัน
 MyActivities=งานของฉัน / กิจกรรม
 MyProjects=โครงการของฉัน
+MyProjectsArea=My projects Area
 DurationEffective=ระยะเวลาที่มีประสิทธิภาพ
 Progress=ความคืบหน้า
 ProgressDeclared=ความคืบหน้าการประกาศ
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=งานที่ได้รับมอบหมา
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=โครงการเปิดโดย thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/th_TH/receiptprinter.lang b/htdocs/langs/th_TH/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/th_TH/receiptprinter.lang
+++ b/htdocs/langs/th_TH/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 6fa99d595db..4064e6f57b7 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=ยกเลิกการส่ง
 DeleteSending=ลบส่ง
 Stock=สต็อกสินค้า
 Stocks=หุ้น
-StocksByLotSerial=หุ้นโดยจัดสรร / อนุกรม
+StocksByLotSerial=Stocks by lot/serial
 Movement=การเคลื่อนไหว
 Movements=การเคลื่อนไหว
 ErrorWarehouseRefRequired=ชื่ออ้างอิงคลังสินค้าจะต้อง
@@ -34,9 +34,10 @@ LastMovements=ความเคลื่อนไหวล่าสุด
 Units=หน่วย
 Unit=หน่วย
 StockCorrection=หุ้นที่ถูกต้อง
-StockTransfer=การโอนหุ้น
-StockMovement=โอน
-StockMovements=การโอนหุ้น
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=ป้ายเคลื่อนไหว
 NumberOfUnit=จำนวนหน่วย
 UnitPurchaseValue=ราคาซื้อหน่วย
@@ -53,8 +54,8 @@ QtyDispatched=ปริมาณส่ง
 QtyDispatchedShort=จำนวนส่ง
 QtyToDispatchShort=จำนวนการจัดส่ง
 OrderDispatch=หุ้นเยี่ยงอย่าง
-RuleForStockManagementDecrease=กฎการลดบริหารสต็อก
-RuleForStockManagementIncrease=กฎสำหรับการเพิ่มขึ้นบริหารสต็อก
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=ลดหุ้นที่แท้จริงในใบแจ้งหนี้ลูกค้า / บันทึกการตรวจสอบเครดิต
 DeStockOnValidateOrder=ลดหุ้นที่แท้จริงในการตรวจสอบการสั่งซื้อของลูกค้า
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=โกดังและผลิตภัณ
 AverageUnitPricePMPShort=ถ่วงน้ำหนักราคานำเข้าเฉลี่ย
 AverageUnitPricePMP=ถ่วงน้ำหนักราคานำเข้าเฉลี่ย
 SellPriceMin=ราคาขายต่อหน่วย
-EstimatedStockValueSellShort=มูลค่าที่จะขาย
-EstimatedStockValueSell=มูลค่าการขาย
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=ป้อนข้อมูลมูลค่าหุ้น
 EstimatedStockValue=ป้อนข้อมูลมูลค่าหุ้น
 DeleteAWarehouse=ลบคลังสินค้า
@@ -113,7 +114,7 @@ AlertOnly= การแจ้งเตือนเท่านั้น
 WarehouseForStockDecrease=<b>s คลังสินค้า%</b> จะใช้สำหรับการลดลงของหุ้น
 WarehouseForStockIncrease=<b>คลังสินค้า% s</b> จะใช้สำหรับการเพิ่มขึ้นของหุ้น
 ForThisWarehouse=สำหรับคลังสินค้านี้
-ReplenishmentStatusDesc=นี่คือรายการของผลิตภัณฑ์ทั้งหมดที่มีหุ้นต่ำกว่าหุ้นที่ต้องการ (หรือต่ำกว่ามูลค่าการแจ้งเตือนหากช่อง "การแจ้งเตือนเท่านั้น" มีการตรวจสอบ) และขอแนะนำให้คุณสามารถสร้างคำสั่งซัพพลายเออร์ที่จะเติมความแตกต่าง
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=นี่คือรายการของคำสั่งซัพพลายเออร์ที่เปิดอยู่ทั้งหมดรวมถึงผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้า เปิดคำสั่งเท่านั้นที่มีผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้าเพื่อให้คำสั่งที่อาจส่งผลกระทบต่อหุ้นจะมองเห็นได้ที่นี่
 Replenishments=replenishments
 NbOfProductBeforePeriod=ปริมาณของ% s สินค้าในสต็อกก่อนระยะเวลาที่เลือก (<% s)
diff --git a/htdocs/langs/th_TH/supplier_proposal.lang b/htdocs/langs/th_TH/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/th_TH/supplier_proposal.lang
+++ b/htdocs/langs/th_TH/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 5fada578a20..bae1d7e637c 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=ใช้ OpenID เข้าสู่ระบบ
 WeeklyHours=สัปดาห์ชั่วโมง
 ColorUser=สีของผู้ใช้
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 397054d93dc..f17bfaded45 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Muhasebe hesabı
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Analiz
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Müşteri analizi
 SuppliersVentilation=Tedarikçi analizi
 TradeMargin=Ticaret kar oranı
@@ -46,7 +47,7 @@ UpdateAccount=Bir muhasebe hesabının değiştirilmesi
 UpdateMvts=Bir hareketin değiştirilmesi
 WriteBookKeeping=Büyük defter hesap kayıtları
 Bookkeeping=Büyük Defter
-AccountBalanceByMonth=Aylık hesap bakiyesi
+AccountBalance=Account balance
 
 AccountingVentilation=Analiz muhasebesi
 AccountingVentilationSupplier=Tedarikçi hesabı analizi
@@ -103,6 +104,7 @@ Code_tiers=Üçüncü parti
 Labelcompte=Hesap etiketi
 Sens=Sens (borsa haberleri yayınlama günlüğü)
 Codejournal=Günlük
+NumPiece=Piece number
 
 DelBookKeeping=Büyük defter kayıtlarını sil
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Hareket doğru denkleştirilmemiş. Alacak = %s. Borç =
 FicheVentilation=Analiz kartı
 GeneralLedgerIsWritten=İşlemler büyük deftere yazılır
 
+MvtNotCorrectlyBalanced=Hareket doğru denkleştirilmemiş. Alacak = %s. Borç = %s
+
 ##Export Journal Feature
 ExportFormat=Dışaktarım biçimi
 Prefixname=Dışaktarım dosyası öneki
@@ -162,13 +166,14 @@ Headername=Başlıktaki ad
 Type=Alan türü
 Param=Ek parametreler
 EnabledProduct=Ürünlerde
-EnabledTiers=In third party
-EnabledVat=KDV nde
+EnabledTiers=Üçüncü partide
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+InitAccountancy=Muhasebe başlangıcı
+InitAccountancyDesc=Bu sayfa, satışlar ve satınalmalar için muhasebe hesabı tanımlanmamış ürünler ve hizmetlere muhasebe hesabı başlatmak üzere kullanılabilir.
+Options=Seçenekler
+OptionModeProductSell=Satış modu
+OptionModeProductBuy=Satınalma modu
+OptionModeProductSellDesc=Satışlar için muhasebe hesabı tanımlanmamış tüm ürünleri göster.
+OptionModeProductBuyDesc=Satınalmalar için muhasebe hesabı tanımlanmamış tüm ürünleri göster.
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index a06f2b65411..71ac557548a 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -154,6 +154,7 @@ Purge=Temizleme
 PurgeAreaDesc=Bu sayfa, Dolibarr tarafından oluşturulan ve kayıt edilen tüm dosyaları silebilmenizi sağlar (<b>%s</b> dizinindeki geçici dosyaları ya da tüm dosyaları). Bu özelliği kullanmak gerekli değildir. Web sunucusunca oluşturulan dosyaların silinmesine olanak vermeyen bir servis sağlayıcı tarafından barındırılan Dolibarr kullanıcıları için sağlanmıştır.
 PurgeDeleteLogFile=Syslog modülü tarafından tanımlanan <b>%s</b> kütük dosyasını silin (bilgi kaybetme riskiniz yoktur)
 PurgeDeleteTemporaryFiles=Tüm geçici dosyaları sil (bilgi kaybetme riskiniz yoktur)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=<b>%s</b> dizinindeki bütün dosyaları sil. Geçici dosyalarla birlikte veritabanı yedek artıkları, belgelere eklenmiş dosyalar (üçüncü partiler, faturalar, v.s.) ECM modülüne yüklenen dosyalar da silinecektir.
 PurgeRunNow=Şimdi temizle
 PurgeNothingToDelete=Silinecek dizin ya da dosya yok.
@@ -362,7 +363,7 @@ HideAnyVATInformationOnPDF=Oluşturulan PDF de KDV ile ilgili tüm bilgileri giz
 HideDescOnPDF=Oluşturulan PDF de ürün açıklamasını gizle
 HideRefOnPDF=Oluşturulan PDF te ürün ref. ini gizle
 HideDetailsOnPDF=Oluşturulan PDF te ürün satır ayrıntılarını gizle
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PlaceCustomerAddressToIsoLocation=Müşteri adresi konumu için fransız konum standartını (La Poste) kullanın
 Library=Kütüphane
 UrlGenerationParameters=URL güvenliği için parametreler
 SecurityTokenIsUnique=Her URL için benzersiz bir güvenlik anahtarı kullan
@@ -416,7 +417,7 @@ ConfirmEraseAllCurrentBarCode=Geçerli bütün barkod değerlerini silmek istedi
 AllBarcodeReset=Tüm barkod değerleri silinmiştir
 NoBarcodeNumberingTemplateDefined=Barkod modülü ayarlarında hiç bir barkod numaralandırma şablonu etkinleştirilmemiştir.
 NoRecordWithoutBarcodeDefined=Barkod değerli hiç kayıt tanımlanmamış.
-EnableFileCache=Enable file cache
+EnableFileCache=Dosya önbelliğini etkinleştir
 
 # Modules
 Module0Name=Kullanıcılar & gruplar
@@ -500,7 +501,7 @@ Module510Desc=Çalışanların maaş ve ödeme yönetimi
 Module520Name=Borç
 Module520Desc=Borçların yönetimi
 Module600Name=Duyurlar
-Module600Desc=Send EMail notifications (triggered by some business events) to third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Üçüncü parti kişilerine (her üçüncü parti için ayarlar tanımlanmıştır) Eposta bildirimleri ya da sabit postalar (bazı Dolibarr iş etkinlikleriyle başlatılan) gönderin
 Module700Name=Bağışlar
 Module700Desc=Bağış yönetimi
 Module770Name=Gider raporları
@@ -964,7 +965,7 @@ DelaysBeforeWarning=Uyarı öncesi süreler
 DelaysOfToleranceBeforeWarning=Uyarı öncesi süre toleransları
 DelaysOfToleranceDesc=Bu ekran, ekranda %s resmi ile bir uyarı bildirilmeden önce tolere edilebilecek süreleri tanımlamanızı sağlar.
 Delays_MAIN_DELAY_ACTIONS_TODO=Henüz gerçekleşmemiş planlı etkinlikler için uyarı yapılmadan önceki süre toleransı (gün olarak).
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks not yet realised
+Delays_MAIN_DELAY_TASKS_TODO=Görev üzerinde planlanan gecikme süresi (gün) tolernsı henüz gerçekleşmedi
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Henüz işleme konulmamış siparişler öncesi uyarı yapılmadan önceki süre toleransı (gün olarak).
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Henüz işleme konulmamış müşteri siparişleri öncesi uyarı yapılmadan önceki süre toleransı (gün olarak).
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Henüz kapatılmamış teklifler öncesi uyarı yapılmadan önceki süre toleransı (gün olarak).
@@ -1089,8 +1090,8 @@ PathDirectory=Dizin
 SendmailOptionMayHurtBuggedMTA="PHP doğrudan posta" yöntemini kullanarak postalar gönderme özelliği bazı posta alıcısı sunucuları tarafından doğru olarak çözümlenemeyen bir posta iletisi oluşturur. Sonuç ise bazı postaların hatalı platformlar tarafından barındırılan kişiler tarafından okunamaz olmasıdır. Bu durum bazı İnternet sağlayıcılarına özgüdür (Örn: Fransa’daki Orange gibi). Bu Dolibarr ya da PHP için bir sorun değildir ama alıcı posta sunucusu için sorundur. Ancak Dolibarr’ı bundan korumak için Kurulum->Diğer de MAIN_FIX_FOR_BUGGED_MTA yı 1 yapma seçeneğini ekleyebilirsiniz. Ancak SMTP standartlarına sıkıca uyan diğer servislerde sorunla karşılaşabilirsiniz. Diğer bir çözüm (önerilen) ise hiçbir sakıncası olmayan "SMTP soket kütüphanesi" ni kullanmaktır.
 TranslationSetup=Çeviri yapılandırması
 TranslationDesc=Ekran görüntüsündeki dil değiştirilebilir:<br>* Genel olarak bu menüden <strong>Giriş - Kurulum - Görünüm</strong><br>* Yalnızca <strong>User display</strong> sekmesindeki kullanıcı formundan (ekranın tepesindeki oturum aça tıklayın).
-TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Toplam etkin özel modül sayısı: <b>%s</b>
+TranslationOverwriteDesc=Aşağıdaki tabloyu tamamlayarak/düzenleyerek bazı değerlerin üzerine de yazabilirsiniz. "%s" için dil kodunu kullanabilir, "%s" için langs/xx_XX/somefile.lang dosyasında bulunan anahtarı kullanabilir ve "%s" yeni bir çeviri için kullanmak isteyeceğiniz yeni değerdir.
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
 ClassNotFoundIntoPathWarning=Sınıf %s PHP youlnda bulunamadı
 YesInSummer=Yazın evet
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Kapalı mali yıl
 DeleteFiscalYear=Mali yıl sil
 ConfirmDeleteFiscalYear=Bu mali yılın silmek istediğinizden emin misiniz?
 AlwaysEditable=Her zaman düzenlenebilir
+IsHidden=Is not visible
 MAIN_APPLICATION_TITLE=Uygulamanın görünür adına zorla (uyarı: burada kendi adınızı ayarlamanız, DoliDoid mobil uygulamasını kullanırken, kullanıcı adını oto doldur özelliğini durdurabilir)
 NbMajMin=Enaz sayıdaki büyük harf karakteri
 NbNumMin=Enaz sayıdaki sayısal karakterler
@@ -1664,10 +1666,10 @@ BackupDumpWizard=Veritabanı yedekleme döküm dosyası oluşturma sihirbazı
 SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu aşağıdaki nedenden ötürü olanaksızdır:
 SomethingMakeInstallFromWebNotPossible2=Bu nedenle, burada anlatılan yükseltme işlemi yalnızca ayrıcalıklı bir kullanıcın elle atacağı adımlardır.
 InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden kurulumu yöneticiniz tarafından engellenmiştir. Bu özelliğe izin verilmesi için ondan <strong>%s</strong> dosyasını kaldırmasını istemelisiniz.
-ConfFileMuseContainCustom=Uygulama içerisinden dış modül kurarken modül dosyalarını  <strong>%s</strong> dizini içinde kaydedin. Bu dizinin Dolibarr tarafından işlenebilmesi için <strong>conf/conf.php</strong> nizi ayarlayın <br>- <strong>$dolibarr_main_url_root_alt</strong> seçeneğini elde etmek için değeri buna <strong>$dolibarr_main_url_root_alt="/custom"</strong> etkinleştirin <br>- <strong>$dolibarr_main_document_root_alt</strong> değerini ise <strong>"%s/custom"</strong> a etkinleştirin.
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Tablo satırlarını fare üzerine geldiğinde vurgula
 HighlightLinesColor=Fare üzerinden geçerken satır rengini vurgula (vurgulanmaması için boş bırakın)
-TextTitleColor=Color of page title
+TextTitleColor=Sayfa başlık rengi
 LinkColor=Bağlantıların rengi
 PressF5AfterChangingThis=Bu değeri değiştirdikten sonra etkin olması için klavyede F5 tuşuna basın
 NotSupportedByAllThemes=Yalnızca eldy teması ile çalışır ancak tüm temalar tarafından desteklenmez
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Bu bakım sürümü duyurmak için kullanabile
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s hazırdır. Sürüm %s hem kullanıcılar, hem de geliştiriciler için bir çok yeni özellik içeren bir ana sürümdür. Bu sürümü http://www.dolibarr.org (Kararlı sürümler alt dizininden) portalının indirme alanından yükleyebilirsiniz. Değişiklerin tam listesini incelemek için <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> adresine bakabilirsiniz.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s hazırdır. Sürüm %s bir bakım sürümü olup yalnızca hataların onarımını içerir. Daha eski bir sürüm kullanan herkesin bu sürüme yükselmesini öneririz. Her bakım sürümünde olduğu gibi, bu sürümde de ne yeni özellik ne de veri yapısı değişikliği vardır. Bu sürümü http://www.dolibarr.org (Kararlı sürümler alt dizininden) portalının indirmeler alanından yükleyebilirsiniz. Tam değişiklik listesini incelemek için <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> adresine bakabilirsiniz.
 MultiPriceRuleDesc="Her ürün/hizmet için çok seviyeli fiyat" açık ise her ürün için farklı fiyatlar (her fiyat seviyesi için bir) tanımlayabilirsiniz. Zaman kazanmak için, burada, temel fiyata göre her seviye için kendiliğinden hesaplama yapılması için kural girebilirisiniz. Bu sayfa zaman kazanmanız için vardır ve yalnzca diğer fiyat seviyeleri temel fiyata bağlı ise kullanışlıdır. Çoğu durumda bu sayfayı gözardı edebilirsiniz.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 955ecb74d8c..a8dd2d3f0eb 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -35,9 +35,9 @@ AllActions= Tüm etkinlikler/görevler
 ViewCal=Ay görünümü
 ViewDay=Gün görünümü
 ViewWeek=Hafta görünümü
-ViewYear=Year view
+ViewYear=Yıl görünümü
 ViewPerUser=Kullanıcı görünümü başına
-ViewPerType=Per type view
+ViewPerType=Görünüm türüne göre
 ViewWithPredefinedFilters= Öntanımlı süzgeçler ile görünüm
 AutoActions= Gündemin otomatik doldurulması
 AgendaAutoActionDesc= Burada Dolibarr'ın otomatik olarak gündemde oluşturmasını istediğiniz etkinlikleri tanımlayın. İşaretli bir şey yoksa (varsayılan olarak) sadece el ile girilen etkinlikler gündeme dahil edilecektir.
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index f144dd78a3f..048613ec2c8 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -58,6 +58,7 @@ Payment=Ödeme
 PaymentBack=Geri ödeme
 Payments=Ödemeler
 PaymentsBack=Geri ödemeler
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Geri ödenen
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
@@ -73,8 +74,8 @@ PaymentsAlreadyDone=Halihazırda yapılmış ödemeler
 PaymentsBackAlreadyDone=Zaten yapılmış geri ödemeler
 PaymentRule=Ödeme kuralı
 PaymentMode=Ödeme türü
-IdPaymentMode=Payment type (id)
-LabelPaymentMode=Payment type (label)
+IdPaymentMode=Ödeme türü (id)
+LabelPaymentMode=Ödeme türü (etiket)
 PaymentModeShort=Ödeme türü
 PaymentTerm=Ödeme koşulu
 PaymentConditions=Ödeme koşulları
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Müşteri nedeniyle ödeme yap
 DisabledBecauseRemainderToPayIsZero=Ödenmemiş kalan sıfır olduğundan devre dışı
 PriceBase=Temel fiyat
 BillStatus=Fatura durumu
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Taslak (doğrulanma gerektirir)
 BillStatusPaid=Ödendi
 BillStatusPaidBackOrConverted=Ödenmiş ya da indirime dönüştürülmüş
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Hata, halen taslak durumunda ola
 BillFrom=Kimden
 BillTo=Kime
 ActionsOnBill=Fatura üzerindeki eylemler
+RecurringInvoiceTemplate=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=Yeni fatura
 LastBills=Son %s fatura
 LastCustomersBills=Son %s müşteri faturası
@@ -186,7 +192,7 @@ ShowInvoice=Fatura göster
 ShowInvoiceReplace=Değiştirilen faturayı göster
 ShowInvoiceAvoir=İade faturası göster
 ShowInvoiceDeposit=Nakit avans faturası göster
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Hakediş faturası göster
 ShowPayment=Ödeme göster
 AlreadyPaid=Zaten ödenmiş
 AlreadyPaidBack=Zaten geri ödenmiş
@@ -199,6 +205,7 @@ Rest=Bekleyen
 AmountExpected=İstenen tutar
 ExcessReceived=Fazla alınan
 EscompteOffered=Teklif edilen indirim (vadeden önce ödemede)
+EscompteOfferedShort=Discount
 SendBillRef=%s faturasının gönderilmesi
 SendReminderBillRef=%s faturasının gönderilmesi (anımsatma)
 StandingOrders=Ödeme talimatları
@@ -224,7 +231,7 @@ NonPercuRecuperable=Kurtarılamaz
 SetConditions=Ödeme koşullarını ayarla
 SetMode=Ödeme biçimini ayarla
 Billed=Faturalanmış
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Yinelenen faturalar
 RepeatableInvoice=Fatura şablonu
 RepeatableInvoices=Fatura şablonları
 Repeatable=Şablon
@@ -273,7 +280,7 @@ HelpAbandonBadCustomer=Bu tutardan vazgeçilmiştir (müşteri kötü bir müşt
 HelpAbandonOther=Bir hata olduğundan dolayı bu tutardan vazgeçilmiştir (örneğin yanlış müşteri ya da bir faturanın başka faturayla değiştirilmesi durumu gibi)
 IdSocialContribution=Sosyal/mali vergi ödeme kimliği
 PaymentId=Ödeme no
-PaymentRef=Payment ref.
+PaymentRef=Ödeme ref.
 InvoiceId=Fatura no
 InvoiceRef=Fatura ref.
 InvoiceDateCreation=Fatura oluşturulma tarihi
@@ -301,11 +308,23 @@ RelatedSupplierInvoices=İlgili tedarikçi faturaları
 LatestRelatedBill=Son ilgili fatura
 WarningBillExist=Uyarı, bir yada çok fatura zaten var
 MergingPDFTool=Birleştirme PDF aracı
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-
+AmountPaymentDistributedOnInvoice=Faturaya dağıtılan ödeme tutarı
+PaymentNote=Ödeme notu
+ListOfPreviousSituationInvoices=Önceki hakediş faturaları listesi
+ListOfNextSituationInvoices=Sonraki hakediş faturaları listesi
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Derhal
 PaymentConditionRECEP=Derhal
@@ -402,7 +421,7 @@ Reported=Gecikmiş
 DisabledBecausePayments=Bazı ödemeler olduğundan dolayı mümkün değil
 CantRemovePaymentWithOneInvoicePaid=En az bir fatura ödenmiş olarak sınıflandırıldığı için ödemeyi silemezsiniz
 ExpectedToPay=Beklenen ödeme
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Uzlaşılmış ödeme silinemiyor
 PayedByThisPayment=Bu ödeme ile ödenmiş
 ClosePaidInvoicesAutomatically=Tamamı ödenmiş bütün standart ve değiştirilmiş faturaları "Ödendi" olarak sınıflandır.
 ClosePaidCreditNotesAutomatically=Tamamı ödenmiş iade faturalarını "Ödendi" olarak sınıflandır.
@@ -414,7 +433,7 @@ NoteListOfYourUnpaidInvoices=Not: Bu liste, satış temsilcisi olarak bağlı ol
 RevenueStamp=Bandrol
 YouMustCreateInvoiceFromThird=Bu seçenek, yalnızca fatura oluştururken, üçüncü parti *müşteri* sekmesinde belirir
 PDFCrabeDescription=Fatura PDF şablonu Crabe. Tam fatura şablonu  (Önerilen şablon)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
+PDFCrevetteDescription=Crevette Fatura PDF Şablonu. Eksiksiz bir hakediş faturası ş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.
 MarsNumRefModelDesc1=Sayı biçimleri, standart faturalar için %syymm-nnnn, değiştirilen faturalar için %syymm-nnnn, nakit avans faturaları için %syymm-nnnn ve alacak dekontları için %syymm-nnnn şeklindedir. Burada yy yıl, mm ay ve nnnn boşluksuz ve 0'a dönüşmeyen bir sayıdır.
 TerreNumRefModelError=$syymm ile başlayan bir fatura hali hazırda vardır ve bu sıra dizisi için uygun değildir. Bu modülü etkinleştirmek için onu kaldırın ya da adını değiştirin.
@@ -444,11 +463,11 @@ DisabledBecauseFinal=Bu hakediş sondur.
 CantBeLessThanMinPercent=Hakediş önceki hakedişin değerinden daha az olamaz.
 NoSituations=Açık pozisyon yok
 InvoiceSituationLast=Son ve genel fatura
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+PDFCrevetteSituationNumber=Hakediş No%s
+PDFCrevetteSituationInvoiceLineDecompte=Hakediş faturası - SAYI
+PDFCrevetteSituationInvoiceTitle=Hakediş faturası
+PDFCrevetteDescription=Crevette Fatura PDF Şablonu. Eksiksiz bir hakediş faturası şablonu
+PDFCrevetteSituationInvoiceLine=Hakediş No%s : Fat. No%s / %s
+TotalSituationInvoice=Toplam hakediş
+invoiceLineProgressError=Fatura satırı ilerleyişi sonraki fatura satırına eşit ya da daha yüksek olamaz
+updatePriceNextInvoiceErrorUpdateline=Hata : Faturanın bu satırı üzerindeki fiyatı güncelle : %s
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 4ded31dc4ec..cb020b307c1 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Son %s sözleşme
 BoxTitleLastModifiedDonations=Son değiştirilen %s bağış
 BoxTitleLastModifiedExpenses=Son düzenlenen %s gider raporu
 BoxGlobalActivity=Genel etkinlik (faturalar, teklifler, siparişler)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=RSS akışı yenilemesi yapılamadı. Son başarılı yenileme tarihi: %s
 LastRefreshDate=Son yenileme tarihi
 NoRecordedBookmarks=Tanımlanmış yerimi yok.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Müşteri faturaları
 ForCustomersOrders=Müşteri siparişleri
 ForProposals=Teklifler
 LastXMonthRolling=Devreden son %s ay
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 993be74c94b..14207d138cb 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -45,7 +45,7 @@ ObjectAlreadyLinkedToCategory=Öğe zaten bu etiketle/kategoriyle ilişkilendiri
 CategorySuccessfullyCreated=%s etiketi/kategorisi başarıyla eklendi.
 ProductIsInCategories=Ürün/hizmet aşağıdaki etiketlere/kategorilere bağlantılandı
 SupplierIsInCategories=Üçüncü parti bu aşağıdaki tedarikçi etiketlerine/kategorilerine bağlantılandı
-CompanyIsInCustomersCategories=Bu üçüncü parti aşağıdaki müşteri/aday etiketlerine/kategorilerine bağlantılandı
+CompanyIsInCustomersCategories=Bu üçüncü parti aşağıdaki müşteri/beklenti etiketlerine/kategorilerine bağlantılandı
 CompanyIsInSuppliersCategories=Bu üçüncü parti aşağıdaki tedarikçi etiketlerine/kategorilerine bağlantılandı
 MemberIsInCategories=Bu üye aşağıdaki üye etiketlerine/kategorilerine bağlantılandı
 ContactIsInCategories=Bu kişi aşağıdaki kişi etiketlerine/kategorilerine bağlantılı
@@ -60,7 +60,7 @@ NotCategorized=Etiketsiz/kategorisiz
 CategoryExistsAtSameLevel=Bu kategori zaten bu ilgi ile var
 ReturnInProduct=Ürün/hizmet kartına geri dön
 ReturnInSupplier=Tedarikçi kartına geri dön
-ReturnInCompany=Müşteri/aday kartına geri dön
+ReturnInCompany=Müşteri/beklenti kartına geri dön
 ContentsVisibleByAll=İçerik herkes tarafından görülebilir
 ContentsVisibleByAllShort=Içerik herkes tarafından görülebilir
 ContentsNotVisibleByAllShort=İçerik herkes tarafından görülemez
@@ -76,7 +76,7 @@ ProductsCategoryShort=Ürün etiketi/kategorisi
 MembersCategoryShort=Üye etiketi/kategorisi
 SuppliersCategoriesShort=Tedarikçi etiketleri/kategorileri
 CustomersCategoriesShort=Müşteri etiketleri/kategorileri
-ProspectsCategoriesShort=Prospects tags/categories
+ProspectsCategoriesShort=Beklenti etiketleri/kategorileri
 CustomersProspectsCategoriesShort=Müşt./aday kategorileri
 ProductsCategoriesShort=ürün etiketleri/kategorileri
 MembersCategoriesShort=Üye etiketleri/kategorileri
@@ -92,12 +92,12 @@ InternalCategory=İç kategori
 CategoryContents=Etiket/kategori içeriği
 CategId=Etiket/kategori kimliği
 CatSupList=Tedarikçi etiketleri/kategorileri listesi
-CatCusList=Müşteri/aday etiketleri/kategorileri listesi
+CatCusList=Müşteri/beklenti etiketleri/kategorileri listesi
 CatProdList=Ürün etiketleri/kategorileri listesi
 CatMemberList=Üye etiketleri/kategorileri listesi
 CatContactList=Kişi etiketleri/kategorileri listesi
 CatSupLinks=Tedarikçiler ve etiketler/kategoriler arasındaki bağlantılar
-CatCusLinks=Müşteriler/adaylar ve etiketler/kategoriler arasındaki bağlantılar
+CatCusLinks=Müşteriler/beklentiler ve etiketler/kategoriler arasındaki bağlantılar
 CatProdLinks=Ürünler/hizmetler ve etiketler/kategoriler arasındaki bağlantılar
 CatMemberLinks=Üyeler ve etiketler/kategoriler arasındaki bağlantılar
 DeleteFromCat=Etiketlerden/kategorilerden kaldır
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 7479b69327a..f36f36dde1c 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (patente)
 ProfId3MA=Id prof. 3 (IF)
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 9b2f4e777e9..01b090b2ed6 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -155,7 +155,7 @@ DepositsAreNotIncluded=- Teminat faturalarını içermez
 DepositsAreIncluded=- Teminat faturalarını içerir
 LT2ReportByCustomersInInputOutputModeES=Üçüncü parti IRPF Raporu
 LT1ReportByCustomersInInputOutputModeES=RE Üçüncü partiye göre rapor
-VATReport=VAT report
+VATReport=KDV raporu
 VATReportByCustomersInInputOutputMode=Müşteriye göre alınan ve ödenen KDV raporu
 VATReportByCustomersInDueDebtMode=Müşteriye göre alınan ve ödenen KDV raporu
 VATReportByQuartersInInputOutputMode=Orana göre alınan ve ödenen KDV raporu
@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Yabancı müşteri raporu
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Kendi firmanızın ülke kodundan farklı olan KDV sinin ilk iki harfine dayanan
 SameCountryCustomersWithVAT=Yerli müşteri raporu
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Kendi firmanızın ülke koduyla aynı olan KDV sinin ilk iki harfine dayanan
+LinkedFichinter=Link to an intervention
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 528c9ecf9aa..3e321df2700 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -16,11 +16,12 @@ KeyForCronAccess=Cron işlerini başlatacak URL için güvenlik anahtarı
 FileToLaunchCronJobs=Cron işlerini başlatacak komut satırı
 CronExplainHowToRunUnix=Unix ortamında komut satırını her 5 dakikada bir çalıştırmak için kron sekmesi girişini kullanmalısınız
 CronExplainHowToRunWin=Mikrosot (tm) Windows ortamında komut satırını her 5 dakikada bir çalıştırmak için Planlanmış görev araçlarını kullanmalısınız
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Planlı işler
-CronListActive=List of enabled/scheduled jobs
+CronListActive=Devre dışı/planlı işlerin listesi
 CronListInactive=Etkin olmayan işler listesi
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Etkin ve engelli
 # Page list
 CronDateLastRun=Son çalıştırma
 CronLastOutput=Son çalıştırma çıktısı
@@ -36,10 +37,11 @@ CronInfo=Planlı iş modülü planlanmış işlerin yürütülmesini sağlar
 CronWaitingJobs=İş bekliyor
 CronTask=İş
 CronNone=Hiçbiri
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Önce değil
+CronDtEnd=Sonra değil
 CronDtNextLaunch=Sonraki yürütme
-CronDtLastLaunch=Son yürütme
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Sıklık
 CronClass=Sınıf
 CronMethod=Yöntem
@@ -52,7 +54,7 @@ CronNoJobs=Kayıtlı iş yok
 CronPriority=Öncelik
 CronLabel=Açıklama
 CronNbRun=Başlatma sayısı
-CronMaxRun=Max nb. launch
+CronMaxRun=Maksimum başlatma sayısı
 CronEach=Her
 JobFinished=İş başlatıldı ve bitirildi
 #Page card
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Bitiş tarihi başlama tarihinden önce olamaz
 CronStatusActiveBtn=Etkin
 CronStatusInactiveBtn=Engelle
 CronTaskInactive=Bu iş devre dışı
-CronDtLastResult=Son sonuç tarihi
 CronId=Kimlik
 CronClassFile=Sınıflar (dosyaadı.sınıf.php)
 CronModuleHelp=Dolibarr modül dizini adı (aynı zamanda dış Dolibarr modülü ile de çalışır). <BR> Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/<u>product</u>/class/product.class.php, modül değeri <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Kron
 CronCannotLoadClass=%s sınıfı ya da %s nesnesi yüklenemiyor
 UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Modül araçları - İş listesi" menüsüne gidin.
 TaskDisabled=İş engellendi
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/tr_TR/deliveries.lang b/htdocs/langs/tr_TR/deliveries.lang
index 504345e0b27..5aed09d9e4b 100644
--- a/htdocs/langs/tr_TR/deliveries.lang
+++ b/htdocs/langs/tr_TR/deliveries.lang
@@ -17,9 +17,9 @@ DeleteDeliveryReceiptConfirm=<b>%s</b> Teslimat fişini silmek istediğiniz emin
 DeliveryMethod=Teslimat yöntemi
 TrackingNumber=İzleme numarası
 DeliveryNotValidated=Teslimat doğrulanmadı
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+StatusDeliveryCanceled=İptal edildi
+StatusDeliveryDraft=Taslak
+StatusDeliveryValidated=Alındı
 # merou PDF model
 NameAndSignature=Adı ve İmzası:
 ToAndDate=Teslim alan ___________________________________ Tarih _____ / _____ /__________
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index b3f772207fe..5fbe6195b84 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -22,7 +22,7 @@ ReviewedByCP=İnceleyen
 DescCP=Açıklama
 SendRequestCP=İzin isteği oluştur
 DelayToRequestCP=İzin istekleri enaz <b>%s gün</b> önce yapolmalıdır.
-MenuConfCP=Balance of leaves
+MenuConfCP=İzinlerin bakiyesi
 UpdateAllCP=İzinleri güncelle
 SoldeCPUser=İzin bakiyesi <b>%s</b> gündür.
 ErrorEndDateCP=Başlama tarihinden büyük bir bitiş tarihi seçmelisiniz.
@@ -80,7 +80,7 @@ alreadyCPexist=Bu dönem için bir izin isteği zaten yapılmış.
 UserName=Adı
 FirstDayOfHoliday=Tatilin birinci günü
 LastDayOfHoliday=Tatilin son günü
-BoxTitleLastLeaveRequests=Last %s modified leave requests
+BoxTitleLastLeaveRequests=Son değiştirilen %s izin istekleri
 HolidaysMonthlyUpdate=Aylık güncelleme
 ManualUpdate=Elle güncelleme
 HolidaysCancelation=İzin isteği iptali
@@ -140,7 +140,7 @@ HolidaysRefusedBody=%s - %s arası izin isteğiniz aşağıdaki nedenden dolayı
 HolidaysCanceled=İptal edilen izin istekleri
 HolidaysCanceledBody=%s - %s arası izin isteğiniz iptal edilmiştir.
 NewByMonth=Her ay eklenen
-Affect=Followed by a counter
-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
+Affect=Bir sayaç tarafından izlenir
+FollowedByACounter=1: Bu türdeki bir izin isteği bir sayaçla izlenmelidir. Bu sayaç elle ya da otomatik olarak arttırılır ve bir izin isteği doğrulandığında sayaç azaltılır.<br>0: Bir sayaçla izlenmez.
+NoLeaveWithCounterDefined=Bir sayaçla izlenmek üzere tanımlanan hiç izin isteği yok.
 GoIntoDictionaryHolidayTypes=Farklı izin türleri ayarlamak için <strong>Giriş - Ayarlar - Sözlükler - İzin türleri</strong> menüsüne git.
diff --git a/htdocs/langs/tr_TR/hrm.lang b/htdocs/langs/tr_TR/hrm.lang
index fe81d2057f0..519dfe89546 100644
--- a/htdocs/langs/tr_TR/hrm.lang
+++ b/htdocs/langs/tr_TR/hrm.lang
@@ -15,6 +15,6 @@ DictionaryFunction=İK - İşlev listesi
 ListOfEmployees=Çalışanlar listesi
 Employees=Çalışanlar
 Employee=Çalışanlar
-Employe=Employe
+Employe=Çalışan
 NewEmployee=Yeni çalışan
 EmployeeCard=Çalışan kartı
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index 65ebf82a5ee..543f2eba9ac 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -54,9 +54,9 @@ PacificNumRefModelDesc1=Sayıyı %syymm-nnnn olarak gösterir, yy: yıl, mm: ay
 PacificNumRefModelError=$syymm Başlayan bir müdahale kartı zaten var ve sıra bu dizi modeli ile uyumlu değildir. Modülü etkinleştirmek için kaldırın ya da yeniden adlandırın.
 PrintProductsOnFichinter=Müdahale kartında ürünleri yazdır
 PrintProductsOnFichinterDetails=Siparişlerden oluşturulan müdahaleler
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=Nb of intervention cards
-NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+InterventionStatistics=Müdahale istatistikleri
+NbOfinterventions=Müdahale kartları sayısı
+NumberOfInterventionsByMonth=Aylık (doğrulama tarihi) müdahale kartları sayısı
 ##### Exports #####
 InterId=Müdahale kimliği
 InterRef=Müdahele ref.
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index 9ad84becee4..33502c554e0 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -32,10 +32,11 @@ Language_es_MX=İspanyolca (Meksika)
 Language_es_PY=İspanyolca (Paraguay)
 Language_es_PE=İspanyolca (Peru)
 Language_es_PR=İspanyolca (Porto Riko)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonyaca
 Language_eu_ES=Baskça
 Language_fa_IR=Farsça
-Language_fi_FI=Finnish
+Language_fi_FI=Fince
 Language_fr_BE=Fransızca (Belçika)
 Language_fr_CA=Fransızca (Kanada)
 Language_fr_CH=Fransızca (İsviçre)
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 3dfab1313db..b1ba4013d62 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Eposta doğrulanması başarılı
 MailUnsubcribe=Aboneliği kaldır
 Unsuscribe=Aboneliği kaldır
 MailingStatusNotContact=Bir daha görüşme
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Eposta alıcısı boş
 WarningNoEMailsAdded=Alıcının listesine ekli yeni Eposta yok.
 ConfirmValidMailing=Bu epostayı doğrulamak istediğinizden emin misiniz?
@@ -81,7 +82,7 @@ ActivateCheckReadKey="Okuma Alındısı" ve "Abonelik İptali" için kullanılan
 EMailSentToNRecipients=EMail sent to %s recipients.
 XTargetsAdded=<b>%s</b> alıcılar listesine eklendi
 EachInvoiceWillBeAttachedToEmail=Varsayılan fatura belgesi şablonu kullanan bir belge oluşturulacak ve her epostaya eklenecektir.
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=Eğer fatura için zaten PDF belgesi oluşturulduysa, epostaya eklenecektir. Eğer oluşturulmadıysa, hçbir eposta gönderilmeyecektir (aynı zamanda, bu sürümün toplu posta gönderiminde ek olarak yalnızca pdf faturaların desteklendiğini unutmayın).
 MailTopicSendRemindUnpaidInvoices=%s (%s) faturası için anımsatma
 SendRemind=Anımsatmayı Eposta ile gönder
 RemindSent=%s anımsatma(lar) gönderildi
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 15b6749d49e..b8efd2ca1cf 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Veritabanı bağlantısı
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Bu eposta türü için hiç şablon tanımlanmamış
 NoTranslation=Çeviri yok
 NoRecordFound=Kayıt bulunamadı
 NoError=Hata yok
@@ -106,7 +106,7 @@ NotePrivate=Not (özel)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr birim fiyatlar için hassasiyeti <b>%s</b> ondalık olarak sınırlandırmıştır.
 DoTest=Deneme
 ToFilter=Süzgeç
-NoFilter=No filter
+NoFilter=Süzgeç yok
 WarningYouHaveAtLeastOneTaskLate=Uyarı, gecikme toleransını aşan en az bir var.
 yes=evet
 Yes=Evet
@@ -230,8 +230,8 @@ Now=Şimdi
 HourStart=Başlama saati
 Date=Tarih
 DateAndHour=Tarih ve saat
-DateToday=Today's date
-DateReference=Reference date
+DateToday=Bugünün tarihi
+DateReference=Referans tarihi
 DateStart=Başlama tarihi
 DateEnd=Bitiş tarih
 DateCreation=Oluşturma tarihi
@@ -311,6 +311,7 @@ UnitPriceHT=Birim fiyat (net)
 UnitPriceTTC=Birim fiyat
 PriceU=B.F.
 PriceUHT=B.F. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net İstenmiş
 PriceUTTC=B.F. (vergi dahil)
 Amount=Tutar
@@ -321,6 +322,9 @@ AmountTTCShort=Tutar (KDV dahil)
 AmountHT=Tutar (KDV hariç)
 AmountTTC=Miktarı (KDV dahil)
 AmountVAT=KDV tutarı
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Vergi 2 tutarı
 AmountLT2=Vergi 3 tutarı
 AmountLT1ES=RE Tutarı
@@ -335,6 +339,7 @@ Percentage=Yüzde
 Total=Toplam
 SubTotal=Aratoplam
 TotalHTShort=Toplam (Net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Toplam (KDV dahil)
 TotalHT=Toplam (KDV hariç)
 TotalHTforthispage=Bu sayfa toplamı (vergisiz net)
@@ -457,6 +462,7 @@ Datas=Veriler
 None=Hiçbiri
 NoneF=Hiçbiri
 Late=Son
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Resim
 Photos=Resimler
 AddPhoto=Resim ekle
@@ -539,6 +545,7 @@ NbOfCustomers=Müşteri sayısı
 NbOfLines=Satır sayısı
 NbOfObjects=Nesne sayısı
 NbOfReferers=Yönlendirenlerin sayısı
+NbOfObjectReferers=Number of refering objects
 Referers=Yönlendirme nesneleri
 TotalQuantity=Toplam miktar
 DateFromTo=%s den %s e kadar
@@ -612,7 +619,7 @@ TotalMan=Toplam
 NeverReceived=Hiç alınmadı
 Canceled=Vazgeçildi
 YouCanChangeValuesForThisListFromDictionarySetup=Bu listedeki değerleri ayarlar - sözlük menüsünden değiştirebilirsiniz
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanSetDefaultValueInModuleSetup=Modül ayarlarında yeni bir kayıt oluştururken kullanılacak varsayılan değeri belirleybilirsiniz
 Color=Renk
 Documents=Bağlı dosyalar
 DocumentsNb=Bağlı dosyalar (%s)
@@ -694,13 +701,14 @@ LinkedToSpecificUsers=Belirli bir kullanıcı kişisine bağlantılı
 DeleteAFile=Bir dosya sil
 ConfirmDeleteAFile=Dosya silmek istediğinizden emin misiniz
 NoResults=Sonuç yok
+AdminTools=Admin tools
 SystemTools=Sistem araçları
 ModulesSystemTools=Modül araçları
 Test=Deneme
 Element=Unsur
 NoPhotoYet=Henüz resim yok
 HomeDashboard=Özet girişi
-Dashboard=Dashboard
+Dashboard=Kontrol Paneli
 Deductible=Düşülebilir
 from=itibaren
 toward=yönünde
@@ -732,7 +740,8 @@ Hello=Merhaba
 Sincerely=Saygılar
 DeleteLine=Satır sil
 ConfirmDeleteLine=Bu satırı silmek istediğinizden emin misiniz?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang
index 32a519d43ff..a694d6cd01e 100644
--- a/htdocs/langs/tr_TR/margins.lang
+++ b/htdocs/langs/tr_TR/margins.lang
@@ -35,9 +35,9 @@ MargeBrute=Ham oran
 MargeNette=Net kar oranı
 MargeType1=En iyi tedarikçi fiyatı kar oranı
 MargeType2=Ağırlıklı Ortalama Fiyatta Kar Oranı (AOF)
-MargeType3=Margin on Cost Price
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier 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
+MargeType3=Maliyet Fiyatı karı
+MARGIN_TYPE_DETAILS=Satır karı: Satış fiyatı - Alış fiyatı<br>Net kar: Satış fiyatı - Maliyet fiyatı
+MarginTypeDesc=* En iyi alış fiyatı karı _ Satış fiyatı - Ürün kartında tanımlı en iyi tedarikçi fiyatı<br>* Ortalama Ağırlıklı Fiyat (OAF) Karı = Satış fiyatı - Ürün Ortalama Ağırlıklı Fiyatı (OAF) veya eğer OAF henüz tanımlanmadıysa en iyi tedarikçi fiyatı<br>* Maliyet fiyatındaki Kar = Satış fiyatı - Ürün kartında tanımlı maliyet fiyatı veya OAF eğer maliyet fiyatı tanımlanmadıysa veya OAF tanımlanmadıysa en iyi tedarikçi fiyatı
 CostPrice=Maliyet fiyatı
 BuyingCost=Maliyet fiyatı
 UnitCharges=Birim masrafları
diff --git a/htdocs/langs/tr_TR/oauth.lang b/htdocs/langs/tr_TR/oauth.lang
index b4fb55454b4..3c0dc290151 100644
--- a/htdocs/langs/tr_TR/oauth.lang
+++ b/htdocs/langs/tr_TR/oauth.lang
@@ -8,7 +8,7 @@ TokenDeleted=Belirteç silindi
 RequestAccess=Erişim ve kaydedilecek yeni bir belirteç alma isteği/yenilemesi için buraya tıklayın
 DeleteAccess=Belirteçi silmek için burayı tıkla
 UseTheFollowingUrlAsRedirectURI=OAuth sağlayıcınız üzerinde kimlik oluştururken Yönlendirme URI olarak aşağıdaki URL'yi kullanın:
-ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
+ListOfSupportedOauthProviders=OAuth2 sağlayıcınız tarafınıdan verilen kimlik bilgilerini burada girin. Burada yalnızca desteklenen OAuth2 sağlayıcılar görünür. Bu ayarlar OAuth2 kimlik doğrulaması gerektiren diğer modüller tarafından da kullanılabilir.
 OAUTH_GOOGLE_NAME=Api Google
 OAUTH_GOOGLE_ID=Api Google Id
 OAUTH_GOOGLE_SECRET=Api Google Parolası
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 9263f424e29..4faf8530d7f 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -82,7 +82,7 @@ OrdersOpened=İşlenecek siparişler
 NoOpenedOrders=Açık sipariş yok
 NoOtherOpenedOrders=Başka açık sipariş yok
 NoDraftOrders=Taslak sipariş yok
-NoOrder=No order
+NoOrder=Sipariş yok
 NoSupplierOrder=Tedarikçi siparişi yok
 OtherOrders=Diğer siparişler
 LastOrders=Son %s müşteri siparişi
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index c8ed58d6a2c..81214a30a09 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -238,8 +238,8 @@ ToExport=Dışaaktar
 NewExport=Yeni dışaaktarım
 ##### External sites #####
 ExternalSites=Dış siteler
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
-WEBSITE_KEYWORDS=Keywords
+WebsiteSetup=Websitesi modülü ayarları
+WEBSITE_PAGEURL=Sayfanın URL si
+WEBSITE_TITLE=Unvan
+WEBSITE_DESCRIPTION=Açıklama
+WEBSITE_KEYWORDS=Anahtar kelimeler
diff --git a/htdocs/langs/tr_TR/paypal.lang b/htdocs/langs/tr_TR/paypal.lang
index 16014ed61e4..fcd6fe11742 100644
--- a/htdocs/langs/tr_TR/paypal.lang
+++ b/htdocs/langs/tr_TR/paypal.lang
@@ -8,7 +8,7 @@ PAYPAL_API_SANDBOX=Test/sandbox modu
 PAYPAL_API_USER=API kullanıcı adı
 PAYPAL_API_PASSWORD=API parolası
 PAYPAL_API_SIGNATURE=API imzası
-PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_SSLVERSION=Curl SSL Sürümü
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY="Dahili" (kredi kartı+paypal) ya da sadece "Paypal" ödemesi sunar
 PaypalModeIntegral=Tümlev
 PaypalModeOnlyPaypal=Yalnızca PayPal
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 1666d451934..23d2c9943cf 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -252,7 +252,7 @@ UnitPmp=Net HAOF birimi
 CostPmpHT=Net toplam HAOF
 ProductUsedForBuild=Üretim tarafından kendiliğinden tüketilir
 ProductBuilded=Üretim tamamlandı
-ProductsMultiPrice=Products and prices for each price level
+ProductsMultiPrice=Her fiyat düzeyi için ürünler ve fiyatlar
 ProductsOrServiceMultiPrice=Müşteri fiyatları (ürünlerin ya da hizmetlerin, çoklu fiyatlar)
 ProductSellByQuarterHT=Üç aylık vergi öncesi ürün cirosu
 ServiceSellByQuarterHT=Üç aylık vergi öncesi hizmet cirosu
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Ana değişimde stok Arttır/Eksilt
 ComposedProduct=Yan ürün
 MinSupplierPrice=En düşük tedarikçi fiyatı
 DynamicPriceConfiguration=Dinamik fiyat yapılandırması
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Genel değişkenler
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Genel değişkenler güncelleyicisi
 GlobalVariableUpdaterType0=JSON verisi
 GlobalVariableUpdaterHelp0=Belirtilen URL'den JSON verilerini ayrıştırır, DEĞER ilgili değerin yerini belirtir,
@@ -311,5 +315,6 @@ PropalMergePdfProductChooseFile=PDF dosyası seç
 IncludingProductWithTag=Etiketli ürün/hizmet içerir
 DefaultPriceRealPriceMayDependOnCustomer=Varsayılan fiyat, gerçek fiyat müşteriye bağlı olabilir
 WarningSelectOneDocument=Lütfen enaz bir belge seçin
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
+DefaultUnitToShow=Birim
+NbOfQtyInProposals=Teklifteki Mik
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 1975b2fc4f0..a394c09f583 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Proje Kimliği
 ProjectLabel=Proje etiketi
 Project=Proje
 Projects=Projeler
+ProjectsArea=Projects Area
 ProjectStatus=Proje durumu
 SharedProject=Herkes
 PrivateProject=Proje ilgilileri
@@ -14,12 +15,12 @@ ProjectsPublicTaskDesc=Bu görünüm, okumanıza izin verilen tüm proje ve gör
 ProjectsDesc=Bu görünüm tüm projeleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 MyTasksDesc=Bu görünüm ilgilisi olduğunuz projelerle ya da görevlerle sınırlıdır (türü ne olursa olsun).
 OnlyOpenedProject=Yalnızca açık projeler görünür (taslak ya da kapalı durumdaki projeler görünmez)
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Kapalı projeler görünmez.
 TasksPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri ve görevleri içerir.
 TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 AllTaskVisibleButEditIfYouAreAssigned=Böyle projeler için bütün görevler görünür, ancak; yalnızca size atanmış görevlere süre girebilirsiniz. Süre girmek istediğiniz görevi kendinize atayın.
 OnlyYourTaskAreVisible=Yalnızca atanmış olduğunuz görevler görünür. Süre girmek istediğiniz görevi kendinize atayın.
-ProjectsArea=Projeler alanı
+ProjectsArea=Projects Area
 NewProject=Yeni proje
 AddProject=Proje oluştur
 DeleteAProject=Bir proje sil
@@ -30,9 +31,9 @@ OfficerProject=Proje sorumlusu
 LastProjects=Son %s proje
 AllProjects=Tüm projeler
 OpenedProjects=Açık projeler
-OpenedTasks=Opened tasks
+OpenedTasks=Açık görevler
 OpportunitiesStatusForOpenedProjects=Durumuna göre açık projelerin fırsat tutarı
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+OpportunitiesStatusForProjects=Projelerin durumuna göre fırsat tutarı
 ProjectsList=Proje listesi
 ShowProject=Proje göster
 SetProject=Proje ayarla
@@ -67,6 +68,7 @@ Activities=Görevler/etkinlikler
 MyActivity=Etkinliğim
 MyActivities=Görevlerim/etkinliklerim
 MyProjects=Projelerim
+MyProjectsArea=My projects Area
 DurationEffective=Etken süre
 Progress=İlerleme
 ProgressDeclared=Bildirilen ilerleme
@@ -132,8 +134,8 @@ TaskModifiedInDolibarr=%s görev değiştirildi
 TaskDeletedInDolibarr=%s görev silindi
 OpportunityStatus=Fırsat durumu
 OpportunityStatusShort=Fırs. durumu
-OpportunityProbability=Opportunity probability
-OpportunityProbabilityShort=Opp. probab.
+OpportunityProbability=Fırsat olabilirliği
+OpportunityProbabilityShort=Fırs. olabil.
 OpportunityAmount=Fırsat tutarı
 OpportunityAmountShort=Fırs. tutarı
 ##### Types de contacts #####
@@ -168,7 +170,7 @@ ProjectsWithThisUserAsContact=İlgili olarak bu kullanıcı olan projeler
 TasksWithThisUserAsContact=Bu kullanıcıya atanmış görevler
 ResourceNotAssignedToProject=Projeye atanmamış
 ResourceNotAssignedToTask=Göreve atanmamış
-ResourceNotAssignedToTheTask=Not assigned to the task
+ResourceNotAssignedToTheTask=Bu göreve atanmamış
 AssignTaskToMe=Görevi bana ata
 AssignTask=Ata
 ProjectOverview=Genel bakış
@@ -183,9 +185,12 @@ TaskAssignedToEnterTime=Atanan görevler. Bu göreve süre girmek mümkün olmal
 IdTaskTime=Görev zamanı kimliği
 YouCanCompleteRef=Eğer referansı bazı bilgilerle tamamlamak isterseniz (arama süzgeçleri olarak kullanmak üzere), ayırmak için bir karakter eklemeniz önerilir, böylece otomatik numaralandırma sonraki projeler için de çalışacaktır. Örneğin; %s-ABC. Etikete arama anahtarları da eklemeyi yeğleyebilirsiniz.
 OpenedProjectsByThirdparties=Üçüncü partiye göre açık projeler
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Fırsatlar toplam tutarı
 OpportunityPonderatedAmount=Fırsatların ağırlık tutarı
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
+OpportunityPonderatedAmountDesc=Olasılıkla ölçülen fırsat tutarı
 OppStatusPROSP=Araştırma
 OppStatusQUAL=Nitelendirme
 OppStatusPROPO=Teklif
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 4f86d05fe2c..d87912b1377 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -25,7 +25,7 @@ LastModifiedProposals=Değiştirilen son %s  teklif
 AllPropals=Tüm teklifler
 LastProposals=Son teklifler
 SearchAProposal=Teklif ara
-NoProposal=No proposal
+NoProposal=Teklif yok
 ProposalsStatistics=Teklif istatistikleri
 NumberOfProposalsByMonth=Aylara göre sayısı
 AmountOfProposalsByMonthHT=Aylık tutar (vergi hariç)
@@ -63,8 +63,8 @@ DatePropal=Teklif tarihi
 DateEndPropal=Son geçerlilik tarihi
 DateEndPropalShort=Bitiş tarihi
 ValidityDuration=Geçerlilik süresi
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Durumu buna ayarlayın
+SetAcceptedRefused=Kabul edildi/reddedildi ayarla
 ClassifyBilled=Faturalanmış olarak sınıflandır
 BuildBill=Fatura oluştur
 ErrorPropalNotFound=%s teklifi bulunamadı
@@ -102,4 +102,4 @@ DefaultModelPropalCreate=Varsayılan model oluşturma
 DefaultModelPropalToBill=Bir teklifi kapatma sırasında varsayılan şablon (faturalanacak)
 DefaultModelPropalClosed=Bir teklifi kapatma sırasında varsayılan şablon (faturalanmamış)
 ProposalCustomerSignature=Yazılı kabul, firma kaşesi, tarih ve imza
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalsStatisticsSuppliers=Tedarikçi teklif istatistikleri
diff --git a/htdocs/langs/tr_TR/receiptprinter.lang b/htdocs/langs/tr_TR/receiptprinter.lang
index b81a2837087..bc2914029f5 100644
--- a/htdocs/langs/tr_TR/receiptprinter.lang
+++ b/htdocs/langs/tr_TR/receiptprinter.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
 PrinterAdded=Yazıcı %s eklendi
 PrinterUpdated=Yazıcı %s güncellendi
 PrinterDeleted=Yazıcı %s silindi
 TestSentToPrinter=Deneme %s Yazıcısına Gönderildi
+ReceiptPrinter=Receipt printers
 ReceiptPrinterDesc=Yazıcı ayarları
 ReceiptPrinterTemplateDesc=Şablon ayarları
 ReceiptPrinterTypeDesc=Fiş Yazıcısı türü açıklaması
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 49cc77c15d2..cb89b8834f1 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -6,7 +6,7 @@ AllSendings=Tüm sevkiyatlar
 Shipment=Sevkiyat
 Shipments=Sevkiyatlar
 ShowSending=Sevkiyatları göster
-Receivings=Delivery Receipts
+Receivings=Teslimat Makbuzları
 SendingsArea=Sevkiyat alanı
 ListOfSendings=Sevkiyat listesi
 SendingMethod=Sevkiyat yöntemi
diff --git a/htdocs/langs/tr_TR/sms.lang b/htdocs/langs/tr_TR/sms.lang
index b998f8655fd..c34c3f07430 100644
--- a/htdocs/langs/tr_TR/sms.lang
+++ b/htdocs/langs/tr_TR/sms.lang
@@ -49,6 +49,6 @@ SendSms=SMS gönder
 SmsInfoCharRemain=Kalan karakter sayısı
 SmsInfoNumero= (Uluslar arası biçim örneği: +33899701761)
 DelayBeforeSending=Gönderimden önceki süre (Dakika)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=Gönderen yok. SMS sağlayıcınızın ayarlarını denetleyin.
 SmsNoPossibleRecipientFound=Hedef yok. SMS sağlayıcı kurulumu kontrol edin.
 
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index bba06c29398..aa5500eb822 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=Son hareketler
 Units=Birimler
 Unit=Birim
 StockCorrection=Stok düzelt
-StockTransfer=Stok hareketi
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Stok hareketi
 StockMovements=Stok hareketleri
 LabelMovement=Taşıma etiketi
diff --git a/htdocs/langs/tr_TR/supplier_proposal.lang b/htdocs/langs/tr_TR/supplier_proposal.lang
index 6a4b9ade86f..b2f85c1b8ac 100644
--- a/htdocs/langs/tr_TR/supplier_proposal.lang
+++ b/htdocs/langs/tr_TR/supplier_proposal.lang
@@ -1,16 +1,17 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Tedarikçi teklifleri
 supplier_proposalDESC=Tedarikçilere yapılan fiyat isteklerini yönet
-SupplierProposalShort=Supplier proposals
-SupplierProposalNew=New request
+SupplierProposalShort=Tedarikçi teklifleri
+SupplierProposalNew=Yeni istek
 CommRequest=Fiyat isteği
 CommRequests=Fiyat istekleri
 SearchRequest=İstek ara
 DraftRequests=Taslak istekler
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Değiştirilen son %s fiyat isteği
 RequestsOpened=Fiyat isteği aç
 SupplierProposalArea=Tedarikçi teklifleri alanı
-SupplierProposalShort=Supplier proposals
+SupplierProposalShort=Tedarikçi teklifleri
 SupplierProposals=Tedarikçi teklifleri
 NewAskPrice=Yeni fiyat isteği
 NewAsk=Yeni istek
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index 7b70fc85c3d..de3f66a300b 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -31,7 +31,7 @@ TripNDF=Gider raporu bilgileri
 PDFStandardExpenseReports=Bu gider raporu için PDF belgesi oluşturulacak standart şablon
 ExpenseReportLine=Gider rapor satırı
 TF_OTHER=Diğer
-TF_TRIP=Transportation
+TF_TRIP=Taşıma
 TF_LUNCH=Öğle yemeği
 TF_METRO=Metro
 TF_TRAIN=Tren
@@ -99,5 +99,5 @@ ConfirmSaveTrip=Bu gider raporunu doğrulamak istediğinizden emin misiniz?
 NoTripsToExportCSV=Bu dönem için dışaaktarılacak gider raporu yok.
 ExpenseReportPayment=Gider raporu ödemesi
 
-ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToApprove=Onaylanacak gider raporları
 ExpenseReportsToPay=Ödenecek gider raporları
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 6dc111874fc..46e25015c8a 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -121,4 +121,5 @@ OpenIDURL=OpenID URL
 LoginUsingOpenID=Oturum açmak için OpenID kullan
 WeeklyHours=Haftalık saatler
 ColorUser=Kullanıcı rengi
-DisabledInMonoUserMode=Disabled in maintenance mode
+DisabledInMonoUserMode=Bakım modunda devre dışıdır
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 5e964edc78f..89150c3ce67 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index a61f713ac2e..9448650e2ca 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -58,6 +58,7 @@ Payment=Платіж
 PaymentBack=Повернення платежу
 Payments=Платежі
 PaymentsBack=Повернення платежів
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Повернення платежу
 DeletePayment=Видалити платіж
 ConfirmDeletePayment=Ви упевнені, що хочете видалити цей платіж?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Відключено, тому що оплата, що залишилася є нульовою
 PriceBase=Цінова база
 BillStatus=Статус рахунку-фактури
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (має бути підтверджений)
 BillStatusPaid=Сплачений
 BillStatusPaidBackOrConverted=Сплачений або конвертований в знижку
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Помилка, неможлив
 BillFrom=Продавець
 BillTo=Покупець
 ActionsOnBill=Дії з рахунком-фактурою
+RecurringInvoiceTemplate=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=Новий рахунок-фактура
 LastBills=Останні %s рахунків-фактур
 LastCustomersBills=Останні %s рахунків-фактур Покупців
@@ -199,6 +205,7 @@ Rest=В очікуванні
 AmountExpected=Заявлена сума
 ExcessReceived=Отриманий надлишок
 EscompteOffered=Надана знижка (за достроковий платіж)
+EscompteOfferedShort=Discount
 SendBillRef=Представлення рахунку %s
 SendReminderBillRef=Представлення рахунку %s (нагадування)
 StandingOrders=Регламенти
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Негайно
 PaymentConditionRECEP=Негайно
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index 81c29fa5c96..0a467938faf 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Замовлення клієнтів
 ForProposals=Пропозиції
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang
index 8d25e7c7bc2..cf32c2b1feb 100644
--- a/htdocs/langs/uk_UA/languages.lang
+++ b/htdocs/langs/uk_UA/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Іспанська (Мексика)
 Language_es_PY=Іспанська (Парагвай)
 Language_es_PE=Іспанська (Перу)
 Language_es_PR=Іспанська (Пуерто-Ріко)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Естонська
 Language_eu_ES=Баскська
 Language_fa_IR=Перська
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 81339a2c0ba..661c6e2dae0 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 69bee21c3f8..39ae7d3c3a0 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/uk_UA/receiptprinter.lang b/htdocs/langs/uk_UA/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/uk_UA/receiptprinter.lang
+++ b/htdocs/langs/uk_UA/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/uk_UA/supplier_proposal.lang b/htdocs/langs/uk_UA/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/uk_UA/supplier_proposal.lang
+++ b/htdocs/langs/uk_UA/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 9cff117f74a..deca56bf2c1 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
 PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or file to delete.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index a4f919a6f49..e67ad0ade2d 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -58,6 +58,7 @@ Payment=Payment
 PaymentBack=Payment back
 Payments=Payments
 PaymentsBack=Payments back
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
@@ -106,6 +107,7 @@ 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=Paid or converted into discount
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=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=Last %s invoices
 LastCustomersBills=Last %s customers invoices
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index 8595403dc30..57bfc174ec5 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 292fcafe238..588867b1f2f 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 07b609a17e4..91d1037bfd4 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 21786df66cf..d8d91f6a8a2 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=None
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Method
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
index 27b533c3f2d..bda34ce2299 100644
--- a/htdocs/langs/uz_UZ/languages.lang
+++ b/htdocs/langs/uz_UZ/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
 Language_fa_IR=Persian
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index fbd7a14cd04..c467af9044e 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=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 ?
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index a0e5df74802..d951b0eacb1 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
@@ -321,6 +322,9 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+MulticurrencyAmountHT=Amount (net of 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
@@ -335,6 +339,7 @@ Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (net of tax)
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
@@ -539,6 +545,7 @@ NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
 NbOfReferers=Number of referrers
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 3926759fcca..5118e77c22b 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index f6f6dd8ecaf..59f4ec5af51 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=Project
 Projects=Projects
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
@@ -19,7 +20,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
+ProjectsArea=Projects Area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -67,6 +68,7 @@ Activities=Tasks/activities
 MyActivity=My activity
 MyActivities=My tasks/activities
 MyProjects=My projects
+MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 Progress=Progress
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 1056cefe332..b6b689675f1 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -34,9 +34,10 @@ LastMovements=Last movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
 DeStockOnValidateOrder=Decrease real stocks on customers orders validation
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Input stock value
 EstimatedStockValue=Input stock value
 DeleteAWarehouse=Delete a warehouse
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index 8a7dfcfe787..c2b43b22808 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 5dca6ae1be8..3b6dac5b7eb 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Tài khoản kế toán
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Lợi nhuận thương mại
@@ -46,7 +47,7 @@ UpdateAccount=Sự biến đổi của một tài khoản kế toán
 UpdateMvts=Sửa đổi của một thay đổi
 WriteBookKeeping=Tài khoản ghi trong sổ kế toán tổng
 Bookkeeping=Sổ cái tổng hợp
-AccountBalanceByMonth=Số dư tài khoản theo tháng
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Của bên thứ ba
 Labelcompte=Tài khoản Label
 Sens=Sens
 Codejournal=Tạp chí
+NumPiece=Piece number
 
 DelBookKeeping=Xóa các bản ghi của sổ kế toán tổng
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 8ddfba3918e..d9ecfa61d98 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -154,6 +154,7 @@ Purge=Thanh lọc
 PurgeAreaDesc=Trang này cho phép bạn xóa toàn bộ các tập tin đã được xây dựng hoặc trữ bở Dolibarr (các tập tin tạm hoặc tất cả các tập tin trong thư mục <b>%s</b>). Không cần thiết phải sử dụng tính năng này. Phần này được cung cấp cho những người dùng Dolibarr mà phần hosting được cung cấp bởi một nhà cung cấp không cung cấp tính năng xóa các tập tin được xây dựng trên web server đó.
 PurgeDeleteLogFile=Xóa tập tin nhật trình <b>%s</b> được tạo bởi module Syslog (không gây nguy hiểm cho việc mất mát dữ liệu)
 PurgeDeleteTemporaryFiles=Xóa toàn bộ các tập tin tạm (không gây nguy hiểm cho việc thất thoát dữ liệu)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các file trong thư mục <b>%s</b>. Tập tin tạm thời mà còn sao lưu cơ sở dữ liệu bãi, tập tin đính kèm với các yếu tố (các bên thứ ba, hóa đơn, ...) và tải lên vào module ECM sẽ bị xóa.
 PurgeRunNow=Thanh lọc bây giờ
 PurgeNothingToDelete=Không có thư mục hoặc tập tin để xóa.
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép
 ClassNotFoundIntoPathWarning=Lớp %s không tìm thấy con đường vào PHP
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Đóng năm tài chính
 DeleteFiscalYear=Xóa năm tài chính
 ConfirmDeleteFiscalYear=Bạn chắc muốn xóa năm tài chính này?
 AlwaysEditable=Luôn luôn có thể được chỉnh sửa
+IsHidden=Is not visible
 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=Số lượng tối thiểu của các ký tự chữ hoa
 NbNumMin=Số lượng tối thiểu của các ký tự số
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Thủ thuật tạo file dump sao lưu dự phòng cơ sở d
 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 để mô tả ở đây là chỉ là bước thủ công một người dùng có đặc quyền có thể làm.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 78bd7ff8ca4..325496e2b65 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -58,6 +58,7 @@ Payment=Thanh toán
 PaymentBack=Thanh toán lại
 Payments=Thanh toán
 PaymentsBack=Thanh toán lại
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Đã trả lại
 DeletePayment=Xóa thanh toán
 ConfirmDeletePayment=Bạn có chắc muốn xóa thanh toán này ?
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=Thực hiện thanh toán do khách hàng
 DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa bởi vì phần chưa thanh toán còn lại là bằng 0
 PriceBase=Giá cơ sở
 BillStatus=Trạng thái hóa đơn
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Dự thảo (cần được xác nhận)
 BillStatusPaid=Đã trả
 BillStatusPaidBackOrConverted=Đã trả hoặc đã chuyển thành giảm giá
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Lỗi, không thể hủy bỏ m
 BillFrom=Từ
 BillTo=Đến
 ActionsOnBill=Hành động trên hoá đơn
+RecurringInvoiceTemplate=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=Hóa đơn mới
 LastBills=%s hóa đơn cuối
 LastCustomersBills=%s hoá đơn khách hàng cuối
@@ -199,6 +205,7 @@ Rest=Chờ xử lý
 AmountExpected=Số tiền đã đòi
 ExcessReceived=Số dư đã nhận
 EscompteOffered=Giảm giá được tặng (thanh toán trước hạn)
+EscompteOfferedShort=Discount
 SendBillRef=Nộp hóa đơn %s
 SendReminderBillRef=Nộp hóa đơn %s (nhắc nhở)
 StandingOrders=Ủy nhiệm chi
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=Ngay lập tức
 PaymentConditionRECEP=Ngay lập tức
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index 7f97a76e819..93eab95a4b1 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=Hợp đồng cuối %s
 BoxTitleLastModifiedDonations=Cuối %s đóng góp sửa đổi
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=Không thể làm mới RSS thông. Cuối ngày làm mới thành công: %s
 LastRefreshDate=Cuối ngày làm mới
 NoRecordedBookmarks=Không có dấu xác định.
@@ -95,4 +97,4 @@ ForCustomersInvoices=Khách hàng hoá đơn
 ForCustomersOrders=Khách hàng đặt hàng
 ForProposals=Đề xuất
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 996cb3a8ea4..7782e8a357f 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+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.)
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 3e6a5e833cc..3916c5560a8 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 2622d29ff89..0f74e2a9783 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Khóa bảo mật cho URL để khởi động công việc cro
 FileToLaunchCronJobs=Dòng lệnh để khởi động công việc cron
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Việc theo lịch trình
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=Không
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Thực hiện tiếp theo
-CronDtLastLaunch=Thực hiện cuối
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=Phương pháp
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=Ngày kết thúc không thể trước ngày bắt đầu
 CronStatusActiveBtn=Kích hoạt
 CronStatusInactiveBtn=Vô hiệu hoá
 CronTaskInactive=Công việc này bị vô hiệu hóa
-CronDtLastResult=Cuối ngày kết quả
 CronId=Id
 CronClassFile=Lớp học (filename.class.php)
 CronModuleHelp=Tên của thư mục module Dolibarr (cũng làm việc với mô-đun Dolibarr bên ngoài). <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm / htdocs / <u>sản phẩm</u> /class/product.class.php lấy, giá trị của mô-đun là <i>sản phẩm</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Không thể tải lớp% s hoặc đối tượng% s
 UseMenuModuleToolsToAddCronJobs=Đi vào menu "Trang chủ - module công cụ - danh sách công việc" để xem và chỉnh sửa các công việc theo lịch trình.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang
index 7a451310daf..9d85f270385 100644
--- a/htdocs/langs/vi_VN/languages.lang
+++ b/htdocs/langs/vi_VN/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=Tây Ban Nha (Mexico)
 Language_es_PY=Tây Ban Nha (Paraguay)
 Language_es_PE=Tây Ban Nha (Peru)
 Language_es_PR=Tây Ban Nha (Puerto Rico)
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonia
 Language_eu_ES=Basque
 Language_fa_IR=Ba Tư
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index b8079fa3bfb..41482d076ab 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=Gửi email xác nhận thành công
 MailUnsubcribe=Hủy đăng ký
 Unsuscribe=Hủy đăng ký
 MailingStatusNotContact=Không liên hệ nữa
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Email người nhận có sản phẩm nào
 WarningNoEMailsAdded=Không có Email mới để thêm vào danh sách người nhận.
 ConfirmValidMailing=Bạn có chắc chắn bạn muốn gửi email để xác nhận điều này?
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 35c0f8c3cbc..2a00c2ec45e 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=Đơn giá (chưa thuế)
 UnitPriceTTC=Đơn giá
 PriceU=U.P.
 PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=Số tiền
@@ -321,6 +322,9 @@ AmountTTCShort=Số tiền (gồm thuế)
 AmountHT=Số tiền (chưa thuế)
 AmountTTC=Số tiền (gồm thuế)
 AmountVAT=Số tiền thuế
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Số tiền thuế 2
 AmountLT2=Số tiền thuế 3
 AmountLT1ES=Amount RE
@@ -335,6 +339,7 @@ Percentage=Phần trăm
 Total=Tổng
 SubTotal=Tổng phụ
 TotalHTShort=Tổng (chưa thuế)
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Tổng (gồm thuế)
 TotalHT=Tổng (chưa thuế)
 TotalHTforthispage=Tổng (có thuế) cho trang này
@@ -457,6 +462,7 @@ Datas=Dữ liệu
 None=Không
 NoneF=Không
 Late=Trễ
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Hình ảnh
 Photos=Hình ảnh
 AddPhoto=Thêm hình ảnh
@@ -539,6 +545,7 @@ NbOfCustomers=Số lượng khách hàng
 NbOfLines=Số dòng
 NbOfObjects=Số đối tượng
 NbOfReferers=Số lượng tham chiếu
+NbOfObjectReferers=Number of refering objects
 Referers=Tham chiếu đối tượng
 TotalQuantity=Tổng số lượng
 DateFromTo=Từ %s đến %s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Đã liên kết với một số liên lạc người dù
 DeleteAFile=Xóa một tập tin
 ConfirmDeleteAFile=Bạn có chắc muốn xóa tập tin
 NoResults=Không có kết quả
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Module công cụ
 Test=Kiểm tra
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=Thứ Hai
 Tuesday=Thứ Ba
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 76a2cfb9af1..e2598cad17e 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Tăng/Giảm tồn kho trên thay đổi gốc
 ComposedProduct=Sản phẩm con
 MinSupplierPrice=Giá tối thiểu nhà cung cấp
 DynamicPriceConfiguration=Cấu hình giá linh hoạt
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Biến toàn cầu
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Cập nhật biến toàn cầu
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index bca6bb36a89..fb47419d372 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -5,6 +5,7 @@ ProjectId=ID dự án
 ProjectLabel=Project label
 Project=Dự án
 Projects=Các dự án
+ProjectsArea=Projects Area
 ProjectStatus=Trạng thái dự án
 SharedProject=Mọi người
 PrivateProject=Liên lạc về dự án
@@ -19,7 +20,7 @@ TasksPublicDesc=Phần xem này hiển thị tất cả dự án và tác vụ m
 TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (quyền người dùng của bạn hiện đang cho phép bạn xem tất cả thông tin).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Khu vực dự án
+ProjectsArea=Projects Area
 NewProject=Dự án mới
 AddProject=Tạo dự án
 DeleteAProject=Xóa một dự án
@@ -67,6 +68,7 @@ Activities=Tác vụ/hoạt động
 MyActivity=Hoạt động của tôi
 MyActivities=Tác vụ/hoạt động của tôi
 MyProjects=Dự án của tôi
+MyProjectsArea=My projects Area
 DurationEffective=Thời hạn hiệu lực
 Progress=Tiến độ
 ProgressDeclared=Tiến độ công bố
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/vi_VN/receiptprinter.lang b/htdocs/langs/vi_VN/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/vi_VN/receiptprinter.lang
+++ b/htdocs/langs/vi_VN/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 9e68258d625..a75b33115a6 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=Hủy bỏ việc gửi
 DeleteSending=Xóa gửi
 Stock=Tồn kho
 Stocks=Tồn kho
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=Chuyển kho
 Movements=Danh sách chuyển kho
 ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết
@@ -34,9 +34,10 @@ LastMovements=Chuyển kho cuối
 Units=Đơn vị
 Unit=Đơn vị
 StockCorrection=Tồn kho chính xác
-StockTransfer=Chuyển nhượng kho
-StockMovement=Chuyển
-StockMovements=Chuyển nhượng kho
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Nhãn Chuyển kho
 NumberOfUnit=Số đơn vị
 UnitPurchaseValue=Giá mua đơn vị
@@ -53,8 +54,8 @@ QtyDispatched=Số lượng cử
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Điều phối kho
-RuleForStockManagementDecrease=Quy tắc cho quản lý kho giảm
-RuleForStockManagementIncrease=Quy tắc cho tăng quản lý kho
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Giảm kho thực tế trên hoá đơn khách hàng / tín dụng ghi xác nhận
 DeStockOnValidateOrder=Giảm tồn kho thực trên khách hàng xác nhận đơn đặt hàng
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=Trọng giá đầu vào trung bình
 AverageUnitPricePMP=Trọng giá đầu vào trung bình
 SellPriceMin=Đơn giá bán
-EstimatedStockValueSellShort=Giá trị bán
-EstimatedStockValueSell=Giá trị bán
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=Giá trị tồn kho đầu vào
 EstimatedStockValue=Giá trị tồn kho đầu vào
 DeleteAWarehouse=Xóa một nhà kho
@@ -113,7 +114,7 @@ AlertOnly= Cảnh báo chỉ
 WarehouseForStockDecrease=<b>Kho% s</b> sẽ được sử dụng cho kho giảm
 WarehouseForStockIncrease=<b>Kho% s</b> sẽ được sử dụng cho kho tăng
 ForThisWarehouse=Đối với kho này
-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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s)
diff --git a/htdocs/langs/vi_VN/supplier_proposal.lang b/htdocs/langs/vi_VN/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/vi_VN/supplier_proposal.lang
+++ b/htdocs/langs/vi_VN/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 6b2109ad1d0..ef7feb78d45 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Sử dụng OpenID để đăng nhập
 WeeklyHours=Giờ hàng tuần
 ColorUser=Màu của người dùng
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 99028bf9666..b4dc0b0b3e8 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=会计账户
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=明细核算
 
+MenuAccountancy=Accountancy
 CustomersVentilation=客户明细
 SuppliersVentilation=供应商明细
 TradeMargin=贸易保证金
@@ -46,7 +47,7 @@ UpdateAccount=修改”会计帐户“
 UpdateMvts=对一个”活动“进行修改
 WriteBookKeeping=在”总账“中的”账户记录“
 Bookkeeping=总帐
-AccountBalanceByMonth=”账户余额“按月份
+AccountBalance=Account balance
 
 AccountingVentilation=明细核算
 AccountingVentilationSupplier=供应商明细核算
@@ -103,6 +104,7 @@ Code_tiers=第三方
 Labelcompte=标签帐户
 Sens=SENS
 Codejournal=日记帐
+NumPiece=Piece number
 
 DelBookKeeping=删除总帐的记录
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=击穿卡
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index ea9785d112b..37dd21abeca 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -154,6 +154,7 @@ Purge=清空
 PurgeAreaDesc=此页面允许您删除目录<b>%s</b>或临时文件夹中 Dolibarr 生成或存储的所有文件。通常无需使用此功能。它为Dolibarr托管在服务器上，但服务供应商未提供删除权限的用户而设。
 PurgeDeleteLogFile=删除系统日志模块定义的日志文件<b>%s</b>(无数据丢失风险)
 PurgeDeleteTemporaryFiles=删除所有临时文件(无数据丢失风险)
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=删除 <b>%s</b> 目录中的所有文件。临时文件、数据库备份转储文件、系统档案条目(第三方、账单)的附件及 电子文档管理 模块中上传的文件。
 PurgeRunNow=立即清空
 PurgeNothingToDelete=没有目录或文件被删除。
@@ -282,7 +283,7 @@ ModulesSetup=模块设置
 ModuleFamilyBase=系统
 ModuleFamilyCrm=客户关系管理(CRM)
 ModuleFamilyProducts=产品管理
-ModuleFamilyHr=人力资源
+ModuleFamilyHr=人事管理
 ModuleFamilyProjects=项目/协同工作
 ModuleFamilyOther=其他
 ModuleFamilyTechnic=多模块工具
@@ -302,7 +303,7 @@ DownloadPackageFromWebSite=下载安装包 (例如从官方网站上 %s)
 UnpackPackageInDolibarrRoot=解压缩安装包到 Dolibarr 的服务器中 <b>%s</b> 模块的目录下
 SetupIsReadyForUse=安装完成，Dolibarr 已可以使用此新组件。
 NotExistsDirect=未设置可选备用根目录。<br>
-InfDirAlt=自 v3 开始，Dolibarr 可以定义备用根目录。这令您可以将插件和自定义模板保存至同一位置。<br>您只需在Dolibarr的根目录下创建一个目录(例如custom)。<br>
+InfDirAlt=自 v3 版本开始，Dolibarr 可以定义备用根目录地址。这令您可以将插件和自定义模板保存至同一位置。<br>您只需在Dolibarr的根目录下创建一个目录(例如custom)。<br>
 InfDirExample=<br>然后在 conf.php 中声明它<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*这些行已经作为注释行存在，移除注释符"#"即可生效。
 YouCanSubmitFile=在这一步中，你可以使用 选择模块文件 来发送包
 CurrentVersion=Dolibarr 当前版本
@@ -421,7 +422,7 @@ EnableFileCache=Enable file cache
 # Modules
 Module0Name=用户和组
 Module0Desc=用户和组管理
-Module1Name=第三方
+Module1Name=客户
 Module1Desc=公司和联络人管理(客户、潜在客户...)
 Module2Name=商业交易
 Module2Desc=交易管理
@@ -474,7 +475,7 @@ Module85Desc=银行或现金帐户管理
 Module100Name=外部站点
 Module100Desc=此模块添加外部网站链接或页面到 Dolibarr 的菜单或页面框架中
 Module105Name=Mailman 及 SPIP
-Module105Desc=成员模块的 Mailman 或 SPIP 接口
+Module105Desc=会员模块的 Mailman 或 SPIP 接口
 Module200Name=LDAP
 Module200Desc=LDAP目录同步
 Module210Name=PostNuke
@@ -483,8 +484,8 @@ Module240Name=数据导出
 Module240Desc=数据导出工具(助理)
 Module250Name=数据导入
 Module250Desc=数据导入工具(助理)
-Module310Name=成员
-Module310Desc=基金会成员管理
+Module310Name=会员
+Module310Desc=会员管理基础模块
 Module320Name=RSS 源
 Module320Desc=添加 RSS 源至 Dolibarr 主屏幕页面
 Module330Name=书签
@@ -503,7 +504,7 @@ Module600Name=通知
 Module600Desc=Send EMail notifications (triggered by some business events) to third-party contacts (setup defined on each thirdparty) or fixed emails
 Module700Name=捐赠
 Module700Desc=捐款的管理
-Module770Name=开支报告
+Module770Name=HR费用报表
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=供应商的商业提案
 Module1120Desc=要求供应商的商业提案和价格
@@ -532,13 +533,13 @@ Module2610Desc=允许 Dolibarr REST 服务器提供 API 服务
 Module2660Name=Call WebServices (SOAP client)
 Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
-Module2700Desc=使用在线 Gravatar 服务(www.gravatar.com)，通过电子邮件搜索来显示用户/成员的头像。需要互联网连接。
+Module2700Desc=使用在线 Gravatar 服务(www.gravatar.com)，通过搜索电子邮件地址来显示用户/成员的头像。此功能需要连网。
 Module2800Desc=FTP 客户端
 Module2900Name=GeoIPMaxmind
 Module2900Desc=Maxmind geoip 数据库的转换能力
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into card of users / third parties / contacts / members
-Module4000Name=HRM
+Module4000Name=人事管理
 Module4000Desc=Human resources management
 Module5000Name=多公司
 Module5000Desc=允许你管理多个公司
@@ -590,10 +591,10 @@ Permission61=读取干预
 Permission62=建立/修改干预
 Permission64=删除干预
 Permission67=导出干预措施
-Permission71=读取成员
-Permission72=建立/修改成员
-Permission74=删除成员
-Permission75=设置成员类型
+Permission71=读取会员
+Permission72=建立/修改会员
+Permission74=删除会员
+Permission75=设置会员类型
 Permission76=导出数据
 Permission78=读取订阅
 Permission79=建立/修改订阅
@@ -621,10 +622,10 @@ Permission114=调和交易
 Permission115=导出交易和帐户报表
 Permission116=账户间转账
 Permission117=支票调度管理
-Permission121=读取与用户相关联的第三方的信息
-Permission122=建立/修改与用户相关联的第三方的信息
-Permission125=删除与用户相关联的第三方的信息
-Permission126=导出第三方信息
+Permission121=读取与用户相关联的客户的信息
+Permission122=建立/修改与用户相关联的客户的信息
+Permission125=删除与用户相关联的客户的信息
+Permission126=导出客户信息
 Permission141=读取所有项目和任务 (包括我未参与的项目)
 Permission142=创建/修改所有项目和项目 (包括我未参与的项目)
 Permission144=删除所有项目和项目 (包括我未参与的项目)
@@ -685,7 +686,7 @@ PermissionAdvanced253=创建/修改内部/外部用户和权限
 Permission254=只能建立/修改外部用户资讯
 Permission255=修改其他用户密码
 Permission256=删除或暂时关闭其他用户
-Permission262=扩展权限到所有第三方(不仅限于与此账户相关联的单位)。对外单位用户无效(他们始终只能访问自己的信息)。
+Permission262=扩展权限到所有客户(不仅限于与此账户相关联的单位)。对外单位用户无效(他们始终只能访问自己的信息)。
 Permission271=读取 CA
 Permission272=读取发票
 Permission273=开具发票
@@ -1065,14 +1066,14 @@ MAIN_PROXY_PORT=代理服务器的端口
 MAIN_PROXY_USER=登录使用代理服务器
 MAIN_PROXY_PASS=使用代理服务器的密码
 DefineHereComplementaryAttributes=此处定义所有默认安装中没有，但您又希望能在 %s 中使用的属性。
-ExtraFields=自定义增补属性
+ExtraFields=自定义属性
 ExtraFieldsLines=增补属性 (行列)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=增补属性 (往来单位)
 ExtraFieldsContacts=增补属性 (联系人/地址)
-ExtraFieldsMember=增补属性 (成员)
-ExtraFieldsMemberType=增补属性 (成员类型)
+ExtraFieldsMember=增补属性 (会员)
+ExtraFieldsMemberType=增补属性 (会员类型)
 ExtraFieldsCustomerOrders=增补的属性（订单）
 ExtraFieldsCustomerInvoices=增补的属性（发票）
 ExtraFieldsSupplierOrders=增补属性 (订单)
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=已启用的模块数: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=您必须至少启用 1 个模块
 ClassNotFoundIntoPathWarning=PHP 路径中未发现 类 %s
 YesInSummer=是(在夏天)
@@ -1130,11 +1131,11 @@ UserMailRequired=新用户创建时需要输入电子邮件
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=客户/供应商模块及其相关参数设置
-CompanyCodeChecker=第三方编号产生及检查模块设定
+CompanyCodeChecker=客户编号生成与检验模块 (客户或供应商)
 AccountCodeManager=会计编号产生及检查模块设定(客户或供应商)
 ModuleCompanyCodeAquarium=根据以下编码原则返回会计编号: <br>以 %s 为前置字串，并紧接著供应商编码。<br>以 %s 为前置字串，并紧接著客户编码。
 ModuleCompanyCodePanicum=只会回传一个空的会计编号
-ModuleCompanyCodeDigitaria=会计编号取决于第三方的编号。代码以C开头，后跟第三方单位的 5 位代码
+ModuleCompanyCodeDigitaria=会计编号取决于客户的编号。代码以C开头，后跟第三方单位的 5 位代码
 UseNotifications=使用通知
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
 ModelModules=文件模板
@@ -1143,7 +1144,7 @@ WatermarkOnDraft=为草稿文档加水印
 JSOnPaimentBill=激活在线支付功能来自动填充付款的形式
 CompanyIdProfChecker=Professional Id 规则
 MustBeUnique=必须是唯一 ID 吗？
-MustBeMandatory=强制创建第三方？
+MustBeMandatory=强制创建客户？
 MustBeInvoiceMandatory=强制验证发票?
 Miscellaneous=杂项设定
 ##### Webcal setup #####
@@ -1167,7 +1168,7 @@ WebCalAddEventOnCreateCompany=添加公司创建日历事件
 WebCalAddEventOnStatusPropal=日程中显示报价单的状态变化
 WebCalAddEventOnStatusContract=日程中显示合同的状态变化
 WebCalAddEventOnStatusBill=日程中显示账单的状态变化
-WebCalAddEventOnStatusMember=日程中显示成员的状态的变化
+WebCalAddEventOnStatusMember=日程中显示会员的状态的变化
 WebCalUrlForVCalExport=<b>%s</b>格式的导出文件可以通过链接 %s 下载
 WebCalCheckWebcalSetup=也许 Webcal 模块的设置不正确。
 ##### Invoices #####
@@ -1243,16 +1244,16 @@ ContractsAndServices=List of contracts and services
 MembersSetup=会员模块设置
 MemberMainOptions=主要选项
 AddSubscriptionIntoAccount=当添加新的已支付订阅时，默认提示在银行模块中创建银行交易。
-AdherentLoginRequired= 管理成员登录
-AdherentMailRequired=创建新成员时要求输入电子邮件
-MemberSendInformationByMailByDefault=设置向成员发送邮件确认(成员确认或添加订阅)复选框默认为启用
+AdherentLoginRequired= 管理人员登录
+AdherentMailRequired=创建新会员时要求输入电子邮件
+MemberSendInformationByMailByDefault=设置向会员发送邮件确认(会员确认或添加订阅)复选框默认为启用
 ##### LDAP setup #####
 LDAPSetup=LDAP 设置
 LDAPGlobalParameters=全局参数
 LDAPUsersSynchro=用户
 LDAPGroupsSynchro=群组
 LDAPContactsSynchro=联系人
-LDAPMembersSynchro=成员
+LDAPMembersSynchro=会员
 LDAPSynchronization=LDAP 同步
 LDAPFunctionsNotAvailableOnPHP=您的 PHP 中 LDAP 功能不可用
 LDAPToDolibarr=LDAP - > Dolibarr
@@ -1286,11 +1287,11 @@ LDAPDnSynchroActiveExample=LDAP->Dolibarr 或 Dolibarr->LDAP 同步
 LDAPDnContactActive=联系人的同步
 LDAPDnContactActiveYes=激活的同步
 LDAPDnContactActiveExample=已激活/取消的同步
-LDAPDnMemberActive=成员的同步
+LDAPDnMemberActive=会员同步
 LDAPDnMemberActiveExample=已激活/取消的同步
 LDAPContactDn=Dolibarr 联系人的 DN
 LDAPContactDnExample=完整的 DN (例如：ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr 成员的 DN
+LDAPMemberDn=Dolibarr 会员DN
 LDAPMemberDnExample=完整的 DN (例如：ou=members,dc=example,dc=com)
 LDAPMemberObjectClassList=objectClass 列表
 LDAPMemberObjectClassListExample=定义记录属性的 (例如：AD 的 top,groupOfUniqueNames) 的objectClass列表
@@ -1300,13 +1301,13 @@ LDAPGroupObjectClassList=objectClass 列表
 LDAPGroupObjectClassListExample=定义记录属性的 (例如：AD 的 top,groupOfUniqueNames) 的objectClass列表
 LDAPContactObjectClassList=objectClass 列表
 LDAPContactObjectClassListExample=定义记录属性的 (例如：AD 的 top,groupOfUniqueNames) 的objectClass列表
-LDAPMemberTypeDn=Dolibarr成员类型的 DN
+LDAPMemberTypeDn=Dolibarr会员类型DN
 LDAPMemberTypeDnExample=完整的 DN (例如：ou=type_members,dc=example,dc=com)
 LDAPTestConnect=测试 LDAP 连接
 LDAPTestSynchroContact=测试联系人的同步
 LDAPTestSynchroUser=测试用户的同步
 LDAPTestSynchroGroup=测试组的同步
-LDAPTestSynchroMember=测试成员的同步
+LDAPTestSynchroMember=测试会员的同步
 LDAPTestSearch= 测试 LDAP 搜索
 LDAPSynchroOK=同步测试成功
 LDAPSynchroKO=同步测试失败
@@ -1363,7 +1364,7 @@ LDAPFieldDescription=描述
 LDAPFieldDescriptionExample=例如 ：备注描述等等
 LDAPFieldNotePublic=公开备注
 LDAPFieldNotePublicExample=例如：客户同意不亲自验货。
-LDAPFieldGroupMembers= 组成员
+LDAPFieldGroupMembers= 群组成员
 LDAPFieldGroupMembersExample= 例如：成员1
 LDAPFieldBirthdate=生日
 LDAPFieldBirthdateExample=例如：
@@ -1380,7 +1381,7 @@ LDAPNoUserOrPasswordProvidedAccessIsReadOnly=未提供管理员名称或密码LD
 LDAPDescContact=此页面中可以定义 Dolibarr 联系人各项数据在 LDAP 树中的 LDAP 属性名称。
 LDAPDescUsers=此页面中可以定义 Dolibarr 用户各项数据在 LDAP 树中的 LDAP 属性名称。
 LDAPDescGroups=此页面中可以定义 Dolibarr 中用户组各项数据在 LDAP 树中的 LDAP 属性名称。
-LDAPDescMembers=此页面中可以定义 Dolibarr 成员各项数据在 LDAP 树中的 LDAP 属性名称。
+LDAPDescMembers=此页面中可以定义 Dolibarr 会员各项数据在 LDAP 树中的 LDAP 属性名称。
 LDAPDescValues=例值以载入如下模式的 <b>OpenLDAP</b>为例:<b>core.schema, cosine.schema, inetorgperson.schema</b>)如果您使用OpenLDAP和这些例值，请修改您的 LDAP 配置文件<b>slapd.conf</b>来载入全部这些模式。
 ForANonAnonymousAccess=存取访问要求验证， (例如写访问)
 PerfDolibarr=性能设置/优化报告
@@ -1416,7 +1417,7 @@ UseSearchToSelectProductTooltip=此外，如果你有大量的产品（> 10万
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 UseEcoTaxeAbility=支持生态附加税 (WEEE)
 SetDefaultBarcodeTypeProducts=默认的条码类型
-SetDefaultBarcodeTypeThirdParties=第三方用默认条码类型
+SetDefaultBarcodeTypeThirdParties=客户默认条码类型
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
 ProductCodeChecker= 产品/服务编号的生成与检查模块
 ProductOtherConf= 产品/服务 配置
@@ -1471,7 +1472,7 @@ MailingDelay=在发送下一条信息时等待几秒
 ##### Notification #####
 NotificationSetup=EMail 通知模块设置
 NotificationEMailFrom=通知模块所使用的邮件发件人
-ListOfAvailableNotifications=可以设置通知的事件列表，可以为每个第三方(前往第三方卡设置)或设置一个固定的电子邮件地址(列表决定于已启用的模块)
+ListOfAvailableNotifications=可以设置通知的事件列表，可以为每个客户(前往客户卡设置)或设置一个固定的电子邮件地址(列表决定于已启用的模块)
 FixedEmailTarget=固定的电子邮件
 ##### Sendings #####
 SendingsSetup=发货单模块设置
@@ -1569,7 +1570,7 @@ ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a so
 ##### Point Of Sales (CashDesk) #####
 CashDesk=POS
 CashDeskSetup=POS 模块设置
-CashDeskThirdPartyForSell=销售时默认使用的通用第三方
+CashDeskThirdPartyForSell=默认的通用的客户使用的销售
 CashDeskBankAccountForSell=接收现金付款的默认帐户
 CashDeskBankAccountForCheque= 接收支票付款的默认帐户
 CashDeskBankAccountForCB= 接收信用卡支付的默认帐户
@@ -1640,6 +1641,7 @@ CloseFiscalYear=关闭财务年度
 DeleteFiscalYear=删除财务年度
 ConfirmDeleteFiscalYear=您确定要删除本财年？
 AlwaysEditable=可以随时编辑
+IsHidden=Is not visible
 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=最少的大写字符数
 NbNumMin=最少的数字数
@@ -1651,7 +1653,7 @@ SortOrder=排序顺序
 Format=格式
 TypePaymentDesc=0：客户支付类型，1：供应商支付类型，2：客户和供应商的付款方式
 IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=开支报告模块设置
+ExpenseReportsSetup=HR费用报表模块设置
 TemplatePDFExpenseReports=用于生成开支报告文档的模板
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1664,7 +1666,7 @@ BackupDumpWizard=数据库转储备份向导
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index f26e86b1b6a..c5610244d07 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -64,7 +64,7 @@ SupplierInvoiceSentByEMail=供应商的发票通过电子邮件发送%s
 ShippingSentByEMail=Shipment %s sent by EMail
 ShippingValidated= Shipment %s validated
 InterventionSentByEMail=Intervention %s sent by EMail
-NewCompanyToDolibarr= 第三方创建
+NewCompanyToDolibarr= 客户已创建
 DateActionPlannedStart= 计划开始日期
 DateActionPlannedEnd= 计划结束日期
 DateActionDoneStart= 真正的开始日期
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 68410da169a..d5c70c8e88a 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -58,6 +58,7 @@ Payment=付款
 PaymentBack=付款
 Payments=付款
 PaymentsBack=付款
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=已退款
 DeletePayment=删除付款
 ConfirmDeletePayment=你确定要删除这个付款？
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=为客户创建付款延迟
 DisabledBecauseRemainderToPayIsZero=禁用，因为未支付金额为0
 PriceBase=价格基准
 BillStatus=发票状态
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=草案(需要确认)
 BillStatusPaid=已支付
 BillStatusPaidBackOrConverted=已支付/已转换为折扣
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=错误，无法取消一个已
 BillFrom=发票来自
 BillTo=发票接收人
 ActionsOnBill=发票的动作
+RecurringInvoiceTemplate=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=新发票
 LastBills=最新的 %s 份发票
 LastCustomersBills=最近 %s 位客户的发票
@@ -199,6 +205,7 @@ Rest=待办
 AmountExpected=索赔额
 ExcessReceived=过量收到
 EscompteOffered=折扣额 (付款协议前付款)
+EscompteOfferedShort=Discount
 SendBillRef=发票 %s  的提交
 SendReminderBillRef=发票 %s  的提交 (提醒)
 StandingOrders=长期订单
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=即时
 PaymentConditionRECEP=即时
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index 9eb803c9a98..6db12270788 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -17,7 +17,7 @@ BoxLastBooks=Last books
 BoxLastActions=最近的操作
 BoxLastContracts=最近的合同
 BoxLastContacts=最近的联系人/地址
-BoxLastMembers=最近的成员
+BoxLastMembers=新进会员
 BoxFicheInter=最近的干预
 BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=销售营业额
@@ -43,7 +43,7 @@ BoxTitleLastSupplierBills=最近的 %s 笔采购账单
 BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=最近更新的 %s 个潜在客户
 BoxTitleLastProductsInContract=最近销售的 %s 个产品/服务
-BoxTitleLastModifiedMembers=Last %s members
+BoxTitleLastModifiedMembers=上一位 %s 会员
 BoxTitleLastFicheInter=最近更新的 %s 个交易干预
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
@@ -60,6 +60,8 @@ BoxTitleLastContracts=最近的 %s 个联系人
 BoxTitleLastModifiedDonations=最近更新的 %s 项捐赠
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=全局活动(账单,报价,订单)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=RSS 刷新失败上次成功更新日期: %s
 LastRefreshDate=上次更新日期
 NoRecordedBookmarks=未设置任何书签。
@@ -95,4 +97,4 @@ ForCustomersInvoices=客户的发票
 ForCustomersOrders=客户订单
 ForProposals=报价
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index 56eff9b822d..d89f1a75aa5 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -11,7 +11,7 @@ CashdeskShowServices=服务
 CashDeskProducts=产品
 CashDeskStock=库存
 CashDeskOn=之于
-CashDeskThirdParty=第三方
+CashDeskThirdParty=客户
 CashdeskDashboard=访问POS
 ShoppingCart=零售单
 NewSell=新零售单
@@ -38,3 +38,4 @@ ShowStock=显示仓库
 DeleteArticle=删除项目
 FilterRefOrLabelOrBC=搜索 (REF /标签)
 UserNeedPermissionToEditStockToUsePos=你已经要求在POS销售时进行库存更新，所以操作POS模块的用户必须有更改库存的权限。
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index 57a000b4285..5f1ac2c117e 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -103,7 +103,7 @@ CatMemberLinks=Links between members and tags/categories
 DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
-ExtraFieldsCategories=Complementary attributes
+ExtraFieldsCategories=自定义属性
 CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
index e6acca5b18b..412ba59fda3 100644
--- a/htdocs/langs/zh_CN/commercial.lang
+++ b/htdocs/langs/zh_CN/commercial.lang
@@ -23,7 +23,7 @@ TaskRDVWith=与 %s 会议
 ShowTask=显示任务
 ShowAction=显示事件
 ActionsReport=事件报告
-ThirdPartiesOfSaleRepresentative=第三方销售代表
+ThirdPartiesOfSaleRepresentative=丙方销售代表
 SalesRepresentative=销售代表
 SalesRepresentatives=销售代表
 SalesRepresentativeFollowUp=销售代表 (跟进)
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 3a76b1fb097..04fbec06e85 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -2,12 +2,12 @@
 ErrorCompanyNameAlreadyExists=公司名称%s已经存在。请使用其它名称。
 ErrorPrefixAlreadyExists=前缀%s已经存在。请使用其它前缀。
 ErrorSetACountryFirst=请先设置国家
-SelectThirdParty=选择一个第三方
-DeleteThirdParty=删除第三方
+SelectThirdParty=选择丙方
+DeleteThirdParty=删除丙方
 ConfirmDeleteCompany=你确定要删除本公司及所有关联信息？
 DeleteContact=删除联络人
 ConfirmDeleteContact=你确定要删除这个联系人和所有关联信息？
-MenuNewThirdParty=新第三方
+MenuNewThirdParty=新建丙方
 MenuNewCompany=新公司
 MenuNewCustomer=新客户
 MenuNewProspect=新展望客户
@@ -15,18 +15,18 @@ MenuNewSupplier=新供应商
 MenuNewPrivateIndividual=新私营个体
 MenuSocGroup=团体
 NewCompany=新公司 (潜在客户、客户、供应商)
-NewThirdParty=新的第三方 (潜在客户、客户、供应商)
+NewThirdParty=新的丙方 (潜在客户、客户、供应商)
 NewSocGroup=新公司集团
 NewPrivateIndividual=新的个人 (潜在客户、客户、供应商)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
 ProspectionArea=展望客户区
 SocGroup=集团群组
-IdThirdParty=第三方身份
+IdThirdParty=丙方身份
 IdCompany=公司ID
 IdContact=联络人ID
 Contacts=联络人/地址
-ThirdPartyContacts=第三方联络人
-ThirdPartyContact=第三方联络人
+ThirdPartyContacts=丙方联络人
+ThirdPartyContact=丙方联络人/地址
 StatusContactValidated=联络人/地址 状态
 Company=公司
 CompanyName=公司名称
@@ -34,17 +34,17 @@ AliasNames=Alias name (commercial, trademark, ...)
 AliasNameShort=Alias name
 Companies=公司
 CountryIsInEEC=国家是欧洲共同体一员
-ThirdPartyName=第三方的名称
-ThirdParty=第三方
-ThirdParties=第三方
-ThirdPartyAll=第三方 (全部)
+ThirdPartyName=丙方名称
+ThirdParty=丙方
+ThirdParties=丙方
+ThirdPartyAll=丙方 (全部)
 ThirdPartyProspects=展望客户
 ThirdPartyProspectsStats=展望客户
 ThirdPartyCustomers=客户
 ThirdPartyCustomersStats=客户
 ThirdPartyCustomersWithIdProf12=与%s或%客户s
 ThirdPartySuppliers=供应商
-ThirdPartyType=第三方类型
+ThirdPartyType=丙方类型
 Company/Fundation=公司/机构
 Individual=私营个体
 ToCreateContactWithSameName=即将自动创建一个具有相同信息的联络人
@@ -85,7 +85,7 @@ Poste= 位置
 DefaultLang=默认语言
 VATIsUsed=使用增值税
 VATIsNotUsed=不使用增值税
-CopyAddressFromSoc=根据第三方地址填写地址
+CopyAddressFromSoc=填写丙方地址
 NoEmailDefined=There is no email defined
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -202,6 +202,12 @@ ProfId3IN=教授ID已3
 ProfId4IN=ID四教授
 ProfId5IN=教授标识5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=ID教授。 1（RC）的
 ProfId2MA=ID教授。 2（Patente）
 ProfId3MA=ID教授。 3（如果）
@@ -276,8 +282,8 @@ EditContact=编辑联系人/地址
 EditContactAddress=编辑联系人/地址
 Contact=联系
 ContactsAddresses=联系方式/地址
-NoContactDefinedForThirdParty=这个第三方没有确定的联系人
-NoContactDefined=没有联系确定了这个第三方
+NoContactDefinedForThirdParty=这个丙方没有确定的联系人
+NoContactDefined=丙方未设定联系人
 DefaultContact=默认接触
 AddCompany=Create company
 AddThirdParty=Create third party
@@ -292,8 +298,8 @@ CustomerAccount=客户帐户
 SupplierAccount=供应商的帐户
 CustomerCodeDesc=客户代码，为所有客户提供独特的
 SupplierCodeDesc=供应商代码，所有供应商的独特
-RequiredIfCustomer=如果是需要第三方客户或前景
-RequiredIfSupplier=如果是需要第三方的供应商
+RequiredIfCustomer=要求丙方是客户或是有盼头的
+RequiredIfSupplier=要求丙方为供应商
 ValidityControledByModule=有效性控制模块
 ThisIsModuleRules=这是本单元的规则
 LastProspect=最后
@@ -305,7 +311,7 @@ ListOfProspectsContacts=潜在客户联系人名单
 ListOfCustomersContacts=客户联系人名单
 ListOfSuppliersContacts=供应商联系人名单
 ListOfCompanies=公司列表
-ListOfThirdParties=第三方名单
+ListOfThirdParties=丙方名单
 ShowCompany=Show thirdparty
 ShowContact=显示联系人
 ContactsAllShort=全部（不过滤）
@@ -343,7 +349,7 @@ ContactPrivate=私人
 ContactPublic=共享
 ContactVisibility=能见度
 ContactOthers=Other
-OthersNotLinkedToThirdParty=其他，未链接到第三方
+OthersNotLinkedToThirdParty=其他，未链接到丙方
 ProspectStatus=潜力状态
 PL_NONE=无
 PL_UNKNOWN=未知
@@ -378,7 +384,7 @@ NoRIB=没有禁止规定
 NoParentCompany=无
 ExportImport=进出口
 ExportCardToFormat=出口卡格式
-ContactNotLinkedToCompany=联系不与任何第三方
+ContactNotLinkedToCompany=联系不与任何丙方
 DolibarrLogin=Dolibarr登录
 NoDolibarrAccess=没有Dolibarr访问
 ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
@@ -403,17 +409,17 @@ DeleteFile=删除文件
 ConfirmDeleteFile=你确定要删除这个文件？
 AllocateCommercial=分配一个商业
 SelectCountry=选择国家
-SelectCompany=选择一个第三方
+SelectCompany=选择一个丙方
 Organization=组织
 AutomaticallyGenerated=自动生成
 FiscalYearInformation=信息财政年度
 FiscalMonthStart=本财年开始一个月
-YouMustCreateContactFirst=您必须创建电子邮件第三方接触首先可以添加电子邮件通知。
+YouMustCreateContactFirst=你得为丙方创建联系方式填写电子邮箱地址，以便必要时可发邮件通知到丙方。
 ListSuppliersShort=供应商名单
 ListProspectsShort=名单前景
 ListCustomersShort=客户名单
 ThirdPartiesArea=Third parties and contact area
-LastModifiedThirdParties=最后%s修改第三方
+LastModifiedThirdParties=最后 %s 已修改丙方
 UniqueThirdParties=独特的第三方总计
 InActivity=打开
 ActivityCeased=关闭
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index be1467fb7e3..aee54a03ee6 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index dbbef3a92ca..6f5fbed231e 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=无
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=接下来执行
-CronDtLastLaunch=最后执行
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=方法
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=启用
 CronStatusInactiveBtn=禁用
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=点击菜单 "主页 - 模块工具 - 工作列表" 来查看并编辑任务列表。
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 7c3a8af9e41..b2d05e2986c 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=人力资源管理（HRM）
+HRM=人事管理
 Holidays=Leaves
 CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index a720108b4d3..b32d89ebad0 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -1,60 +1,60 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=只需按照分步说明。
-MiscellaneousChecks=先决条件检查
-DolibarrWelcome=欢迎Dolibarr
-ConfFileExists=配置文件<b>%s</b>存在。
-ConfFileDoesNotExists=配置文件<b>%s</b>不存在！
-ConfFileDoesNotExistsAndCouldNotBeCreated=配置文件<b>%s</b>不存在，无法创建！
-ConfFileCouldBeCreated=<b>%s的</b>配置文件可以被创建。
-ConfFileIsNotWritable=配置文件<b>%s</b>不是写。检查权限。对于第一次安装，您的Web服务器必须被授予能够进入这个文件写在配置过程中（“文件模式，例如666”在一个像Unix的操作系统）。
-ConfFileIsWritable=配置文件<b>%s</b>是可写的。
-ConfFileReload=重新载入配置文件的所有信息。
-PHPSupportSessions=这个PHP支持会议。
-PHPSupportPOSTGETOk=这个PHP支持的变量的POST和GET。
-PHPSupportPOSTGETKo=有可能你的PHP安装程序不支持变量POST和/或GET。检查你的php.ini中参数<b>的变数</b> 。
-PHPSupportGD=这个PHP支持GD图形功能。
-PHPSupportUTF8=这个PHP支持UTF8的功能。
-PHPMemoryOK=您的PHP最大会话内存设置为<b>%s。</b>这应该是足够的。
-PHPMemoryTooLow=您的PHP最大会话内存设置为<b>%s</b>字节。这应该是太低了。改变你的<b>php.ini中</b>设置<b>memory_limit的</b>参数至少<b>%s</b>字节。
-Recheck=点击这里，更多的有意义的测试
-ErrorPHPDoesNotSupportSessions=您的PHP安装不支持会话。此功能必须作出Dolibarr工作。检查你的PHP安装程序。
-ErrorPHPDoesNotSupportGD=您的PHP安装不支持图形功能的广东。不图将可用。
-ErrorPHPDoesNotSupportUTF8=您的PHP安装不支持UTF8的功能。 Dolibarr不能正常工作。解决这个安装之前Dolibarr。
-ErrorDirDoesNotExists=目录%s不存在。
-ErrorGoBackAndCorrectParameters=后退和纠正错误的参数。
-ErrorWrongValueForParameter=您可能输入一个参数的错误值%s'的。
-ErrorFailedToCreateDatabase=无法创建数据库'%s'的。
-ErrorFailedToConnectToDatabase=无法连接到数据库'%s'的。
-ErrorDatabaseVersionTooLow=数据库版本 (%s) 太低了，需要 %s 版或更高版本。
-ErrorPHPVersionTooLow=PHP的版本太旧。版本%s是必需的。
-WarningPHPVersionTooLow=PHP版本太旧。希望使用 %s 或更高版本。这个版本应该允许安装，但不再被支持。
-ErrorConnectedButDatabaseNotFound=连接到数据库服务器的成功，但'%s'不存在。
-ErrorDatabaseAlreadyExists=数据库'%s'已经存在。
-IfDatabaseNotExistsGoBackAndUncheckCreate=如果数据库不存在，请返回并检查选择“创建数据库”。
+InstallEasy=按照安装指南手册一步步执行即可。
+MiscellaneousChecks=服务器环境检查以便满足安装要求
+DolibarrWelcome=欢迎使用Dolibarr ERP/CRM系统软件
+ConfFileExists=配置文件 <b>%s</b> 已存在。
+ConfFileDoesNotExists=配置文件 <b>%s</b> 没存在哦 !
+ConfFileDoesNotExistsAndCouldNotBeCreated=配置文件<b>%s</b>不存在并且无法创建！
+ConfFileCouldBeCreated=已创建好 <b>%s</b> 配置文件。
+ConfFileIsNotWritable=配置文件 <b>%s</b> 没有写权限。烦请再次检查权限设置。首次安装时，Web服务器必须设置该配置文件为可写权限 (例如Unix系统中需要用"chmod 666"命令来赋予权限)。
+ConfFileIsWritable=配置文件 <b>%s</b> 为可写权限。
+ConfFileReload=从新的配置文件中加载全部信息。
+PHPSupportSessions=此版本PHP支持多线程。
+PHPSupportPOSTGETOk=此版本PHP支持可变的POST和GET。
+PHPSupportPOSTGETKo=有可能你的PHP安装程序不支持变量POST或GET。检查php.ini中参数 <b>variables_order</b> 的设置。
+PHPSupportGD=PHP的GD图形功能已激活。
+PHPSupportUTF8=PHP的UTF8功能已激活。
+PHPMemoryOK=您的PHP最大session会话内存设置为<b>%s</b>。这应该够了的。
+PHPMemoryTooLow=您的PHP最大session会话内存设置为 <b>%s</b>字节。这太低了点儿。请修改 <b>php.ini</b> 中 <b>memory_limit</b>的参数的设置值改大点儿至少  <b>%s</b> 字节。
+Recheck=点击这里有更多的有意义的测试
+ErrorPHPDoesNotSupportSessions=您的PHP安装不支持 sessions会话。而Dolibarr要求 sessions会话功能必须启用并激活Dolibarr才能正常运行。烦请再次检查PHP配置参数是否启用 sessions会话功能。
+ErrorPHPDoesNotSupportGD=您的PHP安装不支持GD图形功能。作图功能将失效。
+ErrorPHPDoesNotSupportUTF8=您的PHP安装不支持UTF8的功能。 Dolibarr不能正常工作。安装Dolibarr之前请先解决UTF8支持问题。
+ErrorDirDoesNotExists=目录 %s 不存在。
+ErrorGoBackAndCorrectParameters=请返回上页并修正里面错误的参数然后再继续下一步。
+ErrorWrongValueForParameter=您可能输入了一个错误的参数值的 '%s' 。
+ErrorFailedToCreateDatabase=无法创建数据库 '%s'。
+ErrorFailedToConnectToDatabase=无法连接到数据库 '%s'。
+ErrorDatabaseVersionTooLow=数据库版本 (%s) 太低了，需要 %s 或更高版本。
+ErrorPHPVersionTooLow=PHP的版本太旧了。至少需要 %s 版本。
+WarningPHPVersionTooLow=PHP版本太旧了。希望您用 %s 或更高的版本。虽然这个版本应该也能安装，但我们不再建议这样做。
+ErrorConnectedButDatabaseNotFound=成功连接到数据库服务器的，但不存在 '%s' 数据库，没找着啊，亲。
+ErrorDatabaseAlreadyExists=数据库 '%s' 已存在。
+IfDatabaseNotExistsGoBackAndUncheckCreate=如果数据库不存在，请返回检查并选择“创建数据库”。
 IfDatabaseExistsGoBackAndCheckCreate=如果数据库已经存在，请返回并取消选中“创建数据库”选项。
-WarningBrowserTooOld=浏览器的版本太旧，您的浏览器需升级到最新版本，建议使用Firefox，Chrome或Opera浏览器。
+WarningBrowserTooOld=浏览器的版本太旧，您的浏览器得升级到最新的版本才行，我们建议您使用Firefox，Chrome或Opera等更棒的浏览器。
 PHPVersion=PHP版本
 YouCanContinue=您可以继续...
 License=使用许可
 ConfigurationFile=配置文件
-WebPagesDirectory=目录下的网页存储
-DocumentsDirectory=目录来存储和生成的文件上传
-URLRoot=网址根
-ForceHttps=部队的安全连接（HTTPS）的
-CheckToForceHttps=选中此选项，迫使安全连接（HTTPS）的。 <br>这就要求网络服务器是一个SSL证书配置。
+WebPagesDirectory=网页存储目录
+DocumentsDirectory=附件存储目录
+URLRoot=根网址
+ForceHttps=安全连接 (https)
+CheckToForceHttps=选中此选项，强制启用 (https)安全连接。<br>这就要求网络服务器已经配置好SSL证书。
 DolibarrDatabase=Dolibarr数据库
-DatabaseChoice=数据库的选择
+DatabaseChoice=选择数据库
 DatabaseType=数据库类型
 DriverType=驱动类型
 Server=服务器
-ServerAddressDescription=名称或IP数据库服务器，通常填入'localhost'当数据库服务器的地址存放在Web服务器相同的服务器比
-ServerPortDescription=数据库服务器端口。保持空如果不明。
+ServerAddressDescription=数据库服务器的名称或IP，当数据库服务器的地址存放在Web服务器相同的服务器的时候，通常填的是'localhost'本机
+ServerPortDescription=数据库服务器端口。如果不懂的话请保持空白，留空不填。
 DatabaseServer=数据库服务器
 DatabaseName=数据库名称
-DatabasePrefix=数据库前缀表
+DatabasePrefix=数据库的表的前缀
 AdminLogin=登录为Dolibarr数据库所有者。
-PasswordAgain=第二次再次输入密码
-AdminPassword=密码Dolibarr数据库所有者。
+PasswordAgain=第二次输入密码
+AdminPassword=Dolibarr数据库所有者的密码。
 CreateDatabase=创建数据库
 CreateUser=创建所有者
 DatabaseSuperUserAccess=数据库服务器 - 超级用户
@@ -62,25 +62,25 @@ CheckToCreateDatabase=检查中，如果数据库不存在，必须创建。 <br
 CheckToCreateUser=如果数据库所有者复选框不存在，必须创建。 <br>在这种情况下，必须选择自己的登录名和密码，并填写在本页面底部的登录/为超级用户帐户的密码。如果此框未被选中，业主数据库及其密码必须存在。
 DatabaseRootLoginDescription=允许创建新的数据库或新用户，无用的，如果你的数据库和数据库登录已经存在就像当你在一个网站举办的托管服务提供商是（用户登录）。
 KeepEmptyIfNoPassword=给空如果用户没有密码（避免这种情况）
-SaveConfigurationFile=保存价值
-ConfigurationSaving=储蓄配置文件
+SaveConfigurationFile=保存参数
+ConfigurationSaving=保存配置文件
 ServerConnection=服务器连接
-DatabaseCreation=数据库的创建
-UserCreation=用户创建
-CreateDatabaseObjects=数据库对象的创建
-ReferenceDataLoading=数据加载参考
+DatabaseCreation=创建数据库
+UserCreation=创建用户
+CreateDatabaseObjects=创建数据库对象
+ReferenceDataLoading=加载演示数据
 TablesAndPrimaryKeysCreation=创建表和主键
-CreateTableAndPrimaryKey=创建表%s
-CreateOtherKeysForTable=创建外键和索引的表%s
-OtherKeysCreation=外键和索引创建
-FunctionsCreation=创造功能
-AdminAccountCreation=管理员登录创作
-PleaseTypePassword=请键入一个密码，空密码不得！
-PleaseTypeALogin=请输入登录！
-PasswordsMismatch=密码不同，请再试一次！
-SetupEnd=安装完
-SystemIsInstalled=此安装已完成。
-SystemIsUpgraded=Dolibarr已经升级成功。
+CreateTableAndPrimaryKey=创建表 %s
+CreateOtherKeysForTable=创建表的外键和索引 %s
+OtherKeysCreation=创建外键和索引
+FunctionsCreation=创建主功能
+AdminAccountCreation=创建管理员登入账号
+PleaseTypePassword=请输入密码，密码不得为空！
+PleaseTypeALogin=请登录！
+PasswordsMismatch=密码不正确，请重试！
+SetupEnd=安装完成
+SystemIsInstalled=本次安装已完成。
+SystemIsUpgraded=Dolibarr升级成功。
 YouNeedToPersonalizeSetup=您需要配置Dolibarr以满足您的需求（外观，功能，...).要做到这一点，请按照以下链接：
 AdminLoginCreatedSuccessfuly=Dolibarr管理员登录<b>'%s'</b>的创建successfuly。
 GoToDolibarr=前往Dolibarr
@@ -148,8 +148,8 @@ MigrationFinished=迁移完成
 LastStepDesc=<strong>最后一步</strong> ：此处定义的登录名和密码，您打算使用连接到软件。不松，因为它是帐户管理所有其他。
 ActivateModule=激活模块%s
 ShowEditTechnicalParameters=点击此处显示/编辑高级参数（专家模式）
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+WarningUpgrade=警告：\n您是否事先进行了数据库备份？\n强烈推荐先进行数据库备份！因为：在数据库中某些错误（如mysql 5.5.40/41/42/43版本中）可能导致在此过程中丢失部分数据或数据表。所以，在执行迁移时强烈建议进行一次完全数据备份。\n点击OK开始数据迁移进程...
+ErrorDatabaseVersionForbiddenForMigration=您的数据库版本为%s。此版本有关键性错误：如果进行数据结构调整（数据迁移过程必须调整数据结构），您会丢失数据。因此，直到您升级数据库到更高级无错误版本前，不允许迁移操作(已知有问题的版本列表：%s)
 
 #########
 # upgrade
@@ -201,7 +201,7 @@ MigrationProjectTaskTime=更新时间花费在几秒钟内
 MigrationActioncommElement=在行动上的更新数据
 MigrationPaymentMode=付款方式的数据迁移
 MigrationCategorieAssociation=迁移类别
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationReloadModule=Reload module %s
+MigrationEvents=迁移事件数据：将事件所有者数据添加到任务列表
+MigrationReloadModule=重载模块%s
 ShowNotAvailableOptions=显示不可用的选项
 HideNotAvailableOptions=隐藏不可用的选项
diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang
index 83f0849ed08..583d7308272 100644
--- a/htdocs/langs/zh_CN/languages.lang
+++ b/htdocs/langs/zh_CN/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=西班牙语（墨西哥）
 Language_es_PY=西班牙语（巴拉圭）
 Language_es_PE=西班牙语（秘鲁）
 Language_es_PR=西班牙语（波多黎各）
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=爱沙尼亚语
 Language_eu_ES=巴斯克
 Language_fa_IR=波斯语
diff --git a/htdocs/langs/zh_CN/loan.lang b/htdocs/langs/zh_CN/loan.lang
index 3c9838c3ea5..811d1c4c0df 100644
--- a/htdocs/langs/zh_CN/loan.lang
+++ b/htdocs/langs/zh_CN/loan.lang
@@ -1,48 +1,48 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-ShowLoanPayment=Show Loan Payment
-Capital=Capital
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
-LoanAccountancyCapitalCode=Accountancy code capital
-LoanAccountancyInsuranceCode=Accountancy code insurance
-LoanAccountancyInterestCode=Accountancy code interest
-LoanPayment=Loan payment
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
-ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
-ErrorLoanLength=Loan length has to be numeric and greater than zero.
-ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+Loan=贷款
+Loans=贷款
+NewLoan=新贷款
+ShowLoan=显示贷款
+PaymentLoan=贷款付款
+ShowLoanPayment=显示支付贷款
+Capital=资本
+Insurance=保险
+Interest=利率
+Nbterms=术语数
+LoanAccountancyCapitalCode=会计代码（资本）
+LoanAccountancyInsuranceCode=会计代码（保险）
+LoanAccountancyInterestCode=会计代码（利率）
+LoanPayment=贷款付款
+ConfirmDeleteLoan=确认删除本贷款
+LoanDeleted=成功删除贷款
+ConfirmPayLoan=确认支付本贷款
+LoanPaid=贷款已支付
+ErrorLoanCapital=贷款金额必须为数字且大于0
+ErrorLoanLength=贷款输入有误，必须为数字且大于0
+ErrorLoanInterest=年度利率必须为数字且大于0
 # Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Length of Mortgage
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
+LoanCalc=银行贷款计算器
+PurchaseFinanceInfo=购买及金融信息
+SalePriceOfAsset=资产出售价格
+PercentageDown=贬值比率
+LengthOfMortgage=质押期限
+AnnualInterestRate=年度利率
+ExplainCalculations=解释计算方式
+ShowMeCalculationsAndAmortization=显示计算结果及分期摊销
+MortgagePaymentInformation=抵押付款信息
+DownPayment=定金
 DownPaymentDesc=这个 <b>预付订金</b>（注：订金，根据中国现行法律的有关规定，其不具有定金，不是订金哦，其不具有定金的性质，只是单方行为，不具有明显的担保性质。交付订金的一方主张定金权利的，人民法院不予支持。 = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)这句数学没学好不译了：）
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+InterestRateDesc=<b>利率</b> = 按百分比显示的年度利率
+MonthlyFactorDesc=<b>月度因子</b> = 下列公式的结果
+MonthlyInterestRateDesc=<b>月度利率</b> = 年度利率除以12（按每年12个月计算）
+MonthTermDesc=贷款按每月计算的 <b>月限</b> =您借款年限乘以12
+MonthlyPaymentDesc=月度付款按以下公式计算
+AmortizationPaymentDesc= <a href="#摊销">摊销</a> 确定您每月支付的银行利息是多少，而本金又是多少。
+AmountFinanced=融资金额
+AmortizationMonthlyPaymentOverYears=月度付款的摊销：: <b>%s</b> 按 %s 年计算
+Totalsforyear=年度合计
+MonthlyPayment=月度付款
+LoanCalcDesc= <b>抵押计算器</b> 可以用来计算房屋抵押贷款中月度付款的金额（需要知道房屋出售价格、贷款条件、买家定金比例、贷款利率）。<br> 
 GoToInterest=%s will go towards INTEREST
 GoToPrincipal=%s will go towards PRINCIPAL
 YouWillSpend=You will spend %s on your house in year %s
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 23bf4028b7e..22783f18330 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=通过电子邮件发送成功验证
 MailUnsubcribe=退订
 Unsuscribe=退订
 MailingStatusNotContact=不要再联系
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=电子邮件收件人是空的
 WarningNoEMailsAdded=没有新的电子邮件添加到收件人的名单。
 ConfirmValidMailing=你确定要验证这个电子邮件？
@@ -95,14 +96,14 @@ NbSent=Nb sent
 # Libelle des modules de liste de destinataires mailing
 MailingModuleDescContactCompanies=所有第三方（联系客户，潜在客户，供应商，...）
 MailingModuleDescDolibarrUsers=用户与邮件全部Dolibarr
-MailingModuleDescFundationMembers=基金会成员与电子邮件
+MailingModuleDescFundationMembers=基础人员邮箱
 MailingModuleDescEmailsFromFile=从一个文本文件（电子邮件电子邮件，姓名或名称;姓;评论）
 MailingModuleDescEmailsFromUser=从用户输入的邮件（电子邮件名字;姓;其他）
 MailingModuleDescContactsCategories=第三方的电子邮件（按类别）
 MailingModuleDescDolibarrContractsLinesExpired=与合同到期的路线第三方
 MailingModuleDescContactsByCompanyCategory=联系第三方（第三方类）
 MailingModuleDescContactsByCategory=Contacts/addresses of third parties (by category)
-MailingModuleDescMembersCategories=基金会的成员（按类别）
+MailingModuleDescMembersCategories=基础会员 (按类别)
 MailingModuleDescContactsByFunction=第三方联系（职位/职务）
 LineInFile=在文件%s的线
 RecipientSelectionModules=为收件人的选择定义的要求
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index ee247a7f786..3fcb16c7535 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=单位价格（净值）
 UnitPriceTTC=单价
 PriceU=向上
 PriceUHT=不含税价格
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=金额
@@ -321,6 +322,9 @@ AmountTTCShort=金额（包括税）
 AmountHT=金额（税后）
 AmountTTC=金额（包括税）
 AmountVAT=增值税额
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=税额2
 AmountLT2=税额3
 AmountLT1ES=RE 额
@@ -335,6 +339,7 @@ Percentage=百分比
 Total=总
 SubTotal=小计
 TotalHTShort=共计（净额）
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=共有（包括税）
 TotalHT=共计（不含税）
 TotalHTforthispage=Total (net of tax) for this page
@@ -387,7 +392,7 @@ ContactsForCompany=联系方式/不会忽略这个第三者
 ContactsAddressesForCompany=这个第三方联系人/地址
 AddressesForCompany=这个第三方的地址
 ActionsOnCompany=关于这个第三方的行动
-ActionsOnMember=有关此成员的活动
+ActionsOnMember=有关此会员的活动
 NActions=%s的行动
 NActionsLate=%s的后期
 RequestAlreadyDone=Request already recorded
@@ -457,6 +462,7 @@ Datas=数据
 None=无
 NoneF=无
 Late=晚
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=图片
 Photos=图片
 AddPhoto=添加图片
@@ -539,6 +545,7 @@ NbOfCustomers=客户数量
 NbOfLines=线数
 NbOfObjects=数对象
 NbOfReferers=数引荐
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=总数量
 DateFromTo=从%s到%s
@@ -621,7 +628,7 @@ BuildDocuments=生成的文件
 UploadDisabled=上传禁用
 MenuECM=文件
 MenuAWStats=awstats的
-MenuMembers=成员
+MenuMembers=会员
 MenuAgendaGoogle=谷歌议程
 ThisLimitIsDefinedInSetup=Dolibarr限制（菜单家庭安装安全）：%s的Kb的，PHP的限制：%s的Kb的
 NoFileFound=在这个目录中保存任何文件
@@ -654,7 +661,7 @@ CoreErrorTitle=系统错误
 CoreErrorMessage=很抱歉，发生错误。检查日志或系统管理员联系。
 CreditCard=信用卡
 FieldsWithAreMandatory=与<b>%或学科</b>是强制性
-FieldsWithIsForPublic=<b>%与</b> s域的成员显示在公开名单。如果你不想要这个，检查“公共”框。
+FieldsWithIsForPublic= 公开显示<b>%s</b> 域的成员名单。如果你不想要这个，检查“公共”框。
 AccordingToGeoIPDatabase=（根据geoip的转换）
 Line=线
 NotSupported=不支持
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=链接到一个特定的用户
 DeleteAFile=删除文件
 ConfirmDeleteAFile=你确定要删除文件？
 NoResults=没有结果
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=模块工具
 Test=测试
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -772,7 +781,7 @@ Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
 SearchIntoContacts=Contacts
-SearchIntoMembers=Members
+SearchIntoMembers=会员
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
@@ -784,4 +793,4 @@ SearchIntoCustomerProposals=Customer proposals
 SearchIntoSupplierProposals=Supplier proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
-SearchIntoExpenseReports=Expense reports
+SearchIntoExpenseReports=HR费用报表
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 54b170cdb47..da3083cfe73 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -7,35 +7,35 @@ Member=会员
 Members=会员
 MemberAccount=会员登录
 ShowMember=出示会员卡
-UserNotLinkedToMember=用户成员没有联系
+UserNotLinkedToMember=用户是用户，会员是会员，成员是成员，半毛钱关系都没有
 ThirdpartyNotLinkedToMember=Third-party not linked to a member
-MembersTickets=成员的机票
-FundationMembers=基金会成员
+MembersTickets=会员票
+FundationMembers=基础会员
 Attributs=属性
 ErrorMemberTypeNotDefined=会员类型没有定义
 ListOfPublicMembers=市民名单
 ListOfValidatedPublicMembers=验证市民名单
-ErrorThisMemberIsNotPublic=该成员不公开
-ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成员（名称<b>：%s后</b> ，登录<b>：%s）</b>是已链接到第三方<b>的%s。</b>首先删除这个链接，因为一个第三方不能被链接到只有一个成员（反之亦然）。
+ErrorThisMemberIsNotPublic=该会员不公开
+ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成员 (名称： <b>%s</b> ，登录： <b>%s</b>) 是已链接到第三方<b>%s</b>。首先删除这个链接，因为一个第三方不能被链接到只有一个成员(反之亦然)。
 ErrorUserPermissionAllowsToLinksToItselfOnly=出于安全原因，您必须被授予权限编辑所有用户能够连接到用户的成员是不是你的。
 ThisIsContentOfYourCard=这是您的信用卡资料
 CardContent=内容您的会员卡
 SetLinkToUser=用户链接到Dolibarr
 SetLinkToThirdParty=链接到第三方Dolibarr
 MembersCards=议员打印卡
-MembersList=成员名单
-MembersListToValid=成员名单草案（待验证）
-MembersListValid=有效成员名单
-MembersListUpToDate=有效成员名单最新订阅
-MembersListNotUpToDate=有效成员名单之日起订阅了
-MembersListResiliated=resiliated成员名单
-MembersListQualified=合格成员名单
-MenuMembersToValidate=草案成员
-MenuMembersValidated=验证成员
-MenuMembersUpToDate=到今天为止成员
-MenuMembersNotUpToDate=过时成员
-MenuMembersResiliated=Resiliated成员
-MembersWithSubscriptionToReceive=接收与认购成员
+MembersList=会员名单
+MembersListToValid=会员名单草案 (待验证)
+MembersListValid=有效人员名录
+MembersListUpToDate=有效人员名单最新订阅
+MembersListNotUpToDate=名单内有效会员即日起订阅生效
+MembersListResiliated=弹性人员名录
+MembersListQualified=合格人员名单
+MenuMembersToValidate=待定会员
+MenuMembersValidated=认证会员
+MenuMembersUpToDate=新进人员
+MenuMembersNotUpToDate=老油条
+MenuMembersResiliated=弹性会员
+MembersWithSubscriptionToReceive=会员接受订阅
 DateAbonment=认购日期
 DateSubscription=认购日期
 DateNextSubscription=下一步订阅
@@ -48,9 +48,9 @@ NewType=新会员类型
 MemberType=会员类型
 MemberTypeId=会员类型ID
 MemberTypeLabel=会员类型标签
-MembersTypes=成员类型
-MembersAttributes=成员属性
-SearchAMember=搜索一个成员
+MembersTypes=会员类型
+MembersAttributes=会员属性
+SearchAMember=搜索会员
 MemberStatusDraft=草案（需要验证）
 MemberStatusDraftShort=草案
 MemberStatusActive=验证（等待订阅）
@@ -59,24 +59,24 @@ MemberStatusActiveLate=订阅过期
 MemberStatusActiveLateShort=过期
 MemberStatusPaid=认购最新
 MemberStatusPaidShort=截至日期
-MemberStatusResiliated=Resiliated成员
+MemberStatusResiliated=弹性会员
 MemberStatusResiliatedShort=Resiliated
-MembersStatusToValid=草案成员
-MembersStatusToValidShort=草案成员
-MembersStatusValidated=验证成员
+MembersStatusToValid=待定人员
+MembersStatusToValidShort=待定会员
+MembersStatusValidated=认证会员
 MembersStatusPaid=认购最新
 MembersStatusPaidShort=截至日期
 MembersStatusNotPaid=认购过时
 MembersStatusNotPaidShort=过时
-MembersStatusResiliated=Resiliated成员
-MembersStatusResiliatedShort=Resiliated成员
+MembersStatusResiliated=兼职人员
+MembersStatusResiliatedShort=弹性会员
 NewCotisation=新的贡献
 PaymentSubscription=支付的新贡献
 EditMember=编辑委员
 SubscriptionEndDate=认购的结束日期
-MembersTypeSetup=成员类型设置
+MembersTypeSetup=会员类型设定
 NewSubscription=新的订阅
-NewSubscriptionDesc=这种形式可以让你记录你的订阅为基础的新成员。如果你想续订（如果已经是会员），请联系，而不是通过电子邮件%s基金会董事会。
+NewSubscriptionDesc=这种形式可以让你记录你的订阅为基础的新会员。如果你想续订(如果已经是会员)，请联系，而不是通过电子邮件%s 基金会董事会。
 Subscription=订阅
 Subscriptions=订阅
 SubscriptionLate=晚
@@ -86,36 +86,36 @@ SubscriptionNotReceivedShort=从未收到
 ListOfSubscriptions=订阅名单
 SendCardByMail=发送卡
 AddMember=Create member
-NoTypeDefinedGoToSetup=任何成员类型定义。前往设置 - 会员类型
+NoTypeDefinedGoToSetup=任何会员类型定义。前往设置 - 会员类型
 NewMemberType=新会员类型
 WelcomeEMail=欢迎电子邮件
 SubscriptionRequired=认购要求
-EditType=编辑成员类型
+EditType=编辑会员类型
 DeleteType=删除
 VoteAllowed=允许投票
 Physical=物理
 Moral=道德
 MorPhy=道德/物理
 Reenable=重新启用
-ResiliateMember=Resiliate成员
+ResiliateMember=弹性会员
 ConfirmResiliateMember=你确定要resiliate该会员？
-DeleteMember=删除成员
-ConfirmDeleteMember=你确定要删除这个会员（删除一个成员将删除他的所有订阅）？
+DeleteMember=删除会员
+ConfirmDeleteMember=你确定要删除这个会员(删除一个会员将删除他的所有订阅) ？
 DeleteSubscription=删除订阅
 ConfirmDeleteSubscription=你确定要删除这个订阅？
 Filehtpasswd=htpasswd文件
 ValidateMember=验证会员
-ConfirmValidateMember=你确定要验证这个成员？
+ConfirmValidateMember=你确定要验证这个会员？
 FollowingLinksArePublic=下面的链接是没有任何Dolibarr权限保护打开的网页。他们不是格式化网页，提供的例子，说明如何列出成员数据库。
-PublicMemberList=公共成员名单
+PublicMemberList=公共会员名录
 BlankSubscriptionForm=认购表格
 BlankSubscriptionFormDesc=dolibarr可以为您提供一个公共URL允许外部访问者问到订阅的基础。如果启用在线支付模块，付款方式也将被自动提供。
 EnablePublicSubscriptionForm=让市民自动认购表格
 MemberPublicLinks=公共林克斯/页
-ExportDataset_member_1=成员和订阅
-ImportDataset_member_1=成员
-LastMembers=上次%s成员
-LastMembersModified=最后%S修饰成员
+ExportDataset_member_1=会员和订阅
+ImportDataset_member_1=会员
+LastMembers=上一位 %s 会员
+LastMembersModified=最后 %s 修改的成员
 LastSubscriptionsModified=最后%s修改订阅
 AttributeName=属性名称
 String=弦
@@ -140,14 +140,14 @@ DescADHERENT_MAIL_RESIL_SUBJECT=电邮题目会员resiliation
 DescADHERENT_MAIL_RESIL=电子邮箱会员resiliation
 DescADHERENT_MAIL_FROM=发件人的电子邮件自动电子邮件
 DescADHERENT_ETIQUETTE_TYPE=标签的格式页
-DescADHERENT_ETIQUETTE_TEXT=文本打印成员地址表
+DescADHERENT_ETIQUETTE_TEXT=文本打印会员地址表
 DescADHERENT_CARD_TYPE=卡的格式页
 DescADHERENT_CARD_HEADER_TEXT=文字印在会员卡顶部
 DescADHERENT_CARD_TEXT=文字印在（会员卡，左对齐）
 DescADHERENT_CARD_TEXT_RIGHT=文字印在（会员卡对齐右）
 DescADHERENT_CARD_FOOTER_TEXT=文字印在会员卡的底部
 GlobalConfigUsedIfNotDefined=如果这里没有定义，将用于基础模块设置中定义的文本
-MayBeOverwrited=这段文字可以为成员的类型定义的值overwrited
+MayBeOverwrited=此 text 文本能够通过定义会员类型参数值来重写
 ShowTypeCard=显示类型'%s'
 HTPasswordExport=htpassword文件生成
 NoThirdPartyAssociatedToMember=无关联的第三方该会员
@@ -159,31 +159,31 @@ MoreActionBankDirect=创建一个直接交易记录的帐户
 MoreActionBankViaInvoice=创建发票和付款帐户
 MoreActionInvoiceOnly=创建一个没有付款发票
 LinkToGeneratedPages=生成访问卡
-LinkToGeneratedPagesDesc=这个屏幕允许你生成你所有的成员或某成员的名片PDF文件。
-DocForAllMembersCards=成员（名片格式生成所有输出实际上设置<b>：%s）</b>
-DocForOneMemberCards=设置<b>：%s</b>生成名片输出实际上是一个特定的成员（格式）
+LinkToGeneratedPagesDesc=这个界面可让你生成所有的成员或单一会员的名片的PDF文件。
+DocForAllMembersCards=为所有成员生成名片
+DocForOneMemberCards=为特定成员生成名片
 DocForLabels=生成报告表（格式输出实际上设置<b>：%s）</b>
 SubscriptionPayment=认购款项
 LastSubscriptionDate=最后认购日期
 LastSubscriptionAmount=最后认购金额
-MembersStatisticsByCountries=成员由国家统计
+MembersStatisticsByCountries=按国别统计人员
 MembersStatisticsByState=成员由州/省的统计信息
-MembersStatisticsByTown=成员由镇统计
+MembersStatisticsByTown=按村镇统计人员
 MembersStatisticsByRegion=Members statistics by region
 MemberByRegion=Members by region
-NbOfMembers=成员数
-NoValidatedMemberYet=没有验证的成员发现
-MembersByCountryDesc=该屏幕显示您成员国的统计数字。然而，图形取决于谷歌在线图服务，可只有一个互联网连接工作。
-MembersByStateDesc=此屏幕显示你的统计，成员由州/省/州。
-MembersByTownDesc=该屏幕显示您的成员由镇统计。
+NbOfMembers=人员数量
+NoValidatedMemberYet=发现未经验证的成员
+MembersByCountryDesc=这个界面显示按国别统计人员的数据。图形依赖于谷歌在线图形服务，因此当然需要连网才能正常工作。
+MembersByStateDesc=此界面显示按省/市/村镇统计人员的数据。
+MembersByTownDesc=此界面显示按村镇统计人员的数据。
 MembersStatisticsDesc=选择你想读的统计...
 MenuMembersStats=统计
-LastMemberDate=最后一个成员日期
+LastMemberDate=最后成员日期
 Nature=性质
 Public=信息是公开的
 Exports=出口
-NewMemberbyWeb=增加了新成员。等待批准
-NewMemberForm=新成员的形式
+NewMemberbyWeb=增加了新成员。等待批准中
+NewMemberForm=新成员申请表
 SubscriptionsStatistics=统计数据上的订阅
 NbOfSubscriptions=订阅数
 AmountOfSubscriptions=订阅金额
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index e6abec91351..04c05b02663 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -69,7 +69,7 @@ PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr是紧凑型的ERP / CRM的几个功能模块组成。一个演示，其中包括所有模块并不意味着什么，因为这永远不会发生。因此，一些演示配置文件都可用。
 ChooseYourDemoProfil=演示材选择符合您的活动...
-DemoFundation=一个基金会管理成员
+DemoFundation=基础会员管理
 DemoFundation2=管理成员及银行账户的基础
 DemoCompanyServiceOnly=管理一特约销售服务活动只
 DemoCompanyShopWithCashDesk=管理与现金办公桌店
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 3720b4817a7..b5e060cd79f 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index d2faf9e2eab..113639d225b 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=项目
 Projects=项目
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=每个人
 PrivateProject=项目联系人
@@ -19,7 +20,7 @@ TasksPublicDesc=这种观点提出的所有项目，您可阅读任务。
 TasksDesc=这种观点提出的所有项目和任务（您的用户权限批准你认为一切）。
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=项目领域
+ProjectsArea=Projects Area
 NewProject=新项目
 AddProject=Create project
 DeleteAProject=删除一个项目
@@ -67,6 +68,7 @@ Activities=任务/活动
 MyActivity=我的活动
 MyActivities=我的任务/活动
 MyProjects=我的项目
+MyProjectsArea=My projects Area
 DurationEffective=有效时间
 Progress=进展
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/zh_CN/receiptprinter.lang b/htdocs/langs/zh_CN/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/zh_CN/receiptprinter.lang
+++ b/htdocs/langs/zh_CN/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 1691d6dee50..a42828b0988 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -34,7 +34,8 @@ LastMovements=最后动作
 Units=单位
 Unit=单位
 StockCorrection=正确的股票
-StockTransfer=Stock movement
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
 LabelMovement=转移标签
diff --git a/htdocs/langs/zh_CN/supplier_proposal.lang b/htdocs/langs/zh_CN/supplier_proposal.lang
index 2b4e770d139..700799ce245 100644
--- a/htdocs/langs/zh_CN/supplier_proposal.lang
+++ b/htdocs/langs/zh_CN/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang
index 52840280ce6..de93b662c9f 100644
--- a/htdocs/langs/zh_CN/trips.lang
+++ b/htdocs/langs/zh_CN/trips.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - trips
 ExpenseReport=Expense report
-ExpenseReports=Expense reports
+ExpenseReports=HR费用报表
 Trip=Expense report
-Trips=Expense reports
+Trips=HR费用报表
 TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index 16d2c2fa76f..ae6229165c3 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -106,8 +106,8 @@ NewGroupCreated=集团创建%s的
 GroupModified=Group %s modified
 GroupDeleted=群组%s删除
 ConfirmCreateContact=你确定要为此创造联系Dolibarr帐户？
-ConfirmCreateLogin=你确定要创建该成员成为Dolibarr帐户？
-ConfirmCreateThirdParty=你确定要创建该成员成为第三者？
+ConfirmCreateLogin=你确定要给该成员创建Dolibarr登陆帐号吗？
+ConfirmCreateThirdParty=你确定要创建该成员成为客户？
 LoginToCreate=登录创建
 NameToCreate=第三党的名称创建
 YourRole=您的角色
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 87e3200f57c..9f6c10745fb 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -34,6 +34,7 @@ AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Breakdown
 
+MenuAccountancy=Accountancy
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
@@ -46,7 +47,7 @@ UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
 Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+AccountBalance=Account balance
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
@@ -103,6 +104,7 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
+NumPiece=Piece number
 
 DelBookKeeping=Delete the records of the general ledger
 
@@ -151,6 +153,8 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
+
 ##Export Journal Feature
 ExportFormat=Format of Export
 Prefixname=Prefix of export File
@@ -163,7 +167,8 @@ Type=Type of fields
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
-EnabledVat=In Vat
+EnabledVat=In VAT
+
 ## 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 accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 2591bd868b3..c9e4b927ec1 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -154,6 +154,7 @@ Purge=Purge
 PurgeAreaDesc=此頁面允許您刪除所有文件或目錄建立存儲<b>Dolibarr（%s</b>或臨時文件中的所有文件）。使用此功能是沒有必要的。它為用戶提供的Dolibarr是由供應商，不提供刪除權限由Web服務器建立檔案託管。
 PurgeDeleteLogFile=刪除日誌文件<b>%s的</b>定義系統日誌模組（無數據風險松）
 PurgeDeleteTemporaryFiles=刪除所有臨時文件（不鬆散數據的風險）
+PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=刪除所有文件目錄<b>%s。</b>臨時文件，而且文件附加到元素（第三方發票，...），進入流腦模組上傳將被刪除。
 PurgeRunNow=現在清除
 PurgeNothingToDelete=沒有目錄或文件刪除。
@@ -1090,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1640,6 +1641,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
+IsHidden=Is not visible
 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
@@ -1664,7 +1666,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 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 only manual steps a privileged user can do.
 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.
-ConfFileMuseContainCustom=Installing an external module from application 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 have option<br>- <strong>$dolibarr_main_url_root_alt</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
+ConfFileMuseContainCustom=Installing an external module from application 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 have option<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 (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1709,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 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 http://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 it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://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.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index a11cdef4223..b1736c1f2f7 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -58,6 +58,7 @@ Payment=付款
 PaymentBack=付款回
 Payments=付款
 PaymentsBack=付款回
+paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=刪除付款
 ConfirmDeletePayment=你確定要刪除這個付款？
@@ -106,6 +107,7 @@ EnterPaymentDueToCustomer=由於客戶的付款
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=價格基準
 BillStatus=發票狀態
+StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=草案（等待驗證）
 BillStatusPaid=支付
 BillStatusPaidBackOrConverted=支付或轉換成折扣
@@ -139,6 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=錯誤，無法取消一個已
 BillFrom=From
 BillTo=Bill To
 ActionsOnBill=行動對發票
+RecurringInvoiceTemplate=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=新建發票(invoice)
 LastBills=上次%s的發票
 LastCustomersBills=上次%s的客戶發票
@@ -199,6 +205,7 @@ Rest=Pending
 AmountExpected=索賠額
 ExcessReceived=收到過剩
 EscompteOffered=折扣額（任期前付款）
+EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=常年訂單
@@ -305,7 +312,19 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+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
+DateLastGeneration=Date of last generation
+MaxPeriodNumber=Max nb of invoice generation
+RestPeriodNumber=Rest period number
+NbOfGenerationDone=Nb of invoice generation already done
+InvoiceAutoValidate=Automatically validate invoice
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not yet reached
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
 PaymentConditionShortRECEP=即時
 PaymentConditionRECEP=即時
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 7fbb0b46479..135b3fe6157 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -60,6 +60,8 @@ BoxTitleLastContracts=上次%的承
 BoxTitleLastModifiedDonations=最後更新的捐款清單
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good Customers
+BoxTitleGoodCustomers=%s Good Customers
 FailedToRefreshDataInfoNotUpToDate=無法刷新的RSS流量。上次成功刷新日期：%s
 LastRefreshDate=最後更新日期
 NoRecordedBookmarks=沒有書簽定義。點擊<a href="%s">這裏</a>添加書簽。
@@ -95,4 +97,4 @@ ForCustomersInvoices=客戶的發票
 ForCustomersOrders=Customers orders
 ForProposals=建議
 LastXMonthRolling=The last %s month rolling
-ChooseBoxToAdd=Choose a box to add
+ChooseBoxToAdd=Add a box to your dashboard...
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 750dfc72a9f..a9d6adf3476 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -202,6 +202,12 @@ ProfId3IN=教授ID已3
 ProfId4IN=ID四教授
 ProfId5IN=教授標識5
 ProfId6IN=-
+ProfId1LU=Id. prof. 1 (RCS)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=-
+ProfId6LU=-
 ProfId1MA=ID教授。 1（RC）的
 ProfId2MA=ID教授。 2（Patente）
 ProfId3MA=ID教授。 3（如果）
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index b73b8043d57..3cc45865195 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -221,3 +221,4 @@ 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
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index 37d2f27be45..c6b4e27c20e 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -16,6 +16,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch 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 environement you can use Scheduled task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Scheduled jobs
 CronListActive=List of enabled/scheduled jobs
@@ -39,7 +40,8 @@ CronNone=無
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
 CronFrequency=Frequency
 CronClass=Class
 CronMethod=方法
@@ -68,7 +70,6 @@ CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=禁用
 CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
 CronId=Id
 CronClassFile=Classes (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
@@ -89,3 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
 TaskDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump
diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index 58087fefed4..c0b1ce638dd 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -32,6 +32,7 @@ Language_es_MX=西班牙語（墨西哥）
 Language_es_PY=西班牙语 (巴拉圭)
 Language_es_PE=西班牙语 (秘鲁)
 Language_es_PR=西班牙語（波多黎各）
+Language_es_VE=Spanish (Venezuela)
 Language_et_EE=爱沙尼亚语
 Language_eu_ES=巴斯克
 Language_fa_IR=波斯語
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 4f4e28ce293..151de7d040f 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -47,6 +47,7 @@ MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 Unsuscribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=電子郵件收件人是空的
 WarningNoEMailsAdded=沒有新的電子郵件添加到收件人的名單。
 ConfirmValidMailing=你確定要驗證這個電子郵件？
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index f90eb0ce70c..af04a545443 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -311,6 +311,7 @@ UnitPriceHT=單位價格（凈值）
 UnitPriceTTC=單價
 PriceU=向上
 PriceUHT=不含稅價格
+PriceUHTCurrency=U.P (currency)
 SupplierProposalUHT=U.P. net Requested
 PriceUTTC=U.P. (inc. tax)
 Amount=總額
@@ -321,6 +322,9 @@ AmountTTCShort=金額（含稅）
 AmountHT=金額（不含稅）
 AmountTTC=金額（含稅）
 AmountVAT=營業稅金額
+MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=稀土額
@@ -335,6 +339,7 @@ Percentage=百分比
 Total=總計
 SubTotal=小計
 TotalHTShort=共計（凈額）
+TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=共有（包括稅）
 TotalHT=共計（不含稅）
 TotalHTforthispage=Total (net of tax) for this page
@@ -457,6 +462,7 @@ Datas=數據
 None=無
 NoneF=無
 Late=最新
+LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=圖片
 Photos=圖片
 AddPhoto=添加圖片
@@ -539,6 +545,7 @@ NbOfCustomers=客戶數
 NbOfLines=行數
 NbOfObjects=物件數
 NbOfReferers=參照數
+NbOfObjectReferers=Number of refering objects
 Referers=Refering objects
 TotalQuantity=總數量
 DateFromTo=從%s到%s
@@ -694,6 +701,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
 DeleteAFile=Delete a file
 ConfirmDeleteAFile=Are you sure you want to delete file
 NoResults=No results
+AdminTools=Admin tools
 SystemTools=System tools
 ModulesSystemTools=Modules tools
 Test=Test
@@ -732,7 +740,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
-
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
 Monday=星期一
 Tuesday=星期二
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 937013628a5..32e6e29d69d 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -295,7 +295,11 @@ ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+AddVariable=Add Variable
+AddUpdater=Add Updater
 GlobalVariables=Global variables
+VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
@@ -313,3 +317,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 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...
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 184201afe31..fb2328ce869 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -5,6 +5,7 @@ ProjectId=Project Id
 ProjectLabel=Project label
 Project=項目
 Projects=項目
+ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=每個人
 PrivateProject=項目聯系人
@@ -19,7 +20,7 @@ TasksPublicDesc=這種觀點提出的所有項目，您可閱讀任務。
 TasksDesc=這種觀點提出的所有項目和任務（您的用戶權限批準你認為一切）。
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=項目領域
+ProjectsArea=Projects Area
 NewProject=新項目
 AddProject=Create project
 DeleteAProject=刪除一個項目
@@ -67,6 +68,7 @@ Activities=任務/活動
 MyActivity=我的活動
 MyActivities=我的任務/活動
 MyProjects=我的項目
+MyProjectsArea=My projects Area
 DurationEffective=有效時間
 Progress=進展
 ProgressDeclared=Declared progress
@@ -183,6 +185,9 @@ TaskAssignedToEnterTime=Task assigned. Entering time on this task should be poss
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
+OnlyOpportunitiesShort=Only opportunities
+OpenedOpportunitiesShort=Opened opportunities
+NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/zh_TW/receiptprinter.lang b/htdocs/langs/zh_TW/receiptprinter.lang
index 28b63d7de79..7b52f072eaf 100644
--- a/htdocs/langs/zh_TW/receiptprinter.lang
+++ b/htdocs/langs/zh_TW/receiptprinter.lang
@@ -1,8 +1,10 @@
 # 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 printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 426c772d93c..520f864acac 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -16,7 +16,7 @@ CancelSending=取消發送
 DeleteSending=刪除發送
 Stock=庫存
 Stocks=庫存
-StocksByLotSerial=Stock by lot/serial
+StocksByLotSerial=Stocks by lot/serial
 Movement=轉讓
 Movements=轉讓
 ErrorWarehouseRefRequired=倉庫引用的名稱是必需的
@@ -34,9 +34,10 @@ LastMovements=最新異動清單
 Units=單位
 Unit=單位
 StockCorrection=修正庫存數
-StockTransfer=Stock transfer
-StockMovement=轉讓
-StockMovements=庫存轉讓
+StockTransfer=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
 LabelMovement=Movement label
 NumberOfUnit=單位數目
 UnitPurchaseValue=Unit purchase price
@@ -53,8 +54,8 @@ QtyDispatched=派出數量
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=聯合調度
-RuleForStockManagementDecrease=<b>啟用或關閉庫存減少的管理規則</b>
-RuleForStockManagementIncrease=<b>啟用或關閉庫存增加的管理規則</b>
+RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=在供應商發票(invoice)或票據(Credit notes)驗證後，減少實際庫存量
 DeStockOnValidateOrder=在客戶訂單驗證後，減少實際庫存量
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -83,8 +84,8 @@ WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/se
 AverageUnitPricePMPShort=投入品平均價格
 AverageUnitPricePMP=投入品平均價格
 SellPriceMin=銷售單價
-EstimatedStockValueSellShort=庫存已銷售值
-EstimatedStockValueSell=庫存已銷售值
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
 EstimatedStockValueShort=估計的庫存價值
 EstimatedStockValue=估計的庫存價值
 DeleteAWarehouse=刪除倉庫
@@ -113,7 +114,7 @@ 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), and suggest you to create supplier orders to fill the difference.
+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 supplier orders to fill the difference.
 ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened 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)
diff --git a/htdocs/langs/zh_TW/supplier_proposal.lang b/htdocs/langs/zh_TW/supplier_proposal.lang
index b95e9f17180..1a1bdc4df16 100644
--- a/htdocs/langs/zh_TW/supplier_proposal.lang
+++ b/htdocs/langs/zh_TW/supplier_proposal.lang
@@ -7,6 +7,7 @@ CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
+SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 082e94f09c0..cd239265054 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code

From 82f57b2ccf8547dfad3c6e8d50970d92821e36bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 20:05:25 +0100
Subject: [PATCH 247/421] Better position for modules

---
 htdocs/core/modules/modExport.class.php | 6 ++++--
 htdocs/core/modules/modImport.class.php | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index d57657c3204..cb3d104e096 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -44,13 +44,15 @@ class modExport extends DolibarrModules
 		$this->numero = 240;
 
 		$this->family = "technic";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->module_position = 520;
+        // 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 = "Outils d'exports de donnees Dolibarr (via un assistant)";
+		// Possible values for version are: 'experimental' or 'dolibarr' or version
 		$this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;
-		$this->picto='technic';
+		$this->picto = 'technic';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/export/temp");
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index ebcd5363e21..63af9dc9064 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -44,7 +44,8 @@ class modImport extends DolibarrModules
 		$this->numero = 250;
 
 		$this->family = "technic";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->module_position = 510;
+        // 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 = "Outils d'imports de donnees Dolibarr (via un assistant)";
 		// Possible values for version are: 'experimental' or 'dolibarr' or version

From 6002897976ce2b8027e3e8c46f7e7aad726861d2 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Fri, 19 Feb 2016 19:47:47 +0100
Subject: [PATCH 248/421] Fix line fetch not converting dates

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

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5b5fe89fc7d..423fff2f21f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1413,8 +1413,8 @@ class Propal extends CommonObject
                         $line->fk_product_type  = $objp->fk_product_type;
 	                    $line->fk_unit          = $objp->fk_unit;
 
-                        $line->date_start  		= $objp->date_start;
-                        $line->date_end  		= $objp->date_end;
+                        $line->date_start  		= $this->db->jdate($objp->date_start);
+                        $line->date_end  		= $this->db->jdate($objp->date_end);
 
 
 						// Multicurrency

From 7765e37101dd6c56c0e4dfb3c331682346c5cd86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Feb 2016 21:09:36 +0100
Subject: [PATCH 249/421] Better support of option SOCIETE_SORT_ON_TYPEENT

---
 htdocs/admin/dict.php                        | 12 ++++++------
 htdocs/core/class/html.form.class.php        |  2 +-
 htdocs/core/class/html.formcompany.class.php |  2 +-
 htdocs/societe/soc.php                       |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index aac782cb37b..bd301ca80f2 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -155,7 +155,7 @@ $tabsql[4] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.favorite FRO
 $tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM ".MAIN_DB_PREFIX."c_civility AS c";
 $tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a";
 $tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1";
-$tabsql[8] = "SELECT t.id    as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid";
+$tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.position, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid";
 $tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAIN_DB_PREFIX."c_currencies AS c";
 $tabsql[10]= "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
@@ -188,7 +188,7 @@ $tabsqlsort[4] ="code ASC";
 $tabsqlsort[5] ="label ASC";
 $tabsqlsort[6] ="a.type ASC, a.module ASC, a.position ASC, a.code ASC";
 $tabsqlsort[7] ="country ASC, code ASC, a.libelle ASC";
-$tabsqlsort[8] ="country DESC, libelle ASC";
+$tabsqlsort[8] ="country DESC,".(! empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?' t.position ASC,':'')." libelle ASC";
 $tabsqlsort[9] ="label ASC";
 $tabsqlsort[10]="country ASC, code ASC, taux ASC, recuperableonly ASC, localtax1 ASC, localtax2 ASC";
 $tabsqlsort[11]="element ASC, source ASC, code ASC";
@@ -221,7 +221,7 @@ $tabfield[4] = "code,label";
 $tabfield[5] = "code,label";
 $tabfield[6] = "code,libelle,type,color,position";
 $tabfield[7] = "code,libelle,country,accountancy_code,deductible";
-$tabfield[8] = "code,libelle,country_id,country";
+$tabfield[8] = "code,libelle,country_id,country".(! empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?',position':'');
 $tabfield[9] = "code,label,unicode";
 $tabfield[10]= "country_id,country,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[11]= "element,source,code,libelle";
@@ -254,7 +254,7 @@ $tabfieldvalue[4] = "code,label";
 $tabfieldvalue[5] = "code,label";
 $tabfieldvalue[6] = "code,libelle,type,color,position";
 $tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible";
-$tabfieldvalue[8] = "code,libelle,country";
+$tabfieldvalue[8] = "code,libelle,country".(! empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?',position':'');
 $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10]= "country,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[11]= "element,source,code,libelle";
@@ -287,7 +287,7 @@ $tabfieldinsert[4] = "code,label";
 $tabfieldinsert[5] = "code,label";
 $tabfieldinsert[6] = "code,libelle,type,color,position";
 $tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible";
-$tabfieldinsert[8] = "code,libelle,fk_country";
+$tabfieldinsert[8] = "code,libelle,fk_country".(! empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?',position':'');
 $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10]= "fk_pays,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[11]= "element,source,code,libelle";
@@ -388,7 +388,7 @@ $tabhelp[4]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[5]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[6]  = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[7]  = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[8]  = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[8]  = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[9]  = array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency"));
 $tabhelp[10] = array('code'=>$langs->trans("EnterAnyCode"), 'taux'=>$langs->trans("SellTaxRate"), 'recuperableonly'=>$langs->trans("RecuperableOnly"), 'localtax1_type'=>$langs->trans("LocalTaxDesc"), 'localtax2_type'=>$langs->trans("LocalTaxDesc"));
 $tabhelp[11] = array();
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index defc9a88e3f..80015e1725a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4639,7 +4639,7 @@ class Form
      *	@param  int				$translate		Translate and encode value
      * 	@param	int				$maxlen			Length maximum for labels
      * 	@param	int				$disabled		Html select box is disabled
-     *  @param	string			$sort			'ASC' or 'DESC' = Sort on label, '' or 'NONE' = Do not sort
+     *  @param	string			$sort			'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order
      *  @param	string			$morecss		Add more class to css styles
      *  @param	int				$addjscombo		Add js combo
      *  @param  string          $moreparamonempty   Add more param on the empty option line. Not used if show_empty not set.
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 40276b6205d..0095469c31c 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -65,7 +65,7 @@ class FormCompany
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
 		$sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
 		if ($filter) $sql.=" ".$filter;
-		$sql.= " ORDER by id";
+		$sql.= " ORDER by position, id";
 		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 1d269753536..ae18fa1890f 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1154,7 +1154,8 @@ else
 
         // Type - Size
         print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td>'."\n";
-        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));
+        $sortparam=(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), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
         if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
         print '</td>';
         print '<td>'.fieldLabel('Staff','effectif_id').'</td><td>';

From b7d99271f86f2d6cedc87f31620b96168f5b071c Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 19 Feb 2016 22:25:59 +0100
Subject: [PATCH 250/421] New add multicurrency on supplier order

---
 htdocs/core/class/commonobject.class.php      |  2 +-
 .../fourn/class/fournisseur.facture.class.php | 67 ++++++++++++-
 htdocs/fourn/facture/card.php                 | 98 ++++++++++++++++++-
 3 files changed, 162 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 70a51d2f8fd..51acd7d901a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1499,7 +1499,7 @@ abstract class CommonObject
 								$this->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options, $line->ref_fourn);
 								break;
 							case 'order_supplier':
-								$r = $this->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,  $line->product_type, false, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit);
+								$this->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,  $line->product_type, false, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit);
 								break;
 							default:
 								dol_syslog(get_class($this).'::setMulticurrencyRate no updateline defined', LOG_DEBUG);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 52c35040d2b..6c49ee7dda0 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -31,7 +31,7 @@
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
  *	Class to manage suppliers invoices
@@ -118,6 +118,14 @@ class FactureFournisseur extends CommonInvoice
 
     var $extraparams=array();
 
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_tx;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
+	
     /**
 	 *	Constructor
 	 *
@@ -162,6 +170,16 @@ class FactureFournisseur extends CommonInvoice
         $amount = $this->amount;
         $remise = $this->remise;
 
+		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = $conf->currency;
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
+
         $this->db->begin();
 
         if (! $remise) $remise = 0 ;
@@ -184,6 +202,9 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ", fk_user_author";
         $sql.= ", date_lim_reglement";
 		$sql.= ", fk_incoterms, location_incoterms";
+        $sql.= ", fk_multicurrency";
+        $sql.= ", multicurrency_code";
+        $sql.= ", multicurrency_tx";
         $sql.= ")";
         $sql.= " VALUES (";
 		$sql.= "'(PROV)'";
@@ -203,6 +224,9 @@ class FactureFournisseur extends CommonInvoice
         $sql.= $this->date_echeance!=''?"'".$this->db->idate($this->date_echeance)."'":"null";
 		$sql.= ", ".(int) $this->fk_incoterms;
         $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", ".(int) $this->fk_multicurrency;
+		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql.= ", ".(double) $this->multicurrency_tx;
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -375,7 +399,8 @@ class FactureFournisseur extends CommonInvoice
         $sql.= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle,";
         $sql.= ' s.nom as socnom, s.rowid as socid,';
         $sql.= ' t.fk_incoterms, t.location_incoterms,';
-        $sql.= " i.libelle as libelle_incoterms";
+        $sql.= " i.libelle as libelle_incoterms,";
+        $sql.= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON (t.fk_cond_reglement = cr.rowid)";
@@ -445,6 +470,14 @@ class FactureFournisseur extends CommonInvoice
 				$this->location_incoterms = $obj->location_incoterms;
 				$this->libelle_incoterms = $obj->libelle_incoterms;
 
+				// Multicurrency
+				$this->fk_multicurrency 		= $obj->fk_multicurrency;
+				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->multicurrency_tx 		= $obj->multicurrency_tx;
+				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				
                 $this->extraparams			= (array) json_decode($obj->extraparams, true);
 
                 $this->socid  = $obj->socid;
@@ -496,6 +529,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
         $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
         $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
+		$sql.= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
         $sql.= ' WHERE fk_facture_fourn='.$this->id;
@@ -547,6 +581,14 @@ class FactureFournisseur extends CommonInvoice
                     $line->rang       		= $obj->rang;
                     $line->fk_unit           = $obj->fk_unit;
 
+					// Multicurrency
+					$line->fk_multicurrency 		= $objp->fk_multicurrency;
+					$line->multicurrency_code 		= $objp->multicurrency_code;
+					$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+					$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+					$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+					$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+				
 	                $this->lines[$i] = $line;
 
                     $i++;
@@ -1271,7 +1313,7 @@ class FactureFournisseur extends CommonInvoice
         $localtaxes_type=getLocalTaxesFromRate($vatrate,0,$mysoc, $this->thirdparty);
         $txtva = preg_replace('/\s*\(.*\)/','',$txtva);  // Remove code into vatrate.
         
-        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
+        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx);
         $total_ht  = $tabprice[0];
         $total_tva = $tabprice[1];
         $total_ttc = $tabprice[2];
@@ -1280,6 +1322,12 @@ class FactureFournisseur extends CommonInvoice
         $pu_ttc = $tabprice[5];
         $total_localtax1 = $tabprice[9];
         $total_localtax2 = $tabprice[10];
+		
+		// MultiCurrency
+		$multicurrency_total_ht  = $tabprice[16];
+        $multicurrency_total_tva = $tabprice[17];
+        $multicurrency_total_ttc = $tabprice[18];
+			
         if (empty($info_bits)) $info_bits=0;
 
         if ($idproduct)
@@ -1321,6 +1369,12 @@ class FactureFournisseur extends CommonInvoice
 	    $line->fk_unit = $fk_unit;
 	    $line->array_options = $array_options;
 
+		// Multicurrency
+		$line->multicurrency_subprice	= price2num($line->subprice * $this->multicurrency_tx);
+		$line->multicurrency_total_ht 	= $multicurrency_total_ht;
+        $line->multicurrency_total_tva 	= $multicurrency_total_tva;
+        $line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+
 	    $res = $line->update($notrigger);
 
 	    if ($res < 1) {
@@ -2163,6 +2217,13 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql.= ", product_type = ".$this->product_type;
 		$sql.= ", info_bits = ".$this->info_bits;
 		$sql.= ", fk_unit = ".$fk_unit;
+		
+		// Multicurrency
+		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+        
 		$sql.= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 518f09b5316..6860d5b6bb6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -261,6 +261,16 @@ if (empty($reshook))
 	{
 	    $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
 	}
+	
+	// Multicurrency Code
+	else if ($action == 'setmulticurrencycode' && $user->rights->facture->creer) {
+		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
+	}
+
+	// Multicurrency rate
+	else if ($action == 'setmulticurrencyrate' && $user->rights->facture->creer) {
+		$result = $object->setMulticurrencyRate(GETPOST('multicurrency_tx', 'int'));
+	}
 
 	// bank account
 	else if ($action == 'setbankaccount' && $user->rights->fournisseur->facture->creer) {
@@ -368,6 +378,8 @@ if (empty($reshook))
 	        $object->fk_project    = ($tmpproject > 0) ? $tmpproject : null;
 			$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 	        $object->location_incoterms = GETPOST('location_incoterms', 'alpha');
+			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+			$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
 
 			// Auto calculation of date due if not filled by user
 			if(empty($object->date_echeance)) $object->date_echeance = $object->calculate_date_lim_reglement();
@@ -1264,6 +1276,8 @@ if ($action == 'create')
         $societe->fetch(GETPOST('socid','int'));
     }
 
+	$currency_code = $conf->currency;
+	
     if (GETPOST('origin') && GETPOST('originid'))
     {
         // Parse element/subelement (ex: project_task)
@@ -1308,6 +1322,12 @@ if ($action == 'create')
             $remise_absolue 	= (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0));
             $dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
 
+			if (!empty($conf->multicurrency->enabled))
+			{
+				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; 
+			}
+			
             $datetmp=dol_mktime(12,0,0,$_POST['remonth'],$_POST['reday'],$_POST['reyear']);
             $dateinvoice=($datetmp==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datetmp);
             $datetmp=dol_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
@@ -1323,6 +1343,8 @@ if ($action == 'create')
         $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);
+		
+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
     }
 
 
@@ -1331,7 +1353,8 @@ if ($action == 'create')
     print '<input type="hidden" name="action" value="add">';
     print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
     print '<input type="hidden" name="originid" value="'.GETPOST('originid').'">';
-
+	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="' . $currency_tx . '">';
+	
     dol_fiche_head();
     
     print '<table class="border" width="100%">';
@@ -1490,6 +1513,16 @@ if ($action == 'create')
     $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
     print '</td></tr>';
 
+	// Multicurrency
+	if (! empty($conf->multicurrency->enabled))
+	{
+		print '<tr>';
+		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+        print '<td colspan="2" class="maxwidthonsmartphone">';
+	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+		print '</td></tr>';
+	}
+
 	// Public note
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
     print '<td>';
@@ -1555,6 +1588,13 @@ if ($action == 'create')
             }
         }
         print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
+		
+		if (!empty($conf->multicurrency->enabled))
+		{
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";	
+		}
     }
     else
     {
@@ -1968,6 +2008,44 @@ else
 		}
 		print '</td></tr>';
 
+		// Multicurrency
+		if (! empty($conf->multicurrency->enabled))
+		{
+			// Multicurrency code
+			print '<tr>';
+			print '<td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print fieldLabel('Currency','multicurrency_code');
+			print '</td>';
+			if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
+				print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="3">';
+			if ($action == 'editmulticurrencycode') {
+				$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+			} else {
+				$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, 'none');
+			}
+			print '</td></tr>';
+		
+			// Multicurrency rate
+			print '<tr>';
+			print '<td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print fieldLabel('Rate','multicurrency_tx');
+			print '</td>';
+			if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon))
+				print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="3">';
+			if ($action == 'editmulticurrencyrate') {
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx');
+			} else {
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none');
+			}
+			print '</td></tr>';
+		}
+
         // Bank Account
         print '<tr><td class="nowrap">';
         print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
@@ -2019,6 +2097,24 @@ else
         }
         print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="3">'.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'</td></tr>';
 
+		if (!empty($conf->multicurrency->enabled))
+		{
+			// Multicurrency Amount HT
+			print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+			print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+			print '</tr>';
+			
+			// Multicurrency Amount VAT
+			print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+			print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+			print '</tr>';
+			
+			// Multicurrency Amount TTC
+			print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+			print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+			print '</tr>';	
+		}
+
         // Project
         if (! empty($conf->projet->enabled))
         {

From d320aebe824341ef95c9117f100a377dabe6a3bf Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 19 Feb 2016 22:41:47 +0100
Subject: [PATCH 251/421] Fix muticurrency attributs not declared in class
 PropalLine Fix fetch_lines of FactureFournisseur with multicurrency fields

---
 htdocs/compta/facture/class/facture.class.php |  8 +++++++
 .../fourn/class/fournisseur.facture.class.php | 21 ++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 8fd43f3d5c8..0b34c42cbad 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4030,6 +4030,14 @@ class FactureLigne extends CommonInvoiceLine
 	 */
 	public $fk_prev_id;
 
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_subprice;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
+	
 	/**
 	 *	Load invoice line from database
 	 *
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 6c49ee7dda0..a6bfef7427b 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -529,7 +529,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
         $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
         $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
-		$sql.= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
+		$sql.= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
         $sql.= ' WHERE fk_facture_fourn='.$this->id;
@@ -582,12 +582,12 @@ class FactureFournisseur extends CommonInvoice
                     $line->fk_unit           = $obj->fk_unit;
 
 					// Multicurrency
-					$line->fk_multicurrency 		= $objp->fk_multicurrency;
-					$line->multicurrency_code 		= $objp->multicurrency_code;
-					$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
-					$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
-					$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
-					$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+					$line->fk_multicurrency 		= $obj->fk_multicurrency;
+					$line->multicurrency_code 		= $obj->multicurrency_code;
+					$line->multicurrency_subprice 	= $obj->multicurrency_subprice;
+					$line->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+					$line->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+					$line->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 				
 	                $this->lines[$i] = $line;
 
@@ -2025,6 +2025,13 @@ class SupplierInvoiceLine extends CommonObjectLine
 	public $localtax1_type;
 	public $localtax2_type;
 
+	// Multicurrency
+	var $fk_multicurrency;
+	var $multicurrency_code;
+	var $multicurrency_subprice;
+	var $multicurrency_total_ht;
+	var $multicurrency_total_tva;
+	var $multicurrency_total_ttc;
 
 	/**
      *	Constructor

From 266fb14a2c7008bd538f490d38bcc1eaab5a635b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 02:19:18 +0100
Subject: [PATCH 252/421] FIX Missing carriage return when phone is into
 property ->phone

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 70a51d2f8fd..c3d9cd56b90 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -491,7 +491,7 @@ abstract class CommonObject
 			$outdone++;
 		}
 
-		if (! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
+		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
     	if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
 			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
 		}

From f762196c775bdd93fadb40b746df80ec5c66eb7f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 02:21:24 +0100
Subject: [PATCH 253/421] NEW Can define number of first and last line into
 import wizard.

---
 htdocs/imports/import.php       | 127 +++++++++++++++++++++++---------
 htdocs/langs/en_US/exports.lang |   4 +
 2 files changed, 98 insertions(+), 33 deletions(-)

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index c6fe3094b68..d4d78ae3535 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -76,6 +76,7 @@ $import_name		= GETPOST('import_name');
 $hexa				= GETPOST('hexa');
 $importmodelid		= GETPOST('importmodelid');
 $excludefirstline	= (GETPOST('excludefirstline') ? GETPOST('excludefirstline') : 0);
+$endatlinenb     	= (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : '');
 $separator			= (GETPOST('separator') ? GETPOST('separator') : (! empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?$conf->global->IMPORT_CSV_SEPARATOR_TO_USE:','));
 $enclosure			= (GETPOST('enclosure') ? GETPOST('enclosure') : '"');
 
@@ -221,8 +222,9 @@ if ($step == 3 && $datatoimport)
 		$langs->load("other");
 
 		$param='&datatoimport='.$datatoimport.'&format='.$format;
-		if ($excludefirstline) $param.='&excludefirstline=1';
-
+		if ($excludefirstline) $param.='&excludefirstline='.$excludefirstline;
+		if ($endatlinenb) $param.='&endatlinenb='.$endatlinenb;
+		
 		$file = $conf->import->dir_temp . '/' . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 		$ret=dol_delete_file($file);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
@@ -328,7 +330,8 @@ if ($step == 1 || ! $datatoimport)
 	$_SESSION["dol_array_match_file_to_database"]='';
 
 	$param='';
-	if ($excludefirstline) $param.='&excludefirstline=1';
+	if ($excludefirstline) $param.='&excludefirstline='.$excludefirstline;
+	if ($endatlinenb) $param.='&endatlinenb='.$endatlinenb;
 	if ($separator) $param.='&separator='.urlencode($separator);
 	if ($enclosure) $param.='&enclosure='.urlencode($enclosure);
 
@@ -395,7 +398,8 @@ if ($step == 1 || ! $datatoimport)
 if ($step == 2 && $datatoimport)
 {
 	$param='&datatoimport='.$datatoimport;
-	if ($excludefirstline) $param.='&excludefirstline=1';
+	if ($excludefirstline) $param.='&excludefirstline='.$excludefirstline;
+	if ($endatlinenb) $param.='&endatlinenb='.$endatlinenb;
 	if ($separator) $param.='&separator='.urlencode($separator);
 	if ($enclosure) $param.='&enclosure='.urlencode($enclosure);
 
@@ -469,7 +473,8 @@ if ($step == 2 && $datatoimport)
 if ($step == 3 && $datatoimport)
 {
 	$param='&datatoimport='.$datatoimport.'&format='.$format;
-	if ($excludefirstline) $param.='&excludefirstline=1';
+	if ($excludefirstline) $param.='&excludefirstline='.$excludefirstline;
+	if ($endatlinenb) $param.='&endatlinenb='.$endatlinenb;
 	if ($separator) $param.='&separator='.urlencode($separator);
 	if ($enclosure) $param.='&enclosure='.urlencode($enclosure);
 
@@ -547,6 +552,7 @@ if ($step == 3 && $datatoimport)
 	print '<input type="hidden" value="'.$step.'" name="step">';
 	print '<input type="hidden" value="'.$format.'" name="format">';
 	print '<input type="hidden" value="'.$excludefirstline.'" name="excludefirstline">';
+	print '<input type="hidden" value="'.$endatlinenb.'" name="endatlinenb">';
 	print '<input type="hidden" value="'.$separator.'" name="separator">';
 	print '<input type="hidden" value="'.$enclosure.'" name="enclosure">';
 	print '<input type="hidden" value="'.$datatoimport.'" name="datatoimport">';
@@ -684,7 +690,8 @@ if ($step == 4 && $datatoimport)
 	// Now $array_match_file_to_database contains  fieldnb(1,2,3...)=>fielddatabase(key in $array_match_file_to_database)
 
 	$param='&format='.$format.'&datatoimport='.$datatoimport.'&filetoimport='.urlencode($filetoimport);
-	if ($excludefirstline) $param.='&excludefirstline=1';
+	if ($excludefirstline) $param.='&excludefirstline='.$excludefirstline;
+	if ($endatlinenb) $param.='&endatlinenb='.$endatlinenb;
 	if ($separator) $param.='&separator='.urlencode($separator);
 	if ($enclosure) $param.='&enclosure='.urlencode($enclosure);
 
@@ -732,6 +739,7 @@ if ($step == 4 && $datatoimport)
 		print '<input type="hidden" value="'.$step.'" name="step">';
 		print '<input type="hidden" value="'.$format.'" name="format">';
 		print '<input type="hidden" value="'.$excludefirstline.'" name="excludefirstline">';
+		print '<input type="hidden" value="'.$endatlinenb.'" name="endatlinenb">';
 		print '<input type="hidden" value="'.$datatoimport.'" name="datatoimport">';
 		print '<input type="hidden" value="'.$filetoimport.'" name="filetoimport">';
 		print $langs->trans("Separator").' : ';
@@ -767,7 +775,8 @@ if ($step == 4 && $datatoimport)
     print '<input type="hidden" name="datatoimport" value="'.$datatoimport.'">';
     print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
     print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-	print '<input type="hidden" name="separator" value="'.$separator.'">';
+    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+    print '<input type="hidden" name="separator" value="'.$separator.'">';
 	print '<input type="hidden" name="enclosure" value="'.$enclosure.'">';
     print '<table><tr><td colspan="2">';
     print $langs->trans("SelectImportFields",img_picto('','uparrow','')).' ';
@@ -1051,7 +1060,8 @@ if ($step == 4 && $datatoimport)
     	print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
 		print '<input type="hidden" name="hexa" value="'.$hexa.'">';
     	print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-		print '<input type="hidden" value="'.$separator.'" name="separator">';
+    	print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+    	print '<input type="hidden" value="'.$separator.'" name="separator">';
 		print '<input type="hidden" value="'.$enclosure.'" name="enclosure">';
 
 		print '<table summary="selectofimportprofil" class="noborder" width="100%">';
@@ -1138,15 +1148,19 @@ if ($step == 5 && $datatoimport)
 	$nboflines=dol_count_nb_of_line($conf->import->dir_temp.'/'.$filetoimport);
 
 	$param='&leftmenu=import&format='.$format.'&datatoimport='.$datatoimport.'&filetoimport='.urlencode($filetoimport).'&nboflines='.$nboflines.'&separator='.urlencode($separator).'&enclosure='.urlencode($enclosure);
-	$param2 = $param;
-	if ($excludefirstline) {
-		$param.='&excludefirstline=1';
-	}
-
+	$param2 = $param;  // $param2 = $param without excludefirstline and endatlinenb
+	if ($excludefirstline) $param.='&excludefirstline='.$excludefirstline;
+	if ($endatlinenb)      $param.='&endatlinenb='.$endatlinenb;
+	
 	llxHeader('',$langs->trans("NewImport"),'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
     $head = import_prepare_head($param,5);
 
+    
+    print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param2.'" method="POST">';
+    print '<input type="hidden" name="step" value="5">';    // step 5
+    print '<input type="hidden" name="action" value="launchsimu">';    // step 5
+    
 	dol_fiche_head($head, 'step5', $langs->trans("NewImport"));
 
 
@@ -1180,6 +1194,17 @@ if ($step == 5 && $datatoimport)
     print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text);
 	print '</td></tr>';
 
+	// Separator and enclosure
+	if ($model == 'csv') {
+	    print '<tr><td width="25%">'.$langs->trans("CsvOptions").'</td>';
+	    print '<td>';
+	    print $langs->trans("Separator").' : ';
+	    print htmlentities($separator);
+	    print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : ';
+	    print htmlentities($enclosure);
+	    print '</td></tr>';
+	}
+	
 	// File to import
 	print '<tr><td>'.$langs->trans("FileToImport").'</td>';
 	print '<td>';
@@ -1197,16 +1222,40 @@ if ($step == 5 && $datatoimport)
 	print $nboflines;
 	print '</td></tr>';
 
-	// Checkbox do not import first line
+	// Do not import first lines
 	print '<tr><td>';
-	print $langs->trans("Option");
+	print $langs->trans("ImportFromLine");
 	print '</td><td>';
-	print '<input type="checkbox" name="excludefirstline" value="1"';
-	print ($excludefirstline?' checked':'');
-	print ' onClick="javascript: window.location=\''.$_SERVER["PHP_SELF"].'?step=5&excludefirstline='.($excludefirstline?'0':'1').$param2.'\';">';
-	print ' '.$langs->trans("DoNotImportFirstLine");
+	if ($action=='launchsimu')
+	{
+	    print '<input type="text" size="4" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
+	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
+        print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
+	}
+	else
+	{
+	    print '<input type="text" size="4" name="excludefirstline" value="'.$excludefirstline.'">';
+	    print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
+	}
 	print '</td></tr>';
 
+	// Do not import end lines
+	print '<tr><td>';
+	print $langs->trans("EndAtLineNb");
+	print '</td><td>';
+	if ($action=='launchsimu')
+	{
+	    print '<input type="text" size="4" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
+	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+        print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
+	}
+	else
+	{
+	    print '<input type="text" size="4" name="endatlinenb" value="'.$endatlinenb.'">';
+	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
+	}
+	print '</td></tr>';
+	
 	print '</table>';
 
 	print '<br>';
@@ -1280,7 +1329,7 @@ if ($step == 5 && $datatoimport)
     dol_fiche_end();
 
 
-    if (GETPOST('action') != 'launchsimu')
+    if ($action != 'launchsimu')
     {
         // Show import id
         print $langs->trans("NowClickToTestTheImport",$langs->transnoentitiesnoconv("RunSimulateImportFile")).'<br>';
@@ -1290,7 +1339,7 @@ if ($step == 5 && $datatoimport)
         print '<div class="center">';
         if ($user->rights->import->run)
         {
-            print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=5&action=launchsimu'.$param.'">'.$langs->trans("RunSimulateImportFile").'</a>';
+            print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
         }
         else
         {
@@ -1336,9 +1385,10 @@ if ($step == 5 && $datatoimport)
                 	$endoffile++;
                 	continue;
                 }
-                if ($excludefirstline && $sourcelinenb == 1) continue;
+                if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue;
+                if ($endatlinenb && ($sourcelinenb > $endatlinenb)) continue;
                 
-                //
+                // Run import
                 $result=$obj->import_insert($arrayrecord,$array_match_file_to_database,$objimport,count($fieldssource),$importid);
                 
                 if (count($obj->errors))   $arrayoferrors[$sourcelinenb]=$obj->errors;
@@ -1412,7 +1462,7 @@ if ($step == 5 && $datatoimport)
 
         print '<div class="center">';
         print $langs->trans("NowClickToRunTheImport",$langs->transnoentitiesnoconv("RunImportFile")).'<br>';
-        print $langs->trans("DataLoadedWithId",$importid).'<br>';
+        if (empty($nboferrors)) print $langs->trans("DataLoadedWithId",$importid).'<br>';
         print '</div>';
 
         print '<br>';
@@ -1427,7 +1477,7 @@ if ($step == 5 && $datatoimport)
             }
             else
             {
-                //print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=5&action=launchsimu'.$param.'">'.$langs->trans("RunSimulateImportFile").'</a>';
+                //print '<input type="submit" class="butAction" value="'.dol_escape_htmltag($langs->trans("RunSimulateImportFile")).'">';
 
                 print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
             }
@@ -1439,7 +1489,10 @@ if ($step == 5 && $datatoimport)
             print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
         }
         print '</div>';
+        
     }
+
+    print '</form>';
 }
 
 
@@ -1482,7 +1535,8 @@ if ($step == 6 && $datatoimport)
 	$nboflines=(! empty($_GET["nboflines"])?$_GET["nboflines"]:dol_count_nb_of_line($conf->import->dir_temp.'/'.$filetoimport));
 
 	$param='&format='.$format.'&datatoimport='.$datatoimport.'&filetoimport='.urlencode($filetoimport).'&nboflines='.$nboflines;
-	if ($excludefirstline) $param.='&excludefirstline=1';
+	if ($excludefirstline) $param.='&excludefirstline='.$excludefirstline;
+	if ($endatlinenb) $param.='&endatlinenb='.$endatlinenb;
 	if ($separator) $param.='&separator='.urlencode($separator);
 	if ($enclosure) $param.='&enclosure='.urlencode($enclosure);
 
@@ -1540,16 +1594,20 @@ if ($step == 6 && $datatoimport)
 	print $nboflines;
 	print '</td></tr>';
 
-	// Checkbox do not import first line
+	// Do not import first lines
 	print '<tr><td>';
-	print $langs->trans("Option");
+	print $langs->trans("ImportFromLine");
 	print '</td><td>';
-	print '<input type="checkbox" name="excludefirstline" value="1" disabled';
-	print ($excludefirstline?' checked':'');
-	print '>';
-	print ' '.$langs->trans("DoNotImportFirstLine");
+	print '<input type="text" size="4" name="excludefirstline" disabled="disabled" value="'.$excludefirstline.'">';
 	print '</td></tr>';
 
+	// Do not import end lines
+	print '<tr><td>';
+	print $langs->trans("EndAtLineNb");
+	print '</td><td>';
+    print '<input type="text" size="4" name="endatlinenb" disabled="disabled" value="'.$endatlinenb.'">';
+	print '</td></tr>';
+	
 	print '</table>';
 
 	print '<br>';
@@ -1651,9 +1709,12 @@ if ($step == 6 && $datatoimport)
 				$endoffile++;
 				continue;
 			}
-			if ($excludefirstline && $sourcelinenb == 1) continue;
+			if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue;
+			if ($endatlinenb && ($sourcelinenb > $endatlinenb)) continue;
 
+			// Run import
 			$result=$obj->import_insert($arrayrecord,$array_match_file_to_database,$objimport,count($fieldssource),$importid);
+			
 			if (count($obj->errors))   $arrayoferrors[$sourcelinenb]=$obj->errors;
 			if (count($obj->warnings))	$arrayofwarnings[$sourcelinenb]=$obj->warnings;
 			if (! count($obj->errors) && ! count($obj->warnings)) $nbok++;
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index e9f44435750..d1a952eccf2 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -128,6 +128,10 @@ 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>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields

From 7ff8c2c3db324aa9fadf1574db21b1026f94fedf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 02:19:18 +0100
Subject: [PATCH 254/421] FIX Missing carriage return when phone is into
 property ->phone

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d29d30139c0..278a9cbb626 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -491,7 +491,7 @@ abstract class CommonObject
 			$outdone++;
 		}
 
-		if (! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
+		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
     	if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
 			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
 		}

From fc8f1272d2d6714bcc5e85e188fa6928f8895be9 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Fri, 19 Feb 2016 19:47:47 +0100
Subject: [PATCH 255/421] Fix line fetch not converting dates

Conflicts:
	htdocs/comm/propal/class/propal.class.php
---
 htdocs/comm/propal/class/propal.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 902ee8c0bf4..460b574c246 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1355,8 +1355,8 @@ class Propal extends CommonObject
                         $line->fk_product_type  = $objp->fk_product_type;
 	                    $line->fk_unit          = $objp->fk_unit;
 
-                        $line->date_start  		= $objp->date_start;
-                        $line->date_end  		= $objp->date_end;
+                        $line->date_start  		= $this->db->jdate($objp->date_start);
+                        $line->date_end  		= $this->db->jdate($objp->date_end);
 
                         $line->fetch_optionals($line->id,$extralabelsline);
 

From fcc26f36bae08b564f4d67bbd182690b13d100b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 02:45:31 +0100
Subject: [PATCH 256/421] Fix default first line to import is 1

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

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index d4d78ae3535..76a3f5a2555 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -75,7 +75,7 @@ $step				= (GETPOST('step') ? GETPOST('step') : 1);
 $import_name		= GETPOST('import_name');
 $hexa				= GETPOST('hexa');
 $importmodelid		= GETPOST('importmodelid');
-$excludefirstline	= (GETPOST('excludefirstline') ? GETPOST('excludefirstline') : 0);
+$excludefirstline	= (GETPOST('excludefirstline') ? GETPOST('excludefirstline') : 1);
 $endatlinenb     	= (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : '');
 $separator			= (GETPOST('separator') ? GETPOST('separator') : (! empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?$conf->global->IMPORT_CSV_SEPARATOR_TO_USE:','));
 $enclosure			= (GETPOST('enclosure') ? GETPOST('enclosure') : '"');

From 0ec6c20ebbab3a1ce3178e270827affe80d9addc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 02:55:32 +0100
Subject: [PATCH 257/421] Translation

---
 htdocs/langs/en_US/boxes.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.

From 277d92af75c88e241928f65be5c1d247012d6314 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 03:14:29 +0100
Subject: [PATCH 258/421] Secure migration for people using a RC

---
 htdocs/core/modules/modProduct.class.php       |  2 +-
 htdocs/core/modules/modService.class.php       |  2 +-
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index e402aa62786..0c260cb047b 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -209,7 +209,7 @@ class modProduct extends DolibarrModules
 		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r]=array('p'=>MAIN_DB_PREFIX.'product','extra'=>MAIN_DB_PREFIX.'product_extrafields');
 		$this->import_tables_creator_array[$r]=array('p'=>'fk_user_author');	// Fields to store import user id
-		$this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*');
+		$this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation');
 		if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode'));
 		if ($mysoc->useNPR()) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.recuperableonly'=>'NPR'));
 		// Add extra fields
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index eb0f51e5c4f..5ea2cfde964 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -233,7 +233,7 @@ class modService extends DolibarrModules
 		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r]=array('p'=>MAIN_DB_PREFIX.'product','extra'=>MAIN_DB_PREFIX.'product_extrafields');
 		$this->import_tables_creator_array[$r]=array('p'=>'fk_user_author');	// Fields to store import user id
-        $this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*');
+        $this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation');
 		if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode'));
         // Add extra fields
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity = ".$conf->entity;
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 8268d0a0773..25eee0dcbc0 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -21,6 +21,19 @@
 -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
+
+-- Already into 3.9 but we do it again to be sure
+ALTER TABLE llx_product ADD COLUMN localtax1_type varchar(10)  NOT NULL DEFAULT '0' after localtax1_tx; 
+ALTER TABLE llx_product ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
+ALTER TABLE llx_product_price ADD COLUMN localtax1_type varchar(10)  NOT NULL DEFAULT '0' after localtax1_tx; 
+ALTER TABLE llx_product_price ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
+ALTER TABLE llx_product_customer_price ADD COLUMN localtax1_type varchar(10)  NOT NULL DEFAULT '0' after localtax1_tx; 
+ALTER TABLE llx_product_customer_price ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
+ALTER TABLE llx_product_customer_price_log ADD COLUMN localtax1_type varchar(10)  NOT NULL DEFAULT '0' after localtax1_tx; 
+ALTER TABLE llx_product_customer_price_log ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
+
+
+
 ALTER TABLE llx_product ADD COLUMN  model_pdf	varchar(255) default '';
 
 CREATE TABLE llx_categorie_user 

From a2817049c90c1962c64593b0ead262ba46668602 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 03:34:56 +0100
Subject: [PATCH 259/421] Fix must show warning only if threshold defined.

---
 htdocs/product/stock/product.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 5b26f215adb..42fadf54923 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -493,16 +493,14 @@ if ($id > 0 || $ref)
         print $form->textwithtooltip($langs->trans("PhysicalStock"), $text_stock_options, 2, 1, img_picto('', 'info'), '', 2);
         print '</td>';
 		print '<td>'.$object->stock_reel;
-		if ($object->seuil_stock_alerte && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
+		if ($object->seuil_stock_alerte != '' && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
 		print '</td>';
 		print '</tr>';
 
         // Calculating a theorical value
         print '<tr><td>'.$langs->trans("VirtualStock").'</td>';
         print "<td>".(empty($object->stock_theorique)?0:$object->stock_theorique);
-        if ($object->stock_theorique < $object->seuil_stock_alerte) {
-            print ' '.img_warning($langs->trans("StockLowerThanLimit"));
-        }
+        if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
         print '</td>';
         print '</tr>';
 

From 2e27319d1bb90b340423470e6a7a706a47706bfa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 03:42:29 +0100
Subject: [PATCH 260/421] Fix Removed not expected br

---
 htdocs/commande/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 9e7f5fae4f8..d7b2bab080a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2396,7 +2396,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 			}
 			print '</div>';
 		}
-		print '<br>';
 
 		if ($action != 'presend')
 		{

From 7def330f54ea655c1fab12cd731ae47541301ce0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 03:58:52 +0100
Subject: [PATCH 261/421] Fix missing error message and input lost in shipment
 create page

---
 htdocs/expedition/card.php                   | 5 +++--
 htdocs/expedition/class/expedition.class.php | 1 +
 htdocs/langs/en_US/errors.lang               | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 9ef7bdee925..c0daef4cd6b 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -852,9 +852,10 @@ if ($action == 'create')
                 if (empty($conf->productbatch->enabled) || ! ($product->hasbatch() && is_object($product->stock_warehouse[$warehouse_id])))
 				{
 	                // Quantity to send
-	                print '<td align="center">';
+	                print '<td align="center"><!-- qty to ship (no lot management) -->';
 	                if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 	                {
+	                    if (GETPOST('qtyl'.$indiceAsked)) $defaultqty=GETPOST('qtyl'.$indiceAsked);
 	                    print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 	                    print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$defaultqty.'">';
 	                }
@@ -931,7 +932,7 @@ if ($action == 'create')
 						{
 							//var_dump($dbatch);
 							$substock=$dbatch->qty +0 ;		// To get a numeric
-							print '<tr><td colspan="3" ></td><td align="center">';
+							print '<tr><td colspan="3" ></td><td align="center"><!-- qty to ship (with lot management) -->';
 							print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.($substock > 0 ? min($defaultqty,$substock) : '0').'">';
 							print '</td>';
 	
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 64436dd8bdd..373cb5f2666 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -853,6 +853,7 @@ class Expedition extends CommonObject
 
 			if (! ($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS))
 			{
+			    $langs->load("errors");
 				$this->error=$langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 				return -1;
 			}
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index f3efba10999..8b64c97ba34 100755
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -172,6 +172,7 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 
 # Warnings
 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.  

From 351ce6228d89466545e3c693cf9a52f03cd51253 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Feb 2016 04:49:02 +0100
Subject: [PATCH 262/421] NEW Add width and height on product card

---
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 6 ++++++
 htdocs/install/mysql/tables/llx_product.sql    | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 25eee0dcbc0..7cd50efc72d 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -36,6 +36,12 @@ ALTER TABLE llx_product_customer_price_log ADD COLUMN localtax2_type varchar(10)
 
 ALTER TABLE llx_product ADD COLUMN  model_pdf	varchar(255) default '';
 
+ALTER TABLE llx_product ADD COLUMN width		float        DEFAULT NULL;
+ALTER TABLE llx_product ADD COLUMN width_units	tinyint      DEFAULT NULL;
+ALTER TABLE llx_product ADD COLUMN height		float        DEFAULT NULL;
+ALTER TABLE llx_product ADD COLUMN height_units tinyint      DEFAULT NULL;
+
+
 CREATE TABLE llx_categorie_user 
 (
   fk_categorie 	integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index e2ed0a49627..78620495f61 100755
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -69,6 +69,10 @@ create table llx_product
   weight_units				tinyint      DEFAULT NULL,
   length					float        DEFAULT NULL,
   length_units				tinyint      DEFAULT NULL,
+  width					    float        DEFAULT NULL,
+  width_units				tinyint      DEFAULT NULL,
+  height					float        DEFAULT NULL,
+  height_units				tinyint      DEFAULT NULL,
   surface					float        DEFAULT NULL,
   surface_units				tinyint      DEFAULT NULL,
   volume					float        DEFAULT NULL,

From 6f6f2a0574725e233e79abc72ac5bf7a8751a6ac Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Sat, 20 Feb 2016 11:18:02 +0100
Subject: [PATCH 263/421] enhance code help translation

---
 .../fourn/class/fournisseur.commande.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 2edbcb0f249..4017e1f3f56 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -141,7 +141,7 @@ class CommandeFournisseur extends CommonOrder
         $this->statuts[5] = 'StatusOrderReceivedAll';
         $this->statuts[6] = 'StatusOrderCanceled';	// Approved->Canceled
         $this->statuts[7] = 'StatusOrderCanceled';	// Process running->canceled
-        //$this->statuts[8] = 'StatusOrderBilled';	// Everything is finish, order received totally and bill received
+        //$this->statuts[8] = 'StatusOrderBilled';	// Everything is finished, order received totally and bill received
         $this->statuts[9] = 'StatusOrderRefused';
     }
 
@@ -585,8 +585,8 @@ class CommandeFournisseur extends CommonOrder
      *	Return clicable name (with picto eventually)
      *
      *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param		string	$option			Sur quoi pointe le lien
-     *	@return		string					Chaine avec URL
+     *	@param		string	$option			On what the link points
+     *	@return		string					Chain with URL
      */
     function getNomUrl($withpicto=0,$option='')
     {
@@ -621,8 +621,8 @@ class CommandeFournisseur extends CommonOrder
      *  Returns the following order reference not used depending on the numbering model activated
      *                  defined within COMMANDE_SUPPLIER_ADDON_NUMBER
      *
-     *  @param	    Societe		$soc  		objet societe
-     *  @return     string                  reference libre pour la facture
+     *  @param	    Company		$soc  		company object
+     *  @return     string                  free reference for the invoice
      */
     function getNextNumRef($soc)
     {
@@ -716,7 +716,7 @@ class CommandeFournisseur extends CommonOrder
 
             $this->db->begin();
 
-			// Definition du nom de modele de numerotation de commande
+			// Definition of order numbering model name
             $soc = new Societe($this->db);
             $soc->fetch($this->fourn_id);
 
@@ -904,7 +904,7 @@ class CommandeFournisseur extends CommonOrder
 
     /**
      * 	Cancel an approved order.
-     *	L'annulation se fait apres l'approbation
+     *	The cancellation is done after approval
      *
      * 	@param	User	$user			User making action
      *	@param	int		$idwarehouse	Id warehouse to use for stock change (not used for supplier orders).
@@ -1028,7 +1028,7 @@ class CommandeFournisseur extends CommonOrder
         // Clean parameters
         if (empty($this->source)) $this->source = 0;
 
-        /* On positionne en mode brouillon la commande */
+        /* One positions in draft mode the order  */
         $this->brouillon = 1;
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur (";
@@ -1078,7 +1078,7 @@ class CommandeFournisseur extends CommonOrder
 				$num=count($this->lines);
 
 	            /*
-	             *  Insertion du detail des produits dans la base
+	             *  integration of products detail in the database
 	             */
 	            for ($i=0;$i<$num;$i++)
 	            {

From c84e74c081e8782119f123ff384445efad8d7821 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sat, 20 Feb 2016 19:37:11 +0100
Subject: [PATCH 264/421] Fix dynamic price parsing in fournisseurs.php

---
 htdocs/product/fournisseurs.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index db6adb52648..d825a1f2c66 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -228,14 +228,8 @@ if (empty($reshook))
 					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
-                        $prod_supplier = new ProductFournisseur($this->db);
-	                    $prod_supplier->id = $prodid;
-                        $prod_supplier->fourn_qty	= $quantity;
-	                    $prod_supplier->fourn_tva_tx = $tva_tx;
-	                    $prod_supplier->fourn_id = $id_fourn;
-	                    $prod_supplier->fk_supplier_price_expression = $price_expression;
                         $priceparser = new PriceParser($db);
-                        $price_result = $priceparser->parseProductSupplier($prod_supplier);
+                        $price_result = $priceparser->parseProductSupplier($object);
 						if ($price_result < 0) { //Expression is not valid
 							$error++;
 							setEventMessages($priceparser->translatedError(), null, 'errors');

From 9fc7041a289e74f05cf3b06f0952032495f52101 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sat, 20 Feb 2016 19:47:17 +0100
Subject: [PATCH 265/421] Use error_parser instead of reserved error var

---
 .../class/price_parser.class.php              | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 0f4ff5a0dbb..aba86bfd97e 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -36,7 +36,7 @@ class PriceParser
 	// Limit of expressions per price
 	public $limit = 100;
 	// The error that occurred when parsing price
-	public $error;
+	public $error_parser;
 	// The expression that caused the error
 	public $error_expr;
 	//The special char
@@ -94,10 +94,10 @@ class PriceParser
 		16, internal error
 		18, internal error
 		*/
-		if (empty($this->error)) {
+		if (empty($this->error_parser)) {
 			return $langs->trans("ErrorPriceExpressionUnknown", 0); //this is not supposed to happen
 		}
-		list($code, $info) = $this->error;
+		list($code, $info) = $this->error_parser;
 		if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg
 		{
 			return $langs->trans("ErrorPriceExpression".$code);
@@ -136,7 +136,7 @@ class PriceParser
 		$expression = trim($expression);
 		if (empty($expression))
 		{
-			$this->error = array(20, null);
+			$this->error_parser = array(20, null);
 			return -2;
 		}
 
@@ -198,8 +198,8 @@ class PriceParser
 			if (!empty($expr))
 			{
 				$last_result = $em->evaluate($expr);
-				$this->error = $em->last_error_code;
-				if ($this->error !== null) { //$em->last_error is null if no error happened, so just check if error is not null
+				$this->error_parser = $em->last_error_code;
+				if ($this->error_parser !== null) { //$em->last_error_code is null if no error happened, so just check if error_parser is not null
 					$this->error_expr = $expr;
 					return -3;
 				}
@@ -211,12 +211,12 @@ class PriceParser
 		}
 		if (!isset($vars["price"]))
 		{
-			$this->error = array(21, $expression);
+			$this->error_parser = array(21, $expression);
 			return -4;
 		}
 		if ($vars["price"] < 0)
 		{
-			$this->error = array(22, $expression);
+			$this->error_parser = array(22, $expression);
 			return -5;
 		}
 		return $vars["price"];
@@ -235,7 +235,7 @@ class PriceParser
 		$price_expression = new PriceExpression($this->db);
 		$res = $price_expression->fetch($product->fk_price_expression);
 		if ($res < 1) {
-			$this->error = array(19, null);
+			$this->error_parser = array(19, null);
 			return -1;
 		}
 
@@ -250,7 +250,7 @@ class PriceParser
 
 		//Parse the expression and return the price, if not error occurred check if price is higher than min
 		$result = $this->parseExpression($product, $price_expression->expression, $extra_values);
-		if (empty($this->error)) {
+		if (empty($this->error_parser)) {
 			if ($result < $product->price_min) {
 				$result = $product->price_min;
 			}
@@ -272,7 +272,7 @@ class PriceParser
 		$res = $price_expression->fetch($product_supplier->fk_supplier_price_expression);
 		if ($res < 1)
 		{
-			$this->error = array(19, null);
+			$this->error_parser = array(19, null);
 			return -1;
 		}
 

From ec0282a28e453558f14fd29b82b1f8feb0eb6af9 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sun, 21 Feb 2016 13:26:48 +0100
Subject: [PATCH 266/421] New add multicurrency display on supplier payment

---
 htdocs/fourn/facture/paiement.php | 86 ++++++++++++++++++++++++++++---
 1 file changed, 80 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 124693ed6da..7aab308d2fa 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -65,7 +65,12 @@ if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="p.rowid";
 $optioncss = GETPOST('optioncss','alpha');
 
-$amounts = array();
+$amounts = array();array();
+$amountsresttopay=array();
+$addwarning=0;
+
+$multicurrency_amounts=array();
+$multicurrency_amountsresttopay=array();
 
 // Security check
 if ($user->societe_id > 0)
@@ -144,6 +149,34 @@ if (empty($reshook))
 
 	            $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => $_POST[$key]);
 	        }
+			elseif (substr($key,0,21) == 'multicurrency_amount_')
+			{
+				$cursorfacid = substr($key,21);
+	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
+	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
+	            if (! empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+	            $result=$tmpinvoice->fetch($cursorfacid);
+	            if ($result <= 0) dol_print_error($db);
+	            $multicurrency_amountsresttopay[$cursorfacid]=price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement(1));
+	            if ($multicurrency_amounts[$cursorfacid])
+	            {
+		            // Check amount
+		            if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
+		            {
+		                $addwarning=1;
+		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
+		            }
+		            // Check date
+		            if ($datepaye && ($datepaye < $tmpinvoice->date))
+		            {
+		            	$langs->load("errors");
+		                //$error++;
+		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+		            }
+	            }
+
+	            $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => GETPOST($key, 'int'));
+			}
 	    }
 
 	    // Check parameters
@@ -163,7 +196,7 @@ if (empty($reshook))
 	        }
 	    }
 
-	    if (empty($totalpayment) && empty($atleastonepaymentnotnull))
+	    if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
 	    {
 	    	setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->trans('PaymentAmount')), null, 'errors');
 	        $error++;
@@ -174,6 +207,13 @@ if (empty($reshook))
 	    	setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('Date')), null, 'errors');
 	        $error++;
 	    }
+		
+		// Check if payments in both currency
+		if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
+		{
+			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
+	        $error++;
+		}
 	}
 
 	/*
@@ -206,6 +246,7 @@ if (empty($reshook))
 	        $paiement = new PaiementFourn($db);
 	        $paiement->datepaye     = $datepaye;
 	        $paiement->amounts      = $amounts;   // Array of amounts
+	        $paiement->multicurrency_amounts = $multicurrency_amounts;
 	        $paiement->paiementid   = $_POST['paiementid'];
 	        $paiement->num_paiement = $_POST['num_paiement'];
 	        $paiement->note         = $_POST['comment'];
@@ -344,8 +385,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				/*
 	             * Autres factures impayees
 	             */
-	            $sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef as df';
-	            $sql.= ', SUM(pf.amount) as am';
+	            $sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.multicurrency_total_ttc, f.datef as df';
+	            $sql.= ', SUM(pf.amount) as am, SUM(pf.multicurrency_amount) as multicurrency_am';
 	            $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
 	            $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
 	            $sql.= " WHERE f.entity = ".$conf->entity;
@@ -378,9 +419,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    print '<td>'.$langs->trans('RefSupplier').'</td>';
 	                    print '<td align="center">'.$langs->trans('Date').'</td>';
 	                    print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
+						if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
 	                    print '<td align="right">'.$langs->trans('AlreadyPaid').'</td>';
+						if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('MulticurrencyAlreadyPaid').'</td>';
 	                    print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
+						if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('MulticurrencyRemainderToPay').'</td>';
 	                    print '<td align="center">'.$langs->trans('PaymentAmount').'</td>';
+						if (!empty($conf->multicurrency->enabled)) print '<td align="center">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
 	                    print '</tr>';
 
 	                    $var=True;
@@ -408,14 +453,39 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                            print '<td align="center"><b>!!!</b></td>';
 	                        }
 	                        print '<td align="right">'.price($objp->total_ttc).'</td>';
+							
+							// Multicurrency
+							if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.price($objp->multicurrency_total_ttc).'</td>';
+	                        
 	                        print '<td align="right">'.price($objp->am).'</td>';
+							
+							// Multicurrency
+							if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.price($objp->multicurrency_am).'</td>';
+	                        
 	                        print '<td align="right">'.price($objp->total_ttc - $objp->am).'</td>';
+							
+							// Multicurrency
+							if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.price($objp->multicurrency_total_ttc - $objp->multicurrency_am).'</td>';
+							
 	                        print '<td align="center">';
 	                        $namef = 'amount_'.$objp->facid;
 							if(!empty($conf->global->FAC_AUTO_FILLJS))
 								print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->total_ttc - $objp->am)."'");
 	                        print '<input type="text" size="8" name="'.$namef.'" value="'.GETPOST($namef).'">';
-							print "</td></tr>\n";
+							print "</td>";
+							
+							// Multicurrency
+							if (!empty($conf->multicurrency->enabled)) 
+							{
+								print '<td align="center">';
+			                    $namef = 'multicurrency_amount_'.$objp->facid;
+								if(!empty($conf->global->FAC_AUTO_FILLJS))
+									print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->multicurrency_total_ttc - $objp->multicurrency_am)."'");
+		                        print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.GETPOST($namef).'">';
+			                    print "</td>";
+							}
+							
+							print "</tr>\n";
 	                        $total+=$objp->total_ht;
 	                        $total_ttc+=$objp->total_ttc;
 	                        $totalrecu+=$objp->am;
@@ -455,7 +525,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	            $preselectedchoice=$addwarning?'no':'yes';
 
 	            print '<br>';
-	            $text=$langs->trans('ConfirmSupplierPayment',$totalpayment,$langs->trans("Currency".$conf->currency));
+	            if (!empty($totalpayment)) $text=$langs->trans('ConfirmSupplierPayment',$totalpayment,$langs->trans("Currency".$conf->currency));
+				if (!empty($multicurrency_totalpayment)) 
+				{
+					$text.='<br />'.$langs->trans('ConfirmSupplierPayment',$multicurrency_totalpayment,$langs->trans("paymentInInvoiceCurrency"));
+				}
 	            if (GETPOST('closepaidinvoices'))
 	            {
 	                $text.='<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");

From 5a8d1f1c95910daaed292fbc434edaf004013e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Peccatte?= <benoit.peccatte@normation.com>
Date: Sun, 21 Feb 2016 14:10:19 +0100
Subject: [PATCH 267/421] Allow imports from xlsx files

---
 .../modules/import/import_xlsx.modules.php    | 686 ++++++++++++++++++
 htdocs/imports/import.php                     |   1 +
 2 files changed, 687 insertions(+)
 create mode 100644 htdocs/core/modules/import/import_xlsx.modules.php

diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
new file mode 100644
index 00000000000..637cf35cc79
--- /dev/null
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -0,0 +1,686 @@
+<?php
+/* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *		\file       htdocs/core/modules/import/import_csv.modules.php
+ *		\ingroup    import
+ *		\brief      File to load import files with CSV format
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/modules/import/modules_import.php';
+
+
+/**
+ *	Class to import Excel files
+ */
+class Importxlsx extends ModeleImports
+{
+    var $db;
+    var $datatoimport;
+
+	var $error='';
+	var $errors=array();
+
+    var $id;           // Id of driver
+	var $label;        // Label of driver
+	var $extension;    // Extension of files imported by driver
+	var $version;      // Version of driver
+
+	var $label_lib;    // Label of external lib used by driver
+	var $version_lib;  // Version of external lib used by driver
+
+	var $separator;
+
+	var $handle;    // Handle fichier
+
+	var $cacheconvert=array();      // Array to cache list of value found after a convertion
+	var $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+  
+	var $workbook; // temporary import file
+	var $record; // current record
+	var $headers; 
+
+
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db				Database handler
+	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
+	 */
+	function __construct($db,$datatoimport)
+	{
+		global $conf,$langs;
+		$this->db = $db;
+
+		// this is used as an extension from the example file code, so we have to put xlsx here !!!
+		$this->id='xlsx';                // Same value as xxx in file name export_xxx.modules.php
+		$this->label='Excel';             // Label of driver
+		$this->desc=$langs->trans("ExcelFormatDesc",$this->separator,$this->enclosure,$this->escape);
+		$this->extension='xlsx';         // Extension for generated file by this driver
+		$this->picto='mime/xls';		// Picto (This is not used by the example file code as Mime type, too bad ...)
+		$this->version='1.0';         // Driver version
+
+		// If driver use an external library, put its name here
+    require_once PHPEXCEL_PATH.'PHPExcel.php';
+		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
+              if (! class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
+              {
+                $langs->load("errors");
+                $this->error=$langs->trans('ErrorPHPNeedModule','zip');
+                return -1;
+              }
+    $this->label_lib='PhpExcel';
+    $this->version_lib='1.8.0';
+
+		$this->datatoimport=$datatoimport;
+		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+	}
+
+// Those Get methods should all be in the parent class !!! 
+	/**
+	 * getDriverId
+	 *
+	 * @return string		Id
+	 */
+	function getDriverId()
+	{
+		return $this->id;
+	}
+
+	/**
+	 *	getDriverLabel
+	 *
+	 *	@return string	Label
+	 */
+	function getDriverLabel()
+	{
+		return $this->label;
+	}
+
+	/**
+	 *	getDriverDesc
+	 *
+	 *	@return string	Description
+	 */
+	function getDriverDesc()
+	{
+		return $this->desc;
+	}
+
+	/**
+	 * getDriverExtension
+	 *
+	 * @return string	Driver suffix
+	 */
+	function getDriverExtension()
+	{
+		return $this->extension;
+	}
+
+	/**
+	 *	getDriverVersion
+	 *
+	 *	@return string	Driver version
+	 */
+	function getDriverVersion()
+	{
+		return $this->version;
+	}
+
+	/**
+	 *	getDriverLabel
+	 *
+	 *	@return string	Label of external lib
+	 */
+	function getLibLabel()
+	{
+		return $this->label_lib;
+	}
+
+	/**
+	 * getLibVersion
+	 *
+	 *	@return string	Version of external lib
+	 */
+	function getLibVersion()
+	{
+		return $this->version_lib;
+	}
+
+
+	/**
+	 * 	Output header of an example file for this format
+	 *
+	 * 	@param	Translate	$outputlangs		Output language
+	 *  @return	string
+	 */
+	function write_header_example($outputlangs)
+	{
+	  global $user,$conf,$langs;
+	  // create a temporary object, the final output will be generated in footer
+          if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
+            $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
+            $cacheSettings = array (
+              'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
+          );
+          PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
+        }
+
+            $this->workbook = new PHPExcel();
+            $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
+            $this->workbook->getProperties()->setTitle($outputlangs->trans("Import").' - '.$file);
+            $this->workbook->getProperties()->setSubject($outputlangs->trans("Import").' - '.$file);
+            $this->workbook->getProperties()->setDescription($outputlangs->trans("Import").' - '.$file);
+
+            $this->workbook->setActiveSheetIndex(0);
+            $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
+            $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
+
+	    return '';
+	}
+
+	/**
+	 * 	Output title line of an example file for this format
+	 *
+	 * 	@param	Translate	$outputlangs		Output language
+	 *  @param	array		$headerlinefields	Array of fields name
+	 * 	@return	string
+	 */
+	function write_title_example($outputlangs,$headerlinefields)
+	{
+    global $conf;
+    $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
+    $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+
+    $col = 0;
+    foreach($headerlinefields as $field) {
+      $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, 1, $outputlangs->transnoentities($field));
+      // set autowidth
+      //$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($col + 1))->setAutoSize(true); 
+      $col++;
+    }
+		return ''; // final output will be generated in footer
+	}
+
+	/**
+	 * 	Output record of an example file for this format
+	 *
+	 * 	@param	Translate	$outputlangs		Output language
+	 * 	@param	array		$contentlinevalues	Array of lines
+	 * 	@return	string
+	 */
+	function write_record_example($outputlangs,$contentlinevalues)
+	{
+    $col = 0;
+    $row = 2;
+    foreach($contentlinevalues as $cell) {
+        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
+        $col++;
+    }
+    return ''; // final output will be generated in footer
+	}
+
+	/**
+	 * 	Output footer of an example file for this format
+	 *
+	 * 	@param	Translate	$outputlangs		Output language
+	 *  @return	string
+	 */
+	function write_footer_example($outputlangs)
+	{
+		// return te file content as a string
+    $tempfile = tempnam(sys_get_temp_dir(), 'dol');
+    $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
+    $objWriter->save($tempfile);
+    $this->workbook->disconnectWorksheets();
+    unset($this->workbook);
+
+    $content = file_get_contents($tempfile);
+    unlink($tempfile);
+    return $content;
+	}
+
+
+
+	/**
+	 *	Open input file
+	 *
+	 *	@param	string	$file		Path of filename
+	 *	@return	int					<0 if KO, >=0 if OK
+	 */
+	function import_open_file($file)
+	{
+		global $langs;
+		$ret=1;
+
+		dol_syslog(get_class($this)."::open_file file=".$file);
+
+		$reader = new PHPExcel_Reader_Excel2007();
+		$this->workbook = $reader->load($file);
+		$this->record = 1;
+		return $ret;
+	}
+
+	/**
+	 * 	Input header line from file
+	 *
+	 * 	@return		int		<0 if KO, >=0 if OK
+	 */
+	function import_read_header()
+	{
+		// This is not called by the import code !!!
+		$this->headers = array();
+		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
+		for($col=0;$col<$colcount;$col++) {
+			$this->headers[$col] = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, 1)->getValue();
+		}
+		return 0;
+	}
+
+
+	/**
+	 * 	Return array of next record in input file.
+	 *
+	 * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
+	 */
+	function import_read_record()
+	{
+		global $conf;
+
+		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
+		if($this->record > $rowcount)
+			return false;
+		$array = array();
+		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
+		for($col=0;$col<$colcount;$col++) {
+			$val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
+			$array[$col]['val'] = $val;
+			$array[$col]['type'] = (dol_strlen($val)?1:-1); // If empty we consider it null
+		}
+		$this->record++;
+		return $array;
+	}
+
+	/**
+	 * 	Close file handle
+	 *
+	 *  @return	integer
+	 */
+	function import_close_file()
+	{
+		$this->workbook->disconnectWorksheets();
+		unset($this->workbook);
+	}
+
+
+	/**
+	 * Insert a record into database
+	 *
+	 * @param	array	$arrayrecord					Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
+	 * @param	array	$array_match_file_to_database	Array of target fields where to insert data: [fieldpos] => 's.fieldname', [fieldpos+1]...
+	 * @param 	Object	$objimport						Object import (contains objimport->import_tables_array, objimport->import_fields_array, objimport->import_convertvalue_array, ...)
+	 * @param	int		$maxfields						Max number of fields to use
+	 * @param	string	$importid						Import key
+	 * @return	int										<0 if KO, >0 if OK
+	 */
+	// What is this doing here ? it is common to all imports, is should be in the parent class
+	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid)
+	{
+		global $langs,$conf,$user;
+        global $thirdparty_static;    	// Specific to thirdparty import
+		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
+
+		$error=0;
+		$warning=0;
+		$this->errors=array();
+		$this->warnings=array();
+
+		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
+
+		//var_dump($array_match_file_to_database);
+		//var_dump($arrayrecord);
+		$array_match_database_to_file=array_flip($array_match_file_to_database);
+		$sort_array_match_file_to_database=$array_match_file_to_database;
+		ksort($sort_array_match_file_to_database);
+
+		//var_dump($sort_array_match_file_to_database);
+
+		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
+		{
+			//print 'W';
+			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
+			$this->warnings[$warning]['type']='EMPTY';
+			$warning++;
+		}
+		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)
+			// For each table to insert, me make a separate insert
+			foreach($objimport->array_import_tables[0] as $alias => $tablename)
+			{
+				// Build sql request
+				$sql='';
+				$listfields='';
+				$listvalues='';
+				$i=0;
+				$errorforthistable=0;
+
+				// Define $tablewithentity_cache[$tablename] if not already defined
+				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+				{
+					dol_syslog("Check if table ".$tablename." has an entity field");
+					$resql=$this->db->DDLDescTable($tablename,'entity');
+					if ($resql)
+					{
+						$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
+				{
+					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
+				}
+
+
+				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
+				foreach($sort_array_match_file_to_database as $key => $val)
+				{
+				    $fieldalias=preg_replace('/\..*$/i','',$val);
+				    $fieldname=preg_replace('/^.*\./i','',$val);
+
+				    if ($alias != $fieldalias) continue;    // Not a field of current table
+
+					if ($key <= $maxfields)
+					{
+						// Set $newval with value to insert and set $listvalues with sql request part for insert
+						$newval='';
+						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+
+						// Make some tests on $newval
+
+						// Is it a required field ?
+						if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ($newval==''))
+						{
+							$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
+							$this->errors[$error]['type']='NOTNULL';
+							$errorforthistable++;
+							$error++;
+						}
+						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
+						else
+						{
+						    // We convert field if required
+						    if (! empty($objimport->array_import_convertvalue[0][$val]))
+						    {
+                                //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
+                                if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                	)
+                                {
+                                    if (! is_numeric($newval) && $newval != '')    // If value into input import file is not a numeric, we apply the function defined into descriptor
+                                    {
+                                        $file=$objimport->array_import_convertvalue[0][$val]['classfile'];
+                                        $class=$objimport->array_import_convertvalue[0][$val]['class'];
+                                        $method=$objimport->array_import_convertvalue[0][$val]['method'];
+                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
+                                        {
+                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                        }
+                                        else
+										{
+                                            dol_include_once($file);
+                                            $classinstance=new $class($this->db);
+                                            // Try the fetch from code or ref
+                                            call_user_func_array(array($classinstance, $method),array('', $newval));
+                                            // If not found, try the fetch from label
+                                            if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
+                                            {
+												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+                                            }
+                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
+                                            //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
+                                            if ($classinstance->id != '')	// id may be 0, it is a found value
+                                            {
+                                                $newval=$classinstance->id;
+                                            }
+                                            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']));
+                                                else if (!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']='ErrorFieldValueNotIn';
+                                                $this->errors[$error]['type']='FOREIGNKEY';
+                                                $errorforthistable++;
+                                                $error++;
+                                            }
+                                        }
+                                    }
+
+                                }
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+                                {
+                                    if (empty($newval)) $newval='0';
+                                }
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+                                {
+                                    if (strtolower($newval) == 'auto')
+                                    {
+                                        $this->thirpartyobject->get_codeclient(0,0);
+                                        $newval=$this->thirpartyobject->code_client;
+                                        //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')
+                                {
+                                    if (strtolower($newval) == 'auto')
+                                    {
+                                        $newval=$this->thirpartyobject->get_codefournisseur(0,1);
+                                        $newval=$this->thirpartyobject->code_fournisseur;
+                                        //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')
+                                {
+                                    if (strtolower($newval) == 'auto')
+                                    {
+                                        $this->thirpartyobject->get_codecompta('customer');
+                                        $newval=$this->thirpartyobject->code_compta;
+                                        //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')
+                                {
+                                    if (strtolower($newval) == 'auto')
+                                    {
+                                        $this->thirpartyobject->get_codecompta('supplier');
+                                        $newval=$this->thirpartyobject->code_compta_fournisseur;
+                                        if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                        //print 'code_compta_fournisseur='.$newval;
+                                    }
+                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                }
+
+                                //print 'Val to use as insert is '.$newval.'<br>';
+						    }
+
+						    // Test regexp
+							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
+							{
+								// If test is "Must exist in a field@table"
+								if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
+								{
+									$field=$reg[1];
+									$table=$reg[2];
+
+									// Load content of field@table into cache array
+									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+									{
+										$sql="SELECT ".$field." as aliasfield FROM ".$table;
+										$resql=$this->db->query($sql);
+										if ($resql)
+										{
+											$num=$this->db->num_rows($resql);
+											$i=0;
+											while ($i < $num)
+											{
+												$obj=$this->db->fetch_object($resql);
+												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												$i++;
+											}
+										}
+										else
+										{
+											dol_print_error($this->db);
+										}
+									}
+
+									// Now we check cache is not empty (should not) and key is into cache
+									if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
+									{
+										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
+										$this->errors[$error]['type']='FOREIGNKEY';
+									    $errorforthistable++;
+										$error++;
+									}
+								}
+								// If test is just a static regex
+								else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
+								{
+								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+									$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
+									$this->errors[$error]['type']='REGEX';
+									$errorforthistable++;
+									$error++;
+								}
+							}
+
+							// Other tests
+							// ...
+						}
+
+						// Define $listfields and $listvalues to build SQL request
+						if ($listfields) { $listfields.=', '; $listvalues.=', '; }
+						$listfields.=$fieldname;
+
+						// 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)."'";
+					}
+					$i++;
+				}
+
+				// We add hidden fields (but only if there is at least one field to add into table)
+				if ($listfields && is_array($objimport->array_import_fieldshidden[0]))
+				{
+    				// Loop on each hidden fields to add them into listfields/listvalues
+				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
+    				{
+    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+    				    if ($listfields) { $listfields.=', '; $listvalues.=', '; }
+    				    if ($val == 'user->id')
+    				    {
+    				        $listfields.=preg_replace('/^'.preg_quote($alias).'\./','',$key);
+    				        $listvalues.=$user->id;
+    				    }
+    				    elseif (preg_match('/^lastrowid-/',$val))
+    				    {
+    				        $tmp=explode('-',$val);
+    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
+    				        $listfields.=preg_replace('/^'.preg_quote($alias).'\./','',$key);
+                            $listvalues.=$lastinsertid;
+    				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+    				    } else 
+				    {
+					 $listfields.=preg_replace('/^'.preg_quote($alias).'\./','',$key);
+					 $listvalues.=$val;
+				    }
+    				}
+				}
+				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
+
+				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
+				if (! $errorforthistable)
+				{
+				    //print "$alias/$tablename/$listfields/$listvalues<br>";
+					if ($listfields)
+					{
+					    //var_dump($objimport->array_import_convertvalue); exit;
+
+						// Build SQL request
+						if (empty($tablewithentity_cache[$tablename]))
+						{
+							$sql ='INSERT INTO '.$tablename.'('.$listfields.', import_key';
+							if (! empty($objimport->array_import_tables_creator[0][$alias])) $sql.=', '.$objimport->array_import_tables_creator[0][$alias];
+							$sql.=') VALUES('.$listvalues.", '".$importid."'";
+						}
+						else
+						{
+							$sql ='INSERT INTO '.$tablename.'('.$listfields.', import_key, entity';
+							if (! empty($objimport->array_import_tables_creator[0][$alias])) $sql.=', '.$objimport->array_import_tables_creator[0][$alias];
+							$sql.=') VALUES('.$listvalues.", '".$importid."', ".$conf->entity ;
+						}
+						if (! empty($objimport->array_import_tables_creator[0][$alias])) $sql.=', '.$user->id;
+						$sql.=')';
+print($sql);
+						dol_syslog("import_csv.modules", LOG_DEBUG);
+
+						//print '> '.join(',',$arrayrecord);
+						//print 'sql='.$sql;
+						//print '<br>'."\n";
+
+						// Run insert request
+						if ($sql)
+						{
+							$resql=$this->db->query($sql);
+							$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that dependent 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).
+							if ($resql)
+							{
+								//print '.';
+							}
+							else
+							{
+								//print 'E';
+								$this->errors[$error]['lib']=$this->db->lasterror();
+								$this->errors[$error]['type']='SQL';
+								$error++;
+							}
+						}
+					}
+					/*else
+					{
+						dol_print_error('','ErrorFieldListEmptyFor '.$alias."/".$tablename);
+					}*/
+				}
+
+			    if ($error) break;
+			}
+		}
+
+		return 1;
+	}
+
+}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index c6fe3094b68..1874ccdd87d 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1135,6 +1135,7 @@ if ($step == 5 && $datatoimport)
 		$obj->import_close_file();
 	}
 
+  // TODO, remove this, since it only works for csv
 	$nboflines=dol_count_nb_of_line($conf->import->dir_temp.'/'.$filetoimport);
 
 	$param='&leftmenu=import&format='.$format.'&datatoimport='.$datatoimport.'&filetoimport='.urlencode($filetoimport).'&nboflines='.$nboflines.'&separator='.urlencode($separator).'&enclosure='.urlencode($enclosure);

From 3c2b50c6a2dea4e6c5aef203397dc8d00c0d9924 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 Feb 2016 19:14:18 +0100
Subject: [PATCH 268/421] Include PR

---
 htdocs/langs/de_DE/companies.lang | 6 +++---
 htdocs/langs/en_US/companies.lang | 2 +-
 htdocs/langs/fr_FR/companies.lang | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 7b247dd2c6d..29b7d549b29 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -111,7 +111,7 @@ ProfId2Short=Prof. ID 2
 ProfId3Short=Prof. ID 3
 ProfId4Short=Prof. ID 4
 ProfId5Short=Prof. ID 5
-ProfId6Short=Prof. id 6
+ProfId6Short=Prof. ID 6
 ProfId1=Professional ID 1
 ProfId2=Professional ID 2
 ProfId3=Professional ID 3
@@ -202,8 +202,8 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Niederlassungsgenehmigung)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 588867b1f2f..05348d7d26a 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index d61b732db4d..1612d396d07 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -202,8 +202,8 @@ ProfId3IN=Id. prof. 3 (SRVC TAX)
 ProfId4IN=Id. prof. 4
 ProfId5IN=Id. prof. 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Autorisation d'établissement)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-

From c1d7f5a7ed983a846919d6feb44e84ae0bc66e0a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 Feb 2016 20:00:40 +0100
Subject: [PATCH 269/421] FIX #4633

---
 htdocs/product/stats/card.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 79d33b1d884..49b700b46ca 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -193,16 +193,19 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 		//print '<table width="100%">';
 
 		// Generation des graphs
-		$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
-		if (! file_exists($dir.'/'.$object->id))
+		if ($object->id > 0)  // We are on statistics for a dedicated product
 		{
-			if (dol_mkdir($dir.'/'.$object->id) < 0)
-			{
-				$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
-				$error++;
-			}
+    		$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
+    		if (! file_exists($dir.'/'.$object->id))
+    		{
+    			if (dol_mkdir($dir.'/'.$object->id) < 0)
+    			{
+    				$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
+    				$error++;
+    			}
+    		}
 		}
-
+		
 		$graphfiles=array(
 		'propal'           =>array('modulepart'=>'productstats_proposals',
 		'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',

From 54a4570b5f9f94bbfa04b4f7daf1141c22444b08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 Feb 2016 20:57:15 +0100
Subject: [PATCH 270/421] FIX #4580

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 4a9efd40585..087195e2905 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -747,7 +747,7 @@ if ($resql)
 	    $arraystcomm=array();
 		foreach($prospectstatic->cacheprospectstatus as $key => $val)
 		{
-			$arraystcomm[$val['id']]=$val['label'];
+	        $arraystcomm[$val['id']]=($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
 		}
 	    print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
 	    print '</td>';

From 93b1b4c66e5e2cd25f1a6fe29fd8889252902286 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 Feb 2016 21:02:25 +0100
Subject: [PATCH 271/421] FIX #4580

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

diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 7259cff218e..e58694fa0f8 100644
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -438,10 +438,10 @@ if ($resql)
     // Prospect status
     print '<td class="liste_titre" align="center">';
     $arraystcomm=array();
-	foreach($prospectstatic->cacheprospectstatus as $key => $val)
-	{
-		$arraystcomm[$val['id']]=$val['label'];
-	}
+    foreach($prospectstatic->cacheprospectstatus as $key => $val)
+    {
+        $arraystcomm[$val['id']]=($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
+    }    
     print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
     print '</td>';
 

From c969b09ef7134f9604a5c1fc881965cb9ae7571e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Peccatte?= <benoit.peccatte@normation.com>
Date: Sun, 21 Feb 2016 21:50:44 +0100
Subject: [PATCH 272/421] Add support to product translation imports

---
 htdocs/core/modules/modProduct.class.php      | 56 ++++++++++++++++++-
 .../install/mysql/migration/3.9.0-4.0.0.sql   |  3 +
 .../install/mysql/tables/llx_product_lang.sql |  3 +-
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 0c260cb047b..a130ed65a22 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -168,6 +168,40 @@ class modProduct extends DolibarrModules
 		if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
 		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
 
+		if (! empty($conf->global->MAIN_MULTILANGS))
+		{
+			// multiline format, you need one line per translated product
+			$this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('l.lang'=>'language', 'l.label'=>'translated_label','l.description'=>'translated_description','l.note'=>'translated_note'));
+			$this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('l.lang'=>'Text', 'l.label'=>'Text','l.description'=>'Text','l.note'=>'Text'));
+			$this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('l.lang'=>'translation', 'l.label'=>'translation','l.description'=>'translation','l.note'=>'translation'));
+			$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
+
+			// single line format, just use one column per translation
+			$sql="SELECT lang FROM ".MAIN_DB_PREFIX."product_lang GROUP BY lang";
+			$langs = array();
+			$resql=$this->db->query($sql);
+			if ($resql) {
+				while ($obj=$this->db->fetch_object($resql)) {
+					// list all language, you need at least one translation available to detect the language
+					$name = $obj->lang;
+					array_push($langs, $name);
+					$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."product_lang as $name ON $name.fk_product = p.rowid AND $name.lang='$name'";
+					// translate the label
+					$this->export_fields_array[$r][$name.".label"]=$name."_label";
+					$this->export_TypeFields_array[$r][$name.".label"]='Text';
+					$this->export_entities_array[$r][$name.".label"]='translation';
+					// translate the description
+					$this->export_fields_array[$r][$name.".description"]=$name."_description";
+					$this->export_TypeFields_array[$r][$name.".description"]='Text';
+					$this->export_entities_array[$r][$name.".description"]='translation';
+					// translate the note
+					$this->export_fields_array[$r][$name.".note"]=$name."_note";
+					$this->export_TypeFields_array[$r][$name.".note"]='Text';
+					$this->export_entities_array[$r][$name.".note"]='translation';
+				}
+			}
+		}
+
 		if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		{
 			// Exports product multiprice
@@ -188,7 +222,7 @@ class modProduct extends DolibarrModules
 				'pr.price_ttc'=>"product",
 				'pr.price_min'=>"product",'pr.price_min_ttc'=>"product",
 				'pr.tva_tx'=>'product',
-			    'pr.recuperableonly'=>'product',
+				'pr.recuperableonly'=>'product',
 				'pr.date_price'=>"product");
 			$this->export_sql_start[$r]='SELECT DISTINCT ';
 			$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
@@ -288,6 +322,26 @@ class modProduct extends DolibarrModules
 				'pr.date_price'=>'2013-04-10');
 		}
 
+		if (! empty($conf->global->MAIN_MULTILANGS))
+		{
+			$this->import_tables_array[$r]['l']=MAIN_DB_PREFIX.'product_lang';
+			// multiline translation, one line per translation
+			$this->import_fields_array[$r]['l.lang']='language';
+			$this->import_fields_array[$r]['l.label']='translated_label';
+			$this->import_fields_array[$r]['l.description']='translated_description';
+			$this->import_fields_array[$r]['l.note']='translated_note';
+			$this->import_examplevalues_array[$r]['l.lang']='en_US';
+
+			// single line translation, one column per translation
+			foreach($langs as $l) {
+				$this->import_tables_array[$r][$l] = MAIN_DB_PREFIX.'product_lang';
+				$this->import_fields_array[$r][$l.'.label']=$l.'_label';
+				$this->import_fields_array[$r][$l.'.description']=$l.'_description';
+				$this->import_fields_array[$r][$l.'.note']=$l.'_note';
+				$this->import_fieldshidden_array[$r][$l.'.lang']="'$l'";
+				$this->import_fieldshidden_array[$r][$l.'.fk_product']='lastrowid-'.MAIN_DB_PREFIX.'product';
+			}
+		}
 	}
 
 
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 7cd50efc72d..1592ca69c63 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -250,6 +250,7 @@ ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
 
+<<<<<<< HEAD
  
 -- Add for recurring template invoices
 
@@ -302,3 +303,5 @@ ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_subprice double(24
 ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
 ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
 ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_product_lang ADD COLUMN import_key varchar(14) DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql
index 8b4371c83b7..7363a65a95c 100644
--- a/htdocs/install/mysql/tables/llx_product_lang.sql
+++ b/htdocs/install/mysql/tables/llx_product_lang.sql
@@ -25,5 +25,6 @@ create table llx_product_lang
   lang           varchar(5)   DEFAULT 0 NOT NULL,
   label          varchar(255) NOT NULL,
   description    text,
-  note           text
+  note           text,
+  import_key varchar(14) DEFAULT NULL
 )ENGINE=innodb;

From fd4cda819c4f5e6215321e7935000d58d7f3d723 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sun, 21 Feb 2016 22:47:52 +0100
Subject: [PATCH 273/421] New add supplier payment

---
 .../compta/paiement/class/paiement.class.php  |  2 +-
 htdocs/fourn/class/paiementfourn.class.php    | 86 ++++++++++++++++---
 htdocs/fourn/facture/card.php                 |  5 +-
 htdocs/fourn/facture/paiement.php             |  2 +
 .../install/mysql/migration/3.9.0-4.0.0.sql   |  1 +
 .../mysql/tables/llx_paiementfourn.sql        |  1 +
 6 files changed, 80 insertions(+), 17 deletions(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 7b6c7dd2f5b..daf43ec9d64 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -150,7 +150,7 @@ class Paiement extends CommonObject
 		global $conf, $langs;
 
 		$error = 0;
-		$way = $this->getWay();  
+		$way = $this->getWay();
 		
 		$now=dol_now();
 		
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index bb84f8ca917..940de150765 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -27,6 +27,7 @@
  */
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
  *	Class to manage payments for supplier invoices
@@ -134,29 +135,58 @@ class PaiementFourn extends Paiement
 		global $langs,$conf;
 
 		$error = 0;
+		$way = $this->getWay();
 
 		// Clean parameters
-		$this->total = 0;
-		foreach ($this->amounts as $key => $value)
+		$totalamount = 0;
+		$totalamount_converted = 0;
+		
+		if ($way == 'dolibarr')
 		{
-			$newvalue = price2num($value, 'MT');
-			$this->amounts[$key] = $newvalue;
-			$this->total += $newvalue;
+			$amounts = &$this->amounts;
+			$amounts_to_update = &$this->multicurrency_amounts;
 		}
-		$this->total = price2num($this->total);
-
+		else
+		{
+			$amounts = &$this->multicurrency_amounts;
+			$amounts_to_update = &$this->amounts;
+		}
+		
+		foreach ($amounts as $key => $value)
+		{
+			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value, $way, 'facture_fourn');
+			$totalamount_converted += $value_converted;
+			$amounts_to_update[$key] = price2num($value_converted, 'MT');
+			
+			$newvalue = price2num($value,'MT');
+			$amounts[$key] = $newvalue;
+			$totalamount += $newvalue;
+		}
+		$totalamount = price2num($totalamount);
+		$totalamount_converted = price2num($totalamount_converted);
 
 		$this->db->begin();
 
-		if ($this->total <> 0) // On accepte les montants negatifs
+		if ($totalamount <> 0) // On accepte les montants negatifs
 		{
 			$ref = $this->getNextNumRef('');
 			$now=dol_now();
-
+			
+			if ($way == 'dolibarr')
+			{
+				$total = $totalamount;
+				$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
+			}
+			else
+			{
+				$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
+				$mtotal = $totalamount;
+			}
+		
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn (';
-			$sql.= 'ref, entity, datec, datep, amount, fk_paiement, num_paiement, note, fk_user_author, fk_bank)';
+			$sql.= 'ref, entity, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, fk_user_author, fk_bank)';
 			$sql.= " VALUES ('".$this->db->escape($ref)."', ".$conf->entity.", '".$this->db->idate($now)."',";
-			$sql.= " '".$this->db->idate($this->datepaye)."', '".$this->total."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.", 0)";
+			$sql.= " '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.", 0)";
 
 			dol_syslog("PaiementFourn::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -171,8 +201,8 @@ class PaiementFourn extends Paiement
 					if (is_numeric($amount) && $amount <> 0)
 					{
 						$amount = price2num($amount);
-						$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn (fk_facturefourn, fk_paiementfourn, amount)';
-						$sql .= ' VALUES ('.$facid.','. $this->id.',\''.$amount.'\')';
+						$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn (fk_facturefourn, fk_paiementfourn, amount, multicurrency_amount)';
+						$sql .= ' VALUES ('.$facid.','. $this->id.',\''.$amount.'\', \''.$this->multicurrency_amounts[$key].'\')';
 						$resql=$this->db->query($sql);
 						if ($resql)
 						{
@@ -229,8 +259,11 @@ class PaiementFourn extends Paiement
 			$error++;
 		}
 
-		if ($this->total <> 0 && $error == 0) // On accepte les montants negatifs
+		if ($totalamount <> 0 && $error == 0) // On accepte les montants negatifs
 		{
+			$this->amount=$total;
+		    $this->total=$total;
+			$this->multicurrency_amount=$mtotal;
 			$this->db->commit();
 			dol_syslog('PaiementFourn::Create Ok Total = '.$this->total);
 			return $this->id;
@@ -625,4 +658,29 @@ class PaiementFourn extends Paiement
 			return "";
 		}
 	}
+
+	/**
+	 * 	get the right way of payment
+	 * 
+	 * 	@return 	string 	'dolibarr' if standard comportment or paid in dolibarr currency, 'customer' if payment received from multicurrency inputs
+	 */
+	function getWay()
+	{
+		global $conf;
+		
+		$way = 'dolibarr';
+		if (!empty($conf->multicurrency->enabled))
+		{
+			foreach ($this->multicurrency_amounts as $value)
+			{
+				if (!empty($value)) // one value found then payment is in invoice currency
+				{
+					$way = 'customer';
+					break;
+				}
+			}
+		}
+		
+		return $way;
+	}
 }
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6860d5b6bb6..73def71adc1 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1269,14 +1269,15 @@ if ($action == 'create')
 
     dol_htmloutput_events();
 
+	$currency_code = $conf->currency;
+	
     $societe='';
     if (GETPOST('socid') > 0)
     {
         $societe=new Societe($db);
         $societe->fetch(GETPOST('socid','int'));
+		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) $currency_code = $societe->multicurrency_code;
     }
-
-	$currency_code = $conf->currency;
 	
     if (GETPOST('origin') && GETPOST('originid'))
     {
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 7aab308d2fa..dd9d8fae87f 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -497,7 +497,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        print '<tr class="liste_total">';
 	                        print '<td colspan="3" align="left">'.$langs->trans('TotalTTC').':</td>';
 	                        print '<td align="right"><b>'.price($total_ttc).'</b></td>';
+							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
 	                        print '<td align="right"><b>'.price($totalrecu).'</b></td>';
+							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
 	                        print '<td align="right"><b>'.price($total_ttc - $totalrecu).'</b></td>';
 	                        print '<td align="center">&nbsp;</td>';
 	                        print "</tr>\n";
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 2b38f915869..c05af05a2d5 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -262,6 +262,7 @@ ALTER TABLE llx_contratdet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAU
 
 ALTER TABLE llx_paiement ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0;
 ALTER TABLE llx_paiement_facture ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0;
+ALTER TABLE llx_paiementfourn ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0;
 ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0;
 
 ALTER TABLE llx_societe_remise_except ADD COLUMN multicurrency_amount_ht double(24,8) NOT NULL;
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index cbcc93d9b0f..aba54627a09 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -26,6 +26,7 @@ create table llx_paiementfourn
   datec             datetime,          -- date de creation de l'enregistrement
   datep             datetime,          -- date de paiement
   amount            real DEFAULT 0,    -- montant
+  multicurrency_amount double(24,8) DEFAULT 0,    -- multicurrency amount
   fk_user_author    integer,           -- auteur
   fk_paiement       integer NOT NULL,  -- moyen de paiement
   num_paiement      varchar(50),       -- numero de paiement (cheque)

From a4f189eea75ce3cd94b103d00b066ca5ba3f7aee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 09:27:18 +0100
Subject: [PATCH 274/421] Fix do not show warning if account defined

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 796e225b268..8637f02bebc 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -881,8 +881,8 @@ class pdf_crabe extends ModelePDFFactures
 				$this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
 			}
 			// Avoid having any valid PDF with setup that is not complete
-			elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER))
-				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER)))
+			elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))
+				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank)))
 			{
 				$outputlangs->load("errors");
 

From 6181ab41490de8ec04450f571516b4449379ee8a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 09:32:42 +0100
Subject: [PATCH 275/421] FIX Avoid to return an error due to mysql warning

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

diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index c9e4211842d..81708e53e31 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -201,6 +201,7 @@ if ($what == 'mysql')
         while (!feof($handlein))
         {
             $read = fgets($handlein);
+            if (preg_match('/'.preg_quote('Warning: Using a password').'/i', $read)) continue;
             fwrite($handle,$read);
             if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
             elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;

From d7304e516a53488fc210710f74b94477c66a221d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Fri, 19 Feb 2016 18:20:51 +0100
Subject: [PATCH 276/421] Added Github templates

---
 CONTRIBUTING.md => .github/CONTRIBUTING.md | 11 ++++-
 .github/ISSUE_TEMPLATE.md                  | 50 ++++++++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md           | 22 ++++++++++
 .gitmessage                                |  7 +++
 htdocs/main.inc.php                        |  7 ++-
 5 files changed, 93 insertions(+), 4 deletions(-)
 rename CONTRIBUTING.md => .github/CONTRIBUTING.md (92%)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .gitmessage

diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 92%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
index 6a188d04abb..690b00211f7 100644
--- a/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -49,6 +49,13 @@ Use clear commit messages with the following structure:
 LONGDESC
 ```
 
+We provide a [.gitmessage](/.gitmessage) file to help you fit the template.
+
+You can add it to your git configuration using:
+```
+git config --local commit.template .gitmessage
+```
+
 #### Keyword
 In uppercase if you want to have the log comment appears into the generated ChangeLog file.
 
@@ -100,9 +107,9 @@ Otherwise, please be a bit verbose about what you're providing.
 Your Pull Request must pass the Continuous Integration checks.
 Also, some code changes need a prior approbation:
 
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the project leader to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the project manager (@eldy) to see if such a library can be accepted.
 
-* if you add a new table, you must first create a page on http://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Than ask the project leader if the new data model you plan to add can be accepted as you suggest.
+* if you add a new table, you must first create a page on http://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Than ask the project manager (@eldy) if the new data model you plan to add can be accepted as you suggest.
 
 ### Resources
 [Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..4f6deb0d531
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,50 @@
+# Instructions
+
+*This is a template to help you report good issues.*
+
+*You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
+
+*Please:*
+- [ ] *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
+- [ ] *only keep the "Bug" or "Feature Request" section*
+- [ ] *replace the bracket enclosed texts with meaningful informations*
+- [ ] *remove any unused sub-section*
+
+
+# Bug
+[*Short description*]
+
+## Environment
+- **Version**: [*Affected Dolibarr version(s)*]
+- **OS**: [*Server OS type and version*]
+- **Web server**: [*Webserver type and version*]
+- **PHP**: [*PHP version*]
+- **Database**: [*Database type and version*]
+- **URL(s)**: [*Affected URL(s)*]
+
+## Report
+
+### Expected behavior
+[*Verbose description*]
+
+### Actual behavior
+[*Verbose description*]
+
+### Steps to reproduce the behavior
+[*Verbose description*]
+
+### [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
+[*Files*]
+
+
+# Feature Request
+[*Short description*]
+
+## Use case
+[*Verbose description*]
+
+## Suggested implementation
+[*Verbose description*]
+
+## Tasks
+[*List of tasks to achieve goal*]
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..ca46c45d959
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,22 @@
+# Instructions
+
+*This is a template to help you make good pull requests.*
+
+*You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
+
+*Please:*
+- [ ] *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
+- [ ] *only keep the "Fix", "Close" or "New" section*
+- [ ] *replace the bracket enclosed textswith meaningful informations*
+
+
+# Fix #[*issue_number Short description*]
+[*Long description*]
+
+
+# Close #[*issue_number Short description*]
+[*Long description*]
+
+
+# New [*Short description*]
+[*Long description*]
diff --git a/.gitmessage b/.gitmessage
new file mode 100644
index 00000000000..a5a71898608
--- /dev/null
+++ b/.gitmessage
@@ -0,0 +1,7 @@
+
+# ^=[ Subject: One line short summary ]=========^|
+# ~ Subject template: [KEYWORD] [ISSUENUM] DESC ~|
+
+# ^=[ Blank: Follow the Subject with a blank line, do NOT remove ]====^|
+
+# ^=[ Details: Describe what changed and explain why it changed ]=====^|
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 88782e7ff71..43080065aec 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1739,7 +1739,10 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 			$bugbaseurl.= '?title=';
 			$bugbaseurl.= urlencode("Bug: ");
 			$bugbaseurl.= '&body=';
-			$bugbaseurl.= urlencode("# Environment\n");
+			// FIXME: use .github/ISSUE_TEMPLATE.md to generate?
+			$bugbaseurl .= urlencode("# Bug\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl.= urlencode("## Environment\n");
 			$bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
 			$bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
 			$bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
@@ -1747,7 +1750,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 			$bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
 			$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
 			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("# Report\n");
+			$bugbaseurl.= urlencode("## Report\n");
 			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
 			print '<a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
 			print '</div>';

From fe06ad39c009570617034a425cc4a0cc7cb24bf9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 12:41:49 +0100
Subject: [PATCH 277/421] NEW Add a tool for developers to purge database with
 no loose of setup

---
 dev/initdata/README                           |  20 +-
 dev/initdata/README-FR                        |  20 --
 dev/initdata/generate-invoice.php             |   2 +-
 dev/initdata/purge-data.php                   | 226 ++++++++++++++++++
 dev/initdemo/README                           |  17 ++
 .../documents_demo/.htaccess                  |   0
 .../commande/(PROV6)/(PROV6).pdf              | Bin
 .../commande/CO1107-0002/CO1107-0002.pdf      | Bin
 .../commande/CO1107-0003/CO1107-0003.pdf      | Bin
 .../commande/CO1107-0004/CO1107-0004.pdf      | Bin
 .../commande/CO1108-0001/CO1108-0001.pdf      | Bin
 .../documents_demo/custom/main.inc.php        |   0
 .../documents_demo/custom/master.inc.php      |   0
 .../invoices/template_invoice.odt             | Bin
 .../doctemplates/orders/template_order.odt    | Bin
 .../projects/template_project.odt             | Bin
 .../proposals/template_proposal.odt           | Bin
 .../tasks/template_task_summary.odt           | Bin
 .../thirdparties/template_thirdparty.odt      | Bin
 .../sending/SH1302-0001/SH1302-0001.pdf       | Bin
 .../expensereport/(PROV2)/(PROV2).pdf         | Bin
 .../ADMIN-ER00001-150101.pdf                  | Bin
 .../ADMIN-ER00002-150101.pdf                  | Bin
 .../facture/(PROV149)/(PROV149).pdf           | Bin
 .../facture/AV1212-0001/AV1212-0001.pdf       | Bin
 .../facture/AV1212-0002/AV1212-0002.pdf       | Bin
 .../facture/AV1303-0003/AV1303-0003.pdf       | Bin
 .../facture/FA1007-0002/FA1007-0002.pdf       | Bin
 .../facture/FA1107-0006/FA1107-0006.pdf       | Bin
 .../FA1107-0019/FA1107-0019_invoice.odt       | Bin
 .../facture/FA1108-0003/FA1108-0003.pdf       | Bin
 .../facture/FA1108-0004/FA1108-0004.pdf       | Bin
 .../facture/FA1108-0005/FA1108-0005.pdf       | Bin
 .../facture/FA1108-0007/FA1108-0007.pdf       | Bin
 .../facture/FA1212-0009/FA1212-0009.pdf       | Bin
 .../FA1212-0009/FA1212-0009_invoice.odt       | Bin
 .../facture/FA1212-0011/FA1212-0011.pdf       | Bin
 .../facture/FA1212-0021/FA1212-0021.pdf       | Bin
 .../facture/FA1212-0023/FA1212-0023.pdf       | Bin
 .../facture/FA1507-0015/FA1507-0015.pdf       | Bin
 .../FA1507-0015/FA1507-0015_invoice.odt       | Bin
 .../ficheinter/FI1007-0001/FI1007-0001.pdf    | Bin
 .../ficheinter/FI1511-0003/FI1511-0003.pdf    | Bin
 .../commande/CF1007-0001/CF1007-0001.pdf      | Bin
 .../commande/CF1007-0002/CF1007-0002.pdf      | Bin
 .../commande/CF1303-0004/CF1303-0004.pdf      | Bin
 .../fournisseur/facture/6/1/16/16.pdf         | Bin
 .../fournisseur/facture/7/1/17/17.pdf         | Bin
 .../mycompany/logos/mybigcompany.png          | Bin
 .../logos/thumbs/mybigcompany_mini.png        | Bin
 .../logos/thumbs/mybigcompany_small.png       | Bin
 .../produit/APPLEPIE/applepieproduct.jpg      | Bin
 .../APPLEPIE/thumbs/applepieproduct_mini.jpg  | Bin
 .../produit/CAKECONTRIB/applepieproduct.jpg   | Bin
 .../thumbs/applepieproduct_mini.jpg           | Bin
 .../produit/COMP-XP4523/compxp4523product.jpg | Bin
 .../thumbs/compxp4523product_mini.jpg         | Bin
 .../produit/DOLIDROID/dolidroid_114x114.png   | Bin
 .../DOLIDROID/dolidroid_512x512_en.png        | Bin
 .../dolidroid_screenshot_home_720x1280.png    | Bin
 .../thumbs/dolidroid_114x114_mini.png         | Bin
 .../thumbs/dolidroid_512x512_en_mini.png      | Bin
 ...olidroid_screenshot_home_720x1280_mini.png | Bin
 .../produit/PEARPIE/pearpieproduct.jpg        | Bin
 .../PEARPIE/thumbs/pearpieproduct_mini.jpg    | Bin
 .../produit/PINKDRESS/pinkdressproduct.jpg    | Bin
 .../thumbs/pinkdressproduct_mini.jpg          | Bin
 .../produit/ROLLUPABC/rolluproduct.jpg        | Bin
 .../ROLLUPABC/thumbs/rolluproduct_mini.jpg    | Bin
 .../propale/PR1007-0001/PR1007-0001.pdf       | Bin
 .../propale/PR1007-0002/PR1007-0002.pdf       | Bin
 .../propale/PR1302-0005/PR1302-0005.pdf       | Bin
 .../propale/PR1302-0006/PR1302-0006.pdf       | Bin
 .../propale/PR1302-0007/PR1302-0007.pdf       | Bin
 .../societe/1/logos/indiancompany.png         | Bin
 .../1/logos/thumbs/indiancompany_mini.png     | Bin
 .../1/logos/thumbs/indiancompany_small.png    | Bin
 .../societe/10/logos/logo_nltechno_94x100.png | Bin
 .../thumbs/logo_nltechno_94x100_mini.png      | Bin
 .../thumbs/logo_nltechno_94x100_small.png     | Bin
 .../societe/11/logos/comapnycorp1company.png  | Bin
 .../logos/thumbs/comapnycorp1company_mini.png | Bin
 .../thumbs/comapnycorp1company_small.png      | Bin
 .../societe/12/logos/pierrecurie.jpg          | Bin
 .../12/logos/thumbs/pierrecurie_mini.jpg      | Bin
 .../12/logos/thumbs/pierrecurie_small.jpg     | Bin
 .../societe/13/logos/companycorp2company.png  | Bin
 .../logos/thumbs/companycorp2company_mini.png | Bin
 .../thumbs/companycorp2company_small.png      | Bin
 .../societe/17/logos/bookkeepercompany.png    | Bin
 .../logos/thumbs/bookkeepercompany_mini.png   | Bin
 .../logos/thumbs/bookkeepercompany_small.png  | Bin
 .../societe/19/logos/magicfoodstore.png       | Bin
 .../19/logos/thumbs/magicfoodstore_mini.png   | Bin
 .../19/logos/thumbs/magicfoodstore_small.png  | Bin
 .../societe/2/logos/teclibcompany.png         | Bin
 .../2/logos/thumbs/teclibcompany_mini.png     | Bin
 .../2/logos/thumbs/teclibcompany_small.png    | Bin
 .../societe/25/logos/printcompany.png         | Bin
 .../25/logos/thumbs/printcompany_mini.png     | Bin
 .../25/logos/thumbs/printcompany_small.png    | Bin
 .../societe/3/logos/spanishcompany.png        | Bin
 .../3/logos/thumbs/spanishcompany_mini.png    | Bin
 .../3/logos/thumbs/spanishcompany_small.png   | Bin
 .../4/logos/thumbs/valeencompany_mini.png     | Bin
 .../4/logos/thumbs/valeencompany_small.png    | Bin
 .../societe/4/logos/valeencompany.png         | Bin
 .../societe/5/logos/nocountrycomp.png         | Bin
 .../5/logos/thumbs/nocountrycomp_mini.png     | Bin
 .../5/logos/thumbs/nocountrycomp_small.png    | Bin
 .../societe/6/logos/swisstouch.png            | Bin
 .../6/logos/thumbs/swisstouch_mini.png        | Bin
 .../6/logos/thumbs/swisstouch_small.png       | Bin
 .../societe/7/logos/genericcustomer.png       | Bin
 .../7/logos/thumbs/genericcustomer_mini.png   | Bin
 .../7/logos/thumbs/genericcustomer_small.png  | Bin
 .../documents_demo/users/0/1/mariecurie.jpg   | Bin
 .../users/0/1/thumbs/mariecurie_mini.jpg      | Bin
 .../users/0/1/thumbs/mariecurie_small.jpg     | Bin
 .../documents_demo/users/1/0/IMG_0013.jpg     | Bin
 .../users/1/0/alberteinstein.jpg              | Bin
 .../users/1/0/thumbs/IMG_0013_mini.jpg        | Bin
 .../users/1/0/thumbs/IMG_0013_small.jpg       | Bin
 .../users/1/0/thumbs/alberteinstein_mini.jpg  | Bin
 .../users/1/0/thumbs/alberteinstein_small.jpg | Bin
 .../documents_demo/users/2/0/daviddoe.png     | Bin
 .../users/2/0/thumbs/daviddoe_mini.png        | Bin
 .../users/2/0/thumbs/daviddoe_small.png       | Bin
 .../documents_demo/users/3/0/pierrecurie.jpg  | Bin
 .../users/3/0/thumbs/pierrecurie_mini.jpg     | Bin
 .../users/3/0/thumbs/pierrecurie_small.jpg    | Bin
 .../users/8/1/ldestailleur_200x200.jpg        | Bin
 .../8/1/thumbs/ldestailleur_200x200_mini.jpg  | Bin
 .../8/1/thumbs/ldestailleur_200x200_small.jpg | Bin
 .../dolibarr-mysql2pgsql.pl                   |   0
 dev/{initdata => initdemo}/initdemo.sh        |   0
 .../mysqldump_dolibarr_3.0.0.sql              |   0
 .../mysqldump_dolibarr_3.1.0.sql              |   0
 .../mysqldump_dolibarr_3.2.0.sql              |   0
 .../mysqldump_dolibarr_3.3.0.sql              |   0
 .../mysqldump_dolibarr_3.4.0.sql              |   0
 .../mysqldump_dolibarr_3.5.0.sql              |   0
 .../mysqldump_dolibarr_3.6.0.sql              |   0
 .../mysqldump_dolibarr_3.7.0.sql              |   0
 .../mysqldump_dolibarr_3.8.0.sql              |   0
 dev/{initdata => initdemo}/removedemo.sh      |   0
 dev/{initdata => initdemo}/savedemo.sh        |   0
 .../sftpget_and_loaddump.php                  |   0
 148 files changed, 248 insertions(+), 37 deletions(-)
 delete mode 100644 dev/initdata/README-FR
 create mode 100755 dev/initdata/purge-data.php
 create mode 100644 dev/initdemo/README
 rename dev/{initdata => initdemo}/documents_demo/.htaccess (100%)
 rename dev/{initdata => initdemo}/documents_demo/commande/(PROV6)/(PROV6).pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/commande/CO1107-0002/CO1107-0002.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/commande/CO1107-0003/CO1107-0003.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/commande/CO1107-0004/CO1107-0004.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/commande/CO1108-0001/CO1108-0001.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/custom/main.inc.php (100%)
 rename dev/{initdata => initdemo}/documents_demo/custom/master.inc.php (100%)
 rename dev/{initdata => initdemo}/documents_demo/doctemplates/invoices/template_invoice.odt (100%)
 rename dev/{initdata => initdemo}/documents_demo/doctemplates/orders/template_order.odt (100%)
 rename dev/{initdata => initdemo}/documents_demo/doctemplates/projects/template_project.odt (100%)
 rename dev/{initdata => initdemo}/documents_demo/doctemplates/proposals/template_proposal.odt (100%)
 rename dev/{initdata => initdemo}/documents_demo/doctemplates/tasks/template_task_summary.odt (100%)
 rename dev/{initdata => initdemo}/documents_demo/doctemplates/thirdparties/template_thirdparty.odt (100%)
 rename dev/{initdata => initdemo}/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/expensereport/(PROV2)/(PROV2).pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/(PROV149)/(PROV149).pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/AV1212-0001/AV1212-0001.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/AV1212-0002/AV1212-0002.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/AV1303-0003/AV1303-0003.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1007-0002/FA1007-0002.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1107-0006/FA1107-0006.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1108-0003/FA1108-0003.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1108-0004/FA1108-0004.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1108-0005/FA1108-0005.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1108-0007/FA1108-0007.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1212-0009/FA1212-0009.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1212-0011/FA1212-0011.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1212-0021/FA1212-0021.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1212-0023/FA1212-0023.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1507-0015/FA1507-0015.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt (100%)
 rename dev/{initdata => initdemo}/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/fournisseur/facture/6/1/16/16.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/fournisseur/facture/7/1/17/17.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/mycompany/logos/mybigcompany.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/APPLEPIE/applepieproduct.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/COMP-XP4523/compxp4523product.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/DOLIDROID/dolidroid_114x114.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/PEARPIE/pearpieproduct.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/ROLLUPABC/rolluproduct.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/propale/PR1007-0001/PR1007-0001.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/propale/PR1007-0002/PR1007-0002.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/propale/PR1302-0005/PR1302-0005.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/propale/PR1302-0006/PR1302-0006.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/propale/PR1302-0007/PR1302-0007.pdf (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/1/logos/indiancompany.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/1/logos/thumbs/indiancompany_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/10/logos/logo_nltechno_94x100.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/11/logos/comapnycorp1company.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/12/logos/pierrecurie.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/13/logos/companycorp2company.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/17/logos/bookkeepercompany.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/19/logos/magicfoodstore.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/2/logos/teclibcompany.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/25/logos/printcompany.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/25/logos/thumbs/printcompany_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/25/logos/thumbs/printcompany_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/3/logos/spanishcompany.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/4/logos/thumbs/valeencompany_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/4/logos/valeencompany.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/5/logos/nocountrycomp.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/6/logos/swisstouch.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/6/logos/thumbs/swisstouch_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/7/logos/genericcustomer.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/0/1/mariecurie.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/0/1/thumbs/mariecurie_small.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/1/0/IMG_0013.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/1/0/alberteinstein.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/2/0/daviddoe.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/2/0/thumbs/daviddoe_mini.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/2/0/thumbs/daviddoe_small.png (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/3/0/pierrecurie.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/8/1/ldestailleur_200x200.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg (100%)
 rename dev/{initdata => initdemo}/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg (100%)
 rename dev/{initdata => initdemo}/dolibarr-mysql2pgsql.pl (100%)
 rename dev/{initdata => initdemo}/initdemo.sh (100%)
 rename dev/{initdata => initdemo}/mysqldump_dolibarr_3.0.0.sql (100%)
 rename dev/{initdata => initdemo}/mysqldump_dolibarr_3.1.0.sql (100%)
 rename dev/{initdata => initdemo}/mysqldump_dolibarr_3.2.0.sql (100%)
 rename dev/{initdata => initdemo}/mysqldump_dolibarr_3.3.0.sql (100%)
 rename dev/{initdata => initdemo}/mysqldump_dolibarr_3.4.0.sql (100%)
 rename dev/{initdata => initdemo}/mysqldump_dolibarr_3.5.0.sql (100%)
 rename dev/{initdata => initdemo}/mysqldump_dolibarr_3.6.0.sql (100%)
 rename dev/{initdata => initdemo}/mysqldump_dolibarr_3.7.0.sql (100%)
 rename dev/{initdata => initdemo}/mysqldump_dolibarr_3.8.0.sql (100%)
 rename dev/{initdata => initdemo}/removedemo.sh (100%)
 rename dev/{initdata => initdemo}/savedemo.sh (100%)
 rename dev/{initdata => initdemo}/sftpget_and_loaddump.php (100%)

diff --git a/dev/initdata/README b/dev/initdata/README
index 00cac903b07..1db130dfe3e 100644
--- a/dev/initdata/README
+++ b/dev/initdata/README
@@ -1,17 +1,5 @@
-README (English)
---------------------------------
+README
+------
 
-*** Demo
-
-Scripts in this directory can be used to reinit a demo database.
-WARNING: This will erase current database with data into initdemo.sql.
-
-Do a chmod 700 initdemo.sh
-then run ./initdemo.sh to launch Graphic User Interface.
-
-Install of package "dialog" is required.
-
-
-*** Other
-
-Other scripts can be used to load data test.
+Scripts in this directory can be used to load or purge data of a database instance.
+WARNING: This may erase data.
diff --git a/dev/initdata/README-FR b/dev/initdata/README-FR
deleted file mode 100644
index 17fb38bd063..00000000000
--- a/dev/initdata/README-FR
+++ /dev/null
@@ -1,20 +0,0 @@
-README (French)
---------------------------------
-
-*** Demo
-
-Ce script permet de reinitialiser une base de donnée Dolibarr avec des
-données de demo.
-ATTENTION: Ceci efface les données en cours de la base avec les données
-du fichier initdemo.sql.
-
-Faite un chmod 700 initdemo.sh
-puis ./initdemo.sh pour lancer l'interface graphique.
-
-L'installation du package "dialog" est indispensable.
-
-
-*** Autre
-
-Les autres scripts peuvent être utilisé pour charger en base des données de tests
-générés automatiquement.
\ No newline at end of file
diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php
index c1b2f2646a5..11d827e0dcf 100755
--- a/dev/initdata/generate-invoice.php
+++ b/dev/initdata/generate-invoice.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *      \file       dev/intdata/generate-invoice.php
+ *      \file       dev/initdata/generate-invoice.php
  *		\brief      Script example to inject random customer invoices (for load tests)
  */
 
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
new file mode 100755
index 00000000000..a0f6d8917e7
--- /dev/null
+++ b/dev/initdata/purge-data.php
@@ -0,0 +1,226 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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/>.
+ *
+ * THIS SCRIPT DELETE ALL MAIN TABLE CONTENT
+ * WARNING, DO NOT USE ON A PRODUCTION INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/purge-data.php
+ *      \brief      Script to delete all main tables
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test si mode batch
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit(-1);
+}
+
+// Recupere root dolibarr
+$path=preg_replace('/purge-data.php/i','',$_SERVER["PHP_SELF"]);
+require ($path."../../htdocs/master.inc.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+$langs->load("main");
+$langs->load("errors");
+
+// Global variables
+$version=DOL_VERSION;
+$error=0;
+
+// List of sql to execute
+$sqls=array(
+    'bank'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'bank_account',
+        'DELETE FROM '.MAIN_DB_PREFIX.'bank_class',
+        'DELETE FROM '.MAIN_DB_PREFIX.'bank_url',
+        'DELETE FROM '.MAIN_DB_PREFIX.'bank',
+    ),
+    'contract'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'contratdet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'contrat',
+    ),
+    'invoice'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'paiement_facture',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture_rec',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facturedet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture WHERE fk_facture_source IS NOT NULL',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture',
+    ),
+    'proposal'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'propaldet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'propal',
+    ),
+    'order'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'commandedet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'commande',
+    ),
+    'supplier_order'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur',
+    ),
+    'supplier_invoice'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn',
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
+    ),
+    'shipment'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet_batch',
+        'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet_extrafields',
+        'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'expedition_extrafields',
+        'DELETE FROM '.MAIN_DB_PREFIX.'expedition',
+    ),
+    'delivery'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'livraisondet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'livraison',
+    ),
+    'intervention'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'fichinterdet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'fichinter',
+    ),
+    'product'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_product',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_lang',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_price',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product',
+    ),
+    'project'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'projet_task_time',
+        'DELETE FROM '.MAIN_DB_PREFIX.'projet_task',
+        'DELETE FROM '.MAIN_DB_PREFIX.'projet',
+    ),
+    'contact'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_contact',
+        'DELETE FROM '.MAIN_DB_PREFIX.'socpeople',
+    ),
+    'thirdparty'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons', 
+        'UPDATE '.MAIN_DB_PREFIX.'adherent SET fk_soc = NULL',
+        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_fournisseur',
+        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_societe',
+        'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except',
+        'DELETE FROM '.MAIN_DB_PREFIX.'societe',
+    )
+);
+
+
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
+
+$mode = $argv[1];
+$option = $argv[2];
+
+if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
+    print "Usage:  $script_file (test|confirm) (all|option)\n";
+    print "\n";
+    print "option can be ".join(',',array_keys($sqls))."\n";
+    exit(-1);
+}
+
+if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
+    print "Usage:  $script_file (test|confirm) (all|option)\n";
+    print "\n";
+    print "option can be ".join(',',array_keys($sqls))."\n";
+    exit(-1);
+}
+
+
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();
+
+print "Purge all data for this database:\n";
+print "Server = ".$db->database_host."\n";
+print "Database name = ".$db->database_name."\n";
+print "Database port = ".$db->database_port."\n";
+print "User = ".$db->database_user."\n";
+print "\n";
+
+if (! $confirmed)
+{
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+
+$db->begin();
+
+$oldfamily='';
+foreach($sqls as $family => $familysql)
+{
+    if ($option && $option != 'all' && $option != $family) continue;
+
+    if ($family != $oldfamily) print "Process action for family ".$family."\n";
+    $oldfamily = $family;
+    
+    foreach($familysql as $sql)
+    {
+        print "Run sql: ".$sql."\n";
+        $resql=$db->query($sql);
+        if (! $resql) 
+        {
+            if ($db->errno() != 'DB_ERROR_NOSUCHTABLE')
+            {
+                $error++;
+            }
+        }
+        
+        if ($error)
+        {
+            print $db->lasterror();
+            $error++;
+            break 2;
+        }
+    }
+}
+
+if ($error || $mode != 'confirm')
+{
+    print "Rollback any changes.\n";
+    $db->rollback();
+}
+else
+{
+    print "Commit all changes.\n";
+    //$db->commit();
+}
+
+$db->close();
+
diff --git a/dev/initdemo/README b/dev/initdemo/README
new file mode 100644
index 00000000000..0cc866940b0
--- /dev/null
+++ b/dev/initdemo/README
@@ -0,0 +1,17 @@
+README
+------
+
+*** Demo
+
+Scripts in this directory can be used to reinit a demo database.
+WARNING: This will erase current database with data into initdemo.sql.
+
+Do a chmod 700 initdemo.sh
+then run ./initdemo.sh to launch Graphic User Interface.
+
+Install of package "dialog" is required.
+
+
+*** Other
+
+Other scripts into initdata can be used to load data test.
diff --git a/dev/initdata/documents_demo/.htaccess b/dev/initdemo/documents_demo/.htaccess
similarity index 100%
rename from dev/initdata/documents_demo/.htaccess
rename to dev/initdemo/documents_demo/.htaccess
diff --git a/dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf b/dev/initdemo/documents_demo/commande/(PROV6)/(PROV6).pdf
similarity index 100%
rename from dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf
rename to dev/initdemo/documents_demo/commande/(PROV6)/(PROV6).pdf
diff --git a/dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf b/dev/initdemo/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
similarity index 100%
rename from dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
rename to dev/initdemo/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
diff --git a/dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf b/dev/initdemo/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
similarity index 100%
rename from dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
rename to dev/initdemo/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
diff --git a/dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf b/dev/initdemo/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
similarity index 100%
rename from dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
rename to dev/initdemo/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
diff --git a/dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf b/dev/initdemo/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
similarity index 100%
rename from dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
rename to dev/initdemo/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
diff --git a/dev/initdata/documents_demo/custom/main.inc.php b/dev/initdemo/documents_demo/custom/main.inc.php
similarity index 100%
rename from dev/initdata/documents_demo/custom/main.inc.php
rename to dev/initdemo/documents_demo/custom/main.inc.php
diff --git a/dev/initdata/documents_demo/custom/master.inc.php b/dev/initdemo/documents_demo/custom/master.inc.php
similarity index 100%
rename from dev/initdata/documents_demo/custom/master.inc.php
rename to dev/initdemo/documents_demo/custom/master.inc.php
diff --git a/dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt b/dev/initdemo/documents_demo/doctemplates/invoices/template_invoice.odt
similarity index 100%
rename from dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt
rename to dev/initdemo/documents_demo/doctemplates/invoices/template_invoice.odt
diff --git a/dev/initdata/documents_demo/doctemplates/orders/template_order.odt b/dev/initdemo/documents_demo/doctemplates/orders/template_order.odt
similarity index 100%
rename from dev/initdata/documents_demo/doctemplates/orders/template_order.odt
rename to dev/initdemo/documents_demo/doctemplates/orders/template_order.odt
diff --git a/dev/initdata/documents_demo/doctemplates/projects/template_project.odt b/dev/initdemo/documents_demo/doctemplates/projects/template_project.odt
similarity index 100%
rename from dev/initdata/documents_demo/doctemplates/projects/template_project.odt
rename to dev/initdemo/documents_demo/doctemplates/projects/template_project.odt
diff --git a/dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt b/dev/initdemo/documents_demo/doctemplates/proposals/template_proposal.odt
similarity index 100%
rename from dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt
rename to dev/initdemo/documents_demo/doctemplates/proposals/template_proposal.odt
diff --git a/dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt b/dev/initdemo/documents_demo/doctemplates/tasks/template_task_summary.odt
similarity index 100%
rename from dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt
rename to dev/initdemo/documents_demo/doctemplates/tasks/template_task_summary.odt
diff --git a/dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt b/dev/initdemo/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
similarity index 100%
rename from dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
rename to dev/initdemo/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
diff --git a/dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf b/dev/initdemo/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
similarity index 100%
rename from dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
rename to dev/initdemo/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
diff --git a/dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf b/dev/initdemo/documents_demo/expensereport/(PROV2)/(PROV2).pdf
similarity index 100%
rename from dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf
rename to dev/initdemo/documents_demo/expensereport/(PROV2)/(PROV2).pdf
diff --git a/dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf b/dev/initdemo/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
similarity index 100%
rename from dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
rename to dev/initdemo/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
diff --git a/dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf b/dev/initdemo/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
similarity index 100%
rename from dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
rename to dev/initdemo/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
diff --git a/dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf b/dev/initdemo/documents_demo/facture/(PROV149)/(PROV149).pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf
rename to dev/initdemo/documents_demo/facture/(PROV149)/(PROV149).pdf
diff --git a/dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf b/dev/initdemo/documents_demo/facture/AV1212-0001/AV1212-0001.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf
rename to dev/initdemo/documents_demo/facture/AV1212-0001/AV1212-0001.pdf
diff --git a/dev/initdata/documents_demo/facture/AV1212-0002/AV1212-0002.pdf b/dev/initdemo/documents_demo/facture/AV1212-0002/AV1212-0002.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/AV1212-0002/AV1212-0002.pdf
rename to dev/initdemo/documents_demo/facture/AV1212-0002/AV1212-0002.pdf
diff --git a/dev/initdata/documents_demo/facture/AV1303-0003/AV1303-0003.pdf b/dev/initdemo/documents_demo/facture/AV1303-0003/AV1303-0003.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/AV1303-0003/AV1303-0003.pdf
rename to dev/initdemo/documents_demo/facture/AV1303-0003/AV1303-0003.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1007-0002/FA1007-0002.pdf b/dev/initdemo/documents_demo/facture/FA1007-0002/FA1007-0002.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1007-0002/FA1007-0002.pdf
rename to dev/initdemo/documents_demo/facture/FA1007-0002/FA1007-0002.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1107-0006/FA1107-0006.pdf b/dev/initdemo/documents_demo/facture/FA1107-0006/FA1107-0006.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1107-0006/FA1107-0006.pdf
rename to dev/initdemo/documents_demo/facture/FA1107-0006/FA1107-0006.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt b/dev/initdemo/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt
rename to dev/initdemo/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt
diff --git a/dev/initdata/documents_demo/facture/FA1108-0003/FA1108-0003.pdf b/dev/initdemo/documents_demo/facture/FA1108-0003/FA1108-0003.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1108-0003/FA1108-0003.pdf
rename to dev/initdemo/documents_demo/facture/FA1108-0003/FA1108-0003.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1108-0004/FA1108-0004.pdf b/dev/initdemo/documents_demo/facture/FA1108-0004/FA1108-0004.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1108-0004/FA1108-0004.pdf
rename to dev/initdemo/documents_demo/facture/FA1108-0004/FA1108-0004.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1108-0005/FA1108-0005.pdf b/dev/initdemo/documents_demo/facture/FA1108-0005/FA1108-0005.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1108-0005/FA1108-0005.pdf
rename to dev/initdemo/documents_demo/facture/FA1108-0005/FA1108-0005.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1108-0007/FA1108-0007.pdf b/dev/initdemo/documents_demo/facture/FA1108-0007/FA1108-0007.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1108-0007/FA1108-0007.pdf
rename to dev/initdemo/documents_demo/facture/FA1108-0007/FA1108-0007.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009.pdf b/dev/initdemo/documents_demo/facture/FA1212-0009/FA1212-0009.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009.pdf
rename to dev/initdemo/documents_demo/facture/FA1212-0009/FA1212-0009.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt b/dev/initdemo/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt
rename to dev/initdemo/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt
diff --git a/dev/initdata/documents_demo/facture/FA1212-0011/FA1212-0011.pdf b/dev/initdemo/documents_demo/facture/FA1212-0011/FA1212-0011.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1212-0011/FA1212-0011.pdf
rename to dev/initdemo/documents_demo/facture/FA1212-0011/FA1212-0011.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1212-0021/FA1212-0021.pdf b/dev/initdemo/documents_demo/facture/FA1212-0021/FA1212-0021.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1212-0021/FA1212-0021.pdf
rename to dev/initdemo/documents_demo/facture/FA1212-0021/FA1212-0021.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1212-0023/FA1212-0023.pdf b/dev/initdemo/documents_demo/facture/FA1212-0023/FA1212-0023.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1212-0023/FA1212-0023.pdf
rename to dev/initdemo/documents_demo/facture/FA1212-0023/FA1212-0023.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015.pdf b/dev/initdemo/documents_demo/facture/FA1507-0015/FA1507-0015.pdf
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015.pdf
rename to dev/initdemo/documents_demo/facture/FA1507-0015/FA1507-0015.pdf
diff --git a/dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt b/dev/initdemo/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt
similarity index 100%
rename from dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt
rename to dev/initdemo/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt
diff --git a/dev/initdata/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf b/dev/initdemo/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf
similarity index 100%
rename from dev/initdata/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf
rename to dev/initdemo/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf
diff --git a/dev/initdata/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf b/dev/initdemo/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf
similarity index 100%
rename from dev/initdata/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf
rename to dev/initdemo/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf
diff --git a/dev/initdata/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf b/dev/initdemo/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf
similarity index 100%
rename from dev/initdata/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf
rename to dev/initdemo/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf
diff --git a/dev/initdata/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf b/dev/initdemo/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf
similarity index 100%
rename from dev/initdata/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf
rename to dev/initdemo/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf
diff --git a/dev/initdata/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf b/dev/initdemo/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf
similarity index 100%
rename from dev/initdata/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf
rename to dev/initdemo/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf
diff --git a/dev/initdata/documents_demo/fournisseur/facture/6/1/16/16.pdf b/dev/initdemo/documents_demo/fournisseur/facture/6/1/16/16.pdf
similarity index 100%
rename from dev/initdata/documents_demo/fournisseur/facture/6/1/16/16.pdf
rename to dev/initdemo/documents_demo/fournisseur/facture/6/1/16/16.pdf
diff --git a/dev/initdata/documents_demo/fournisseur/facture/7/1/17/17.pdf b/dev/initdemo/documents_demo/fournisseur/facture/7/1/17/17.pdf
similarity index 100%
rename from dev/initdata/documents_demo/fournisseur/facture/7/1/17/17.pdf
rename to dev/initdemo/documents_demo/fournisseur/facture/7/1/17/17.pdf
diff --git a/dev/initdata/documents_demo/mycompany/logos/mybigcompany.png b/dev/initdemo/documents_demo/mycompany/logos/mybigcompany.png
similarity index 100%
rename from dev/initdata/documents_demo/mycompany/logos/mybigcompany.png
rename to dev/initdemo/documents_demo/mycompany/logos/mybigcompany.png
diff --git a/dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png b/dev/initdemo/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png
rename to dev/initdemo/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png
diff --git a/dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png b/dev/initdemo/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png
similarity index 100%
rename from dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png
rename to dev/initdemo/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png
diff --git a/dev/initdata/documents_demo/produit/APPLEPIE/applepieproduct.jpg b/dev/initdemo/documents_demo/produit/APPLEPIE/applepieproduct.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/APPLEPIE/applepieproduct.jpg
rename to dev/initdemo/documents_demo/produit/APPLEPIE/applepieproduct.jpg
diff --git a/dev/initdata/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg b/dev/initdemo/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg
rename to dev/initdemo/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg
diff --git a/dev/initdata/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg b/dev/initdemo/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg
rename to dev/initdemo/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg
diff --git a/dev/initdata/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg b/dev/initdemo/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg
rename to dev/initdemo/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg
diff --git a/dev/initdata/documents_demo/produit/COMP-XP4523/compxp4523product.jpg b/dev/initdemo/documents_demo/produit/COMP-XP4523/compxp4523product.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/COMP-XP4523/compxp4523product.jpg
rename to dev/initdemo/documents_demo/produit/COMP-XP4523/compxp4523product.jpg
diff --git a/dev/initdata/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg b/dev/initdemo/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg
rename to dev/initdemo/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg
diff --git a/dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_114x114.png b/dev/initdemo/documents_demo/produit/DOLIDROID/dolidroid_114x114.png
similarity index 100%
rename from dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_114x114.png
rename to dev/initdemo/documents_demo/produit/DOLIDROID/dolidroid_114x114.png
diff --git a/dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png b/dev/initdemo/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
similarity index 100%
rename from dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
rename to dev/initdemo/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
diff --git a/dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png b/dev/initdemo/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
similarity index 100%
rename from dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
rename to dev/initdemo/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
diff --git a/dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png b/dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
rename to dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
diff --git a/dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png b/dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
rename to dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
diff --git a/dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png b/dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
rename to dev/initdemo/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
diff --git a/dev/initdata/documents_demo/produit/PEARPIE/pearpieproduct.jpg b/dev/initdemo/documents_demo/produit/PEARPIE/pearpieproduct.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/PEARPIE/pearpieproduct.jpg
rename to dev/initdemo/documents_demo/produit/PEARPIE/pearpieproduct.jpg
diff --git a/dev/initdata/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg b/dev/initdemo/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg
rename to dev/initdemo/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg
diff --git a/dev/initdata/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg b/dev/initdemo/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg
rename to dev/initdemo/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg
diff --git a/dev/initdata/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg b/dev/initdemo/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg
rename to dev/initdemo/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg
diff --git a/dev/initdata/documents_demo/produit/ROLLUPABC/rolluproduct.jpg b/dev/initdemo/documents_demo/produit/ROLLUPABC/rolluproduct.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/ROLLUPABC/rolluproduct.jpg
rename to dev/initdemo/documents_demo/produit/ROLLUPABC/rolluproduct.jpg
diff --git a/dev/initdata/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg b/dev/initdemo/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg
rename to dev/initdemo/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg
diff --git a/dev/initdata/documents_demo/propale/PR1007-0001/PR1007-0001.pdf b/dev/initdemo/documents_demo/propale/PR1007-0001/PR1007-0001.pdf
similarity index 100%
rename from dev/initdata/documents_demo/propale/PR1007-0001/PR1007-0001.pdf
rename to dev/initdemo/documents_demo/propale/PR1007-0001/PR1007-0001.pdf
diff --git a/dev/initdata/documents_demo/propale/PR1007-0002/PR1007-0002.pdf b/dev/initdemo/documents_demo/propale/PR1007-0002/PR1007-0002.pdf
similarity index 100%
rename from dev/initdata/documents_demo/propale/PR1007-0002/PR1007-0002.pdf
rename to dev/initdemo/documents_demo/propale/PR1007-0002/PR1007-0002.pdf
diff --git a/dev/initdata/documents_demo/propale/PR1302-0005/PR1302-0005.pdf b/dev/initdemo/documents_demo/propale/PR1302-0005/PR1302-0005.pdf
similarity index 100%
rename from dev/initdata/documents_demo/propale/PR1302-0005/PR1302-0005.pdf
rename to dev/initdemo/documents_demo/propale/PR1302-0005/PR1302-0005.pdf
diff --git a/dev/initdata/documents_demo/propale/PR1302-0006/PR1302-0006.pdf b/dev/initdemo/documents_demo/propale/PR1302-0006/PR1302-0006.pdf
similarity index 100%
rename from dev/initdata/documents_demo/propale/PR1302-0006/PR1302-0006.pdf
rename to dev/initdemo/documents_demo/propale/PR1302-0006/PR1302-0006.pdf
diff --git a/dev/initdata/documents_demo/propale/PR1302-0007/PR1302-0007.pdf b/dev/initdemo/documents_demo/propale/PR1302-0007/PR1302-0007.pdf
similarity index 100%
rename from dev/initdata/documents_demo/propale/PR1302-0007/PR1302-0007.pdf
rename to dev/initdemo/documents_demo/propale/PR1302-0007/PR1302-0007.pdf
diff --git a/dev/initdata/documents_demo/societe/1/logos/indiancompany.png b/dev/initdemo/documents_demo/societe/1/logos/indiancompany.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/1/logos/indiancompany.png
rename to dev/initdemo/documents_demo/societe/1/logos/indiancompany.png
diff --git a/dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png b/dev/initdemo/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png
rename to dev/initdemo/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png
diff --git a/dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_small.png b/dev/initdemo/documents_demo/societe/1/logos/thumbs/indiancompany_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_small.png
rename to dev/initdemo/documents_demo/societe/1/logos/thumbs/indiancompany_small.png
diff --git a/dev/initdata/documents_demo/societe/10/logos/logo_nltechno_94x100.png b/dev/initdemo/documents_demo/societe/10/logos/logo_nltechno_94x100.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/10/logos/logo_nltechno_94x100.png
rename to dev/initdemo/documents_demo/societe/10/logos/logo_nltechno_94x100.png
diff --git a/dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png b/dev/initdemo/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png
rename to dev/initdemo/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png
diff --git a/dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png b/dev/initdemo/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png
rename to dev/initdemo/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png
diff --git a/dev/initdata/documents_demo/societe/11/logos/comapnycorp1company.png b/dev/initdemo/documents_demo/societe/11/logos/comapnycorp1company.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/11/logos/comapnycorp1company.png
rename to dev/initdemo/documents_demo/societe/11/logos/comapnycorp1company.png
diff --git a/dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png b/dev/initdemo/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png
rename to dev/initdemo/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png
diff --git a/dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png b/dev/initdemo/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png
rename to dev/initdemo/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png
diff --git a/dev/initdata/documents_demo/societe/12/logos/pierrecurie.jpg b/dev/initdemo/documents_demo/societe/12/logos/pierrecurie.jpg
similarity index 100%
rename from dev/initdata/documents_demo/societe/12/logos/pierrecurie.jpg
rename to dev/initdemo/documents_demo/societe/12/logos/pierrecurie.jpg
diff --git a/dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg b/dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
rename to dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
diff --git a/dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg b/dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
similarity index 100%
rename from dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
rename to dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
diff --git a/dev/initdata/documents_demo/societe/13/logos/companycorp2company.png b/dev/initdemo/documents_demo/societe/13/logos/companycorp2company.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/13/logos/companycorp2company.png
rename to dev/initdemo/documents_demo/societe/13/logos/companycorp2company.png
diff --git a/dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png b/dev/initdemo/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png
rename to dev/initdemo/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png
diff --git a/dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png b/dev/initdemo/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png
rename to dev/initdemo/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png
diff --git a/dev/initdata/documents_demo/societe/17/logos/bookkeepercompany.png b/dev/initdemo/documents_demo/societe/17/logos/bookkeepercompany.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/17/logos/bookkeepercompany.png
rename to dev/initdemo/documents_demo/societe/17/logos/bookkeepercompany.png
diff --git a/dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png b/dev/initdemo/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png
rename to dev/initdemo/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png
diff --git a/dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png b/dev/initdemo/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png
rename to dev/initdemo/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png
diff --git a/dev/initdata/documents_demo/societe/19/logos/magicfoodstore.png b/dev/initdemo/documents_demo/societe/19/logos/magicfoodstore.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/19/logos/magicfoodstore.png
rename to dev/initdemo/documents_demo/societe/19/logos/magicfoodstore.png
diff --git a/dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png b/dev/initdemo/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png
rename to dev/initdemo/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png
diff --git a/dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png b/dev/initdemo/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png
rename to dev/initdemo/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png
diff --git a/dev/initdata/documents_demo/societe/2/logos/teclibcompany.png b/dev/initdemo/documents_demo/societe/2/logos/teclibcompany.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/2/logos/teclibcompany.png
rename to dev/initdemo/documents_demo/societe/2/logos/teclibcompany.png
diff --git a/dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png b/dev/initdemo/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png
rename to dev/initdemo/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png
diff --git a/dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png b/dev/initdemo/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png
rename to dev/initdemo/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png
diff --git a/dev/initdata/documents_demo/societe/25/logos/printcompany.png b/dev/initdemo/documents_demo/societe/25/logos/printcompany.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/25/logos/printcompany.png
rename to dev/initdemo/documents_demo/societe/25/logos/printcompany.png
diff --git a/dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_mini.png b/dev/initdemo/documents_demo/societe/25/logos/thumbs/printcompany_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_mini.png
rename to dev/initdemo/documents_demo/societe/25/logos/thumbs/printcompany_mini.png
diff --git a/dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_small.png b/dev/initdemo/documents_demo/societe/25/logos/thumbs/printcompany_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_small.png
rename to dev/initdemo/documents_demo/societe/25/logos/thumbs/printcompany_small.png
diff --git a/dev/initdata/documents_demo/societe/3/logos/spanishcompany.png b/dev/initdemo/documents_demo/societe/3/logos/spanishcompany.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/3/logos/spanishcompany.png
rename to dev/initdemo/documents_demo/societe/3/logos/spanishcompany.png
diff --git a/dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png b/dev/initdemo/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png
rename to dev/initdemo/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png
diff --git a/dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png b/dev/initdemo/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png
rename to dev/initdemo/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png
diff --git a/dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png b/dev/initdemo/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png
rename to dev/initdemo/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png
diff --git a/dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_small.png b/dev/initdemo/documents_demo/societe/4/logos/thumbs/valeencompany_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_small.png
rename to dev/initdemo/documents_demo/societe/4/logos/thumbs/valeencompany_small.png
diff --git a/dev/initdata/documents_demo/societe/4/logos/valeencompany.png b/dev/initdemo/documents_demo/societe/4/logos/valeencompany.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/4/logos/valeencompany.png
rename to dev/initdemo/documents_demo/societe/4/logos/valeencompany.png
diff --git a/dev/initdata/documents_demo/societe/5/logos/nocountrycomp.png b/dev/initdemo/documents_demo/societe/5/logos/nocountrycomp.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/5/logos/nocountrycomp.png
rename to dev/initdemo/documents_demo/societe/5/logos/nocountrycomp.png
diff --git a/dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png b/dev/initdemo/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png
rename to dev/initdemo/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png
diff --git a/dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png b/dev/initdemo/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png
rename to dev/initdemo/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png
diff --git a/dev/initdata/documents_demo/societe/6/logos/swisstouch.png b/dev/initdemo/documents_demo/societe/6/logos/swisstouch.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/6/logos/swisstouch.png
rename to dev/initdemo/documents_demo/societe/6/logos/swisstouch.png
diff --git a/dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png b/dev/initdemo/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png
rename to dev/initdemo/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png
diff --git a/dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_small.png b/dev/initdemo/documents_demo/societe/6/logos/thumbs/swisstouch_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_small.png
rename to dev/initdemo/documents_demo/societe/6/logos/thumbs/swisstouch_small.png
diff --git a/dev/initdata/documents_demo/societe/7/logos/genericcustomer.png b/dev/initdemo/documents_demo/societe/7/logos/genericcustomer.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/7/logos/genericcustomer.png
rename to dev/initdemo/documents_demo/societe/7/logos/genericcustomer.png
diff --git a/dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png b/dev/initdemo/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png
rename to dev/initdemo/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png
diff --git a/dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png b/dev/initdemo/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png
similarity index 100%
rename from dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png
rename to dev/initdemo/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png
diff --git a/dev/initdata/documents_demo/users/0/1/mariecurie.jpg b/dev/initdemo/documents_demo/users/0/1/mariecurie.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/0/1/mariecurie.jpg
rename to dev/initdemo/documents_demo/users/0/1/mariecurie.jpg
diff --git a/dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg b/dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
rename to dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
diff --git a/dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_small.jpg b/dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
rename to dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
diff --git a/dev/initdata/documents_demo/users/1/0/IMG_0013.jpg b/dev/initdemo/documents_demo/users/1/0/IMG_0013.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/1/0/IMG_0013.jpg
rename to dev/initdemo/documents_demo/users/1/0/IMG_0013.jpg
diff --git a/dev/initdata/documents_demo/users/1/0/alberteinstein.jpg b/dev/initdemo/documents_demo/users/1/0/alberteinstein.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/1/0/alberteinstein.jpg
rename to dev/initdemo/documents_demo/users/1/0/alberteinstein.jpg
diff --git a/dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg b/dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
rename to dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
diff --git a/dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg b/dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
rename to dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
diff --git a/dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg b/dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
rename to dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
diff --git a/dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg b/dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
rename to dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
diff --git a/dev/initdata/documents_demo/users/2/0/daviddoe.png b/dev/initdemo/documents_demo/users/2/0/daviddoe.png
similarity index 100%
rename from dev/initdata/documents_demo/users/2/0/daviddoe.png
rename to dev/initdemo/documents_demo/users/2/0/daviddoe.png
diff --git a/dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_mini.png b/dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_mini.png
similarity index 100%
rename from dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_mini.png
rename to dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_mini.png
diff --git a/dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_small.png b/dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_small.png
similarity index 100%
rename from dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_small.png
rename to dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_small.png
diff --git a/dev/initdata/documents_demo/users/3/0/pierrecurie.jpg b/dev/initdemo/documents_demo/users/3/0/pierrecurie.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/3/0/pierrecurie.jpg
rename to dev/initdemo/documents_demo/users/3/0/pierrecurie.jpg
diff --git a/dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg b/dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
rename to dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
diff --git a/dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg b/dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
rename to dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
diff --git a/dev/initdata/documents_demo/users/8/1/ldestailleur_200x200.jpg b/dev/initdemo/documents_demo/users/8/1/ldestailleur_200x200.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/8/1/ldestailleur_200x200.jpg
rename to dev/initdemo/documents_demo/users/8/1/ldestailleur_200x200.jpg
diff --git a/dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg b/dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
rename to dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
diff --git a/dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg b/dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
similarity index 100%
rename from dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
rename to dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
diff --git a/dev/initdata/dolibarr-mysql2pgsql.pl b/dev/initdemo/dolibarr-mysql2pgsql.pl
similarity index 100%
rename from dev/initdata/dolibarr-mysql2pgsql.pl
rename to dev/initdemo/dolibarr-mysql2pgsql.pl
diff --git a/dev/initdata/initdemo.sh b/dev/initdemo/initdemo.sh
similarity index 100%
rename from dev/initdata/initdemo.sh
rename to dev/initdemo/initdemo.sh
diff --git a/dev/initdata/mysqldump_dolibarr_3.0.0.sql b/dev/initdemo/mysqldump_dolibarr_3.0.0.sql
similarity index 100%
rename from dev/initdata/mysqldump_dolibarr_3.0.0.sql
rename to dev/initdemo/mysqldump_dolibarr_3.0.0.sql
diff --git a/dev/initdata/mysqldump_dolibarr_3.1.0.sql b/dev/initdemo/mysqldump_dolibarr_3.1.0.sql
similarity index 100%
rename from dev/initdata/mysqldump_dolibarr_3.1.0.sql
rename to dev/initdemo/mysqldump_dolibarr_3.1.0.sql
diff --git a/dev/initdata/mysqldump_dolibarr_3.2.0.sql b/dev/initdemo/mysqldump_dolibarr_3.2.0.sql
similarity index 100%
rename from dev/initdata/mysqldump_dolibarr_3.2.0.sql
rename to dev/initdemo/mysqldump_dolibarr_3.2.0.sql
diff --git a/dev/initdata/mysqldump_dolibarr_3.3.0.sql b/dev/initdemo/mysqldump_dolibarr_3.3.0.sql
similarity index 100%
rename from dev/initdata/mysqldump_dolibarr_3.3.0.sql
rename to dev/initdemo/mysqldump_dolibarr_3.3.0.sql
diff --git a/dev/initdata/mysqldump_dolibarr_3.4.0.sql b/dev/initdemo/mysqldump_dolibarr_3.4.0.sql
similarity index 100%
rename from dev/initdata/mysqldump_dolibarr_3.4.0.sql
rename to dev/initdemo/mysqldump_dolibarr_3.4.0.sql
diff --git a/dev/initdata/mysqldump_dolibarr_3.5.0.sql b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
similarity index 100%
rename from dev/initdata/mysqldump_dolibarr_3.5.0.sql
rename to dev/initdemo/mysqldump_dolibarr_3.5.0.sql
diff --git a/dev/initdata/mysqldump_dolibarr_3.6.0.sql b/dev/initdemo/mysqldump_dolibarr_3.6.0.sql
similarity index 100%
rename from dev/initdata/mysqldump_dolibarr_3.6.0.sql
rename to dev/initdemo/mysqldump_dolibarr_3.6.0.sql
diff --git a/dev/initdata/mysqldump_dolibarr_3.7.0.sql b/dev/initdemo/mysqldump_dolibarr_3.7.0.sql
similarity index 100%
rename from dev/initdata/mysqldump_dolibarr_3.7.0.sql
rename to dev/initdemo/mysqldump_dolibarr_3.7.0.sql
diff --git a/dev/initdata/mysqldump_dolibarr_3.8.0.sql b/dev/initdemo/mysqldump_dolibarr_3.8.0.sql
similarity index 100%
rename from dev/initdata/mysqldump_dolibarr_3.8.0.sql
rename to dev/initdemo/mysqldump_dolibarr_3.8.0.sql
diff --git a/dev/initdata/removedemo.sh b/dev/initdemo/removedemo.sh
similarity index 100%
rename from dev/initdata/removedemo.sh
rename to dev/initdemo/removedemo.sh
diff --git a/dev/initdata/savedemo.sh b/dev/initdemo/savedemo.sh
similarity index 100%
rename from dev/initdata/savedemo.sh
rename to dev/initdemo/savedemo.sh
diff --git a/dev/initdata/sftpget_and_loaddump.php b/dev/initdemo/sftpget_and_loaddump.php
similarity index 100%
rename from dev/initdata/sftpget_and_loaddump.php
rename to dev/initdemo/sftpget_and_loaddump.php

From 945eb9f0948d974a91a021039f1a067165cfa281 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 12:52:01 +0100
Subject: [PATCH 278/421] NEW Add the event BILL_PAYED to list of supported
 events for module notification.

---
 htdocs/core/class/notify.class.php                  | 13 +++++++++++++
 ...erface_50_modNotification_Notification.class.php |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 11c6294975d..98a06174595 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -234,6 +234,7 @@ class Notify
 			$notifcode,
 			array(
 				'BILL_VALIDATE',
+			    'BILL_PAYED',
 				'ORDER_VALIDATE',
 				'PROPAL_VALIDATE',
 				'FICHINTER_VALIDATE',
@@ -296,6 +297,12 @@ class Notify
 								$object_type = 'facture';
 								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
 								break;
+							case 'BILL_PAYED':
+								$link='/compta/facture.php?facid='.$object->id;
+								$dir_output = $conf->facture->dir_output;
+								$object_type = 'facture';
+								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed",$newref);
+								break;
 							case 'ORDER_VALIDATE':
 								$link='/commande/card.php?id='.$object->id;
 								$dir_output = $conf->commande->dir_output;
@@ -443,6 +450,12 @@ class Notify
 						$object_type = 'facture';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
 						break;
+					case 'BILL_PAYED':
+						$link='/compta/facture.php?facid='.$object->id;
+						$dir_output = $conf->facture->dir_output;
+						$object_type = 'facture';
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed",$newref);
+						break;
 					case 'ORDER_VALIDATE':
 						$link='/commande/card.php?id='.$object->id;
 						$dir_output = $conf->commande->dir_output;
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 160387f5fde..70719006c5c 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -36,7 +36,8 @@ class InterfaceNotification extends DolibarrTriggers
 	public $picto = 'email';
 
     var $listofmanagedevents=array(
-    	'BILL_VALIDATE',
+        'BILL_VALIDATE',
+        'BILL_PAYED',
     	'ORDER_VALIDATE',
     	'PROPAL_VALIDATE',
         'FICHINTER_VALIDATE',

From b591ba12803b94f699b247ccdfb9c5666cffb912 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 12:56:41 +0100
Subject: [PATCH 279/421] Uncomment line

---
 dev/initdata/purge-data.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index a0f6d8917e7..25ab928b136 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -219,7 +219,7 @@ if ($error || $mode != 'confirm')
 else
 {
     print "Commit all changes.\n";
-    //$db->commit();
+    $db->commit();
 }
 
 $db->close();

From 2a6009096dcdcce018ffb01c93c34883b450925b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 13:11:46 +0100
Subject: [PATCH 280/421] Add hidden option PRODUCT_DISABLE_LENGTH and
 PRODUCT_DISABLE_SURFACE

---
 htdocs/product/card.php | 92 ++++++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 37 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 46e91e9f120..987754a36ae 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -975,15 +975,21 @@ else
             print $formproduct->select_measuring_units("weight_units","weight");
             print '</td></tr>';
             // Length
-            print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
-            print '<input name="size" size="4" value="'.GETPOST('size').'">';
-            print $formproduct->select_measuring_units("size_units","size");
-            print '</td></tr>';
-            // Surface
-            print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
-            print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
-            print $formproduct->select_measuring_units("surface_units","surface");
-            print '</td></tr>';
+            if (empty($conf->global->PRODUCT_DISABLE_LENGTH))
+            {
+                print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
+                print '<input name="size" size="4" value="'.GETPOST('size').'">';
+                print $formproduct->select_measuring_units("size_units","size");
+                print '</td></tr>';
+            }
+            if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
+            {
+                // Surface
+                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+                print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
+                print $formproduct->select_measuring_units("surface_units","surface");
+                print '</td></tr>';
+            }
             // Volume
             print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
             print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
@@ -1275,16 +1281,22 @@ else
                 print '<input name="weight" size="5" value="'.$object->weight.'"> ';
                 print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);
                 print '</td></tr>';
-                // Length
-                print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
-                print '<input name="size" size="5" value="'.$object->length.'"> ';
-                print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
-                print '</td></tr>';
-                // Surface
-                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
-                print '<input name="surface" size="5" value="'.$object->surface.'"> ';
-                print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units);
-                print '</td></tr>';
+                if (empty($conf->global->PRODUCT_DISABLE_LENGTH))
+                {
+                    // Length
+                    print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
+                    print '<input name="size" size="5" value="'.$object->length.'"> ';
+                    print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
+                    print '</td></tr>';
+                }
+                if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
+                {
+                    // Surface
+                    print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+                    print '<input name="surface" size="5" value="'.$object->surface.'"> ';
+                    print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units);
+                    print '</td></tr>';
+                }
                 // Volume
                 print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
                 print '<input name="volume" size="5" value="'.$object->volume.'"> ';
@@ -1565,28 +1577,34 @@ else
                     print '&nbsp;';
                 }
                 print "</td></tr>\n";
-                // Length
-                print '<tr><td>'.$langs->trans("Length").'</td><td colspan="2">';
-                if ($object->length != '')
+                if (empty($conf->global->PRODUCT_DISABLE_LENGTH))
                 {
-                    print $object->length." ".measuring_units_string($object->length_units,"size");
+                    // Length
+                    print '<tr><td>'.$langs->trans("Length").'</td><td colspan="2">';
+                    if ($object->length != '')
+                    {
+                        print $object->length." ".measuring_units_string($object->length_units,"size");
+                    }
+                    else
+                    {
+                        print '&nbsp;';
+                    }
+                    print "</td></tr>\n";
                 }
-                else
+                if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
                 {
-                    print '&nbsp;';
+                    // Surface
+                    print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
+                    if ($object->surface != '')
+                    {
+                        print $object->surface." ".measuring_units_string($object->surface_units,"surface");
+                    }
+                    else
+                    {
+                        print '&nbsp;';
+                    }
+                    print "</td></tr>\n";
                 }
-                print "</td></tr>\n";
-                // Surface
-                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
-                if ($object->surface != '')
-                {
-                    print $object->surface." ".measuring_units_string($object->surface_units,"surface");
-                }
-                else
-                {
-                    print '&nbsp;';
-                }
-                print "</td></tr>\n";
                 // Volume
                 print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
                 if ($object->volume != '')

From 355f091246225fd337c3dadb0a56b1224605c585 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 13:28:08 +0100
Subject: [PATCH 281/421] FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and
 SOCIETE_DISABLE_STATE

---
 htdocs/core/class/commonobject.class.php | 10 +++++-----
 htdocs/core/lib/functions.lib.php        |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 278a9cbb626..743b26ecc67 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -447,7 +447,7 @@ abstract class CommonObject
     {
     	global $conf, $langs;
 
-    	$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');
+    	$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS
     	
     	$contactid=0;
     	$thirdpartyid=0;
@@ -483,11 +483,11 @@ abstract class CommonObject
 			$out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1); $outdone++;
 			$outdone++;
 		}
-		
-		if (! in_array($this->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)
-				&& ! empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) 
+
+		if (! in_array($this->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
+				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) 
 		{
-			$out.=($outdone?'<br>':'').$this->state;
+			$out.=($outdone?' - ':'').$this->state;
 			$outdone++;
 		}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 138a3054333..c9917e5852d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1001,7 +1001,7 @@ function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
 	global $conf,$langs;
 
 	$ret='';
-	$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');
+	$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS
 
 	// Address
 	$ret .= $object->address;
@@ -1009,7 +1009,7 @@ function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
 	if (in_array($object->country_code,array('US','AU')) || ! empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS))   	// US: title firstname name \n address lines \n town, state, zip \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->town;
-		if ($object->state && in_array($object->country_code,$countriesusingstate))
+		if ($object->state)
 		{
 			$ret.=", ".$object->state;
 		}
@@ -1018,7 +1018,7 @@ function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
 	else if (in_array($object->country_code,array('GB','UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->town;
-		if ($object->state && in_array($object->country_code,$countriesusingstate))
+		if ($object->state)
 		{
 			$ret.=", ".$object->state;
 		}
@@ -1028,12 +1028,11 @@ function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
 	{
 		$ret .= ($ret ? $sep : '' ).$object->zip;
 		$ret .= ($object->town?(($object->zip?' ':'').$object->town):'');
-		if ($object->state && in_array($object->country_code,$countriesusingstate))
+		if ($object->state)
 		{
 			$ret.="\n".$object->state;
 		}
 	}
-
 	else                                        		// Other: title firstname name \n address lines \n zip town \n country
 	{
 		$ret .= $object->zip ? (($ret ? $sep : '' ).$object->zip) : '';

From a08fa814ec0123432102a059a598c3b8be552886 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 13:32:01 +0100
Subject: [PATCH 282/421] Better filter to exclude mysqldump warning

---
 htdocs/admin/tools/export.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 81708e53e31..3a25ceadfe6 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -198,10 +198,12 @@ if ($what == 'mysql')
         $ok=0;
         dol_syslog("Run command ".$fullcommandcrypted);
         $handlein = popen($fullcommandclear, 'r');
+        $i=0;
         while (!feof($handlein))
         {
+            $i++;   // output line number
             $read = fgets($handlein);
-            if (preg_match('/'.preg_quote('Warning: Using a password').'/i', $read)) continue;
+            if ($i == 1 && preg_match('/'.preg_quote('Warning: Using a password').'/i', $read)) continue;
             fwrite($handle,$read);
             if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
             elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;

From 8e83f4f15c861cfabbf2bedd9e682f4b9383404c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 13:52:01 +0100
Subject: [PATCH 283/421] Fix missing translation load

---
 htdocs/core/boxes/box_graph_orders_permonth.php          | 4 +++-
 htdocs/core/boxes/box_graph_orders_supplier_permonth.php | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index c42ac88074a..4f86dcd0b8b 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -89,7 +89,9 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 		if ($user->rights->commande->lire)
 		{
-			$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+		    $langs->load("orders");
+		    
+		    $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 2f7ecb3cbda..6df7d81766c 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -88,7 +88,9 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
-			$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+		    $langs->load("orders");
+		    
+		    $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 

From dcdc53464dd9978159633e082206b01331e4412c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 14:25:12 +0100
Subject: [PATCH 284/421] Fix select2 text color

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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1aa5b41ac3f..e1f58616f36 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3559,6 +3559,9 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+.select2-container .select2-choice {
+	color: #000;
+}
 .selectoptiondisabledwhite {
 	background: #FFFFFF !important;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e08512b9ca4..baa772e85dd 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3410,6 +3410,9 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+.select2-container .select2-choice {
+	color: #000;
+}
 .selectoptiondisabledwhite {
 	background: #FFFFFF !important;
 }

From d128df1fe571adfe385c6d9a9035e6e71bb0bb72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 14:33:14 +0100
Subject: [PATCH 285/421] Fix js error .submit is not a function

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

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 1eaff21f05f..ddc23769f46 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1271,7 +1271,7 @@ else
         dol_fiche_end();
 
         print '<div class="center">';
-        print '<input type="submit" class="button" name="submit" value="'.$langs->trans('AddThirdParty').'">';
+        print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
         if ($backtopage)
         {
             print ' &nbsp; ';

From cfdaa0e13c373f1cf38b6a60f347fced3f30e7fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 14:49:30 +0100
Subject: [PATCH 286/421] Fix missing translation Fix import of state

---
 htdocs/core/class/cstate.class.php | 305 +++++++++++++++++++++++++++++
 htdocs/langs/en_US/products.lang   |   2 +
 2 files changed, 307 insertions(+)
 create mode 100644 htdocs/core/class/cstate.class.php

diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
new file mode 100644
index 00000000000..a2a84d3b9ed
--- /dev/null
+++ b/htdocs/core/class/cstate.class.php
@@ -0,0 +1,305 @@
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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/>.
+ */
+
+/**
+ *      \file       htdocs/core/class/cstate.class.php
+ *      \ingroup    core
+ *      \brief      This file is a CRUD class file (Create/Read/Update/Delete) for c_departements dictionary
+ */
+
+// Put here all includes required by your class file
+//require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+
+/**
+ * 	Class to manage dictionary States (used by imports)
+ */
+class Cstate // extends CommonObject
+{
+	var $db;							//!< To store db handler
+	var $error;							//!< To return error code (or message)
+	var $errors=array();				//!< To return several error codes (or messages)
+	//var $element='cstate';			//!< Id that identify managed objects
+	//var $table_element='cstate';	    //!< Name of table without prefix where object is stored
+
+    var $id;
+	var $code_departement;
+	var $nom;
+	var $active;
+
+
+
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDb		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        return 1;
+    }
+
+
+    /**
+     *  Create object into database
+     *
+     *  @param      User	$user        User that create
+     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+     *  @return     int      		   	 <0 if KO, Id of created object if OK
+     */
+    function create($user, $notrigger=0)
+    {
+    	global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
+		if (isset($this->nom)) $this->nom=trim($this->nom);
+		if (isset($this->active)) $this->active=trim($this->active);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+        // Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
+		$sql.= "rowid,";
+		$sql.= "code_departement,";
+		$sql.= "nom,";
+		$sql.= "active";
+        $sql.= ") VALUES (";
+		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->rowid."'").",";
+		$sql.= " ".(! isset($this->code_departement)?'NULL':"'".$this->db->escape($this->code_departement)."'").",";
+		$sql.= " ".(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").",";
+		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->active."'")."";
+		$sql.= ")";
+
+		$this->db->begin();
+
+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
+
+			if (! $notrigger)
+			{
+	            // Uncomment this and change MYOBJECT to your own tag if you
+	            // want this action call a trigger.
+
+	            //// Call triggers
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            //$interface=new Interfaces($this->db);
+	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+	            //// End call triggers
+			}
+        }
+
+        // Commit or rollback
+        if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+            return $this->id;
+		}
+    }
+
+
+    /**
+     *  Load object in memory from database
+     *
+     *  @param      int		$id    	Id object
+     *  @param		string	$code	Code
+     *  @return     int          	<0 if KO, >0 if OK
+     */
+    function fetch($id,$code='')
+    {
+    	global $langs;
+        $sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.code_departement,";
+		$sql.= " t.nom,";
+		$sql.= " t.active";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
+        if ($id)   $sql.= " WHERE t.rowid = ".$id;
+        elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id    = $obj->rowid;
+				$this->code_departement = $obj->code_departement;
+				$this->nom = $obj->nom;
+				$this->active = $obj->active;
+            }
+            $this->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+      	    $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Update object into database
+     *
+     *  @param      User	$user        User that modify
+     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+     *  @return     int     		   	 <0 if KO, >0 if OK
+     */
+    function update($user=null, $notrigger=0)
+    {
+    	global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
+		if (isset($this->nom)) $this->nom=trim($this->nom);
+		if (isset($this->active)) $this->active=trim($this->active);
+
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
+		$sql.= " code_departement=".(isset($this->code_departement)?"'".$this->db->escape($this->code_departement)."'":"null").",";
+		$sql.= " nom=".(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").",";
+		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
+        $sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+	            // Uncomment this and change MYOBJECT to your own tag if you
+	            // want this action call a trigger.
+
+	            //// Call triggers
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            //$interface=new Interfaces($this->db);
+	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+	            //// End call triggers
+	    	}
+		}
+
+        // Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+    }
+
+
+ 	/**
+ 	 *  Delete object in database
+	 *
+     *	@param  User	$user        User that delete
+     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_departements";
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+		        // want this action call a trigger.
+
+		        //// Call triggers
+		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+		        //$interface=new Interfaces($this->db);
+		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+		        //// End call triggers
+			}
+		}
+
+        // Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+}
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index ea480222aa7..52eadb2e11c 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -314,3 +314,5 @@ 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...
+WeightUnits=Weight unit
+SizeUnits=Size unit

From 81116da33b0b722547958173515b7c52acd87f05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 15:10:33 +0100
Subject: [PATCH 287/421] Add a control of file format

---
 htdocs/imports/import.php      | 11 +++++++++++
 htdocs/langs/en_US/errors.lang |  1 +
 2 files changed, 12 insertions(+)

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 300d3a9d7f6..23d5a61415b 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -623,6 +623,17 @@ if ($step == 4 && $datatoimport)
 	    $obj->separator = $separator;
 	    $obj->enclosure = $enclosure;
 	}
+    if ($model == 'xlsx') {
+        if (! preg_match('/\.xlsx$/i', $filetoimport))
+        {
+            $langs->load("errors");
+            $param='&datatoimport='.$datatoimport.'&format='.$format;
+            setEventMessages($langs->trans("ErrorFileMustHaveFormat", $model),null,'errors');
+            header("Location: ".$_SERVER["PHP_SELF"].'?step=3'.$param.'&filetoimport='.urlencode($relativepath));
+            exit;
+        }
+        
+    }
 
 	// Load source fields in input file
 	$fieldssource=array();
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 8b64c97ba34..bbbb9dbaddf 100755
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -173,6 +173,7 @@ ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 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.  

From 77cbd885f26ac03009b0c1b60263743be1716b42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 15:30:27 +0100
Subject: [PATCH 288/421] NEW Add minimum stock and desired stock into
 import/export profiles. NEW Add state into thirdparty export fields

---
 htdocs/core/modules/modCommande.class.php   |  7 +-
 htdocs/core/modules/modExpedition.class.php |  7 +-
 htdocs/core/modules/modProduct.class.php    |  7 +-
 htdocs/core/modules/modSociete.class.php    | 92 ++-------------------
 4 files changed, 22 insertions(+), 91 deletions(-)

diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 8390e1f10a0..7ed9e7f58d9 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -178,10 +178,10 @@ class modCommande extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='CustomersOrdersAndOrdersLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("commande","commande","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.label'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text','d.nom'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
 		$this->export_dependencies_array[$r]=array('order_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		$keyforselect='commande'; $keyforelement='order'; $keyforaliasextra='extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -191,6 +191,7 @@ class modCommande extends DolibarrModules
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande as c';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 6d29a426afd..7d9ab6b17bd 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -226,14 +226,15 @@ class modExpedition extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("expedition","shipment","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
-		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Numeric");
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.label'=>'company','co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company','co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
 		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expedition as c, '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed, '.MAIN_DB_PREFIX.'commandedet as cd';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 0c260cb047b..c47343df638 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -149,9 +149,10 @@ class modProduct extends DolibarrModules
 		$this->export_permission[$r]=array(array("produit","export"));
 		$this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",'p.label'=>"Label",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.customcode'=>'CustomCode','p.price_base_type'=>"PriceBase",'p.price'=>"UnitPriceHT",'p.price_ttc'=>"UnitPriceTTC",'p.tva_tx'=>'VATRate','p.tosell'=>"OnSell",'p.tobuy'=>"OnBuy",'p.datec'=>'DateCreation','p.tms'=>'DateModification');
 		if ($mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly']='NPR';
-		if (! empty($conf->stock->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.stock'=>'Stock','p.pmp'=>'PMPValue'));
+		if (! empty($conf->stock->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.stock'=>'Stock','p.seuil_stock_alerte'=>'StockLimit','p.desiredstock'=>'DesiredStock','p.pmp'=>'PMPValue'));
 		if (! empty($conf->barcode->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.barcode'=>'BarCode'));
 		if (! empty($conf->fournisseur->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('s.nom'=>'Supplier','pf.ref_fourn'=>'SupplierRef','pf.unitprice'=>'SuppliersPrices'));
+		if (! empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.cost_price'=>'CostPrice'));
 		$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date');
 		if (! empty($conf->stock->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.stock'=>'Numeric','p.pmp'=>'Numeric'));
 		if (! empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.barcode'=>'Text'));
@@ -210,8 +211,10 @@ class modProduct extends DolibarrModules
 		$this->import_tables_array[$r]=array('p'=>MAIN_DB_PREFIX.'product','extra'=>MAIN_DB_PREFIX.'product_extrafields');
 		$this->import_tables_creator_array[$r]=array('p'=>'fk_user_author');	// Fields to store import user id
 		$this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation');
-		if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode'));
+		if (! empty($conf->stock->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.seuil_stock_alerte'=>'StockLimit','p.desiredstock'=>'DesiredStock','p.pmp'=>'PMPValue'));
+		if (! empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.cost_price'=>'CostPrice'));
 		if ($mysoc->useNPR()) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.recuperableonly'=>'NPR'));
+		if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode'));
 		// Add extra fields
 		$import_extrafield_sample=array();
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity IN (0, ".$conf->entity.')';
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 311971264f4..5bc4c11529e 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -253,53 +253,14 @@ class modSociete extends DolibarrModules
 		$this->export_label[$r]='ExportDataset_company_1';
 		$this->export_icon[$r]='company';
 		$this->export_permission[$r]=array(array("societe","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"Id",'s.nom'=>"Name",'s.status'=>"Status",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"AccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.default_lang'=>"DefaultLang",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'t.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','st.code'=>'ProspectStatus','d.nom'=>'State');
+		$this->export_fields_array[$r]=array('s.rowid'=>"Id",'s.nom'=>"Name",'s.status'=>"Status",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"AccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'d.nom'=>'State','c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.default_lang'=>"DefaultLang",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'t.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','st.code'=>'ProspectStatus');
 		if (! empty($conf->global->SOCIETE_USEPREFIX)) $this->export_fields_array[$r]['s.prefix']='Prefix';
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid');
 		$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Numeric",'s.client'=>"Numeric",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text');
 		$this->export_entities_array[$r]=array();	// We define here only fields that use another picto
 		$this->export_examplevalues_array[$r]=array('s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'0 (not a supplier) or 1 (supplier)');
-		// Add extra fields
-        $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
-        $resql=$this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
-        {
-        	while ($obj=$this->db->fetch_object($resql))
-        	{
-        		$fieldname='extra.'.$obj->name;
-        		$fieldlabel=ucfirst($obj->label);
-        		$typeFilter="Text";
-        		switch($obj->type)
-        		{
-        			case 'int':
-        			case 'double':
-        			case 'price':
-        				$typeFilter="Numeric";
-        				break;
-        			case 'date':
-        			case 'datetime':
-        				$typeFilter="Date";
-        				break;
-        			case 'boolean':
-        				$typeFilter="Boolean";
-        				break;
-        			case 'sellist':
-						$tmp='';
-						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) 
-        				{
-							$stack=array_keys($tmpparam['options']);
-							$tmp=array_shift($stack);
-						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
-						break;
-        		}
-        		$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-        		$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-        		$this->export_entities_array[$r][$fieldname]='company';
-        	}
-        }
-        // End add axtra fields
+        $keyforselect='societe'; $keyforelement='company'; $keyforaliasextra='extra';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
@@ -326,45 +287,8 @@ class modSociete extends DolibarrModules
             unset($this->export_fields_array[$r]['s.code_fournisseur']);
             unset($this->export_entities_array[$r]['s.code_fournisseur']);
         }
-        // Add extra fields
-        $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople'";
-        $resql=$this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
-        {
-        	while ($obj=$this->db->fetch_object($resql))
-        	{
-        		$fieldname='extra.'.$obj->name;
-        		$fieldlabel=ucfirst($obj->label);
-        		$typeFilter="Text";
-        		switch($obj->type)
-        		{
-        			case 'int':
-        			case 'double':
-        			case 'price':
-        				$typeFilter="Numeric";
-        				break;
-        			case 'date':
-        			case 'datetime':
-        				$typeFilter="Date";
-        				break;
-        			case 'boolean':
-        				$typeFilter="Boolean";
-        				break;
-        			case 'sellist':
-						$tmp='';
-						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
-					case 'select':
-						$typeFilter="Select:".$obj->param;
-						break;
-        		}
-        		$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-        		$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-        		$this->export_entities_array[$r][$fieldname]='contact';
-        	}
-        }
-        // End add axtra fields
+        $keyforselect='socpeople'; $keyforelement='contact'; $keyforaliasextra='extra';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
         $this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'socpeople as c';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON c.fk_soc = s.rowid';
@@ -402,7 +326,8 @@ class modSociete extends DolibarrModules
 		$this->import_fieldshidden_array[$r]=array('s.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'societe');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r]=array(
 			's.fk_typent'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/core/class/ctypent.class.php','class'=>'Ctypent','method'=>'fetch','dict'=>'DictionaryCompanyType'),
-			's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
+			's.fk_departement'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cstate.class.php','class'=>'Cstate','method'=>'fetch','dict'=>'DictionaryState'),
+		    's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
 			's.fk_stcomm'=>array('rule'=>'zeroifnull'),
 		    's.code_client'=>array('rule'=>'getcustomercodeifauto'),
 		    's.code_fournisseur'=>array('rule'=>'getsuppliercodeifauto'),
@@ -437,7 +362,8 @@ class modSociete extends DolibarrModules
 		$this->import_fieldshidden_array[$r]=array('s.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'socpeople');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r]=array(
 			's.fk_soc'=>array('rule'=>'fetchidfromref','file'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'),
-			's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
+			's.fk_departement'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cstate.class.php','class'=>'Cstate','method'=>'fetch','dict'=>'DictionaryState'),
+		    's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 		$this->import_regex_array[$r]=array('s.birthday'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','s.datec'=>'^[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])?$');

From a215f007767f53f340e90c67265b9290dba42de6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 16:15:21 +0100
Subject: [PATCH 289/421] Fix path after rename

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9eb355b2ab4..a19b8647deb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -162,11 +162,11 @@ before_script:
     echo "MySQL"
     mysql -e 'DROP DATABASE IF EXISTS travis;'
     mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
-    mysql -D travis < dev/initdata/mysqldump_dolibarr_3.5.0.sql
+    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
   fi
   # FIXME: find a way to import a MySQL dump into PostgreSQL
   #if [ "$DB" = 'postgresql' ]; then
-  #  pgsql travis < dev/initdata/mysqldump_dolibarr_3.5.0.sql
+  #  pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
   #fi
   # TODO: SQLite
   echo

From f759f26db9937c4573b45a6e6d192c670bfe2429 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 16:20:21 +0100
Subject: [PATCH 290/421] Fix travis error

---
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 1592ca69c63..963a0040dfe 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -250,7 +250,6 @@ ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
 
-<<<<<<< HEAD
  
 -- Add for recurring template invoices
 

From 843dada35d10868436c027d153de0beafe8bd0d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 17:42:41 +0100
Subject: [PATCH 291/421] Fix translation export/import

---
 htdocs/core/modules/modProduct.class.php | 58 ++++++++----------------
 htdocs/exports/export.php                |  6 ++-
 htdocs/langs/en_US/products.lang         |  3 ++
 3 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 6ddd135c959..b775f3dcb15 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -153,56 +153,26 @@ class modProduct extends DolibarrModules
 		if (! empty($conf->barcode->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.barcode'=>'BarCode'));
 		if (! empty($conf->fournisseur->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('s.nom'=>'Supplier','pf.ref_fourn'=>'SupplierRef','pf.unitprice'=>'SuppliersPrices'));
 		if (! empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.cost_price'=>'CostPrice'));
+		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel','l.description'=>'TranslatedDescription','l.note'=>'TranslatedNote'));
 		$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date');
 		if (! empty($conf->stock->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.stock'=>'Numeric','p.pmp'=>'Numeric'));
 		if (! empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.barcode'=>'Text'));
 		if (! empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('s.nom'=>'Text','pf.ref_fourn'=>'Text','pf.unitprice'=>'Numeric'));
+		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('l.lang'=>'Text', 'l.label'=>'Text','l.description'=>'Text','l.note'=>'Text'));
 		$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.label'=>"product",'p.description'=>"product",'p.url'=>"product",'p.accountancy_code_sell'=>'product','p.accountancy_code_sell'=>'product','p.note'=>"product",'p.length'=>"product",'p.surface'=>"product",'p.volume'=>"product",'p.weight'=>"product",'p.customcode'=>'product','p.price_base_type'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>"product",'p.tosell'=>"product",'p.tobuy'=>"product",'p.datec'=>"product",'p.tms'=>"product");
 		if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.stock'=>'product','p.pmp'=>'product'));
 		if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'product'));
 		if (! empty($conf->fournisseur->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('s.nom'=>'product','pf.ref_fourn'=>'product','pf.unitprice'=>'product'));
+		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('l.lang'=>'translation', 'l.label'=>'translation','l.description'=>'translation','l.note'=>'translation'));
 		$keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
+		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
 		if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
 		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
 
-		if (! empty($conf->global->MAIN_MULTILANGS))
-		{
-			// multiline format, you need one line per translated product
-			$this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('l.lang'=>'language', 'l.label'=>'translated_label','l.description'=>'translated_description','l.note'=>'translated_note'));
-			$this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('l.lang'=>'Text', 'l.label'=>'Text','l.description'=>'Text','l.note'=>'Text'));
-			$this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('l.lang'=>'translation', 'l.label'=>'translation','l.description'=>'translation','l.note'=>'translation'));
-			$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
-
-			// single line format, just use one column per translation
-			$sql="SELECT lang FROM ".MAIN_DB_PREFIX."product_lang GROUP BY lang";
-			$langs = array();
-			$resql=$this->db->query($sql);
-			if ($resql) {
-				while ($obj=$this->db->fetch_object($resql)) {
-					// list all language, you need at least one translation available to detect the language
-					$name = $obj->lang;
-					array_push($langs, $name);
-					$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."product_lang as $name ON $name.fk_product = p.rowid AND $name.lang='$name'";
-					// translate the label
-					$this->export_fields_array[$r][$name.".label"]=$name."_label";
-					$this->export_TypeFields_array[$r][$name.".label"]='Text';
-					$this->export_entities_array[$r][$name.".label"]='translation';
-					// translate the description
-					$this->export_fields_array[$r][$name.".description"]=$name."_description";
-					$this->export_TypeFields_array[$r][$name.".description"]='Text';
-					$this->export_entities_array[$r][$name.".description"]='translation';
-					// translate the note
-					$this->export_fields_array[$r][$name.".note"]=$name."_note";
-					$this->export_TypeFields_array[$r][$name.".note"]='Text';
-					$this->export_entities_array[$r][$name.".note"]='translation';
-				}
-			}
-		}
-
 		if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		{
 			// Exports product multiprice
@@ -327,15 +297,22 @@ class modProduct extends DolibarrModules
 
 		if (! empty($conf->global->MAIN_MULTILANGS))
 		{
-			$this->import_tables_array[$r]['l']=MAIN_DB_PREFIX.'product_lang';
+		    $r++;
+			/* FIXME Must be a dedicated import profil. Not working yet
+		    $this->import_code[$r]=$this->rights_class.'_multiprice';
+		    $this->import_label[$r]="ProductTranslations";
+			$this->import_icon[$r]=$this->picto;
+			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+		    $this->import_tables_array[$r]['l']=MAIN_DB_PREFIX.'product_lang';
 			// multiline translation, one line per translation
-			$this->import_fields_array[$r]['l.lang']='language';
-			$this->import_fields_array[$r]['l.label']='translated_label';
-			$this->import_fields_array[$r]['l.description']='translated_description';
-			$this->import_fields_array[$r]['l.note']='translated_note';
+			$this->import_fields_array[$r]['l.lang']='Language';
+			$this->import_fields_array[$r]['l.label']='TranslatedLabel';
+			$this->import_fields_array[$r]['l.description']='TranslatedDescription';
+			$this->import_fields_array[$r]['l.note']='TranslatedNote';
 			$this->import_examplevalues_array[$r]['l.lang']='en_US';
-
+			*/
 			// single line translation, one column per translation
+			/*
 			foreach($langs as $l) {
 				$this->import_tables_array[$r][$l] = MAIN_DB_PREFIX.'product_lang';
 				$this->import_fields_array[$r][$l.'.label']=$l.'_label';
@@ -344,6 +321,7 @@ class modProduct extends DolibarrModules
 				$this->import_fieldshidden_array[$r][$l.'.lang']="'$l'";
 				$this->import_fieldshidden_array[$r][$l.'.fk_product']='lastrowid-'.MAIN_DB_PREFIX.'product';
 			}
+			*/
 		}
 	}
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 34dc813b989..c1db488f78d 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -65,7 +65,8 @@ $entitytoicon = array(
     'shipment_line'=> 'sending',
     'expensereport'=> 'trip',
     'expensereport_line'=> 'trip',
-    'contract_line' => 'contract'
+    'contract_line' => 'contract',
+    'translation'  => 'generic'
 );
 
 // Translation code
@@ -105,7 +106,8 @@ $entitytolang = array(
 	'expensereport'=> 'ExpenseReport',
 	'expensereport_line'=> 'ExpenseReportLine',
     'contract'     => 'Contract',
-    'contract_line'=> 'ContractLine'
+    'contract_line'=> 'ContractLine',
+    'translation'  => 'Translation'
 );
 
 $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array();
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index b00701a6314..51c30e6dc6e 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -318,3 +318,6 @@ 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...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
\ No newline at end of file

From 6db0f01fa465cd759c19bb830625745428d3b92c Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Mon, 22 Feb 2016 19:53:39 +0100
Subject: [PATCH 292/421] FIX :  Bad Argentina provences

---
 htdocs/install/mysql/data/llx_20_c_departements.sql | 3 ++-
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql      | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index ff6f22768a3..91c1e1ace43 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -953,7 +953,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2306', 2302, '', 0, 'CHACO', 'Chaco', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2307', 2302, '', 0, 'CORRIENTES', 'Corrientes', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2308', 2302, '', 0, 'ENTRE RIOS', 'Entre Ríos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2309', 2302, '', 0, 'FORMOSA MISIONES', 'Formosa Misiones', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2309', 2302, '', 0, 'FORMOSA', 'Formosa', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2310', 2302, '', 0, 'SANTA FE', 'Santa Fe', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2311', 2303, '', 0, 'LA RIOJA', 'La Rioja', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2312', 2303, '', 0, 'MENDOZA', 'Mendoza', 1);
@@ -970,6 +970,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2323', 2305, '', 0, 'TIERRA DEL FUEGO', 'Tierra del Fuego', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2324', 2305, '', 0, 'ISLAS MALVINAS', 'Islas Malvinas', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2325', 2305, '', 0, 'ANTARTIDA', 'Antártida', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2326', 2305, '', 0, 'MISIONES', 'Misiones', 1);
 
 -- Parish Barbados (id country=46)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CC', 4601, 'Oistins', 0, 'CC', 'Christ Church', 1);
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 46bd098e888..7eb1fd46269 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -593,3 +593,7 @@ ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN doc_ref varchar(300) NOT NU
 
 ALTER TABLE llx_holiday ADD COLUMN tms timestamp;
 ALTER TABLE llx_holiday ADD COLUMN entity integer DEFAULT 1 NOT NULL;
+
+-- Fix Argentina provences
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2326', 2305, '', 0, 'MISIONES', 'Misiones', 1);
+UPDATE llx_c_departements SET ncc = "FORMOSA", nom = "Formosa" WHERE nom = "Formosa Misiones";

From 673f0c70a6e924f63a17feee5a8f7a84531f97fc Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Mon, 22 Feb 2016 22:00:59 +0100
Subject: [PATCH 293/421] NEW: TimeZone can be supplied to mktime

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e81ffecf83c..f7b8ab9de0b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1285,7 +1285,10 @@ function dol_getdate($timestamp,$fast=false)
  *	@param	int			$month			Month (1 to 12)
  *	@param	int			$day			Day (1 to 31)
  *	@param	int			$year			Year
- *	@param	mixed		$gm				True or 1 or 'gmt'=Input informations are GMT values, False or 0 or 'server' = local to server TZ, 'user' = local to user TZ
+ *	@param	mixed		$gm				True or 1 or 'gmt'=Input informations are GMT values
+ *										False or 0 or 'server' = local to server TZ
+ *										'user' = local to user TZ
+ *										'tz,TimeZone' = use specified timezone
  *	@param	int			$check			0=No check on parameters (Can use day 32, etc...)
  *	@return	int|string					Date as a timestamp, '' or false if error
  * 	@see 								dol_print_date, dol_stringtotime, dol_getdate
@@ -1331,6 +1334,18 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
 				$default_timezone=@date_default_timezone_get();
 			}
 		}
+		else if (strrpos($gm, "tz,") !== false)
+		{
+			$timezone=str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'
+			try
+			{
+				$localtz = new DateTimeZone($timezone);
+			}
+			catch(Exception $e)
+			{
+				dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
+			}
+		}
 
 		if (empty($localtz)) {
 			$localtz = new DateTimeZone('UTC');

From ac6001cec89ae7857be0426accc9a2cda17ff039 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Feb 2016 09:27:18 +0100
Subject: [PATCH 294/421] Fix do not show warning if account defined

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index a02ad089c5b..9716b6bd968 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -881,8 +881,8 @@ class pdf_crabe extends ModelePDFFactures
 				$this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
 			}
 			// Avoid having any valid PDF with setup that is not complete
-			elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER))
-				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER)))
+			elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))
+				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank)))
 			{
 				$outputlangs->load("errors");
 

From e6d06a67b48e2dbedb25eddde1cbf8ea2ac6657f Mon Sep 17 00:00:00 2001
From: Sof <virtualsof@yahoo.fr>
Date: Tue, 23 Feb 2016 13:00:52 +0100
Subject: [PATCH 295/421] FIX : Fatal error: Class 'FormVentilation' not found

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

diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index 7704e7f3198..0a7737041b7 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
 
 $langs->load("errors");
 $langs->load("admin");

From 798a40f6c08022b250c6e002f4d84fbc6012645b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Feb 2016 13:02:53 +0100
Subject: [PATCH 296/421] Update changelog

---
 build/debian/README.howto | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 5a8b7b742a2..d5026f23321 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -213,6 +213,9 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 
 * Staying into git root directory, run
 > git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
+and enter version when requested with format
+x.y.z+dfsgw
+(x.y.z = version, w start from 1 and is increased for each new import)
 
 Note: If there was errors solved manually, you may need to make a git commit
 
@@ -294,8 +297,8 @@ x.y.z+dfsgw
 
 Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
 
-* Fix debian/* files used to build package.
-Add an entry into debian/changelog
+* Update/fix debian/* files used to build package.
+At least, add an entry into debian/changelog
 > dch -v x.y.z+dfsgw-v "My comment" will add entry.
 For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increased for each new import)
 Then check/modify changelog to replace "version" or "unstable" with "UNRELEASED".
@@ -310,7 +313,7 @@ To update dolibarr debian package when only files into debian has changed:
 * Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2, 3...)
 
 
-To update dolibarr debian package when only files into debian has changed:
+To update dolibarr debian package when only files not into debian has changed:
 
 * Manually, add patches into debian/patches and update file debian/series, or do the 2 steps with "quilt import filepatch.patch"
 * You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revien a l'état du upstream sans les patch.

From 28b8258acbda690c99b9b2df09ac4a678ba7cb34 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Feb 2016 19:50:33 +0100
Subject: [PATCH 297/421] Fix in most cases, we don't need translated value of
 languages, jsut list of language code. Fix cost price was not updated.

---
 htdocs/core/class/translate.class.php  | 10 +++++++---
 htdocs/product/class/product.class.php |  9 +++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 89ab0019865..866b746362b 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -735,7 +735,7 @@ class Translate
 	 *
 	 * 	@param	string	$langdir		Directory to scan
 	 *  @param  integer	$maxlength   	Max length for each value in combo box (will be truncated)
-	 *  @param	int		$usecode		Show code instead of country name for language variant
+	 *  @param	int		$usecode		1=Show code instead of country name for language variant, 2=Show only code
 	 *  @return array     				List of languages
 	 */
 	function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0)
@@ -751,9 +751,13 @@ class Translate
 			{
 				$this->load("languages");
 
-				if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
+				if ($usecode == 2)
 				{
-					$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
+				    $langs_available[$dir] = $dir;
+				}
+				if ($usecode == 1 || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
+				{
+				    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
 				}
 				else
 				{
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index c725d2c4420..2d1a4187963 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -734,6 +734,7 @@ class Product extends CommonObject
 			$sql.= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy)."'";
 			$sql.= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell)."'";
 			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");
+			$sql.= ", cost_price = " . ($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
 	        $sql.= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
 	        $sql.= ", price_autogen = " . (!$this->price_autogen ? 0 : 1);
 			$sql.= ", fk_price_expression = ".($this->fk_price_expression != 0 ? $this->fk_price_expression : 'NULL');
@@ -987,8 +988,8 @@ class Product extends CommonObject
 	function setMultiLangs($user)
 	{
 		global $langs;
-
-		$langs_available = $langs->get_available_languages();
+		
+		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 0, 2);
 		$current_lang = $langs->getDefaultLang();
 
 		foreach ($langs_available as $key => $value)
@@ -1017,7 +1018,7 @@ class Product extends CommonObject
 					$sql2.= "','".$this->db->escape($this->description);
 					$sql2.= "','".$this->db->escape($this->note)."')";
 				}
-				dol_syslog(get_class($this).'::setMultiLangs');
+				dol_syslog(get_class($this).'::setMultiLangs key = current_lang = '.$key);
 				if (! $this->db->query($sql2))
 				{
 					$this->error=$this->db->lasterror();
@@ -1051,7 +1052,7 @@ class Product extends CommonObject
 
 				// on ne sauvegarde pas des champs vides
 				if ( $this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"] )
-				dol_syslog(get_class($this).'::setMultiLangs');
+				dol_syslog(get_class($this).'::setMultiLangs key = '.$key);
 				if (! $this->db->query($sql2))
 				{
 					$this->error=$this->db->lasterror();

From 1a4413dbc31c54b9755059134c8c2ada58baf225 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Feb 2016 19:51:52 +0100
Subject: [PATCH 298/421] Update how to

---
 build/debian/README.howto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index d5026f23321..6b2360b78b5 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -394,6 +394,6 @@ Cons are:
 - The patch include more than the only one security reported fxes
 
 So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
-since it provides more stability and is or me a more secured process.
+since it provides more stability and is for me a more secured process.
 "
 

From 57aebe4e1f35d49d55a3820e54be86ac60d22d08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Feb 2016 20:00:07 +0100
Subject: [PATCH 299/421] Add script to import products

---
 dev/initdata/import-product.php | 243 ++++++++++++++++++++++++++++++++
 1 file changed, 243 insertions(+)
 create mode 100755 dev/initdata/import-product.php

diff --git a/dev/initdata/import-product.php b/dev/initdata/import-product.php
new file mode 100755
index 00000000000..1364e1b06b8
--- /dev/null
+++ b/dev/initdata/import-product.php
@@ -0,0 +1,243 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-product.php
+ *		\brief      Script example to insert products from a csv file. 
+ *                  To purge data, you can have a look at purge-data.php
+ */
+
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
+}
+
+// Recupere root dolibarr
+$path=preg_replace('/import-product.php/i','',$_SERVER["PHP_SELF"]);
+require ($path."../../htdocs/master.inc.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+$delimiter=',';
+$enclosure='"';
+$linelength=10000;
+$escape='/';
+
+// Global variables
+$version=DOL_VERSION;
+$confirmed=1;
+$error=0;
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
+
+$mode = $argv[1];
+$filepath = $argv[2];
+$filepatherr = $filepath.'.err';
+$defaultlang = empty($argv[3])?'en_US':$argv[3];
+$startlinenb = empty($argv[4])?1:$argv[4];
+$endlinenb = empty($argv[5])?0:$argv[5];
+
+if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+    print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [defaultlang] [startlinenb] [endlinenb]\n";
+    print "Usage:  $script_file test myfilepath.csv fr_FR 2 1002\n";
+    print "\n";
+    exit(-1);
+}
+if (! file_exists($filepath)) {
+    print "Error: File ".$filepath." not found.\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();
+
+// Ask confirmation
+if (! $confirmed)
+{
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+// Open input and ouput files
+$fhandle = fopen($filepath, 'r');
+if (! $fhandle)
+{
+    print 'Error: Failed to open file '.$filepath."\n";
+    exit(1);
+}
+$fhandleerr = fopen($filepatherr, 'w');
+if (! $fhandleerr)
+{
+    print 'Error: Failed to open file '.$filepatherr."\n";
+    exit(1);
+}
+
+$langs->setDefaultLang($defaultlang);
+
+
+$db->begin();
+
+$i=0;
+while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
+{
+    $i++;
+    $errorrecord=0;
+    
+    if ($startlinenb && $i < $startlinenb) continue;
+    if ($endlinenb && $i > $endlinenb) continue;
+    
+    $produit = new Product($db);
+    $produit->type = 0;
+    $produit->status = 1;
+    $produit->ref = trim($fields[0]);
+    
+    print "Process line nb ".$i.", ref ".$produit->ref;
+    $produit->label = trim($fields[2]);
+    $produit->description = trim($fields[4]."\n".($fields[5] ? $fields[5].' x '.$fields[6].' x '.$fields[7] : ''));
+    $produit->volume = price2num($fields[8]);
+    $produit->volume_unit = 0;     
+    $produit->weight = price2num($fields[9]);
+    $produit->weight_units = 0;          // -3 = g
+
+    $produit->customcode = $fields[10];
+    $produit->barcode = $fields[1];
+
+    $produit->status = 1;
+    $produit->status_buy = 1;
+    
+    $produit->finished = 1;
+    
+    $produit->price_min = null;
+    $produit->price_min_ttc = null;
+    $produit->price = price2num($fields[11]);
+    $produit->price_ttc = price2num($fields[12]);
+    $produit->price_base_type = 'TTC';
+    $produit->tva_tx = price2num($fields[13]);
+    $produit->tva_npr = 0;
+    
+    /*$produit->multiprices[$i]=$result["price"];
+    $produit->multiprices_ttc[$i]=$result["price_ttc"];
+    $produit->multiprices_min[$i]=null;
+    $produit->multiprices_min_ttc[$i]=null;
+    $produit->multiprices_base_type[$i]='TTC';
+    $produit->multiprices_tva_tx[$i]=price2num((float) $fields[13]);
+    $produit->multiprices_recuperableonly[$i]=0;*/
+    
+    $produit->cost_price = price2num($fields[16]);
+    
+    // Extrafields
+    $produit->array_options['options_ecotaxdeee']=price2num($fields[17]);
+    
+    $ret=$produit->create($user);
+    if ($ret < 0)
+    {
+        print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
+        $errorrecord++;
+    }
+	else 
+	{
+	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
+	}
+
+	dol_syslog("Add prices");
+	
+    // If we use price level, insert price for each level
+	if (! $errorrecord && 1)
+	{
+	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 0, $produit->tva_npr, 0, 0, array());
+	    $ret2=$produit->updatePrice(price2num($fields[15]), $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+	    if ($ret1 < 0 || $ret2 < 0)
+        {
+            print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - updatePrice OK";
+    	}
+	}
+	
+	dol_syslog("Add multilangs");
+	
+	// Add alternative languages
+	if (! $errorrecord && 1)
+	{
+    	$produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
+	    $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
+
+    	$ret=$produit->setMultiLangs($user);
+        if ($ret < 0)
+        {
+            print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - setMultiLangs OK";
+    	}
+	}
+	
+	print "\n";
+	
+	if ($errorrecord) 
+	{
+	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
+	    $error++;    // $errorrecord will be reset
+	}
+}
+
+
+
+
+
+// commit or rollback
+if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
+{
+    print "Rollback any changes.\n";
+    $db->rollback();
+}
+else
+{
+    print "Commit all changes.\n";
+    $db->commit();
+}
+
+$db->close();
+fclose($fhandle);
+fclose($fhandleerr);
+
+exit($error);

From 769843f919af499b9837538b42b3e9b88792b96b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Feb 2016 20:07:22 +0100
Subject: [PATCH 300/421] Correct multiprice import

---
 dev/initdata/import-product.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/initdata/import-product.php b/dev/initdata/import-product.php
index 1364e1b06b8..d873adce039 100755
--- a/dev/initdata/import-product.php
+++ b/dev/initdata/import-product.php
@@ -178,8 +178,8 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     // If we use price level, insert price for each level
 	if (! $errorrecord && 1)
 	{
-	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 0, $produit->tva_npr, 0, 0, array());
-	    $ret2=$produit->updatePrice(price2num($fields[15]), $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+	    $ret2=$produit->updatePrice(price2num($fields[15]), $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
 	    if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();

From f55c1014ee6b832c42133646f9eb6c5d46b2a082 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Feb 2016 23:03:52 +0100
Subject: [PATCH 301/421] Add more example of import scripts

---
 dev/initdata/import-thirdparties.php | 237 +++++++++++++++++++++++++++
 dev/initdata/import-users.php        | 177 ++++++++++++++++++++
 dev/initdata/purge-data.php          |   4 +
 3 files changed, 418 insertions(+)
 create mode 100755 dev/initdata/import-thirdparties.php
 create mode 100755 dev/initdata/import-users.php

diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php
new file mode 100755
index 00000000000..1b4f9f57df0
--- /dev/null
+++ b/dev/initdata/import-thirdparties.php
@@ -0,0 +1,237 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-thirdparties.php
+ *		\brief      Script example to insert thirdparties from a csv file. 
+ *                  To purge data, you can have a look at purge-data.php
+ */
+
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
+}
+
+// Recupere root dolibarr
+$path=preg_replace('/import-thirdparties.php/i','',$_SERVER["PHP_SELF"]);
+require ($path."../../htdocs/master.inc.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+$delimiter=',';
+$enclosure='"';
+$linelength=10000;
+$escape='/';
+
+// Global variables
+$version=DOL_VERSION;
+$confirmed=1;
+$error=0;
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
+
+$mode = $argv[1];
+$filepath = $argv[2];
+$filepatherr = $filepath.'.err';
+//$defaultlang = empty($argv[3])?'en_US':$argv[3];
+$startlinenb = empty($argv[3])?1:$argv[3];
+$endlinenb = empty($argv[4])?0:$argv[4];
+
+if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+    print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
+    print "Usage:  $script_file test myfilepath.csv 2 1002\n";
+    print "\n";
+    exit(-1);
+}
+if (! file_exists($filepath)) {
+    print "Error: File ".$filepath." not found.\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();
+
+// Ask confirmation
+if (! $confirmed)
+{
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+// Open input and ouput files
+$fhandle = fopen($filepath, 'r');
+if (! $fhandle)
+{
+    print 'Error: Failed to open file '.$filepath."\n";
+    exit(1);
+}
+$fhandleerr = fopen($filepatherr, 'w');
+if (! $fhandleerr)
+{
+    print 'Error: Failed to open file '.$filepatherr."\n";
+    exit(1);
+}
+
+//$langs->setDefaultLang($defaultlang);
+
+
+$db->begin();
+
+$i=0;
+while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
+{
+    $i++;
+    $errorrecord=0;
+
+    if ($startlinenb && $i < $startlinenb) continue;
+    if ($endlinenb && $i > $endlinenb) continue;
+
+    $object = new Societe($db);
+    $object->state = $fields[6];
+    $object->client = $fields[7];
+    $object->fournisseur = $fields[8];
+    
+    $object->name = trim($fields[13]);
+    $object->name_alias = trim($fields[0]);
+    
+    $object->address = trim($fields[14]);
+    $object->zip = trim($fields[15]);
+    $object->town = trim($fields[16]);
+    $object->country_code = trim($fields[22]);
+    $object->phone = trim($fields[23]);
+    $object->fax = trim($fields[24]);
+    $object->email = trim($fields[26]);
+    $object->siret = trim($fields[29]);
+    $object->tva_intra = trim($fields[34]);
+    $object->default_lang = trim($fields[43]);
+    
+    $condpayment = trim($fields[36]);
+    $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_paiement_term', 'label');
+    
+    $object->code_client = $fields[9];
+    $object->code_fournisseur = $fields[10];
+
+    $labeltype = trim($fields[1]);
+    $object->typent_id = dol_getIdFromCode($db, $labeltype, 'c_typent', 'label');
+
+    print "Process line nb ".$i.", name ".$object->name;
+
+
+    // Extrafields
+    //$object->array_options['options_state']=price2num($fields[20]);
+    //$object->array_options['options_region']=price2num($fields[18]);
+    
+    $ret=$object->create($user);
+    if ($ret < 0)
+    {
+        print " - Error in create result code = ".$ret." - ".$object->errorsToString();
+        $errorrecord++;
+    }
+	else 
+	{
+	    print " - Creation OK with name ".$object->name." - id = ".$ret;
+	}
+
+	dol_syslog("Add contacts");
+	
+    // Insert an invoice contact if there is an invoice email != standard email
+	if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
+	{
+	    $contact = new Contact($db);
+	    $contact->firstname = '';
+	    $contact->lastname = '';
+	     
+	    if ($ret1 < 0 || $ret2 < 0)
+        {
+            print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - create contact OK";
+    	}
+	}
+	
+	// Insert a delivery contact
+	if (! $errorrecord && 1)
+	{
+	    $contact = new Contact($db);
+	    $contact->firstname = '';
+	    $contact->lastname = '';
+	     
+	    if ($ret1 < 0 || $ret2 < 0)
+        {
+            print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - create contact OK";
+    	}
+	}
+	
+
+	print "\n";
+	
+	if ($errorrecord) 
+	{
+	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
+	    $error++;    // $errorrecord will be reset
+	}
+}
+
+
+
+
+
+// commit or rollback
+if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
+{
+    print "Rollback any changes.\n";
+    $db->rollback();
+}
+else
+{
+    print "Commit all changes.\n";
+    $db->commit();
+}
+
+$db->close();
+fclose($fhandle);
+fclose($fhandleerr);
+
+exit($error);
diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php
new file mode 100755
index 00000000000..0b3566423fd
--- /dev/null
+++ b/dev/initdata/import-users.php
@@ -0,0 +1,177 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-thirdparties.php
+ *		\brief      Script example to insert thirdparties from a csv file. 
+ *                  To purge data, you can have a look at purge-data.php
+ */
+
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
+}
+
+// Recupere root dolibarr
+$path=preg_replace('/import-users.php/i','',$_SERVER["PHP_SELF"]);
+require ($path."../../htdocs/master.inc.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+$delimiter=',';
+$enclosure='"';
+$linelength=10000;
+$escape='/';
+
+// Global variables
+$version=DOL_VERSION;
+$confirmed=1;
+$error=0;
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
+
+$mode = $argv[1];
+$filepath = $argv[2];
+$filepatherr = $filepath.'.err';
+//$defaultlang = empty($argv[3])?'en_US':$argv[3];
+$startlinenb = empty($argv[3])?1:$argv[3];
+$endlinenb = empty($argv[4])?0:$argv[4];
+
+if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+    print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
+    print "Usage:  $script_file test myfilepath.csv 2 1002\n";
+    print "\n";
+    exit(-1);
+}
+if (! file_exists($filepath)) {
+    print "Error: File ".$filepath." not found.\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();
+
+// Ask confirmation
+if (! $confirmed)
+{
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+// Open input and ouput files
+$fhandle = fopen($filepath, 'r');
+if (! $fhandle)
+{
+    print 'Error: Failed to open file '.$filepath."\n";
+    exit(1);
+}
+$fhandleerr = fopen($filepatherr, 'w');
+if (! $fhandleerr)
+{
+    print 'Error: Failed to open file '.$filepatherr."\n";
+    exit(1);
+}
+
+//$langs->setDefaultLang($defaultlang);
+
+
+$db->begin();
+
+$i=0;
+while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
+{
+    $i++;
+    $errorrecord=0;
+    
+    if ($startlinenb && $i < $startlinenb) continue;
+    if ($endlinenb && $i > $endlinenb) continue;
+    
+    $object = new User($db);
+    $object->statut = 1;
+    
+    $tmp=explode(' ',$fields[3],2);
+    
+    $object->firstname = trim($tmp[0]);
+    $object->lastname = trim($tmp[1]);
+    if ($object->lastname) $object->login = strtolower(substr($object->firstname, 0, 1)) . strtolower(substr($object->lastname, 0));
+    else $object->login=strtolower($object->firstname);
+    $object->login=preg_replace('/ /','',$object->login);
+    $object->password = 'init';
+    
+    print "Process line nb ".$i.", login ".$object->login;
+    
+    $ret=$object->create($user);
+    if ($ret < 0)
+    {
+        print " - Error in create result code = ".$ret." - ".$object->errorsToString();
+        $errorrecord++;
+    }
+	else 
+	{
+	    print " - Creation OK with login ".$object->login." - id = ".$ret;
+	}
+
+	print "\n";
+	
+	if ($errorrecord) 
+	{
+	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
+	    $error++;    // $errorrecord will be reset
+	}
+}
+
+
+
+
+
+// commit or rollback
+if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
+{
+    print "Rollback any changes.\n";
+    $db->rollback();
+}
+else
+{
+    print "Commit all changes.\n";
+    $db->commit();
+}
+
+$db->close();
+fclose($fhandle);
+fclose($fhandleerr);
+
+exit($error);
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index 25ab928b136..82448a5d857 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -53,6 +53,10 @@ $error=0;
 
 // List of sql to execute
 $sqls=array(
+    'user'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX."user_rights WHERE fk_user IN (SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin')",
+        'DELETE FROM '.MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin'",
+    ),
     'bank'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'bank_account',
         'DELETE FROM '.MAIN_DB_PREFIX.'bank_class',

From 09951888a554f5aceecf10415fda5f957217a14f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Feb 2016 23:04:17 +0100
Subject: [PATCH 302/421] Can select number of records for warehouse lists.

---
 htdocs/product/list.php       |  5 ++---
 htdocs/product/stock/list.php | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index c25c4c1ce0a..f69adcfc8dd 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -270,14 +270,13 @@ else
 	$reshook=$hookmanager->executeHooks('printFieldSelect',$parameters);    // Note that $action and $object may have been modified by hook
 	$sql.=$hookmanager->resPrint;
     //if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte";    // Not used yet
-    $nbtotalofrecords = 0;
+    $sql.= $db->order($sortfield,$sortorder);
+	$nbtotalofrecords = 0;
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	{
 		$result = $db->query($sql);
 		$nbtotalofrecords = $db->num_rows($result);
 	}
-
-    $sql.= $db->order($sortfield,$sortorder);
     $sql.= $db->plimit($limit + 1, $offset);
 
     $resql = $db->query($sql);
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index bebfc87b528..58f95625d94 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -37,13 +37,13 @@ $search_label=GETPOST("snom","alpha")?GETPOST("snom","alpha"):GETPOST("search_la
 $sall=GETPOST("sall","alpha");
 $search_status=GETPOST("search_status","int");
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield");
 $sortorder = GETPOST("sortorder");
 if (! $sortfield) $sortfield="e.label";
 if (! $sortorder) $sortorder="ASC";
 $page = GETPOST("page");
 if ($page < 0) $page = 0;
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 
 $year = strftime("%Y",time());
@@ -107,14 +107,17 @@ if ($result)
 	$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 	llxHeader("",$langs->trans("ListOfWarehouses"),$help_url);
 
-	print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $totalnboflines);
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+	$param='';
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
+	print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_generic.png', 0, '', '', $limit);
+	
 	if ($sall)
 	{
 	    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -126,13 +129,13 @@ if ($result)
 	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
 
 	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "e.label","","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("LocationSummary"),$_SERVER["PHP_SELF"], "e.lieu","","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stockqty",'','','align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("EstimatedStockValue"), $_SERVER["PHP_SELF"], "e.valo_pmp",'','','align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("EstimatedStockValueSell"), $_SERVER["PHP_SELF"], "",'','','align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"], "e.statut",'','','align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "e.label","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("LocationSummary"),$_SERVER["PHP_SELF"], "e.lieu","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stockqty",'',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("EstimatedStockValue"), $_SERVER["PHP_SELF"], "e.valo_pmp",'',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("EstimatedStockValueSell"), $_SERVER["PHP_SELF"], "",'',$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"], "e.statut",'',$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	// Lignes des champs de filtre

From 449d44419d28735572e25f5d871e99fa78d3f7a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 11:17:47 +0100
Subject: [PATCH 303/421] Fix: When module shipment is on, a contact of order
 is also contact of shipment

---
 htdocs/contact/card.php                | 27 ++++++++++++--------------
 htdocs/contact/class/contact.class.php |  6 +++---
 htdocs/langs/en_US/companies.lang      |  2 ++
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 6fe648b375f..fca007bfd1f 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1124,14 +1124,6 @@ else
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
         
-        // Statut
-		/*print '<tr><td>'.$langs->trans("Status").'</td>';
-		print '<td>';
-		print $object->getLibStatut(4);
-		print '</td>';
-		print '</tr>'."\n";
-		*/
-        
 		// Categories
 		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) {
 			print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
@@ -1151,13 +1143,6 @@ else
 
         $object->load_ref_elements();
 
-        if (! empty($conf->commande->enabled))
-        {
-            print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
-            print $object->ref_commande?$object->ref_commande:$langs->trans("NoContactForAnyOrder");
-            print '</td></tr>';
-        }
-
         if (! empty($conf->propal->enabled))
         {
             print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
@@ -1165,6 +1150,18 @@ else
             print '</td></tr>';
         }
 
+        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");
+            print '</td><td colspan="3">';
+            $none=$langs->trans("NoContactForAnyOrder");
+            if  (! empty($conf->expedition->enabled)) { $none=$langs->trans("NoContactForAnyOrderOrShipments"); }
+            print $object->ref_commande?$object->ref_commande:$none;
+            print '</td></tr>';
+        }
+
         if (! empty($conf->contrat->enabled))
         {
             print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 723784d9a5d..2feb3f73b05 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -664,10 +664,10 @@ class Contact extends CommonObject
 
 
 	/**
-	 *  Charge le nombre d'elements auquel est lie ce contact
+	 *  Load number of elements the contact is used as a link for
 	 *  ref_facturation
 	 *  ref_contrat
-	 *  ref_commande
+	 *  ref_commande (for order and/or shipments)
 	 *  ref_propale
 	 *
      *  @return     int             					<0 if KO, >=0 if OK
@@ -701,7 +701,7 @@ class Contact extends CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->error()." - ".$sql;
+			$this->error=$this->db->lasterror();
 			return -1;
 		}
 	}
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 05348d7d26a..2559aa8bafb 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -317,10 +317,12 @@ ShowContact=Show contact
 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
+NoContactForAnyOrderOrShipment=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

From 2747259fbdb227d4b68c5a0243672f91c1d3c4f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 12:01:50 +0100
Subject: [PATCH 304/421] Fix: missing payment term and condition into update
 method

---
 htdocs/core/class/commonobject.class.php | 2 +-
 htdocs/societe/class/societe.class.php   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 32670098ec3..f6c760799ed 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -228,7 +228,7 @@ abstract class CommonObject
 	public $barcode_type_coder;
 
 	/**
-	 * @var int Payment method ID?
+	 * @var int Payment method ID (cheque, cash, ...)
 	 * @see setPaymentMethods()
 	 */
 	public $mode_reglement_id;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 1541e5e6f6a..babd8387c5b 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -836,6 +836,11 @@ class Societe extends CommonObject
 
             $sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
 
+            $sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
+            $sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
+            $sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
+            $sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
+            
             $sql .= ",client = " . (! empty($this->client)?$this->client:0);
             $sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
             $sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");

From 5d1241be2ff08b2421c945a0ea07d1551e9f0549 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 12:10:25 +0100
Subject: [PATCH 305/421] Sync transifex

---
 htdocs/langs/fr_FR/admin.lang     | 5 +++--
 htdocs/langs/fr_FR/boxes.lang     | 4 ++--
 htdocs/langs/fr_FR/companies.lang | 4 +++-
 htdocs/langs/fr_FR/errors.lang    | 2 ++
 htdocs/langs/fr_FR/exports.lang   | 4 ++++
 htdocs/langs/fr_FR/products.lang  | 3 +++
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ef95c99ec18..333be2ad4fc 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Configuration du module
 ModulesSetup=Configuration des modules
 ModuleFamilyBase=Système
 ModuleFamilyCrm=Gestion de la relation client (GRC)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Gestion des Produits/Services (PM)
 ModuleFamilyHr=Gestion des Ressources Humaines (RH)
 ModuleFamilyProjects=Projets/Travail collaboratif
@@ -1090,7 +1091,7 @@ PathDirectory=Répertoire
 SendmailOptionMayHurtBuggedMTA=La fonction d'envoi de mails par la méthode "PHP mail directe" génère un message mail qui peut être mal interprété par certains serveurs mal configurés de réception de mail. Cela se traduit par des mails non lisibles chez les personnes hébergés par ces plateformes boguées. C'est le cas des clients de certains fournisseurs d'accès internet (Ex: Orange). Ce n'est pas un problème, ni dans Dolibarr ni dans PHP mais sur le serveur de réception. Vous pouvez toutefois ajouter l'option MAIN_FIX_FOR_BUGGED_MTA à 1 dans configuration - divers pour modifier Dolibarr afin de compenser le bug. Toutefois ce sont les serveurs respectueux du standard d'envoi de mail qui pourront avoir des problèmes. L'autre solution (recommandée) est d'utiliser la méthode d'envoi SMTP socket library qui n'a aucun de ces inconvénients.
 TranslationSetup=Configuration de la traduction
 TranslationDesc=Le choix de la langue affichée à l'écran se modifie:<br>* Soit de manière globale depuis le menu <strong>Accueil - Configuration - Affichage</strong><br>* Soit de manière spécifique à l'utilisateur depuis l'onglet <strong>Interface utilisateur</strong> de sa fiche utilisateur (cliquer sur l'identifiant en haut de l'écran).
-TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
+TranslationOverwriteDesc=Vous pouvez aussi écraser des valeurs en complétant/corrigeant le tableau suivant. Vous devez utiliser pour "%s" le code de langue, pour "%s" le code trouvé dans le fichier langs/xx_XX/somefile.lang et "%s" la nouvelle valeur que vous souhaitez utiliser comme nouvelle traduction.
 TotalNumberOfActivatedModules=Nombre total de modules/fonctionnalités activés: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Vous devez activer au moins une fonctionnalité
 ClassNotFoundIntoPathWarning=La classe %s n'a pas été trouvée dans le chemin PHP
@@ -1712,4 +1713,4 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s est disponible. La ver
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version de maintanance, aussi elle ne contient que des correctifs de bugs. Nous recommandons tout personne utilisant une version plus ancienne de migrer sur celle-ci. En tant que version de maintenance, aucune nouvelle fonctionnalité n'est ajouté, ni modification de format de données. Vous pouvez télécharger cette version à partir de la zone de téléchargement du portail http://www.dolibarr.org (sous-répertoire "Versions stables"). Vous pouvez lire le <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pour la liste complète des changements.
 MultiPriceRuleDesc=Quand l'option « Plusieurs niveaux de prix par produit/service» est activée, vous pouvez définir différents prix (un par niveau de prix) pour chaque produits. Pour sauver du temps, vous pouvez entrer ici une règle pour avoir un prix pour chaque niveau calculé automatiquement. Cette page est ici pour sauver du temps et peut être utile si vos prix pour chaque niveaux sont relatif au premier niveau. Vous pouvez ignorer cette page dans la plupart des cas
 ModelModulesProduct=Modèles des documents de produits
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+ToGenerateCodeDefineAutomaticRuleFirst=Pour pouvoir générer automatiquement des codes, vous devez d'abord définir un gestionnaire pour définir automatiquement le numéro du codebar.
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index a006c333239..b19d51dfbd3 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Les %s derniers contrats
 BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
 BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
 BoxGlobalActivity=Activité globale (factures, propositions, commandes)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Échec du rafraichissement du flux RSS. Date du dernier rafraichissement : %s
 LastRefreshDate=Date dernier rafraichissement
 NoRecordedBookmarks=Pas de marques-pages personnels.
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index cbc25ec597d..d0f883a242a 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Id. prof. 3 (SRVC TAX)
 ProfId4IN=Id. prof. 4
 ProfId5IN=Id. prof. 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Afficher contact
 ContactsAllShort=Tous (pas de filtre)
 ContactType=Type de contact
 ContactForOrders=Contact de commandes
+ContactForOrdersOrShipments=Contact de commandes ou expéditions
 ContactForProposals=Contact de propositions
 ContactForContracts=Contact de contrats
 ContactForInvoices=Contact de factures
 NoContactForAnyOrder=Ce contact n'est contact d'aucune commande
+NoContactForAnyOrderOrShipment=Ce contact n'est contact d'aucune commande ni expédition
 NoContactForAnyProposal=Ce contact n'est contact d'aucune proposition commerciale
 NoContactForAnyContract=Ce contact n'est contact d'aucun contrat
 NoContactForAnyInvoice=Ce contact n'est contact d'aucune facture
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 79bba51615c..4c4e934ffff 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Paramètre(s) obligatoire(s) non fournis
 ErrorOppStatusRequiredIfAmount=Vous avez fixé un montant estimé pour cette opportunité/affaire. Aussi, vous devez également entrer son statut
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mauvaise définition du tableau Menu dans le descripteur de module (mauvaise valeur pour la clé fk_menu)
 ErrorSavingChanges=Une erreur est survenue lors de la sauvegarde des modifications
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 73650632926..44be3ccbe50 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Code spécial
 ExportStringFilter=%% permet de remplacer 1 ou plusieurs caractères dans le texte
 ExportDateFilter=AAAA, AAAAMM, AAAAMMJJ: filtre pour une année/mois/jour<br>AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMJJ+AAAAMMJJ: filtre pour une plage année/mois/jour<br> > AAAA, > AAAAMM, > AAAAMMJJ': filtre pour une date supérieure à une année/mois/jour donné<br> < AAAA, < AAAAMM, < AAAAMMJJ: filtre pour une date inférieure à une année/mois/jour donné
 ExportNumericFilter='NNNNN' filtres sur une valeur<br>'NNNNN+NNNNN' filtres sur une place de valeurs<br>'&gt;NNNNN' filtres sur les valeurs plus petites<br>'&gt;NNNNN' filtres sur les valeurs plus grandes
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Si vous voulez filtrer sur certaines valeurs, saisissez ces valeurs.
 FilterableFields=Champs filtrables
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 0e99bc447e9..f8514e725b3 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -318,3 +318,6 @@ WarningSelectOneDocument=Sélectionnez au moins un document
 DefaultUnitToShow=Unité
 NbOfQtyInProposals=Qté en propositions
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes

From 0f6e88b460871cc1d6a9c1b54ff436a225e8faaf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 12:18:24 +0100
Subject: [PATCH 306/421] Update css of warehouse list

---
 htdocs/expedition/shipment.php                  | 2 +-
 htdocs/product/class/html.formproduct.class.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 58d65eea6d3..9af5bd25811 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -723,7 +723,7 @@ if ($id > 0 || ! empty($ref))
 				{
 					print '<td>'.$langs->trans("WarehouseSource").'</td>';
 					print '<td>';
-					print $formproduct->selectWarehouses(! empty($commande->warehouse_id)?$commande->warehouse_id:-1,'entrepot_id','',1);
+					print $formproduct->selectWarehouses(! empty($commande->warehouse_id)?$commande->warehouse_id:-1, 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
 					if (count($formproduct->cache_warehouses) <= 0)
 					{
 						print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>';
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 27b8e6f3ba2..b3fd124b21c 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -137,7 +137,7 @@ class FormProduct
 	 *  @param	array	$events			events to add to select2
 	 * 	@return	string					HTML select
 	 */
-	function selectWarehouses($selected='',$htmlname='idwarehouse',$filtertype='',$empty=0,$disabled=0,$fk_product=0,$empty_label='', $showstock=0, $forcecombo=0, $events=array())
+	function selectWarehouses($selected='',$htmlname='idwarehouse',$filtertype='',$empty=0,$disabled=0,$fk_product=0,$empty_label='', $showstock=0, $forcecombo=0, $events=array(), $morecss='')
 	{
 		global $conf,$langs,$user;
 
@@ -156,7 +156,7 @@ class FormProduct
 			$nodatarole=($comboenhancement?' data-role="none"':'');
 		}
 		
-		$out.='<select class="flat"'.($disabled?' disabled':'').' id="'.$htmlname.'" name="'.($htmlname.($disabled?'_disabled':'')).'"'.$nodatarole.'>';
+		$out.='<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled':'').' id="'.$htmlname.'" name="'.($htmlname.($disabled?'_disabled':'')).'"'.$nodatarole.'>';
 		if ($empty) $out.='<option value="-1">'.($empty_label?$empty_label:'&nbsp;').'</option>';
 		foreach($this->cache_warehouses as $id => $arraytypes)
 		{

From d5112c0c820cace60269d97e17506c91e43c8617 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 12:23:34 +0100
Subject: [PATCH 307/421] Better sample import scripts

---
 dev/initdata/import-thirdparties.php | 99 ++++++++++++++++++++++------
 dev/initdata/import-users.php        |  1 -
 dev/initdata/purge-data.php          | 64 +++++++++++++-----
 3 files changed, 126 insertions(+), 38 deletions(-)

diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php
index 1b4f9f57df0..53f03ff0d98 100755
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -131,29 +131,35 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     $object->address = trim($fields[14]);
     $object->zip = trim($fields[15]);
     $object->town = trim($fields[16]);
-    $object->country_code = trim($fields[22]);
-    $object->phone = trim($fields[23]);
-    $object->fax = trim($fields[24]);
+    $object->country_id = dol_getIdFromCode($db, trim($fields[21]), 'c_country', 'code', 'rowid');
+    $object->phone = trim($fields[22]);
+    $object->fax = trim($fields[23]);
     $object->email = trim($fields[26]);
-    $object->siret = trim($fields[29]);
+    $object->idprof2 = trim($fields[29]);
     $object->tva_intra = trim($fields[34]);
     $object->default_lang = trim($fields[43]);
-    
+
+    //$condpayment = dol_string_unaccent(trim($fields[36]));
     $condpayment = trim($fields[36]);
-    $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_paiement_term', 'label');
-    
+    $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid');
+    dol_syslog("cond_reglement id=".$object->cond_reglement_id);
+
     $object->code_client = $fields[9];
     $object->code_fournisseur = $fields[10];
 
     $labeltype = trim($fields[1]);
-    $object->typent_id = dol_getIdFromCode($db, $labeltype, 'c_typent', 'label');
+    $object->typent_id = dol_getIdFromCode($db, $labeltype, 'c_typent', 'libelle');
 
+    // Set price level
+    $object->price_level = 1;
+    if ($labeltype == 'Revendeur') $object->price_level = 2;
+    
     print "Process line nb ".$i.", name ".$object->name;
 
 
     // Extrafields
-    //$object->array_options['options_state']=price2num($fields[20]);
-    //$object->array_options['options_region']=price2num($fields[18]);
+    $object->array_options['options_anastate']=price2num($fields[20]);
+    $object->array_options['options_anaregion']=price2num($fields[17]);
     
     $ret=$object->create($user);
     if ($ret < 0)
@@ -166,15 +172,54 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	    print " - Creation OK with name ".$object->name." - id = ".$ret;
 	}
 
-	dol_syslog("Add contacts");
+	dol_syslog("Set price level");
+	$object->set_price_level($object->price_level, $user);
 	
-    // Insert an invoice contact if there is an invoice email != standard email
+	// Assign sales representative
+	if ($fields[3])
+	{
+    	$salesrep=new User($db);
+    	
+    	$tmp=explode(' ',$fields[3],2);
+    	$salesrep->firstname = trim($tmp[0]);
+    	$salesrep->lastname = trim($tmp[1]);
+    	if ($salesrep->lastname) $salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
+    	else $salesrep->login=strtolower($salesrep->firstname);
+    	$salesrep->login=preg_replace('/ /','',$salesrep->login);
+    	$salesrep->fetch(0,$salesrep->login);
+    
+    	$result = $object->add_commercial($user, $salesrep->id);
+    	if ($result < 0)
+    	{
+    	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
+    	    $errorrecord++;
+    	}
+    	else
+    	{
+    	    print " - create link sale representative OK";
+    	}
+	}	
+	
+	dol_syslog("Add invoice contacts");
+	// Insert an invoice contact if there is an invoice email != standard email
 	if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
 	{
+	    $ret1=$ret2=0;
+	    
 	    $contact = new Contact($db);
-	    $contact->firstname = '';
-	    $contact->lastname = '';
-	     
+	    $contact->lastname = $object->name;
+	    $contact->address=$object->address;
+	    $contact->zip=$object->zip;
+	    $contact->town=$object->town;
+	    $contact->country_id=$object->country_id;
+	    $contact->email=$fields[27];
+	    $contact->socid=$object->id;
+	    
+	    $ret1=$contact->create($user);
+	    if ($ret1 > 0)
+	    {
+	        //$ret2=$contact->add_contact($object->id, 'BILLING');
+	    }
 	    if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
@@ -186,13 +231,29 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	}
 	}
 	
+	dol_syslog("Add delivery contacts");
 	// Insert a delivery contact
 	if (! $errorrecord && 1)
 	{
-	    $contact = new Contact($db);
-	    $contact->firstname = '';
-	    $contact->lastname = '';
-	     
+	    $ret1=$ret2=0;
+	    
+	    $contact2 = new Contact($db);
+	    $contact2->lastname = $fields[47];
+	    $contact2->address = $fields[48];
+	    $contact2->zip = $fields[50];
+	    $contact2->town = $fields[51];
+	    $contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
+	    $contact2->note_public=$fields[54];
+	    $contact2->socid=$object->id;
+	    
+	    // Extrafields
+	    $contact2->array_options['options_anazoneliv']=price2num($fields[53]);
+	    
+	    $ret1=$contact2->create($user);
+	    if ($ret1 > 0)
+	    {
+	        //$ret2=$contact2->add_contact($object->id, 'SHIPPING');
+	    }
 	    if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php
index 0b3566423fd..61896cae8b7 100755
--- a/dev/initdata/import-users.php
+++ b/dev/initdata/import-users.php
@@ -124,7 +124,6 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     $object->statut = 1;
     
     $tmp=explode(' ',$fields[3],2);
-    
     $object->firstname = trim($tmp[0]);
     $object->lastname = trim($tmp[1]);
     if ($object->lastname) $object->login = strtolower(substr($object->firstname, 0, 1)) . strtolower(substr($object->lastname, 0));
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index 82448a5d857..64054a7a798 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -124,6 +124,7 @@ $sqls=array(
         'DELETE FROM '.MAIN_DB_PREFIX.'socpeople',
     ),
     'thirdparty'=>array(
+        '@contact',
         'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons', 
         'UPDATE '.MAIN_DB_PREFIX.'adherent SET fk_soc = NULL',
         'DELETE FROM '.MAIN_DB_PREFIX.'categorie_fournisseur',
@@ -184,6 +185,46 @@ if (! $confirmed)
 }
 
 
+/**
+ * Process sql requests of a family
+ */
+function processfamily($family)
+{
+    global $db, $sqls;
+    
+    $error=0;
+    foreach($sqls[$family] as $sql)
+    {
+        if (preg_match('/^@/',$sql))
+        {
+            $newfamily=preg_replace('/@/','',$sql);
+            processfamily($newfamily);
+            continue;
+        }
+        
+        print "Run sql: ".$sql."\n";
+        $resql=$db->query($sql);
+        if (! $resql)
+        {
+            if ($db->errno() != 'DB_ERROR_NOSUCHTABLE')
+            {
+                $error++;
+            }
+        }
+    
+        if ($error)
+        {
+            print $db->lasterror();
+            $error++;
+            break;
+        }
+    }
+    
+    if ($error) return -1;
+    else return 1;
+}
+
+
 $db->begin();
 
 $oldfamily='';
@@ -193,25 +234,12 @@ foreach($sqls as $family => $familysql)
 
     if ($family != $oldfamily) print "Process action for family ".$family."\n";
     $oldfamily = $family;
-    
-    foreach($familysql as $sql)
+
+    $result=processfamily($family);
+    if ($result < 0) 
     {
-        print "Run sql: ".$sql."\n";
-        $resql=$db->query($sql);
-        if (! $resql) 
-        {
-            if ($db->errno() != 'DB_ERROR_NOSUCHTABLE')
-            {
-                $error++;
-            }
-        }
-        
-        if ($error)
-        {
-            print $db->lasterror();
-            $error++;
-            break 2;
-        }
+        $error++;
+        break;
     }
 }
 

From 513b46e1d4a6edeed91e9ccc8b0f2ce7bdc5dd9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 13:19:25 +0100
Subject: [PATCH 308/421] NEW Can reopen an closed shipment

---
 htdocs/expedition/card.php                   | 98 +++++++++++---------
 htdocs/expedition/class/expedition.class.php | 28 +++++-
 2 files changed, 81 insertions(+), 45 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8238f76ad9b..b0bdbf75af3 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -102,40 +102,6 @@ $permissiondellink=$user->rights->expedition->livraison->creer;	// Used by the i
  * Actions
  */
 
-
-// Set incoterm
-if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-{
-	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-}
-
-if ($action == 'update_extras')
-{
-	// Fill array 'array_options' with data from update form
-	$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-	$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-	if ($ret < 0) $error++;
-
-	if (! $error)
-	{
-		// Actions on extra fields (by external module or standard code)
-		// TODO le hook fait double emploi avec le trigger !!
-		$hookmanager->initHooks(array('expeditiondao'));
-		$parameters = array('id' => $object->id);
-		$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook)) {
-			$result = $object->insertExtraFields();
-			if ($result < 0) {
-				$error++;
-			}
-		} else if ($reshook < 0)
-			$error++;
-	}
-
-	if ($error)
-		$action = 'edit_extras';
-}
-
 $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');
@@ -144,6 +110,46 @@ if (empty($reshook))
 {
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
+	// Set incoterm
+	if ($action == 'reopen' && $user->rights->expedition->creer)
+	{
+	    $object->fetch($id);
+	    $result = $object->reOpen();
+	}
+	
+	// Set incoterm
+	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+	{
+	    $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	}
+	
+	if ($action == 'update_extras')
+	{
+	    // Fill array 'array_options' with data from update form
+	    $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+	    if ($ret < 0) $error++;
+	
+	    if (! $error)
+	    {
+	        // Actions on extra fields (by external module or standard code)
+	        // TODO le hook fait double emploi avec le trigger !!
+	        $hookmanager->initHooks(array('expeditiondao'));
+	        $parameters = array('id' => $object->id);
+	        $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	        if (empty($reshook)) {
+	            $result = $object->insertExtraFields();
+	            if ($result < 0) {
+	                $error++;
+	            }
+	        } else if ($reshook < 0)
+	            $error++;
+	    }
+	
+	    if ($error)
+	        $action = 'edit_extras';
+	}
+	
 	if ($action == 'add' && $user->rights->expedition->creer)
 	{
 	    $error=0;
@@ -339,7 +345,7 @@ if (empty($reshook))
 	    }
 	    else
 	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToShip")), null, 'errors');
+	        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
 
@@ -1108,9 +1114,9 @@ if ($action == 'create')
 							}
 						}
 					}
-					if ($subj == 0) // Line not shown yet
+					if ($subj == 0) // Line not shown yet, we show it
 					{
-						print '<tr><td colspan="3" ></td><td align="center">';
+						print '<tr><td colspan="3" ></td><td align="center"><!-- line not shown yet, we show it -->';
 						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
     						//$disabled='disabled="disabled"';
@@ -1358,7 +1364,9 @@ else if ($id || $ref)
 		print '</tr>';
 
 		// Weight
-		print '<tr><td>'.$form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+		print '<tr><td>';
+		print $form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer);
+		print '</td><td colspan="3">';
 
 		if ($action=='edittrueWeight')
 		{
@@ -1379,10 +1387,12 @@ else if ($id || $ref)
 			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
 		}
 
+        // Calculated
 		if ($totalWeight > 0)
 		{
 			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
 			print $totalWeight.' '.measuring_units_string(0,"weight");
+			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')'; 
 			if (!empty($object->trueWeight)) print ')';
 		}
 		print '</td></tr>';
@@ -1412,10 +1422,8 @@ else if ($id || $ref)
 		{
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
-
 		}
 
-
 		print '</td></tr>';
 
 		// Depth
@@ -1442,6 +1450,7 @@ else if ($id || $ref)
 		{
 			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
 			print $totalVolume.' '.measuring_units_string(0,"volume");
+			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
 			if ($calculatedVolume) print ')';
 		}
 		print "</td>\n";
@@ -1743,11 +1752,12 @@ else if ($id || $ref)
 		}
 
 		// TODO add alternative status
-		/* if ($object->statut == 1 && $user->rights->expedition->creer)
+		// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
+		if ($object->statut == 2 && $object->billed && $user->rights->expedition->creer)
 		{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-		}*/
-
+		    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+		}
+		
 		// Send
 		if ($object->statut > 0)
 		{
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 9ccee64c8ab..62ffb53cc51 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1792,7 +1792,7 @@ class Expedition extends CommonObject
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-			//TODO: Option to set order billed if 100% of order is shipped
+			//TODO: Add option/checkbox to set order billed if 100% of order is shipped
 			$this->statut=2;
 			$this->billed=1;
 			return 1;
@@ -1804,6 +1804,32 @@ class Expedition extends CommonObject
 		}
 	}
 
+	/**
+	 *	Classify the shipping as validated/opened
+	 *
+	 *	@return     int     <0 if ko, >0 if ok
+	 */
+	function reOpen()
+	{
+		global $conf;
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=1';
+		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->statut=1;
+			$this->billed=0;
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+	
 	/**
 	 *  Create a document onto disk according to template module.
 	 *

From 33d5fa38efcc82efb610c5017401e2ce48a822aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 13:29:37 +0100
Subject: [PATCH 309/421] Fix pdfBuildThirdpartyName must return main name.
 Alias should be an option.

---
 htdocs/core/lib/pdf.lib.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 62a92f4d5ac..34ff6103f11 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -340,22 +340,21 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
 /**
  * Returns the name of the thirdparty
  *
- * @param Societe|Contact $thirdparty Contact or thirdparty
- * @param Translate $outputlangs Output language
+ * @param   Societe|Contact     $thirdparty     Contact or thirdparty
+ * @param   Translate           $outputlangs    Output language
+ * @param   int                 $includealias   1=Include alias name after name
  * @return string
  */
-function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs)
+function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includealias=0)
 {
-	//Recipient name
+	// Recipient name
 	$socname = '';
 
-	// On peut utiliser le nom de la societe du contact
 	if ($thirdparty instanceof Societe) {
-		if (!empty($thirdparty->name_alias)) {
-			$socname = $thirdparty->name_alias."\n";
-		}
-
 		$socname .= $thirdparty->name;
+		if ($includealias && !empty($thirdparty->name_alias)) {
+		    $socname .= "\n".$thirdparty->name_alias;
+		}
 	} elseif ($thirdparty instanceof Contact) {
 		$socname = $thirdparty->socname;
 	} else {

From 02c0f528809158a2df3b259e39dd2e8efd2e8a62 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 16:56:24 +0100
Subject: [PATCH 310/421] NEW Include sales representative into export of
 thirdparties

---
 htdocs/core/modules/modSociete.class.php | 10 ++++++----
 htdocs/langs/en_US/companies.lang        |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 5bc4c11529e..f2ce7ebf0da 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -255,12 +255,13 @@ class modSociete extends DolibarrModules
 		$this->export_permission[$r]=array(array("societe","export"));
 		$this->export_fields_array[$r]=array('s.rowid'=>"Id",'s.nom'=>"Name",'s.status'=>"Status",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"AccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'d.nom'=>'State','c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.default_lang'=>"DefaultLang",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'t.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','st.code'=>'ProspectStatus');
 		if (! empty($conf->global->SOCIETE_USEPREFIX)) $this->export_fields_array[$r]['s.prefix']='Prefix';
+		$keyforselect='societe'; $keyforelement='company'; $keyforaliasextra='extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$this->export_fields_array[$r]+=array('u.login'=>'SaleRepresentativeLogin','u.firstname'=>'SaleRepresentativeFirstname', 'u.lastname'=>'SaleRepresentativeLastname');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Numeric",'s.client'=>"Numeric",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text');
-		$this->export_entities_array[$r]=array();	// We define here only fields that use another picto
+		$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Numeric",'s.client'=>"Numeric",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text','u.login'=>'Text','u.firstname'=>'Text','u.lastname'=>'Text');
+		$this->export_entities_array[$r]=array('u.login'=>'user','u.firstname'=>'user','u.lastname'=>'user');	// We define here only fields that use another picto
 		$this->export_examplevalues_array[$r]=array('s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'0 (not a supplier) or 1 (supplier)');
-        $keyforselect='societe'; $keyforelement='company'; $keyforaliasextra='extra';
-        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
@@ -270,6 +271,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON sc.fk_user = u.rowid';
 		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe', 1).')';
 
 		// Export list of contacts and attributes
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 2559aa8bafb..92fef1d9d33 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -440,3 +440,6 @@ 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
\ No newline at end of file

From 9e8fcd19aa6ae27e9fa13aac9d73525ee975e1cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 17:05:34 +0100
Subject: [PATCH 311/421] Fix PHPCS

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

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index b3fd124b21c..6b64b625e53 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -135,6 +135,7 @@ class FormProduct
 	 *  @param	int		$showstock		1=show stock count
 	 *  @param	int		$forcecombo		force combo iso ajax select2
 	 *  @param	array	$events			events to add to select2
+	 *  @param  string  $morecss        Add more css classes
 	 * 	@return	string					HTML select
 	 */
 	function selectWarehouses($selected='',$htmlname='idwarehouse',$filtertype='',$empty=0,$disabled=0,$fk_product=0,$empty_label='', $showstock=0, $forcecombo=0, $events=array(), $morecss='')

From 0f49bb8645128bcc0471ea170de736b63a9282d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 17:09:04 +0100
Subject: [PATCH 312/421] Clean code

---
 htdocs/admin/websites.php | 135 +-------------------------------------
 1 file changed, 1 insertion(+), 134 deletions(-)

diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index 0a7737041b7..de4c0472f62 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -27,7 +27,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -833,150 +832,18 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 	global $bc;
 
 	$formadmin = new FormAdmin($db);
-	$formcompany = new FormCompany($db);
-	if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
 
 	foreach ($fieldlist as $field => $value)
 	{
-		if ($fieldlist[$field] == 'country')
-		{
-			if (in_array('region_id',$fieldlist))
-			{
-				print '<td>';
-				//print join(',',$fieldlist);
-				print '</td>';
-				continue;
-			}	// For state page, we do not show the country input (we link to region, not country)
-			print '<td>';
-			$fieldname='country';
-			print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28, 'maxwidth300');
-			print '</td>';
-		}
-		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)
-			{
-				$country_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
-				print '<td>';
-				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
-				print '</td>';
-			}
-		}
-		elseif ($fieldlist[$field] == 'region')
-		{
-			print '<td>';
-			$formcompany->select_region($region_id,'region');
-			print '</td>';
-		}
-		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')
+		if ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
 			print '</td>';
 		}
-		// Le type de template
-		elseif ($fieldlist[$field] == 'type_template')
-		{
-			print '<td>';
-			print $form->selectarray('type_template', $elementList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
-			print '</td>';
-		}
-		// Le type de l'element (pour les type de contact)
-		elseif ($fieldlist[$field] == 'element')
-		{
-			print '<td>';
-			print $form->selectarray('element', $elementList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
-			print '</td>';
-		}
-		// La source de l'element (pour les type de contact)
-		elseif ($fieldlist[$field] == 'source')
-		{
-			print '<td>';
-			print $form->selectarray('source', $sourceList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
-			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
-		{
-			print '<td>';
-			print 'user<input type="hidden" name="type" value="user">';
-			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm' || $fieldlist[$field] == 'deductible') {
-			print '<td>';
-			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'))) {
-			$align="left";
-			if (in_array($fieldlist[$field],array('taux','localtax1','localtax2'))) $align="right";	// Fields aligned on right
-			print '<td align="'.$align.'">';
-			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'))) {
-			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea></td>';
-		}
-		elseif (in_array($fieldlist[$field], array('content')))
-		{
-			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
-			{
-				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
-			}
-			else print '<td>';
-			if ($context != 'hide')
-			{
-				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea>';
-				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''), '', 140, 'dolibarr_mailings', 'In', 0, false, true, ROWS_5, '90%');
-				print $doleditor->Create(1);
-			}
-			else print '&nbsp;';
-			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
-			print '<td><input type="text" class="flat" value="'.price((! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'')).'" size="8" name="'.$fieldlist[$field].'"></td>';
-		}
 		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>';
 		}
-		elseif ($fieldlist[$field]=='unit') {
-			print '<td>';
-			$units = array(
-					'mm' => $langs->trans('SizeUnitmm'),
-					'cm' => $langs->trans('SizeUnitcm'),
-					'point' => $langs->trans('SizeUnitpoint'),
-					'inch' => $langs->trans('SizeUnitinch')
-			);
-			print $form->selectarray('unit', $units, (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''), 0, 0, 0);
-			print '</td>';
-		}
-		// Le type de taxe locale
-		elseif ($fieldlist[$field] == 'localtax1_type' || $fieldlist[$field] == 'localtax2_type')
-		{
-			print '<td align="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')
-		{
-			print '<td>';
-			if (! empty($conf->accounting->enabled))
-			{
-				$accountancy_account = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
-				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1);
-			}
-			else
-			{
-				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" name="'.$fieldlist[$field].'">';
-			}
-			print '</td>';
-		}
 		else
 		{
 			print '<td>';

From 715b2024cd2a6e83e75ca173b26e5024ba7c8b30 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 17:17:41 +0100
Subject: [PATCH 313/421] Better repair script

---
 htdocs/install/mysql/migration/repair.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index fafe5a4ad9f..dbb2ee0b7df 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -113,6 +113,8 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, position) values
 
 
 -- Stock calculation on product
+DELETE FROM llx_product_stock WHERE fk_product NOT IN (select rowid from llx_product); 
+
 UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid);
 
 

From 9f240c6c88ebb5ae4785eb642f257bd36120575d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 17:27:28 +0100
Subject: [PATCH 314/421] Better import examples

---
 dev/initdata/import-product.php      | 15 +++----
 dev/initdata/import-thirdparties.php | 64 ++++++++++++++++++----------
 dev/initdata/import-users.php        |  5 +++
 dev/initdata/purge-data.php          |  4 ++
 4 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/dev/initdata/import-product.php b/dev/initdata/import-product.php
index d873adce039..5c1f80c384c 100755
--- a/dev/initdata/import-product.php
+++ b/dev/initdata/import-product.php
@@ -112,6 +112,7 @@ $langs->setDefaultLang($defaultlang);
 $db->begin();
 
 $i=0;
+$nboflines++;
 while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
@@ -120,6 +121,8 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
     
+    $nboflines++;
+    
     $produit = new Product($db);
     $produit->type = 0;
     $produit->status = 1;
@@ -149,14 +152,6 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     $produit->tva_tx = price2num($fields[13]);
     $produit->tva_npr = 0;
     
-    /*$produit->multiprices[$i]=$result["price"];
-    $produit->multiprices_ttc[$i]=$result["price_ttc"];
-    $produit->multiprices_min[$i]=null;
-    $produit->multiprices_min_ttc[$i]=null;
-    $produit->multiprices_base_type[$i]='TTC';
-    $produit->multiprices_tva_tx[$i]=price2num((float) $fields[13]);
-    $produit->multiprices_recuperableonly[$i]=0;*/
-    
     $produit->cost_price = price2num($fields[16]);
     
     // Extrafields
@@ -179,7 +174,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	if (! $errorrecord && 1)
 	{
 	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
-	    $ret2=$produit->updatePrice(price2num($fields[15]), $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
+	    $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
 	    if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
@@ -225,6 +220,8 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 
 
 // commit or rollback
+print "Nb of lines qualified: ".$nboflines."\n";
+print "Nb of errors: ".$error."\n";
 if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php
index 53f03ff0d98..199807473f8 100755
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -112,6 +112,7 @@ if (! $fhandleerr)
 $db->begin();
 
 $i=0;
+$nboflines=0;
 while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
@@ -120,13 +121,15 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
 
+    $nboflines++;
+    
     $object = new Societe($db);
     $object->state = $fields[6];
     $object->client = $fields[7];
     $object->fournisseur = $fields[8];
     
-    $object->name = trim($fields[13]);
-    $object->name_alias = trim($fields[0]);
+    $object->name = $fields[13]?trim($fields[13]):$fields[0];
+    $object->name_alias = $fields[0]!=$fields[13]?trim($fields[0]):'';
     
     $object->address = trim($fields[14]);
     $object->zip = trim($fields[15]);
@@ -140,9 +143,18 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     $object->default_lang = trim($fields[43]);
 
     //$condpayment = dol_string_unaccent(trim($fields[36]));
-    $condpayment = trim($fields[36]);
-    $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid');
-    dol_syslog("cond_reglement id=".$object->cond_reglement_id);
+    if ($fields[36])
+    {
+        $condpayment = trim($fields[36]);
+        if ($condpayment == 'A la commande') $condpayment = 'A réception de commande';
+        if ($condpayment == 'A reception facture') $condpayment = 'Réception de facture';
+        $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid');
+        if (empty($object->cond_reglement_id))
+        {
+            print " - Error cant find payment mode for ".$condpayment."\n";
+            $errorrecord++;
+        }
+    }
 
     $object->code_client = $fields[9];
     $object->code_fournisseur = $fields[10];
@@ -160,23 +172,29 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     // Extrafields
     $object->array_options['options_anastate']=price2num($fields[20]);
     $object->array_options['options_anaregion']=price2num($fields[17]);
-    
-    $ret=$object->create($user);
-    if ($ret < 0)
-    {
-        print " - Error in create result code = ".$ret." - ".$object->errorsToString();
-        $errorrecord++;
-    }
-	else 
-	{
-	    print " - Creation OK with name ".$object->name." - id = ".$ret;
-	}
 
-	dol_syslog("Set price level");
-	$object->set_price_level($object->price_level, $user);
-	
+    if (! $errorrecord)
+    {
+        $ret=$object->create($user);
+        if ($ret < 0)
+        {
+            print " - Error in create result code = ".$ret." - ".$object->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - Creation OK with name ".$object->name." - id = ".$ret;
+    	}
+    }
+
+    if (! $errorrecord)
+    {
+        dol_syslog("Set price level");
+	    $object->set_price_level($object->price_level, $user);
+    }
+
 	// Assign sales representative
-	if ($fields[3])
+	if (! $errorrecord && $fields[3])
 	{
     	$salesrep=new User($db);
     	
@@ -233,12 +251,12 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	
 	dol_syslog("Add delivery contacts");
 	// Insert a delivery contact
-	if (! $errorrecord && 1)
+	if (! $errorrecord && $fields[47])
 	{
 	    $ret1=$ret2=0;
 	    
 	    $contact2 = new Contact($db);
-	    $contact2->lastname = $fields[47];
+	    $contact2->lastname = 'Service livraison - '.$fields[47];
 	    $contact2->address = $fields[48];
 	    $contact2->zip = $fields[50];
 	    $contact2->town = $fields[51];
@@ -280,6 +298,8 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 
 
 // commit or rollback
+print "Nb of lines qualified: ".$nboflines."\n";
+print "Nb of errors: ".$error."\n";
 if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php
index 61896cae8b7..355f41e9886 100755
--- a/dev/initdata/import-users.php
+++ b/dev/initdata/import-users.php
@@ -112,6 +112,7 @@ if (! $fhandleerr)
 $db->begin();
 
 $i=0;
+$nboflines=0;
 while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
@@ -120,6 +121,8 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
     
+    $nboflines++;
+    
     $object = new User($db);
     $object->statut = 1;
     
@@ -158,6 +161,8 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 
 
 // commit or rollback
+print "Nb of lines qualified: ".$nboflines."\n";
+print "Nb of errors: ".$error."\n";
 if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index 64054a7a798..a2a69f6ed2f 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -112,6 +112,7 @@ $sqls=array(
         'DELETE FROM '.MAIN_DB_PREFIX.'product_lang',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_price',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
         'DELETE FROM '.MAIN_DB_PREFIX.'product',
     ),
     'project'=>array(
@@ -187,6 +188,9 @@ if (! $confirmed)
 
 /**
  * Process sql requests of a family
+ * 
+ * @param   string  $family     Name of family key of array $sqls
+ * @return  int                 -1 if KO, 1 if OK
  */
 function processfamily($family)
 {

From c3eb60325b08c242bda05cd8571a2d051d565f2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 18:18:24 +0100
Subject: [PATCH 315/421] Reduce nb of dirs

---
 dev/{uml => dbmodel}/dolibarr.uml   |   0
 dev/{uml => dbmodel}/dolibarr.umldi |   0
 dev/dbmodel/dolibarr_schema.mwb     | Bin 208405 -> 296494 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename dev/{uml => dbmodel}/dolibarr.uml (100%)
 rename dev/{uml => dbmodel}/dolibarr.umldi (100%)

diff --git a/dev/uml/dolibarr.uml b/dev/dbmodel/dolibarr.uml
similarity index 100%
rename from dev/uml/dolibarr.uml
rename to dev/dbmodel/dolibarr.uml
diff --git a/dev/uml/dolibarr.umldi b/dev/dbmodel/dolibarr.umldi
similarity index 100%
rename from dev/uml/dolibarr.umldi
rename to dev/dbmodel/dolibarr.umldi
diff --git a/dev/dbmodel/dolibarr_schema.mwb b/dev/dbmodel/dolibarr_schema.mwb
index c5d414514c76b5252c96d615ec55fb3b0127ff41..aec0f2d22990c878c2492245549c35213b42d7a5 100644
GIT binary patch
literal 296494
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%0DN$
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

literal 208405
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


From 6ee4637f35b36569eb29ab58e850f5e540e0ca64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 22:12:38 +0100
Subject: [PATCH 316/421] Fix bad status translation for shipment

---
 htdocs/commande/class/commande.class.php | 16 ++++++++--------
 htdocs/commande/list.php                 | 12 +++++++-----
 htdocs/langs/en_US/orders.lang           |  1 +
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 663d07e1ccd..eb240c852fc 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2995,7 +2995,7 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
             if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
         }
         elseif ($mode == 1)
         {
@@ -3005,7 +3005,7 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
             if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
         }
         elseif ($mode == 2)
         {
@@ -3015,7 +3015,7 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort');
             if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
         }
         elseif ($mode == 3)
         {
@@ -3025,7 +3025,7 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7');
             if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
         }
         elseif ($mode == 4)
         {
@@ -3034,8 +3034,8 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
             if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill').$billedtext,'statut6').' '.$langs->trans('StatusOrderToBill').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed');
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
         }
         elseif ($mode == 5)
         {
@@ -3044,8 +3044,8 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_VALIDATED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderValidatedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
             if ($statut==self::STATUS_ACCEPTED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderSentShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'),'statut7');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderToBill').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').' </span>'.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDeliveredShort').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
         }
     }
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ce6df0524c4..d2cf04dde0b 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -175,10 +175,6 @@ if ($viewstatut <> '')
 	{
 		if ($viewstatut == 1 && empty($conf->expedition->enabled)) $sql.= ' AND c.fk_statut IN (1,2)';	// If module expedition disabled, we include order with status 'sending in process' into 'validated'
 		else $sql.= ' AND c.fk_statut = '.$viewstatut; // brouillon, validee, en cours, annulee
-		if ($viewstatut == 3)
-		{
-			$sql.= ' AND c.facture = 0'; // need to create invoice
-		}
 	}
 	if ($viewstatut == 4)
 	{
@@ -387,7 +383,13 @@ if ($resql)
 	print '<input class="flat" type="text" size="6" name="search_total_ht" value="'.$search_total_ht.'">';
 	print '</td>';
 	print '<td align="right">';
-	$liststatus=array('0'=>$langs->trans("StatusOrderDraftShort"), '1'=>$langs->trans("StatusOrderValidated"), '2'=>$langs->trans("StatusOrderSentShort"), '3'=>$langs->trans("StatusOrderDelivered"), '-1'=>$langs->trans("StatusOrderCanceledShort"));
+	$liststatus=array(
+	    '0'=>$langs->trans("StatusOrderDraftShort"), 
+	    '1'=>$langs->trans("StatusOrderValidated"), 
+	    '2'=>$langs->trans("StatusOrderSentShort"), 
+	    '3'=>$langs->trans("StatusOrderDelivered"), 
+	    '-1'=>$langs->trans("StatusOrderCanceledShort")
+	);
 	print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4);
 	print '</td>';
 	print '<td align="center">';
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 72044348151..d7105badd32 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved

From 4b89b0b7aa2f013db6647b24b898742f6a670291 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Feb 2016 22:12:38 +0100
Subject: [PATCH 317/421] Fix bad status translation for shipment

---
 htdocs/commande/class/commande.class.php | 16 ++++++++--------
 htdocs/commande/list.php                 | 12 +++++++-----
 htdocs/langs/en_US/orders.lang           |  1 +
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 53c914f7a3c..915e8a1e08c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2927,7 +2927,7 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
             if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
         }
         elseif ($mode == 1)
         {
@@ -2937,7 +2937,7 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
             if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
         }
         elseif ($mode == 2)
         {
@@ -2947,7 +2947,7 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort');
             if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
         }
         elseif ($mode == 3)
         {
@@ -2957,7 +2957,7 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7');
             if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
         }
         elseif ($mode == 4)
         {
@@ -2966,8 +2966,8 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
             if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill').$billedtext,'statut6').' '.$langs->trans('StatusOrderToBill').$billedtext;
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed');
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
         }
         elseif ($mode == 5)
         {
@@ -2976,8 +2976,8 @@ class Commande extends CommonOrder
             if ($statut==self::STATUS_VALIDATED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderValidatedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
             if ($statut==self::STATUS_ACCEPTED) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderSentShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
             if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'),'statut7');
-            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderToBill').$billedtext,'statut6');
-            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').' </span>'.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
+            if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
+            if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDeliveredShort').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
         }
     }
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 4f4fa01105d..fda90bf4056 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -162,10 +162,6 @@ if ($viewstatut <> '')
 	{
 		if ($viewstatut == 1 && empty($conf->expedition->enabled)) $sql.= ' AND c.fk_statut IN (1,2)';	// If module expedition disabled, we include order with status 'sending in process' into 'validated'
 		else $sql.= ' AND c.fk_statut = '.$viewstatut; // brouillon, validee, en cours, annulee
-		if ($viewstatut == 3)
-		{
-			$sql.= ' AND c.facture = 0'; // need to create invoice
-		}
 	}
 	if ($viewstatut == 4)
 	{
@@ -372,7 +368,13 @@ if ($resql)
 	print '<input class="flat" type="text" size="6" name="search_total_ht" value="'.$search_total_ht.'">';
 	print '</td>';
 	print '<td align="right">';
-	$liststatus=array('0'=>$langs->trans("StatusOrderDraftShort"), '1'=>$langs->trans("StatusOrderValidated"), '2'=>$langs->trans("StatusOrderSentShort"), '3'=>$langs->trans("StatusOrderDelivered"), '-1'=>$langs->trans("StatusOrderCanceledShort"));
+	$liststatus=array(
+	    '0'=>$langs->trans("StatusOrderDraftShort"), 
+	    '1'=>$langs->trans("StatusOrderValidated"), 
+	    '2'=>$langs->trans("StatusOrderSentShort"), 
+	    '3'=>$langs->trans("StatusOrderDelivered"), 
+	    '-1'=>$langs->trans("StatusOrderCanceledShort")
+	);
 	print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4);
 	print '</td>';
 	print '<td align="center">';
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 72044348151..d7105badd32 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved

From fe564489d6de1bf63ec4e60dad1f21d462aff22e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 00:50:32 +0100
Subject: [PATCH 318/421] Make report templates easier to use

---
 .github/ISSUE_TEMPLATE.md        | 27 +++++++++------------------
 .github/PULL_REQUEST_TEMPLATE.md | 12 ++++--------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4f6deb0d531..a105eed20ea 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,14 +1,9 @@
 # Instructions
-
-*This is a template to help you report good issues.*
-
-*You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-
+*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
 *Please:*
-- [ ] *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
-- [ ] *only keep the "Bug" or "Feature Request" section*
-- [ ] *replace the bracket enclosed texts with meaningful informations*
-- [ ] *remove any unused sub-section*
+- *only keep the "Bug" or "Feature Request" section*
+- *replace the bracket enclosed texts with meaningful informations*
+- *remove any unused sub-section*
 
 
 # Bug
@@ -22,21 +17,17 @@
 - **Database**: [*Database type and version*]
 - **URL(s)**: [*Affected URL(s)*]
 
-## Report
-
-### Expected behavior
+## Expected and actual behavior
 [*Verbose description*]
 
-### Actual behavior
+## Steps to reproduce the behavior
 [*Verbose description*]
 
-### Steps to reproduce the behavior
-[*Verbose description*]
-
-### [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
+## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
 [*Files*]
 
 
+
 # Feature Request
 [*Short description*]
 
@@ -46,5 +37,5 @@
 ## Suggested implementation
 [*Verbose description*]
 
-## Tasks
+## Suggested steps
 [*List of tasks to achieve goal*]
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ca46c45d959..035387834bd 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,9 @@
 # Instructions
-
-*This is a template to help you make good pull requests.*
-
-*You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-
+*This is a template to help you make good pull requests. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
 *Please:*
-- [ ] *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
-- [ ] *only keep the "Fix", "Close" or "New" section*
-- [ ] *replace the bracket enclosed textswith meaningful informations*
+- *only keep the "Fix", "Close" or "New" section*
+- *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
+- *replace the bracket enclosed textswith meaningful informations*
 
 
 # Fix #[*issue_number Short description*]

From 191394bf88a5e82c62265cc02d18e28fd3d56573 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 01:00:13 +0100
Subject: [PATCH 319/421] Fix: specific contact of object were lost when used
 to create invoice.

---
 htdocs/compta/facture.php | 55 ++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 923ee04036a..ca469782bd8 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -971,7 +971,15 @@ if (empty($reshook))
 
 					if ($id > 0)
 					{
-						// If deposit invoice
+						dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+
+						$classname = ucfirst($subelement);
+						$srcobject = new $classname($db);
+
+						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines or deposit lines");
+						$result = $srcobject->fetch($object->origin_id);
+						
+					    // If deposit invoice
 						if ($_POST['type'] == Facture::TYPE_DEPOSIT)
 						{
 							$typeamount = GETPOST('typedeposit', 'alpha');
@@ -985,13 +993,6 @@ if (empty($reshook))
 							{
 								$amountdeposit = 0;
 
-								dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
-
-								$classname = ucfirst($subelement);
-								$srcobject = new $classname($db);
-
-								dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add deposit lines");
-								$result = $srcobject->fetch($object->origin_id);
 								if ($result > 0)
 								{
 									$totalamount = 0;
@@ -1041,14 +1042,6 @@ if (empty($reshook))
 						}
 						else
 						{
-
-							dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
-
-							$classname = ucfirst($subelement);
-							$srcobject = new $classname($db);
-
-							dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
-							$result = $srcobject->fetch($object->origin_id);
 							if ($result > 0)
 							{
 								$lines = $srcobject->lines;
@@ -1153,12 +1146,38 @@ if (empty($reshook))
 								$error ++;
 							}
 						}
+						
+						// Now we create same links to contact than the ones found on origin object
+						if (empty($conf->global->INVOICE_NO_PROPAGATE_CONTACTS_FROM_ORIGIN))
+						{
+    						$originforcontact = $object->origin;
+    						$originidforcontact = $object->origin_id;
+    						if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+    						{
+    						    $originforcontact=$srcobject->origin;
+    						    $originidforcontact=$srcobject->origin_id;
+    						}
+    						$sqlcontact = "SELECT code, fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+    						$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+    
+    						$resqlcontact = $db->query($sqlcontact);
+    						if ($resqlcontact)
+    						{
+                                while($objcontact = $db->fetch_object($resqlcontact))
+                                {
+                                    //print $objcontact->code.'-'.$objcontact->fk_socpeople."\n";                                
+                                    $object->add_contact($objcontact->fk_socpeople, $objcontact->code);
+                                }
+    						}
+    						else dol_print_error($resqlcontact);					
+						}						
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error ++;
 					}
-				} 			// If some invoice's lines already known
-				else {
+				} 			
+				else 
+				{   // If some invoice's lines coming from page
 					$id = $object->create($user);
 
 					for($i = 1; $i <= $NBLINES; $i ++) {

From 773e5e3b0aca0a2da089c15284b9d519e150c504 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 01:00:13 +0100
Subject: [PATCH 320/421] Fix: specific contact of object were lost when used
 to create invoice.

---
 htdocs/compta/facture.php | 55 ++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 090a82cbaa2..d922ce35d96 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -942,7 +942,15 @@ if (empty($reshook))
 
 					if ($id > 0)
 					{
-						// If deposit invoice
+						dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+
+						$classname = ucfirst($subelement);
+						$srcobject = new $classname($db);
+
+						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines or deposit lines");
+						$result = $srcobject->fetch($object->origin_id);
+						
+					    // If deposit invoice
 						if ($_POST['type'] == Facture::TYPE_DEPOSIT)
 						{
 							$typeamount = GETPOST('typedeposit', 'alpha');
@@ -956,13 +964,6 @@ if (empty($reshook))
 							{
 								$amountdeposit = 0;
 
-								dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
-
-								$classname = ucfirst($subelement);
-								$srcobject = new $classname($db);
-
-								dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add deposit lines");
-								$result = $srcobject->fetch($object->origin_id);
 								if ($result > 0)
 								{
 									$totalamount = 0;
@@ -1012,14 +1013,6 @@ if (empty($reshook))
 						}
 						else
 						{
-
-							dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
-
-							$classname = ucfirst($subelement);
-							$srcobject = new $classname($db);
-
-							dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
-							$result = $srcobject->fetch($object->origin_id);
 							if ($result > 0)
 							{
 								$lines = $srcobject->lines;
@@ -1124,12 +1117,38 @@ if (empty($reshook))
 								$error ++;
 							}
 						}
+						
+						// Now we create same links to contact than the ones found on origin object
+						if (empty($conf->global->INVOICE_NO_PROPAGATE_CONTACTS_FROM_ORIGIN))
+						{
+    						$originforcontact = $object->origin;
+    						$originidforcontact = $object->origin_id;
+    						if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+    						{
+    						    $originforcontact=$srcobject->origin;
+    						    $originidforcontact=$srcobject->origin_id;
+    						}
+    						$sqlcontact = "SELECT code, fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+    						$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+    
+    						$resqlcontact = $db->query($sqlcontact);
+    						if ($resqlcontact)
+    						{
+                                while($objcontact = $db->fetch_object($resqlcontact))
+                                {
+                                    //print $objcontact->code.'-'.$objcontact->fk_socpeople."\n";                                
+                                    $object->add_contact($objcontact->fk_socpeople, $objcontact->code);
+                                }
+    						}
+    						else dol_print_error($resqlcontact);					
+						}						
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error ++;
 					}
-				} 			// If some invoice's lines already known
-				else {
+				} 			
+				else 
+				{   // If some invoice's lines coming from page
 					$id = $object->create($user);
 
 					for($i = 1; $i <= $NBLINES; $i ++) {

From 017b607e53c931aa3010dfdc68ccd7ef85fac5b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 01:05:03 +0100
Subject: [PATCH 321/421] Better script name

---
 dev/initdata/{import-product.php => import-products.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename dev/initdata/{import-product.php => import-products.php} (100%)

diff --git a/dev/initdata/import-product.php b/dev/initdata/import-products.php
similarity index 100%
rename from dev/initdata/import-product.php
rename to dev/initdata/import-products.php

From a0ccd8b0d46e2ed478c968c754862edd08550204 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 01:05:39 +0100
Subject: [PATCH 322/421] Enhance purge script

---
 dev/initdata/purge-data.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index a2a69f6ed2f..232ab1b5c41 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -78,10 +78,6 @@ $sqls=array(
         'DELETE FROM '.MAIN_DB_PREFIX.'propaldet',
         'DELETE FROM '.MAIN_DB_PREFIX.'propal',
     ),
-    'order'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'commandedet',
-        'DELETE FROM '.MAIN_DB_PREFIX.'commande',
-    ),
     'supplier_order'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet',
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur',
@@ -92,16 +88,22 @@ $sqls=array(
         'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
         'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
     ),
+    'delivery'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'livraisondet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'livraison',
+    ),
     'shipment'=>array(
+        '@delivery',
         'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet_batch',
         'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet_extrafields',
         'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet',
         'DELETE FROM '.MAIN_DB_PREFIX.'expedition_extrafields',
         'DELETE FROM '.MAIN_DB_PREFIX.'expedition',
     ),
-    'delivery'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'livraisondet',
-        'DELETE FROM '.MAIN_DB_PREFIX.'livraison',
+    'order'=>array(
+        '@shipment',
+        'DELETE FROM '.MAIN_DB_PREFIX.'commandedet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'commande',
     ),
     'intervention'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'fichinterdet',

From 99006206958b7a7680ff1fc6438e69745c57725e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 02:05:28 +0100
Subject: [PATCH 323/421] uniformize labels

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 25e5d7d7d56..6f34d71a66b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1465,8 +1465,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 	$form->select_date('', 're', '', '', '', "crea_commande", 1, 1);			// Always autofill date with current date
 	print '</td></tr>';
 
-	// Date de livraison
-	print "<tr><td>".$langs->trans("DeliveryDate").'</td><td colspan="2">';
+	// Delivery date planed
+	print "<tr><td>".$langs->trans("DateDeliveryPlanned").'</td><td colspan="2">';
 	if (empty($datedelivery))
 	{
 		if (! empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7*$conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
@@ -1494,7 +1494,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	}
 
 	// Delivery delay
-	print '<tr><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">';
+	print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">';
 	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1);
 	print '</td></tr>';
 
@@ -2147,8 +2147,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '</td></tr>';
 		}
 
-		// Availability
-		print '<tr><td height="10">';
+		// Delivery delay
+		print '<tr class="fielddeliverydelay"><td height="10">';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('AvailabilityPeriod');
 		print '</td>';

From b0f816a400ec38370cc9c450e7a534d428eaca79 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 02:22:40 +0100
Subject: [PATCH 324/421] NEW Add weight/volume for one product into shipment
 export

---
 htdocs/core/modules/modExpedition.class.php | 6 +++---
 htdocs/langs/en_US/products.lang            | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 7d9ab6b17bd..1251088822f 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2013	   Philippe Grand	    <philippe.grand@atoo-net.com>
@@ -226,10 +226,10 @@ class modExpedition extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("expedition","shipment","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.weight'=>'ProductWeight','p.weight_unit'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnit');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
 		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company','co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company','co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product','p.weight'=>'product','p.weight_unit'=>'product','p.volume'=>'product','p.volume_units'=>'product');
 		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index a6360e39f72..06057792ec6 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -321,5 +321,8 @@ ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
 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
 SizeUnits=Size unit

From f1ba81ec66e39ee95eecbbe194ccf0624091c143 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 02:44:34 +0100
Subject: [PATCH 325/421] Fix bad formatting of order / shipment ref on PDF

---
 htdocs/core/lib/pdf.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 896926d1f57..2eff197e481 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -364,6 +364,7 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
 	return $outputlangs->convToOutputCharset($socname);
 }
 
+
 /**
  *   	Return a string with full address formated
  *
@@ -1889,7 +1890,8 @@ function pdf_getLinkedObjects($object,$outputlangs)
 			foreach($objects as $elementobject)
 			{
 				$elementobject->fetchObjectLinked();
-				$order = $elementobject->linkedObjects['commande'][0];
+
+				$order = reset($elementobject->linkedObjects['commande']);
 
 				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
 				{
@@ -1903,9 +1905,9 @@ function pdf_getLinkedObjects($object,$outputlangs)
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
 					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
 					$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
-					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending");
+					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
 					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-					$linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
 				}
 			}
 		}

From a5c3658f532cf70a039ee8e82fb381e003d25058 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 02:44:34 +0100
Subject: [PATCH 326/421] Fix bad formatting of order / shipment ref on PDF

---
 htdocs/core/lib/pdf.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 34ff6103f11..c6df0040e4e 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -364,6 +364,7 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
 	return $outputlangs->convToOutputCharset($socname);
 }
 
+
 /**
  *   	Return a string with full address formated
  *
@@ -1881,7 +1882,8 @@ function pdf_getLinkedObjects($object,$outputlangs)
 			foreach($objects as $elementobject)
 			{
 				$elementobject->fetchObjectLinked();
-				$order = $elementobject->linkedObjects['commande'][0];
+
+				$order = reset($elementobject->linkedObjects['commande']);
 
 				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
 				{
@@ -1895,9 +1897,9 @@ function pdf_getLinkedObjects($object,$outputlangs)
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
 					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
 					$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
-					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending");
+					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
 					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-					$linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
 				}
 			}
 		}

From 96305ca00f1ef32ee8287ecb60cd54a3466bf9de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 03:04:36 +0100
Subject: [PATCH 327/421] Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT

---
 htdocs/commande/list.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index d2cf04dde0b..4ab4eec2aef 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -42,6 +42,7 @@ $langs->load('orders');
 $langs->load('deliveries');
 $langs->load('companies');
 $langs->load('compta');
+$langs->load('bills');
 
 $orderyear=GETPOST("orderyear","int");
 $ordermonth=GETPOST("ordermonth","int");
@@ -352,7 +353,7 @@ if ($resql)
     $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'c.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Billed'),$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
+	if (empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) print_liste_field_titre($langs->trans('Billed'),$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
 	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>';
 
@@ -392,9 +393,12 @@ if ($resql)
 	);
 	print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4);
 	print '</td>';
-	print '<td align="center">';
-	print $form->selectyesno('billed', $billed, 1, 0, 1);
-	print '</td>';
+	if (empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
+	{
+	    print '<td align="center">';
+    	print $form->selectyesno('billed', $billed, 1, 0, 1);
+	    print '</td>';
+	}
     print '<td class="liste_titre" align="right">';
     $searchpitco=$form->showFilterAndCheckAddButtons(0);
     print $searchpitco;
@@ -605,7 +609,7 @@ if ($resql)
 		print '<td align="right" class="nowrap">'.$generic_commande->LibStatut($objp->fk_statut, $objp->billed, 5, 1).'</td>';
 
 		// Billed
-		print '<td align="center">'.yn($objp->billed).'</td>';
+		if (empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) print '<td align="center">'.yn($objp->billed).'</td>';
 		
 		print '<td></td>';
 

From 59a6cb5f5534b2f48f90937afdd988681a85c21f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 03:04:36 +0100
Subject: [PATCH 328/421] Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT

Conflicts:
	htdocs/commande/list.php
---
 htdocs/commande/list.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index fda90bf4056..9de719a9e9d 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -42,6 +42,7 @@ $langs->load('orders');
 $langs->load('deliveries');
 $langs->load('companies');
 $langs->load('compta');
+$langs->load('bills');
 
 $orderyear=GETPOST("orderyear","int");
 $ordermonth=GETPOST("ordermonth","int");
@@ -337,7 +338,7 @@ if ($resql)
     $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'c.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Billed'),$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
+	if (empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) print_liste_field_titre($langs->trans('Billed'),$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
 	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>';
 
@@ -377,9 +378,12 @@ if ($resql)
 	);
 	print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4);
 	print '</td>';
-	print '<td align="center">';
-	print $form->selectyesno('billed', $billed, 1, 0, 1);
-	print '</td>';
+	if (empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
+	{
+    	print '<td align="center">';
+    	print $form->selectyesno('billed', $billed, 1, 0, 1);
+    	print '</td>';
+	}
 	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print "</td></tr>\n";
@@ -588,7 +592,7 @@ if ($resql)
 		print '<td align="right" class="nowrap">'.$generic_commande->LibStatut($objp->fk_statut, $objp->billed, 5, 1).'</td>';
 
 		// Billed
-		print '<td align="center">'.yn($objp->billed).'</td>';
+		if (empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) print '<td align="center">'.yn($objp->billed).'</td>';
 		
 		print '<td></td>';
 

From b46c23ab35e40969f6e86c7eba745ca3715b813d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 03:19:11 +0100
Subject: [PATCH 329/421] Fix bad file name

---
 dev/initdata/import-products.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php
index 5c1f80c384c..3c467fbfff5 100755
--- a/dev/initdata/import-products.php
+++ b/dev/initdata/import-products.php
@@ -34,7 +34,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/import-product.php/i','',$_SERVER["PHP_SELF"]);
+$path=preg_replace('/import-products.php/i','',$_SERVER["PHP_SELF"]);
 require ($path."../../htdocs/master.inc.php");
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

From a95240e33db561cceb25399b1c18693d8d627284 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 13:46:38 +0100
Subject: [PATCH 330/421] FIX Some troubles into weight and volume calculation
 when unit differs. NEW Introduce a function showDimensionInBestUnit

---
 htdocs/core/lib/functions.lib.php             |  36 +++
 htdocs/core/lib/product.lib.php               |  54 ++--
 .../expedition/doc/pdf_rouget.modules.php     | 258 ++++++++++++------
 .../modules/facture/doc/pdf_crabe.modules.php |   9 +-
 htdocs/expedition/card.php                    |  65 ++---
 htdocs/expedition/class/expedition.class.php  |  50 +++-
 htdocs/langs/en_US/sendings.lang              |   1 +
 7 files changed, 316 insertions(+), 157 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f7b8ab9de0b..a285e256860 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3408,6 +3408,42 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
 	return $amount;
 }
 
+
+/**
+ * Output a dimension with best unit 
+ * @param float     $dimension      Dimension
+ * @param int       $unit           Unit of dimension (0, -3, ...)
+ * @param string    $type           'weight', 'volume', ...
+ */
+function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs)
+{
+    if ($dimension < 1/10000) 
+    {
+        $dimension = $dimension * 1000000;
+        $unit = $unit - 6; 
+    }
+    elseif ($dimension < 1/10) 
+    {
+        $dimension = $dimension * 1000;
+        $unit = $unit - 3; 
+    }
+    elseif ($dimension > 100000000)
+    {
+        $dimension = $dimension / 1000000;
+        $unit = $unit + 6;
+    }
+    elseif ($dimension > 100000)
+    {
+        $dimension = $dimension / 1000;
+        $unit = $unit + 3;
+    }
+    
+    $ret=price($dimension, 0, $outputlangs, 0, 0).' '.measuring_units_string($unit, $type);
+    
+    return $ret;
+}
+
+
 /**
  *	Return localtax rate for a particular vat, when selling a product with vat $vatrate, from a $thirdparty_buyer to a $thirdparty_seller
  *  Note: This function applies same rules than get_default_tva
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 1d3114f8819..d946ef2b588 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -337,7 +337,7 @@ function show_stats_for_company($product,$socid)
  *	@param	int		$unit                Unit key (-3,0,3,98,99...)
  *	@param  string	$measuring_style     Style of unit: weight, volume,...
  *	@return	string	   			         Unit string
- * 	@see	load_measuring_units
+ * 	@see	formproduct->load_measuring_units
  */
 function measuring_units_string($unit,$measuring_style='')
 {
@@ -346,41 +346,41 @@ function measuring_units_string($unit,$measuring_style='')
 	$measuring_units=array();
 	if ($measuring_style == 'weight')
 	{
-		$measuring_units[3] = $langs->trans("WeightUnitton");
-		$measuring_units[0] = $langs->trans("WeightUnitkg");
-		$measuring_units[-3] = $langs->trans("WeightUnitg");
-		$measuring_units[-6] = $langs->trans("WeightUnitmg");
-        $measuring_units[99] = $langs->trans("WeightUnitpound");
+		$measuring_units[3] = $langs->transnoentitiesnoconv("WeightUnitton");
+		$measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
+		$measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
+		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
 	}
 	else if ($measuring_style == 'size')
 	{
-		$measuring_units[0] = $langs->trans("SizeUnitm");
-		$measuring_units[-1] = $langs->trans("SizeUnitdm");
-		$measuring_units[-2] = $langs->trans("SizeUnitcm");
-		$measuring_units[-3] = $langs->trans("SizeUnitmm");
-        $measuring_units[98] = $langs->trans("SizeUnitfoot");
-		$measuring_units[99] = $langs->trans("SizeUnitinch");
+		$measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
+		$measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
+		$measuring_units[-2] = $langs->transnoentitiesnoconv("SizeUnitcm");
+		$measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
+        $measuring_units[98] = $langs->transnoentitiesnoconv("SizeUnitfoot");
+		$measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
 	}
 	else if ($measuring_style == 'surface')
 	{
-		$measuring_units[0] = $langs->trans("SurfaceUnitm2");
-		$measuring_units[-2] = $langs->trans("SurfaceUnitdm2");
-		$measuring_units[-4] = $langs->trans("SurfaceUnitcm2");
-		$measuring_units[-6] = $langs->trans("SurfaceUnitmm2");
-        $measuring_units[98] = $langs->trans("SurfaceUnitfoot2");
-		$measuring_units[99] = $langs->trans("SurfaceUnitinch2");
+		$measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
+		$measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
+		$measuring_units[-4] = $langs->transnoentitiesnoconv("SurfaceUnitcm2");
+		$measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
+        $measuring_units[98] = $langs->transnoentitiesnoconv("SurfaceUnitfoot2");
+		$measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
 	}
 	else if ($measuring_style == 'volume')
 	{
-		$measuring_units[0] = $langs->trans("VolumeUnitm3");
-		$measuring_units[-3] = $langs->trans("VolumeUnitdm3");
-		$measuring_units[-6] = $langs->trans("VolumeUnitcm3");
-		$measuring_units[-9] = $langs->trans("VolumeUnitmm3");
-        $measuring_units[88] = $langs->trans("VolumeUnitfoot3");
-        $measuring_units[89] = $langs->trans("VolumeUnitinch3");
-		$measuring_units[97] = $langs->trans("VolumeUnitounce");
-		$measuring_units[98] = $langs->trans("VolumeUnitlitre");
-        $measuring_units[99] = $langs->trans("VolumeUnitgallon");
+		$measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
+		$measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");
+		$measuring_units[-6] = $langs->transnoentitiesnoconv("VolumeUnitcm3");
+		$measuring_units[-9] = $langs->transnoentitiesnoconv("VolumeUnitmm3");
+        $measuring_units[88] = $langs->transnoentitiesnoconv("VolumeUnitfoot3");
+        $measuring_units[89] = $langs->transnoentitiesnoconv("VolumeUnitinch3");
+		$measuring_units[97] = $langs->transnoentitiesnoconv("VolumeUnitounce");
+		$measuring_units[98] = $langs->transnoentitiesnoconv("VolumeUnitlitre");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("VolumeUnitgallon");
 	}
 
 	return $measuring_units[$unit];
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 6cc965c5c4f..a4d72c6531e 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -63,18 +63,20 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$this->option_logo = 1;
 
-		// Recupere emmetteur
+		// Get source company
 		$this->emetteur=$mysoc;
 		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
 
-		// Defini position des colonnes
+		// Define position of columns
 		$this->posxdesc=$this->marge_gauche+1;
-		$this->posxqtyordered=$this->page_largeur - $this->marge_droite - 70;
-		$this->posxqtytoship=$this->page_largeur - $this->marge_droite - 35;
-		$this->posxpicture=$this->posxqtyordered - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
-		
+		$this->posxweightvol=$this->page_largeur - $this->marge_droite - 80;
+		$this->posxqtyordered=$this->page_largeur - $this->marge_droite - 60;
+		$this->posxqtytoship=$this->page_largeur - $this->marge_droite - 30;
+		$this->posxpicture=$this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
+
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
+		    $this->posxweightvol-=20;
 		    $this->posxpicture-=20;
 		    $this->posxqtyordered-=20;
 		    $this->posxqtytoship-=20;
@@ -92,7 +94,7 @@ class pdf_rouget extends ModelePdfExpedition
      *  @param		int			$hideref			Do not show ref
      *  @return     int         	    			1=OK, 0=KO
 	 */
-	function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
 		global $user,$conf,$langs,$hookmanager;
 
@@ -123,27 +125,15 @@ class pdf_rouget extends ModelePdfExpedition
             {
                 if (empty($object->lines[$i]->fk_product)) continue;
         
-                $objphoto->fetch($object->lines[$i]->fk_product);
-                //var_dump($objphoto->ref);exit;
-                if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-                {
-                    $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
-                {
-                    $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
-                }
-        
-                $arephoto = false;
-                foreach ($pdir as $midir)
-                {
-                    if (! $arephoto)
-                    {
-                        $dir = $conf->product->dir_output.'/'.$midir;
-        
-                        foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+				$objphoto = new Product($this->db);
+				$objphoto->fetch($object->lines[$i]->fk_product);
+                
+				$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;
+				
+				$realpath='';
+
+                foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
                         {
                             if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
                             {
@@ -162,16 +152,14 @@ class pdf_rouget extends ModelePdfExpedition
                             }
         
                             $realpath = $dir.$filename;
-                            $arephoto = true;
-                        }
-                    }
+                            break;
                 }
         
-                if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+                if ($realpath) $realpatharray[$i]=$realpath;
             }
         }
         
-        if (count($realpatharray) == 0) $this->posxpicture=$this->posxqtyordered;        
+        if (count($realpatharray) == 0) $this->posxpicture=$this->posxweightvol;        
         
 		if ($conf->expedition->dir_output)
 		{
@@ -210,9 +198,12 @@ class pdf_rouget extends ModelePdfExpedition
 				global $action;
 				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
+				// Set nblignes with the new facture lines content after hook
+				$nblignes = count($object->lines);
+				
 				$pdf=pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
-				$heightforinfotot = 0;	// Height reserved to output the info and total part
+				$heightforinfotot = 30;	// Height reserved to output the info and total part
 		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
 	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
                 $pdf->SetAutoPageBreak(1,0);
@@ -380,7 +371,7 @@ class pdf_rouget extends ModelePdfExpedition
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
 					{
 						$curX = $this->posxpicture-1;
-						$pdf->Image($realpatharray[$i], $curX + (($this->posxqtyordered-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
+						$pdf->Image($realpatharray[$i], $curX + (($this->posxweightvol-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
 						$posYAfterImage=$curY+$imglinesize['height'];
 					}
@@ -389,7 +380,6 @@ class pdf_rouget extends ModelePdfExpedition
 					$curX = $this->posxdesc-1;
 
 					$pdf->startTransaction();
-					// Description de la ligne produit
 					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
 						
 					$pageposafter=$pdf->getPage();
@@ -445,6 +435,20 @@ class pdf_rouget extends ModelePdfExpedition
 
 					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 
+					$pdf->SetXY($this->posxweightvol, $curY);
+					$weighttxt='';
+					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->weight) 
+					{
+					    $weighttxt=$object->lines[$i]->weight*$object->lines[$i]->qty_shipped.' '.measuring_units_string($object->lines[$i]->weight_units,"weight");
+					}
+					$voltxt='';
+					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->volume) 
+					{
+					    $voltxt=$object->lines[$i]->volume*$object->lines[$i]->qty_shipped.' '.measuring_units_string($object->lines[$i]->volume_units,"volume");
+					}
+						
+					$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?', ':'').$voltxt,'','C');
+					
 					$pdf->SetXY($this->posxqtyordered, $curY);
 					$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked,'','C');
 
@@ -501,15 +505,18 @@ class pdf_rouget extends ModelePdfExpedition
 				// Show square
 				if ($pagenb == 1)
 				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext - $heightforinfotot, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforfooter - $heightforfreetext - $heightforinfotot + 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
 				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext - $heightforinfotot, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforfooter - $heightforfreetext - $heightforinfotot + 1;
+					$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;
 				}
 
+				// Affiche zone totaux
+				$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
 				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
@@ -519,11 +526,6 @@ class pdf_rouget extends ModelePdfExpedition
 				$pdf->Output($file,'F');
 
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
 				$hookmanager->initHooks(array('pdfgeneration'));
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
 				global $action;
@@ -532,7 +534,7 @@ class pdf_rouget extends ModelePdfExpedition
 				if (! empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				return 1;
+				return 1;	// No error
 			}
 			else
 			{
@@ -549,6 +551,89 @@ class pdf_rouget extends ModelePdfExpedition
 		return 0;   // Erreur par defaut
 	}
 
+	/**
+	 *	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	Translate	$outputlangs	Objet langs
+	 *	@return int							Position pour suite
+	 */
+	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	{
+		global $conf,$mysoc;
+
+        $sign=1;
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$tab2_top = $posy;
+		$tab2_hl = 4;
+		$pdf->SetFont('','', $default_font_size - 1);
+
+		// Tableau total
+		$col1x = $this->posxweightvol-50; $col2x = $this->posxweightvol;
+		/*if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$col2x-=20;
+		}*/
+		$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
+
+		$useborder=0;
+		$index = 0;
+
+		$totalWeighttoshow='';
+		$totalVolumetoshow='';
+
+		// Load dim data
+		$tmparray=$object->getTotalWeightVolume();
+		$totalWeight=$tmparray['weight'];
+		$totalVolume=$tmparray['volume'];
+		// Set trueVolume and volume_units not currently stored into database
+		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) 
+		{
+		    $object->trueVolume=price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
+		    $object->volume_units=$object->size_units * 3;
+		}
+		
+		if ($totalWeight!='') $totalWeighttoshow=showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		if ($totalVolume!='') $totalVolumetoshow=showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
+		if ($object->trueWeight) $totalWeighttoshow=showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+		if ($object->trueVolume) $totalVolumetoshow=showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+
+		// Total Weight
+		if ($totalWeighttoshow)
+		{
+    		$pdf->SetFillColor(255,255,255);
+    		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+    		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Weigth"), 0, 'L', 1);
+    
+    		$pdf->SetXY($col2x-20, $tab2_top + $tab2_hl * $index);
+    		$pdf->MultiCell($largcol2+20, $tab2_hl, $totalWeighttoshow, 0, 'R', 1);
+    		
+    		$index++;
+		}
+		
+		if ($totalVolumetoshow)
+		{
+    		// Total Volume
+    		$pdf->SetFillColor(255,255,255);
+    		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+    		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Volume"), 0, 'L', 1);
+    
+    		$pdf->SetXY($col2x-20, $tab2_top + $tab2_hl * $index);
+    		$pdf->MultiCell($largcol2+20, $tab2_hl, $totalVolumetoshow, 0, 'R', 1);
+		
+		    $index++;
+		}
+    	
+		$pdf->SetTextColor(0,0,0);
+
+		return ($tab2_top + ($tab2_hl * $index));
+	}
+	
 	/**
 	 *   Show table for lines
 	 *
@@ -573,13 +658,13 @@ class pdf_rouget extends ModelePdfExpedition
 
 		// Amount in (at tab_top - 1)
 		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',$default_font_size - 1);
+		$pdf->SetFont('','',$default_font_size - 2);
 
 		// Output Rect
 		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
 
 		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','',$default_font_size - 1);
+		$pdf->SetFont('','', $default_font_size - 1);
 
 		if (empty($hidetop))
 		{
@@ -589,10 +674,17 @@ class pdf_rouget extends ModelePdfExpedition
 			$pdf->MultiCell($this->posxqtyordered - $this->posxdesc, 2, $outputlangs->transnoentities("Description"), '', 'L');
 		}
 
+		$pdf->line($this->posxweightvol-1, $tab_top, $this->posxweightvol-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxweightvol-1, $tab_top+1);
+			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 2, $outputlangs->transnoentities("WeightVolShort"),'','C');
+		}
+		
 		$pdf->line($this->posxqtyordered-1, $tab_top, $this->posxqtyordered-1, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
-			$pdf->SetXY($this->posxqtyordered, $tab_top+1);
+			$pdf->SetXY($this->posxqtyordered-1, $tab_top+1);
 			$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"),'','C');
 		}
 
@@ -616,12 +708,14 @@ class pdf_rouget extends ModelePdfExpedition
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs,$mysoc;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		$langs->load("orders");
+		
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
-		//Affiche le filigrane brouillon - Print Draft Watermark
+		// Show Draft Watermark
 		if($object->statut==0 && (! empty($conf->global->SHIPPING_DRAFT_WATERMARK)) )
 		{
             pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->SHIPPING_DRAFT_WATERMARK);
@@ -631,8 +725,10 @@ class pdf_rouget extends ModelePdfExpedition
 		$pdf->SetTextColor(0,0,60);
 		$pdf->SetFont('','B', $default_font_size + 3);
 
-        $posx=$this->page_largeur-$this->marge_droite-100;
+		$w = 110;
+		
 		$posy=$this->marge_haute;
+		$posx=$this->page_largeur-$this->marge_droite-$w;
 
 		$pdf->SetXY($this->marge_gauche,$posy);
 
@@ -649,14 +745,14 @@ class pdf_rouget extends ModelePdfExpedition
 			{
 				$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');
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
 		else
 		{
 			$text=$this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
 		// Show barcode
@@ -685,14 +781,14 @@ class pdf_rouget extends ModelePdfExpedition
 		}
 
 
-		$posx=$this->page_largeur - 100 - $this->marge_droite;
+		$posx=$this->page_largeur - $w - $this->marge_droite;
 		$posy=$this->marge_haute;
 
 		$pdf->SetFont('','B', $default_font_size + 2);
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$title=$outputlangs->transnoentities("SendingSheet");
-		$pdf->MultiCell(100, 4, $title, '', 'R');
+		$pdf->MultiCell($w, 4, $title, '', 'R');
         $posy+=1;
 
 		$pdf->SetFont('','', $default_font_size + 1);
@@ -700,7 +796,7 @@ class pdf_rouget extends ModelePdfExpedition
 		$posy+=4;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefSending") ." : ".$object->ref, '', 'R');
+		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("RefSending") ." : ".$object->ref, '', 'R');
 
 		// Date planned delivery
 		if (! empty($object->date_delivery))
@@ -708,7 +804,7 @@ class pdf_rouget extends ModelePdfExpedition
     		$posy+=4;
     		$pdf->SetXY($posx,$posy);
     		$pdf->SetTextColor(0,0,60);
-    		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery,"day",false,$outputlangs,true), '', 'R');
+    		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery,"day",false,$outputlangs,true), '', 'R');
 		}
 		
 		if (! empty($object->client->code_client))
@@ -716,7 +812,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$posy+=4;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
 		}
 
 
@@ -744,11 +840,11 @@ class pdf_rouget extends ModelePdfExpedition
 				$text=$linkedobject->ref;
 				if ($linkedobject->ref_client) $text.=' ('.$linkedobject->ref_client.')';
 				$Yoff = $Yoff+8;
-				$pdf->SetXY($this->page_largeur - $this->marge_droite - 100,$Yoff);
-				$pdf->MultiCell(100, 2, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text), 0, 'R');
+				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w,$Yoff);
+				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text), 0, 'R');
 				$Yoff = $Yoff+3;
-				$pdf->SetXY($this->page_largeur - $this->marge_droite - 60,$Yoff);
-				$pdf->MultiCell(60, 2, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($linkedobject->date,"day",false,$outputlangs,true), 0, 'R');
+				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w,$Yoff);
+				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($linkedobject->date,"day",false,$outputlangs,true), 0, 'R');
 			}
 		}
 
@@ -761,18 +857,20 @@ class pdf_rouget extends ModelePdfExpedition
 			if (! empty($origin) && is_object($object->$origin)) $arrayidcontact=$object->$origin->getIdContact('internal','SALESREPFOLL');
 		 	if (count($arrayidcontact) > 0)
 		 	{
-		 		$object->fetch_user($arrayidcontact[0]);
+		 		$object->fetch_user(reset($arrayidcontact));
 		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
 		 	}
 
 		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->client);
 
 			// Show sender
+			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx=$this->marge_gauche;
-			$posy=42;
-			$hautcadre=40;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
 
+			$hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+				
 			// Show sender frame
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','', $default_font_size - 2);
@@ -780,19 +878,19 @@ class pdf_rouget extends ModelePdfExpedition
 			$pdf->MultiCell(66,5, $outputlangs->transnoentities("Sender").":", 0, 'L');
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetFillColor(230,230,230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-
+			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0,0,60);
+			
 			// Show sender name
 			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetTextColor(0,0,60);
 			$pdf->SetFont('','B',$default_font_size);
-			$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell($widthrecbox-2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
 			$posy=$pdf->getY();
 
 			// Show sender information
-			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetXY($posx+2,$posy);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->MultiCell($widthrecbox-2, 4, $carac_emetteur, 0, 'L');
 
 
 			// If SHIPPING contact defined, we use it
@@ -817,24 +915,23 @@ class pdf_rouget extends ModelePdfExpedition
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,(!empty($object->contact)?$object->contact:null),$usecontact,'targetwithdetails');
 
 			// Show recipient
-			$widthrecbox=100;
+			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
 			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42;
+			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx=$this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
 
 			// Show recipient frame
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell($widthrecbox, 4, $outputlangs->transnoentities("Recipient").":", 0, 'L');
+			$pdf->SetXY($posx+2,$posy-5);
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient").":", 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
-			$pdf->SetTextColor(0,0,0);
 
 			// Show recipient name
 			$pdf->SetXY($posx+2,$posy+3);
 			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
@@ -844,6 +941,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
 		}
 
+		$pdf->SetTextColor(0,0,0);
 	}
 
 	/**
@@ -853,7 +951,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	void
+	 *      @return	int								Return height of bottom margin including footer text
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 030a67a1c58..c971cb4e3fe 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -86,7 +86,6 @@ class pdf_crabe extends ModelePDFFactures
 		$this->name = "crabe";
 		$this->description = $langs->trans('PDFCrabeDescription');
 
-		// Dimension page pour format A4
 		$this->type = 'pdf';
 		$formatarray=pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
@@ -673,20 +672,20 @@ class pdf_crabe extends ModelePDFFactures
 				if (! empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				return 1;   // Pas d'erreur
+				return 1;   // No error
 			}
 			else
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","FAC_OUTPUTDIR");
+			$this->error=$langs->transnoentities("ErrorConstantNotDefined","FAC_OUTPUTDIR");
 			return 0;
 		}
-		$this->error=$langs->trans("ErrorUnknown");
+		$this->error=$langs->transnoentities("ErrorUnknown");
 		return 0;   // Erreur par defaut
 	}
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index b0bdbf75af3..e51841ed499 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1251,44 +1251,13 @@ else if ($id || $ref)
 
 		}
 
-		// Calculate true totalWeight and totalVolume for all products
+		
+		// Calculate totalWeight and totalVolume for all products
 		// by adding weight and volume of each product line.
-		$totalWeight = '';
-		$totalVolume = '';
-		$weightUnit=0;
-		$volumeUnit=0;
-		for ($i = 0 ; $i < $num_prod ; $i++)
-		{
-			$weightUnit=0;
-			$volumeUnit=0;
-			if (! empty($lines[$i]->weight_units)) $weightUnit = $lines[$i]->weight_units;
-			if (! empty($lines[$i]->volume_units)) $volumeUnit = $lines[$i]->volume_units;
-
-			// TODO Use a function addvalueunits(val1,unit1,val2,unit2)=>(val,unit)
-			if ($lines[$i]->weight_units < 50)
-			{
-				$trueWeightUnit=pow(10,$weightUnit);
-				$totalWeight += $lines[$i]->weight*$lines[$i]->qty_shipped*$trueWeightUnit;
-			}
-			else
-			{
-				$trueWeightUnit=$weightUnit;
-				$totalWeight += $lines[$i]->weight*$lines[$i]->qty_shipped;
-			}
-			if ($lines[$i]->volume_units < 50)
-			{
-				//print $lines[$i]->volume."x".$lines[$i]->volume_units."x".($lines[$i]->volume_units < 50)."x".$volumeUnit;
-				$trueVolumeUnit=pow(10,$volumeUnit);
-				//print $lines[$i]->volume;
-				$totalVolume += $lines[$i]->volume*$lines[$i]->qty_shipped*$trueVolumeUnit;
-			}
-			else
-			{
-				$trueVolumeUnit=$volumeUnit;
-				$totalVolume += $lines[$i]->volume*$lines[$i]->qty_shipped;
-			}
-		}
-
+		$tmparray=$object->getTotalWeightVolume();
+		$totalWeight=$tmparray['weight'];
+		$totalVolume=$tmparray['volume'];
+		
 		print '<table class="border" width="100%">';
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
@@ -1391,7 +1360,8 @@ else if ($id || $ref)
 		if ($totalWeight > 0)
 		{
 			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
-			print $totalWeight.' '.measuring_units_string(0,"weight");
+			//print $totalWeight.' '.measuring_units_string(0,"weight");
+			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs);
 			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')'; 
 			if (!empty($object->trueWeight)) print ')';
 		}
@@ -1438,18 +1408,27 @@ else if ($id || $ref)
 		print '</td>';
 		print '<td colspan="3">';
 		$calculatedVolume=0;
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
+		$volumeUnit=0;
+		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) 
+		{
+		    $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
+		    $volumeUnit=$object->size_units * 3;
+		}
 		// If sending volume not defined we use sum of products
 		if ($calculatedVolume > 0)
 		{
-			print $calculatedVolume.' ';
-			if ($volumeUnit < 50) print measuring_units_string(0,"volume");
-			else print measuring_units_string($volumeUnit,"volume");
+			if ($volumeUnit < 50) 
+			{
+			    //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
+			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs);
+			}
+			else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
 		}
 		if ($totalVolume > 0)
 		{
 			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
-			print $totalVolume.' '.measuring_units_string(0,"volume");
+			//print $totalVolume.' '.measuring_units_string(0,"volume");
+			print showDimensionInBestUnit($totalVolume, 0, "volume", $langs);
 			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
 			if ($calculatedVolume) print ')';
 		}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 62ffb53cc51..1c098979740 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1003,7 +1003,7 @@ class Expedition extends CommonObject
 		if (isset($this->trueWeight)) $this->weight=trim($this->trueWeight);
 		if (isset($this->note_private)) $this->note=trim($this->note_private);
 		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->model_pdf)) $this->model_pdf=trim($this->model_pdf);
+		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
 
 
 
@@ -1035,7 +1035,7 @@ class Expedition extends CommonObject
 		$sql.= " weight=".(($this->trueWeight != '')?$this->trueWeight:"null").",";
 		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
 		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " model_pdf=".(isset($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null").",";
+		$sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
 		$sql.= " entity=".$conf->entity;
 
         $sql.= " WHERE rowid=".$this->id;
@@ -1742,6 +1742,52 @@ class Expedition extends CommonObject
 
     }
 
+    /**
+     * Return into unit=0, the calculated total of weight and volume of all lines * qty
+	 * Calculate by adding weight and volume of each product line.
+     * 
+     * @return  array           array('weight'=>...,'volume'=>...)
+     */
+    function getTotalWeightVolume()
+    {
+        $weightUnit=0;
+        $volumeUnit=0;
+        $totalWeight = '';
+        $totalVolume = '';
+        foreach ($this->lines as $line)
+        {
+            $weightUnit=0;
+            $volumeUnit=0;
+            if (! empty($line->weight_units)) $weightUnit = $line->weight_units;
+            if (! empty($line->volume_units)) $volumeUnit = $line->volume_units;
+        
+            //var_dump($line->volume_units);
+            if ($line->weight_units < 50)   // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
+            {
+                $trueWeightUnit=pow(10,$weightUnit);
+                $totalWeight += $line->weight*$line->qty_shipped*$trueWeightUnit;
+            }
+            else
+            {
+                $totalWeight += $line->weight*$line->qty_shipped;   // This may be wrong if we mix different units
+            }
+            if ($line->volume_units < 50)   // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
+            {
+                //print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
+                $trueVolumeUnit=pow(10,$volumeUnit);
+                //print $line->volume;
+                $totalVolume += $line->volume*$line->qty_shipped*$trueVolumeUnit;
+            }
+            else
+            {
+                $totalVolume += $line->volume*$line->qty_shipped;   // This may be wrong if we mix different units
+            }
+        }
+        
+        return array('weight'=>$totalWeight, 'volume'=>$totalVolume);
+    }
+
+    
 	/**
 	 * Forge an set tracking url
 	 *
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index bba305a9f0a..cd4b812ad54 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -70,6 +70,7 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse. 
+WeightVolShort=Weight/Vol.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer

From b3c3d3aac5faf7ee63a1abb78c0b1c83c91b0db5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 14:18:32 +0100
Subject: [PATCH 331/421] NEW Add total weight and volume on PDF NEW Can hide
 column qty ordered.

---
 .../expedition/doc/pdf_rouget.modules.php     | 78 ++++++++++++-------
 htdocs/expedition/class/expedition.class.php  |  7 +-
 2 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index a4d72c6531e..c8019843d6a 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -69,11 +69,11 @@ class pdf_rouget extends ModelePdfExpedition
 
 		// Define position of columns
 		$this->posxdesc=$this->marge_gauche+1;
-		$this->posxweightvol=$this->page_largeur - $this->marge_droite - 80;
-		$this->posxqtyordered=$this->page_largeur - $this->marge_droite - 60;
-		$this->posxqtytoship=$this->page_largeur - $this->marge_droite - 30;
+		$this->posxweightvol=$this->page_largeur - $this->marge_droite - 76;
+		$this->posxqtyordered=$this->page_largeur - $this->marge_droite - 56;
+		$this->posxqtytoship=$this->page_largeur - $this->marge_droite - 28;
 		$this->posxpicture=$this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
-
+		
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
 		    $this->posxweightvol-=20;
@@ -81,6 +81,13 @@ class pdf_rouget extends ModelePdfExpedition
 		    $this->posxqtyordered-=20;
 		    $this->posxqtytoship-=20;
 		}
+		
+		if (! empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
+		{
+		    $this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
+		    $this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
+		    $this->posxqtyordered = $this->posxqtytoship;
+		}
 	}
 
 	/**
@@ -203,7 +210,7 @@ class pdf_rouget extends ModelePdfExpedition
 				
 				$pdf=pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
-				$heightforinfotot = 30;	// Height reserved to output the info and total part
+				$heightforinfotot = 8;	// Height reserved to output the info and total part
 		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
 	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
                 $pdf->SetAutoPageBreak(1,0);
@@ -446,12 +453,15 @@ class pdf_rouget extends ModelePdfExpedition
 					{
 					    $voltxt=$object->lines[$i]->volume*$object->lines[$i]->qty_shipped.' '.measuring_units_string($object->lines[$i]->volume_units,"volume");
 					}
-						
+					
 					$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?', ':'').$voltxt,'','C');
 					
-					$pdf->SetXY($this->posxqtyordered, $curY);
-					$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked,'','C');
-
+					if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
+					{
+					   $pdf->SetXY($this->posxqtyordered, $curY);
+					   $pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked,'','C');
+					}
+					
 					$pdf->SetXY($this->posxqtytoship, $curY);
 					$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxqtytoship), 3, $object->lines[$i]->qty_shipped,'','C');
 
@@ -571,7 +581,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('','B', $default_font_size - 1);
 
 		// Tableau total
 		$col1x = $this->posxweightvol-50; $col2x = $this->posxweightvol;
@@ -579,8 +589,9 @@ class pdf_rouget extends ModelePdfExpedition
 		{
 			$col2x-=20;
 		}*/
-		$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
-
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) $largcol2 = ($this->posxqtyordered - $this->posxweightvol);
+		else $largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		
 		$useborder=0;
 		$index = 0;
 
@@ -591,6 +602,8 @@ class pdf_rouget extends ModelePdfExpedition
 		$tmparray=$object->getTotalWeightVolume();
 		$totalWeight=$tmparray['weight'];
 		$totalVolume=$tmparray['volume'];
+		$totalOrdered=$tmparray['ordered'];
+		$totalToShip=$tmparray['toship'];
 		// Set trueVolume and volume_units not currently stored into database
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) 
 		{
@@ -603,31 +616,35 @@ class pdf_rouget extends ModelePdfExpedition
 		if ($object->trueWeight) $totalWeighttoshow=showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
 		if ($object->trueVolume) $totalVolumetoshow=showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
 
+    	$pdf->SetFillColor(255,255,255);
+    	$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+    	$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
+    	
+        if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
+        {
+            $pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
+        	$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
+        }
+        
+    	$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
+    	$pdf->MultiCell($this->largeur_page - $this->marge_droite - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
+    	 
 		// Total Weight
 		if ($totalWeighttoshow)
 		{
-    		$pdf->SetFillColor(255,255,255);
-    		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-    		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Weigth"), 0, 'L', 1);
-    
     		$pdf->SetXY($col2x-20, $tab2_top + $tab2_hl * $index);
     		$pdf->MultiCell($largcol2+20, $tab2_hl, $totalWeighttoshow, 0, 'R', 1);
     		
     		$index++;
 		}
-		
 		if ($totalVolumetoshow)
 		{
-    		// Total Volume
-    		$pdf->SetFillColor(255,255,255);
-    		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-    		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Volume"), 0, 'L', 1);
-    
     		$pdf->SetXY($col2x-20, $tab2_top + $tab2_hl * $index);
     		$pdf->MultiCell($largcol2+20, $tab2_hl, $totalVolumetoshow, 0, 'R', 1);
 		
 		    $index++;
 		}
+		if (! $totalWeighttoshow && ! $totalVolumetoshow) $index++;
     	
 		$pdf->SetTextColor(0,0,0);
 
@@ -681,13 +698,16 @@ class pdf_rouget extends ModelePdfExpedition
 			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 2, $outputlangs->transnoentities("WeightVolShort"),'','C');
 		}
 		
-		$pdf->line($this->posxqtyordered-1, $tab_top, $this->posxqtyordered-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->posxqtyordered-1, $tab_top+1);
-			$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"),'','C');
-		}
-
+        if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
+        {
+            $pdf->line($this->posxqtyordered-1, $tab_top, $this->posxqtyordered-1, $tab_top + $tab_height);
+    		if (empty($hidetop))
+    		{
+    			$pdf->SetXY($this->posxqtyordered-1, $tab_top+1);
+    			$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"),'','C');
+    		}
+        }
+        
 		$pdf->line($this->posxqtytoship-1, $tab_top, $this->posxqtytoship-1, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 1c098979740..0978688f3f3 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1754,8 +1754,13 @@ class Expedition extends CommonObject
         $volumeUnit=0;
         $totalWeight = '';
         $totalVolume = '';
+        $totalOrdered = '';
+        $totalToShip = '';
         foreach ($this->lines as $line)
         {
+            $totalOrdered+=$line->qty_asked;
+            $totalToShip+=$line->qty_shipped;
+            
             $weightUnit=0;
             $volumeUnit=0;
             if (! empty($line->weight_units)) $weightUnit = $line->weight_units;
@@ -1784,7 +1789,7 @@ class Expedition extends CommonObject
             }
         }
         
-        return array('weight'=>$totalWeight, 'volume'=>$totalVolume);
+        return array('weight'=>$totalWeight, 'volume'=>$totalVolume, 'ordered'=>$totalOrdered, 'toship'=>$totalToShip);
     }
 
     

From f0736a30a6cc7ca0d5fe3ed33be6271fa126c635 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 25 Feb 2016 14:53:06 +0100
Subject: [PATCH 332/421] Added Malta VAT

Hope use it Soon ;-)
---
 htdocs/install/mysql/data/llx_c_tva.sql | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 24c2b1099fa..a75bb531acf 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -170,6 +170,12 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (12
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (124,  12,  '7','0','VAT super-reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (125,  12,  '0','0','VAT Rate 0', 1);
 
+-- MALTA (id country=148)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1481,  148, '18','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1482,  148, '7','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1483,  148, '5','0','VAT super-reduced rate', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1484,  148, '0','0','VAT Rate 0', 1);
+
 -- NEDERLAND (id country=17)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (171, 17,  '19','0','Algemeen BTW tarief',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (172, 17,   '6','0','Verlaagd BTW tarief', 1);

From 8c43276fdac55879bd0a0e861242c27c2daefad9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 15:46:14 +0100
Subject: [PATCH 333/421] FIX Extrafields of shipments was not included into
 export fields

---
 htdocs/core/modules/modExpedition.class.php | 33 ++++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 1251088822f..7cc4c79a00c 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -222,22 +222,47 @@ class modExpedition extends DolibarrModules
 		//--------
 		$r=0;
 
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+		$shipment=new Commande($this->db);
+		$idcontacts=join(',',array_keys($shipment->liste_type_contact('external','',0,0,'')));
+		
 		$r++;
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("expedition","shipment","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.weight'=>'ProductWeight','p.weight_unit'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnit');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnit');
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
 		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company','co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product','p.weight'=>'product','p.weight_unit'=>'product','p.volume'=>'product','p.volume_units'=>'product');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company','co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product','p.weight'=>'product','p.weight_units'=>'product','p.volume'=>'product','p.volume_units'=>'product');
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r]+=array('sp.rowid'=>'contact','sp.lastname'=>'contact','sp.firstname'=>'contact','sp.note_public'=>'contact');
 		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) 
+		{
+		    $keyforselect='socpeople'; $keyforelement='contact'; $keyforaliasextra='extra3';
+		    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		}
+		$keyforselect='expedition'; $keyforelement='shipment'; $keyforaliasextra='extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$keyforselect='expeditiondet'; $keyforelement='shipment_line'; $keyforaliasextra='extra2';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expedition as c, '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expedition as c';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed, '.MAIN_DB_PREFIX.'commandedet as cd';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expeditiondet_extrafields as extra2 ON ed.rowid = extra2.fk_object';
+		$this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'commandedet as cd';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
+		{
+		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
+		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
+		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
+		}
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
 		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('shipment',1).')';
 	}

From 8927948befa49acadfa5dae051abd3155dd813d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 16:27:28 +0100
Subject: [PATCH 334/421] NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN

---
 htdocs/commande/card.php  | 40 ++++++++++++++++++++++++++++------
 htdocs/compta/facture.php | 23 ++++++++++----------
 htdocs/contrat/card.php   | 46 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 85 insertions(+), 24 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6f34d71a66b..c58516f4fea 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -371,17 +371,43 @@ if (empty($reshook))
 									$fk_parent_line = $result;
 								}
 							}
-
-							// Hooks
-							$parameters = array('objFrom' => $srcobject);
-							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
-							                                                                               // modified by hook
-							if ($reshook < 0)
-								$error++;
 						} else {
 							setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 							$error++;
 						}
+
+						// Now we create same links to contact than the ones found on origin object
+						if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
+						{
+						    $originforcontact = $object->origin;
+						    $originidforcontact = $object->origin_id;
+						    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+						    {
+						        $originforcontact=$srcobject->origin;
+						        $originidforcontact=$srcobject->origin_id;
+						    }
+						    $sqlcontact = "SELECT code, fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+						    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+						    	
+						    $resqlcontact = $db->query($sqlcontact);
+						    if ($resqlcontact)
+						    {
+						        while($objcontact = $db->fetch_object($resqlcontact))
+						        {
+						            //print $objcontact->code.'-'.$objcontact->fk_socpeople."\n";
+						            $object->add_contact($objcontact->fk_socpeople, $objcontact->code);
+						        }
+						    }
+						    else dol_print_error($resqlcontact);
+						}
+							
+						// Hooks
+						$parameters = array('objFrom' => $srcobject);
+						$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
+						// modified by hook
+						if ($reshook < 0)
+						    $error++;
+						
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index ca469782bd8..28c4694412f 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -916,7 +916,7 @@ if (empty($reshook))
 				$object->fetch_thirdparty();
 
 				// If creation from another object of another module (Example: origin=propal, originid=1)
-				if ($origin && $originid)
+				if (! empty($origin) && ! empty($originid))
 				{
 					// Parse element/subelement (ex: project_task)
 					$element = $subelement = $origin;
@@ -1134,13 +1134,6 @@ if (empty($reshook))
 										}
 									}
 								}
-
-								// Hooks
-								$parameters = array('objFrom' => $srcobject);
-								$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
-								                                                                               // modified by hook
-								if ($reshook < 0)
-									$error ++;
 							} else {
 								setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 								$error ++;
@@ -1148,7 +1141,7 @@ if (empty($reshook))
 						}
 						
 						// Now we create same links to contact than the ones found on origin object
-						if (empty($conf->global->INVOICE_NO_PROPAGATE_CONTACTS_FROM_ORIGIN))
+						if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
 						{
     						$originforcontact = $object->origin;
     						$originidforcontact = $object->origin_id;
@@ -1170,10 +1163,18 @@ if (empty($reshook))
                                 }
     						}
     						else dol_print_error($resqlcontact);					
-						}						
+						}
+						
+						// Hooks
+						$parameters = array('objFrom' => $srcobject);
+						$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
+						// modified by hook
+						if ($reshook < 0)
+						    $error++;
+						
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
-						$error ++;
+						$error++;
 					}
 				} 			
 				else 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 37ec345295b..d910ebb6a79 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -58,6 +58,8 @@ $confirm=GETPOST('confirm','alpha');
 $socid = GETPOST('socid','int');
 $id = GETPOST('id','int');
 $ref=GETPOST('ref','alpha');
+$origin=GETPOST('origin','alpha');
+$originid=GETPOST('originid','int');
 
 $datecontrat='';
 
@@ -239,13 +241,13 @@ if (empty($reshook))
 	    	$object->ref						= GETPOST('ref','alpha');
 	    	$object->ref_customer				= GETPOST('ref_customer','alpha');
 	    	$object->ref_supplier				= GETPOST('ref_supplier','alpha');
-	
+
 		    // If creation from another object of another module (Example: origin=propal, originid=1)
-		    if ($_POST['origin'] && $_POST['originid'])
+		    if (! empty($origin) && ! empty($originid))
 		    {
 		        // Parse element/subelement (ex: project_task)
-		        $element = $subelement = $_POST['origin'];
-		        if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
+		        $element = $subelement = $origin;
+		        if (preg_match('/^([^_]+)_([^_]+)/i',$origin,$regs))
 		        {
 		            $element = $regs[1];
 		            $subelement = $regs[2];
@@ -255,8 +257,8 @@ if (empty($reshook))
 		        if ($element == 'order')    { $element = $subelement = 'commande'; }
 		        if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
 	
-		        $object->origin    = $_POST['origin'];
-		        $object->origin_id = $_POST['originid'];
+		        $object->origin    = $origin;
+		        $object->origin_id = $originid;
 	
 		        // Possibility to add external linked objects with hooks
 		        $object->linked_objects[$object->origin] = $object->origin_id;
@@ -367,6 +369,38 @@ if (empty($reshook))
 		                setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 		                $error++;
 		            }
+		            
+		            // Now we create same links to contact than the ones found on origin object
+		            if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
+		            {
+		                $originforcontact = $object->origin;
+		                $originidforcontact = $object->origin_id;
+		                if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+		                {
+		                    $originforcontact=$srcobject->origin;
+		                    $originidforcontact=$srcobject->origin_id;
+		                }
+		                $sqlcontact = "SELECT code, fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+		                $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+	                	
+		                $resqlcontact = $db->query($sqlcontact);
+		                if ($resqlcontact)
+		                {
+		                    while($objcontact = $db->fetch_object($resqlcontact))
+		                    {
+		                        //print $objcontact->code.'-'.$objcontact->fk_socpeople."\n";
+		                        $object->add_contact($objcontact->fk_socpeople, $objcontact->code);
+		                    }
+		                }
+		                else dol_print_error($resqlcontact);
+		            }
+
+		            // Hooks
+		            $parameters = array('objFrom' => $srcobject);
+		            $reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
+		            // modified by hook
+		            if ($reshook < 0)
+		                $error++;		            
 		        }
 		        else
 		        {

From 7fc58ddabc9552394775b33b031d384dbcc0ba59 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 18:18:00 +0100
Subject: [PATCH 335/421] FIX Array of linked elements for PDF contains
 duplicates and missing data

---
 htdocs/core/lib/pdf.lib.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 2eff197e481..f714ee472cb 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1846,10 +1846,10 @@ function pdf_getLinkedObjects($object,$outputlangs)
 	$linkedobjects=array();
 
 	$object->fetchObjectLinked();
-
+	
 	foreach($object->linkedObjects as $objecttype => $objects)
 	{
-		if ($objecttype == 'propal')
+	    if ($objecttype == 'propal')
 		{
 			$outputlangs->load('propal');
 
@@ -1887,26 +1887,28 @@ function pdf_getLinkedObjects($object,$outputlangs)
 		{
 			$outputlangs->load('orders');
 			$outputlangs->load('sendings');
-			foreach($objects as $elementobject)
+			foreach($objects as $x => $elementobject)
 			{
 				$elementobject->fetchObjectLinked();
-
+				
 				$order = reset($elementobject->linkedObjects['commande']);
 
-				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
+				// We concat this record info into fields xxx_value. title is overwrote.
+				if (! empty($object->linkedObjects['commande']) || $object->element == 'commande')	// There is already a link to order or object is the order, so we show only info of shipment
 				{
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+					if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
 					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
 					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
 					$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
 				}
-				else	// We show both info of order and shipment
+				else	// We show both info of order and shipment.
 				{
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+					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);
 					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
-					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+					if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
 					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
 				}
 			}

From 0d6546e18ea54a55ef99d519705ce3e28d9de020 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 18:18:33 +0100
Subject: [PATCH 336/421] NEW Add an explanation message on shipment page to
 explain you can't make shipment if order is not validated

---
 htdocs/expedition/shipment.php   | 8 +++++++-
 htdocs/langs/en_US/sendings.lang | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 9af5bd25811..c7de7ee207a 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -701,7 +701,13 @@ if ($id > 0 || ! empty($ref))
 
 
         // Bouton expedier avec gestion des stocks
-        if (! empty($conf->stock->enabled) && ($commande->statut > Commande::STATUS_DRAFT && $commande->statut < Commande::STATUS_CLOSED))
+
+        if (! empty($conf->stock->enabled) && $commande->statut == Commande::STATUS_DRAFT)
+        {
+            print $langs->trans("ValidateOrderFirstBeforeShipment");
+        }
+        
+		if (! empty($conf->stock->enabled) && ($commande->statut > Commande::STATUS_DRAFT && $commande->statut < Commande::STATUS_CLOSED))
 		{
 			if ($user->rights->expedition->creer)
 			{
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index cd4b812ad54..a118a4d8373 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -71,6 +71,7 @@ ProductQtyInShipmentAlreadySent=Product quantity from opened customer order alre
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into 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
 SendingMethodCATCH=Catch by customer

From cdcad62967cfd6c7988c98a634a6c62d9f27169f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 18:18:00 +0100
Subject: [PATCH 337/421] FIX Array of linked elements for PDF contains
 duplicates and missing data

---
 htdocs/core/lib/pdf.lib.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index c6df0040e4e..a4d5a734472 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1838,10 +1838,10 @@ function pdf_getLinkedObjects($object,$outputlangs)
 	$linkedobjects=array();
 
 	$object->fetchObjectLinked();
-
+	
 	foreach($object->linkedObjects as $objecttype => $objects)
 	{
-		if ($objecttype == 'propal')
+	    if ($objecttype == 'propal')
 		{
 			$outputlangs->load('propal');
 
@@ -1879,26 +1879,28 @@ function pdf_getLinkedObjects($object,$outputlangs)
 		{
 			$outputlangs->load('orders');
 			$outputlangs->load('sendings');
-			foreach($objects as $elementobject)
+			foreach($objects as $x => $elementobject)
 			{
 				$elementobject->fetchObjectLinked();
-
+				
 				$order = reset($elementobject->linkedObjects['commande']);
 
-				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
+				// We concat this record info into fields xxx_value. title is overwrote.
+				if (! empty($object->linkedObjects['commande']) || $object->element == 'commande')	// There is already a link to order or object is the order, so we show only info of shipment
 				{
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+					if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
 					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
 					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
 					$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
 				}
-				else	// We show both info of order and shipment
+				else	// We show both info of order and shipment.
 				{
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+					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);
 					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
-					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+					if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
 					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
 				}
 			}

From 54034ea852bcf69653b72f169862d498da83b21f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 18:30:31 +0100
Subject: [PATCH 338/421] NEW Add $object in parameter of pdf_build_address so
 we could include hook into the function.

---
 htdocs/core/lib/pdf.lib.php                   | 23 +++++++++----------
 .../commande/doc/pdf_einstein.modules.php     |  2 +-
 .../contract/doc/pdf_strato.modules.php       |  2 +-
 .../expedition/doc/pdf_merou.modules.php      |  2 +-
 .../expedition/doc/pdf_rouget.modules.php     |  2 +-
 .../modules/facture/doc/pdf_crabe.modules.php |  2 +-
 .../fichinter/doc/pdf_soleil.modules.php      |  2 +-
 .../livraison/doc/pdf_typhon.modules.php      |  2 +-
 .../modules/propale/doc/pdf_azur.modules.php  |  2 +-
 .../pdf/pdf_canelle.modules.php               |  2 +-
 .../pdf/pdf_muscadet.modules.php              |  2 +-
 .../doc/pdf_aurore.modules.php                |  2 +-
 12 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index f714ee472cb..4a53ed839fc 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -373,10 +373,11 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
  *   	@param  Societe		$targetcompany		Target company object
  *      @param  Contact		$targetcontact		Target contact object
  * 		@param	int			$usecontact			Use contact instead of company
- * 		@param	int			$mode				Address type ('source', 'target', 'targetwithdetails')
+ * 		@param	int			$mode				Address type ('source', 'target', 'targetwithdetails': target but include also phone/fax/email/url)
+ *      @param  Object      $object             Object we want to build document for
  * 		@return	string							String with full address
  */
-function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$targetcontact='',$usecontact=0,$mode='source')
+function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$targetcontact='',$usecontact=0,$mode='source',$object=null)
 {
 	global $conf;
 
@@ -1846,10 +1847,10 @@ function pdf_getLinkedObjects($object,$outputlangs)
 	$linkedobjects=array();
 
 	$object->fetchObjectLinked();
-	
+
 	foreach($object->linkedObjects as $objecttype => $objects)
 	{
-	    if ($objecttype == 'propal')
+		if ($objecttype == 'propal')
 		{
 			$outputlangs->load('propal');
 
@@ -1887,28 +1888,26 @@ function pdf_getLinkedObjects($object,$outputlangs)
 		{
 			$outputlangs->load('orders');
 			$outputlangs->load('sendings');
-			foreach($objects as $x => $elementobject)
+			foreach($objects as $elementobject)
 			{
 				$elementobject->fetchObjectLinked();
-				
+
 				$order = reset($elementobject->linkedObjects['commande']);
 
-				// We concat this record info into fields xxx_value. title is overwrote.
-				if (! empty($object->linkedObjects['commande']) || $object->element == 'commande')	// There is already a link to order or object is the order, so we show only info of shipment
+				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
 				{
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-					if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
 					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
 					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
 					$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
 				}
-				else	// We show both info of order and shipment.
+				else	// We show both info of order and shipment
 				{
 					$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->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
 					$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
 					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
-					if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
 					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
 				}
 			}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 3ea6fd63ef0..0118a3c7e7d 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1311,7 +1311,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target', $object);
 
 			// Show recipient
 			$widthrecbox=100;
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 56af3a40cd2..25ae8c7f015 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -626,7 +626,7 @@ class pdf_strato extends ModelePDFContract
 
 			$this->recipient->name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target');
+			$carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target', $object);
 
 			// Show recipient
 			$widthrecbox=100;
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 974bbac1a3e..769b503d8ac 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -633,7 +633,7 @@ class pdf_merou extends ModelePdfExpedition
 
 		$carac_client_name=pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-		$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,((!empty($object->contact))?$object->contact:null),$usecontact,'targetwithdetails');
+		$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,((!empty($object->contact))?$object->contact:null),$usecontact,'targetwithdetails',$object);
 
 		$blDestX=$blExpX+55;
 		$blW=54;
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index c8019843d6a..062812fb811 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -932,7 +932,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,(!empty($object->contact)?$object->contact:null),$usecontact,'targetwithdetails');
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,(!empty($object->contact)?$object->contact:null),$usecontact,'targetwithdetails',$object);
 
 			// Show recipient
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index c971cb4e3fe..0c535ef0b22 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1605,7 +1605,7 @@ class pdf_crabe extends ModelePDFFactures
 
 			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target',$object);
 
 			// Show recipient
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 98485be3207..08c08474981 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -620,7 +620,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target');
+			$carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target',$object);
 
 			// Show recipient
 			$widthrecbox=100;
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index ace4f5e0139..4bb0260ecc8 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -854,7 +854,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target',$object);
 
 			// Show recipient
 			$widthrecbox=100;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index a67f78185d6..20c1abff49c 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1502,7 +1502,7 @@ class pdf_azur extends ModelePDFPropales
 
 			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target',$object);
 
 			// Show recipient
 			$widthrecbox=100;
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 6b89ef7f5c8..ae96756b9f0 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -1111,7 +1111,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target');
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object);
 
 			// Show recipient
 			$widthrecbox=100;
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index b881f45dab0..2d30037878d 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -1163,7 +1163,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target',$object);
 
 			// Show recipient
 			$widthrecbox=100;
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 cc7123bba7e..68181831581 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -1348,7 +1348,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 			}
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target',$object);
 
 			// Show recipient
 			$widthrecbox=100;

From 4b4de22a5494e2e5122d5b482b2d08038ef4d50f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Feb 2016 20:54:37 +0100
Subject: [PATCH 339/421] NEW Add hook pdf_build_address NEW Add option
 MAIN_PUBLIC_NOTE_IN_ADDRESS

---
 htdocs/core/class/hookmanager.class.php |   1 +
 htdocs/core/lib/pdf.lib.php             | 274 +++++++++++++-----------
 2 files changed, 153 insertions(+), 122 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index e2de6e61c86..df24b5a36ca 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -143,6 +143,7 @@ class HookManager
 				'formattachOptions',
 				'formBuilddocLineOptions',
 				'moveUploadedFile',
+			    'pdf_build_address',
 				'pdf_writelinedesc',
 			    'pdf_getlinenum',
 			    'pdf_getlineref',
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 4a53ed839fc..e7305b0ff1d 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -366,7 +366,7 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
 
 
 /**
- *   	Return a string with full address formated
+ *   	Return a string with full address formated for output on documents
  *
  * 		@param	Translate	$outputlangs		Output langs object
  *   	@param  Societe		$sourcecompany		Source company object
@@ -379,126 +379,150 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
  */
 function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$targetcontact='',$usecontact=0,$mode='source',$object=null)
 {
-	global $conf;
-
-	$stringaddress = '';
+	global $conf, $hookmanager;
 
 	if ($mode == 'source' && ! is_object($sourcecompany)) return -1;
 	if ($mode == 'target' && ! is_object($targetcompany)) return -1;
 
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO: Deprecated
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state)) $sourcecompany->state=getState($sourcecompany->state_id);
-	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id);
+	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO deprecated
+	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state))       $sourcecompany->state=getState($sourcecompany->state_id);
+	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id); //TODO deprecated
+	if (! empty($targetcompany->state_id) && empty($targetcompany->state))       $targetcompany->state=getState($targetcompany->state_id);
 
-	if ($mode == 'source')
+	$reshook=0;
+	$stringaddress = '';
+	if (is_object($hookmanager))
 	{
-		$withCountry = 0;
-		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
-
-		$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
-
-		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
-		{
-			// Phone
-			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
-			// Fax
-			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
-			// EMail
-			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
-			// Web
-			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
-		}
+		$parameters = array('sourcecompany'=>&$sourcecompany,'targetcompany'=>&$targetcompany,'targetcontact'=>$targetcontact,'outputlangs'=>$outputlangs,'mode'=>$mode,'usecontact'=>$usecontact);
+		$action='';
+		$reshook = $hookmanager->executeHooks('pdf_build_address',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		$stringaddress.=$hookmanager->resPrint;
 	}
-
-	if ($mode == 'target' || $mode == 'targetwithdetails')
+	if (empty($reshook))
 	{
-		if ($usecontact)
-		{
-			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1));
+    	if ($mode == 'source')
+    	{
+    		$withCountry = 0;
+    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
+    
+    		$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
+    
+    		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
+    		{
+    			// Phone
+    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+    			// Fax
+    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+    			// EMail
+    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+    			// Web
+    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+    		}
+    	}
+    
+    	if ($mode == 'target' || $mode == 'targetwithdetails')
+    	{
+    		if ($usecontact)
+    		{
+    			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1));
+    
+    			if (!empty($targetcontact->address)) {
+    				$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcontact))."\n";
+    			}else {
+    				$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany))."\n";
+    			}
+    			// Country
+    			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
+    				$stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code))."\n";
+    			}
+    			else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+    				$stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code))."\n";
+    			}
+    
+    			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails')
+    			{
+    				// Phone
+    				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+    				if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+    				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
+    				if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+    				// Fax
+    				if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+    				// EMail
+    				if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+    				// Web
+    				if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+    			}
+    		}
+    		else
+    		{
+    			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany))."\n";
+    			// Country
+    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code))."\n";
+    
+    			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails')
+    			{
+    				// Phone
+    				if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+    				if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+    				if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
+    				if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+    				// Fax
+    				if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+    				// EMail
+    				if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+    				// Web
+    				if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+    			}
+    		}
+    
+    		// Intra VAT
+    		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
+    		{
+    			if ($targetcompany->tva_intra) $stringaddress.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+    		}
+    
+    		// Professionnal Ids
+    		if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
+    		{
+    			$tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
+    		}
+    		if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
+    		{
+    			$tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
+    		}
+    		if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
+    		{
+    			$tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
+    		}
+    		if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
+    		{
+    			$tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
+    		}
 
-			if (!empty($targetcontact->address)) {
-				$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcontact))."\n";
-			}else {
-				$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany))."\n";
-			}
-			// Country
-			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
-				$stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code))."\n";
-			}
-			else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
-				$stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code))."\n";
-			}
-
-			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails')
-			{
-				// Phone
-				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-				if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-				if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
-				// Fax
-				if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
-				// EMail
-				if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
-				// Web
-				if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
-			}
-		}
-		else
-		{
-			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany))."\n";
-			// Country
-			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code))."\n";
-
-			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails')
-			{
-				// Phone
-				if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-				if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-				if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-				if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
-				// Fax
-				if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
-				// EMail
-				if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
-				// Web
-				if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
-			}
-		}
-
-		// Intra VAT
-		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
-		{
-			if ($targetcompany->tva_intra) $stringaddress.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
-		}
-
-		// Professionnal Ids
-		if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
-		{
-			$tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
-			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
-		}
-		if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
-		{
-			$tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
-			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
-		}
-		if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
-		{
-			$tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
-			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
-		}
-		if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
-		{
-			$tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
-			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-			$stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
-		}
+    		// Public note
+    		if (! empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
+    		{
+    		    if ($mode == 'source' && ! empty($sourcecompany->note_public))
+        		{
+        		    $stringaddress.="\n".$sourcecompany->note_public;
+        		}
+        		if (($mode == 'target' || $mode == 'targetwithdetails') && ! empty($targetcompany->note_public))
+        		{
+        		    $stringaddress.="\n".$targetcompany->note_public;
+        		}
+    		}
+    	}
 	}
-
+	
 	return $stringaddress;
 }
 
@@ -1046,6 +1070,7 @@ function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hide
 	global $db, $conf, $langs, $hookmanager;
 
 	$reshook=0;
+	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
@@ -1055,16 +1080,16 @@ function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hide
 		$action='';
 		$reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	
-		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
 		$labelproductservice=pdf_getlinedesc($object,$i,$outputlangs,$hideref,$hidedesc,$issupplierline);
 		// Description
 		$pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J',true);
-		return $labelproductservice;
+		$result.=$labelproductservice;
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1763,6 +1788,7 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
 	global $hookmanager;
 
 	$reshook=0;
+	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
@@ -1778,9 +1804,9 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
 	{
 		if ($object->lines[$i]->special_code == 3)
     	{
-    		return $outputlangs->transnoentities("Option");
+    		$result.=$outputlangs->transnoentities("Option");
     	}
-		if (empty($hidedetails) || $hidedetails > 1) $result.=price(($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(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
 	}
 	return $result;
 }
@@ -1833,8 +1859,8 @@ function pdf_getTotalQty($object,$type,$outputlangs)
 }
 
 /**
- * 	Return linked objects
- *  FIXME This function returns only one link per link type instead of all links. If we fix this, we must also fix function pdf_writeLinkedObjects
+ * 	Return linked objects to use for document generation.
+ *  Warning: To save space, this function returns only one link per link type (all links are concated on same record string). This function is used by pdf_writeLinkedObjects
  *
  * 	@param	object		$object			Object
  * 	@param	Translate	$outputlangs	Object lang for output
@@ -1850,7 +1876,11 @@ function pdf_getLinkedObjects($object,$outputlangs)
 
 	foreach($object->linkedObjects as $objecttype => $objects)
 	{
-		if ($objecttype == 'propal')
+	    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')
 		{
 			$outputlangs->load('propal');
 
@@ -1862,13 +1892,13 @@ function pdf_getLinkedObjects($object,$outputlangs)
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
 			}
 		}
-		else if ($objecttype == 'commande')
+		else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
 		{
 			$outputlangs->load('orders');
 			foreach($objects as $elementobject)
 			{
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref) . ($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '');
+				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref) . ($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '') . ($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
 			}
@@ -1892,7 +1922,7 @@ function pdf_getLinkedObjects($object,$outputlangs)
 			{
 				$elementobject->fetchObjectLinked();
 
-				$order = reset($elementobject->linkedObjects['commande']);
+				$order = reset($elementobject->linkedObjects['commande']);  // Get first order
 
 				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
 				{

From 61edda61e12b202add84cbda8dc9b34035b87019 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 10:38:42 +0100
Subject: [PATCH 340/421] Fix remove some warnings

---
 htdocs/core/class/commonobject.class.php |  6 ++--
 htdocs/core/lib/pdf.lib.php              | 35 +++++++++++++-----------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f6c760799ed..e5735f298cf 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -768,9 +768,10 @@ abstract class CommonObject
      *    @param	int			$statut		Status of links to get (-1=all)
      *    @param	string		$source		Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
      *    @param	int         $list       0:Return array contains all properties, 1:Return array contains just id
+     *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
      *    @return	array		            Array of contacts
      */
-    function liste_contact($statut=-1,$source='external',$list=0)
+    function liste_contact($statut=-1,$source='external',$list=0,$code='')
     {
         global $langs;
 
@@ -788,6 +789,7 @@ abstract class CommonObject
         $sql.= " WHERE ec.element_id =".$this->id;
         $sql.= " AND ec.fk_c_type_contact=tc.rowid";
         $sql.= " AND tc.element='".$this->element."'";
+        if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
         if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
         if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
         $sql.= " AND tc.active=1";
@@ -825,7 +827,7 @@ abstract class CommonObject
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error=$this->db->lasterror();
             dol_print_error($this->db);
             return -1;
         }
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index e7305b0ff1d..c7bdd9cd6b0 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1922,23 +1922,26 @@ function pdf_getLinkedObjects($object,$outputlangs)
 			{
 				$elementobject->fetchObjectLinked();
 
-				$order = reset($elementobject->linkedObjects['commande']);  // Get first order
-
-				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
+				if (count($elementobject->linkedObjects) > 0)
 				{
-					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
-					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
-					$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-				}
-				else	// We show both info of order and shipment
-				{
-					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
-					$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
-					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
-					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
+    				$order = reset($elementobject->linkedObjects['commande']);  // Get first order
+    
+    				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
+    				{
+    					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+    					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
+    					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
+    					$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+    				}
+    				else	// We show both info of order and shipment
+    				{
+    					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
+    					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+    					$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
+    					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
+    					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+    					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
+    				}
 				}
 			}
 		}

From b072b5a1815295111c7b835073946e6abb793dd9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 10:38:42 +0100
Subject: [PATCH 341/421] Fix remove some warnings

Conflicts:
	htdocs/core/lib/pdf.lib.php
---
 htdocs/core/class/commonobject.class.php |  6 ++--
 htdocs/core/lib/pdf.lib.php              | 39 ++++++++++++------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 743b26ecc67..5f41976236c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -768,9 +768,10 @@ abstract class CommonObject
      *    @param	int			$statut		Status of links to get (-1=all)
      *    @param	string		$source		Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
      *    @param	int         $list       0:Return array contains all properties, 1:Return array contains just id
+     *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
      *    @return	array		            Array of contacts
      */
-    function liste_contact($statut=-1,$source='external',$list=0)
+    function liste_contact($statut=-1,$source='external',$list=0,$code='')
     {
         global $langs;
 
@@ -788,6 +789,7 @@ abstract class CommonObject
         $sql.= " WHERE ec.element_id =".$this->id;
         $sql.= " AND ec.fk_c_type_contact=tc.rowid";
         $sql.= " AND tc.element='".$this->element."'";
+        if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
         if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
         if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
         $sql.= " AND tc.active=1";
@@ -825,7 +827,7 @@ abstract class CommonObject
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error=$this->db->lasterror();
             dol_print_error($this->db);
             return -1;
         }
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index a4d5a734472..ad584e21d86 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1879,29 +1879,30 @@ function pdf_getLinkedObjects($object,$outputlangs)
 		{
 			$outputlangs->load('orders');
 			$outputlangs->load('sendings');
-			foreach($objects as $x => $elementobject)
+			foreach($objects as $elementobject)
 			{
 				$elementobject->fetchObjectLinked();
-				
-				$order = reset($elementobject->linkedObjects['commande']);
 
-				// We concat this record info into fields xxx_value. title is overwrote.
-				if (! empty($object->linkedObjects['commande']) || $object->element == 'commande')	// There is already a link to order or object is the order, so we show only info of shipment
+				if (isset($elementobject->linkedObjects['commande']) && count($elementobject->linkedObjects['commande']) > 0)
 				{
-					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-					if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
-					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
-					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
-					$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-				}
-				else	// We show both info of order and shipment.
-				{
-					$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);
-					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
-					if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
+    				$order = reset($elementobject->linkedObjects['commande']);  // Get first order
+    
+    				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
+    				{
+    					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+    					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
+    					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
+    					$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+    				}
+    				else	// We show both info of order and shipment
+    				{
+    					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
+    					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+    					$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
+    					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
+    					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+    					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
+    				}
 				}
 			}
 		}

From 7567336680653dee460e4651bb3cae74b4ed69ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 10:51:06 +0100
Subject: [PATCH 342/421] FIX #4683

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a680886827a..3855e2525c4 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -448,7 +448,7 @@ $facturestatic=new Facture($db);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.increment, f.fk_mode_reglement, f.total as total_ht, f.tva as total_tva, f.total_ttc,';
+$sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.total as total_ht, f.tva as total_tva, f.total_ttc,';
 $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
 $sql.= ' f.paye as paye, f.fk_statut,';
 $sql.= ' s.nom as name, s.rowid as socid, s.code_client, s.client ';
@@ -527,7 +527,7 @@ if ($search_user > 0)
 }
 if (! $sall)
 {
-    $sql.= ' GROUP BY f.rowid, f.facnumber, ref_client, f.type, f.note_private, f.increment, f.total, f.tva, f.total_ttc,';
+    $sql.= ' GROUP BY f.rowid, f.facnumber, ref_client, f.type, f.note_private, f.note_public, f.increment, f.total, f.tva, f.total_ttc,';
     $sql.= ' f.datef, f.date_lim_reglement,';
     $sql.= ' f.paye, f.fk_statut,';
     $sql.= ' s.nom, s.rowid, s.code_client, s.client';
@@ -810,7 +810,7 @@ if ($resql)
             $facturestatic->type=$objp->type;
             $facturestatic->statut=$objp->fk_statut;
             $facturestatic->date_lim_reglement=$db->jdate($objp->datelimite);
-            $notetoshow=dol_string_nohtmltag(($user->societe_id>0?$objp->note_public:$objp->note),1);
+            $notetoshow=dol_string_nohtmltag(($user->societe_id>0?$objp->note_public:$objp->note_private),1);
             $paiement = $facturestatic->getSommePaiement();
 
             print '<table class="nobordernopadding"><tr class="nocellnopadd">';

From f330a1c8e50d57474a221b081c97e93cf240fbc8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 10:55:47 +0100
Subject: [PATCH 343/421] Fix phpcs

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a285e256860..b80d0d740ae 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3410,10 +3410,13 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
 
 
 /**
- * Output a dimension with best unit 
- * @param float     $dimension      Dimension
- * @param int       $unit           Unit of dimension (0, -3, ...)
- * @param string    $type           'weight', 'volume', ...
+ * Output a dimension with best unit
+ *  
+ * @param   float       $dimension      Dimension
+ * @param   int         $unit           Unit of dimension (0, -3, ...)
+ * @param   string      $type           'weight', 'volume', ...
+ * @param   Translate   $outputlangs    Translate language object
+ * @return  string                      String to show dimensions
  */
 function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs)
 {

From 145a87030cef52c4c7b8f8b82dd21201c65d14ae Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 26 Feb 2016 12:01:55 +0100
Subject: [PATCH 344/421] Update supplier_order.php

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

diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index dc3db7a0036..50eb9c9a322 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -44,6 +44,7 @@ $type=GETPOST('type', 'alpha');
 $value=GETPOST('value', 'alpha');
 $label = GETPOST('label','alpha');
 $action=GETPOST('action', 'alpha');
+$scandir = GETPOST('scandir','alpha');
 
 $specimenthirdparty=new Societe($db);
 $specimenthirdparty->initAsSpecimen();

From 8c85f173790eb2207a6c0e5b4f89cefe49c24c0a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 26 Feb 2016 12:02:53 +0100
Subject: [PATCH 345/421] Update supplier_invoice.php

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

diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 92992490ac3..6fa692f47fc 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -43,6 +43,7 @@ accessforbidden();
 $type=GETPOST('type', 'alpha');
 $value=GETPOST('value', 'alpha');
 $action=GETPOST('action', 'alpha');
+$scandir = GETPOST('scandir','alpha');
 
 $specimenthirdparty=new Societe($db);
 $specimenthirdparty->initAsSpecimen();

From e115ac90ecc22a4d74535b693f33be465802f252 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 12:08:04 +0100
Subject: [PATCH 346/421] Code comment

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b80d0d740ae..33cd6a270da 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3239,7 +3239,7 @@ function vatrate($rate,$addpercent=false,$info_bits=0,$usestarfornpr=0)
  *		@param	float		$amount			Amount to format
  *		@param	integer		$form			Type of format, HTML or not (not by default)
  *		@param	Translate	$outlangs		Object langs for output
- *		@param	int			$trunc			1=Truncate if there is too much decimals (default), 0=Does not truncate
+ *		@param	int			$trunc			1=Truncate if there is too much decimals (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accurancy) before inserted into database or after a computation, so this parameter should be useless.
  *		@param	int			$rounding		Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOTAL)
  *		@param	int			$forcerounding	Force the number of decimal to forcerounding decimal (-1=do not force)
  *		@param	string		$currency_code	To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)

From 2e25c7969b4b3dc1d9f809c1f7ae3562d1c14110 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 12:22:32 +0100
Subject: [PATCH 347/421] Fix when setting a price for a product, selection of
 product must not show any price

---
 htdocs/core/class/html.form.class.php | 31 +++++++++++++++------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 73b401025e9..be1bfc0c7fc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1834,14 +1834,15 @@ class Form
     /**
      * constructProductListOption
      *
-     * @param 	resultset	$objp			Resultset of fetch
-     * @param 	string		$opt			Option
-     * @param 	string		$optJson		Option
-     * @param 	int			$price_level	Price level
-     * @param 	string		$selected		Preselected value
+     * @param 	resultset	$objp			    Resultset of fetch
+     * @param 	string		$opt			    Option (var used for returned value in string option format)
+     * @param 	string		$optJson		    Option (var used for returned value in json format)
+     * @param 	int			$price_level	    Price level
+     * @param 	string		$selected		    Preselected value
+     * @param   int         $hidepriceinlabel   Hide price in label
      * @return	void
      */
-	private function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected)
+	private function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel=0)
 	{
 		global $langs,$conf,$user,$db;
 
@@ -1888,7 +1889,7 @@ class Form
         $found=0;
 
         // Multiprice
-        if ($price_level >= 1 && $conf->global->PRODUIT_MULTIPRICES)		// If we need a particular price level (from 1 to 6)
+        if (empty($hidepriceinlabel) && $price_level >= 1 && $conf->global->PRODUIT_MULTIPRICES)		// If we need a particular price level (from 1 to 6)
         {
             $sql = "SELECT price, price_ttc, price_base_type, tva_tx";
             $sql.= " FROM ".MAIN_DB_PREFIX."product_price";
@@ -1929,7 +1930,7 @@ class Form
         }
 
 		// Price by quantity
-		if (!empty($objp->quantity) && $objp->quantity >= 1 && ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
 		{
 			$found = 1;
 			$outqty=$objp->quantity;
@@ -1954,20 +1955,22 @@ class Form
             $outpricebasetype=$objp->price_base_type;
             $outtva_tx=$objp->tva_tx;
 		}
-		if (!empty($objp->quantity) && $objp->quantity >= 1)
+		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1)
 		{
 			$opt.=" (".price($objp->unitprice,1,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
 			$outval.=" (".price($objp->unitprice,0,$langs,0,0,-1,$conf->currency)."/".$langs->transnoentities("Unit").")";	// Do not use strtolower because it breaks utf8 encoding
 		}
-		if (!empty($objp->remise_percent) && $objp->remise_percent >= 1)
+		if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1)
 		{
 			$opt.=" - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
 			$outval.=" - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
 		}
 
-		//Price by customer
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-			if (!empty($objp->idprodcustprice)) {
+		// Price by customer
+		if (empty($hidepriceinlabel) && !empty($conf->global->PRODUIT_CUSTOMER_PRICES)) 
+		{
+			if (!empty($objp->idprodcustprice)) 
+			{
 				$found = 1;
 
 				if ($objp->custprice_base_type == 'HT')
@@ -1989,7 +1992,7 @@ class Form
 		}
 
         // If level no defined or multiprice not found, we used the default price
-        if (! $found)
+        if (empty($hidepriceinlabel) && ! $found)
         {
             if ($objp->price_base_type == 'HT')
             {

From 30d6aa0b96231c855692957a63745305a9aca153 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Fri, 26 Feb 2016 13:14:23 +0100
Subject: [PATCH 348/421] FIX: Some filters are lost when paging

---
 htdocs/commande/list.php       | 21 ++++++++++++++-------
 htdocs/compta/facture/list.php | 11 +++++++++--
 htdocs/fourn/facture/list.php  | 10 +++++++++-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 517cd95e536..237cd9c0c29 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2015      Frederic France        <frederic.france@free.fr>
  * Copyright (C) 2015      Marcos García          <marcosgdf@gmail.com>
  * Copyright (C) 2015      Jean-François Ferry      <jfefe@aternatik.fr>
+ * Copyright (C) 2016	   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
@@ -44,8 +45,10 @@ $langs->load('companies');
 
 $orderyear=GETPOST("orderyear","int");
 $ordermonth=GETPOST("ordermonth","int");
+$orderday=GETPOST("orderday","int");
 $deliveryyear=GETPOST("deliveryyear","int");
 $deliverymonth=GETPOST("deliverymonth","int");
+$deliveryday=GETPOST("deliveryday","int");
 $search_product_category=GETPOST('search_product_category','int');
 $search_ref=GETPOST('search_ref','alpha')!=''?GETPOST('search_ref','alpha'):GETPOST('sref','alpha');
 $search_ref_customer=GETPOST('search_ref_customer','alpha');
@@ -87,7 +90,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
     $search_total_ht='';
     $orderyear='';
     $ordermonth='';
-    $deliverymonth='';
+	$orderday='';
+	$deliveryday='';
+	$deliverymonth='';
     $deliveryyear='';
 }
 
@@ -168,10 +173,10 @@ if ($viewstatut <> '')
 }
 if ($ordermonth > 0)
 {
-    if ($orderyear > 0 && empty($day))
+    if ($orderyear > 0 && empty($orderday))
     $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,$ordermonth,false))."' AND '".$db->idate(dol_get_last_day($orderyear,$ordermonth,false))."'";
-    else if ($orderyear > 0 && ! empty($day))
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $ordermonth, $day, $orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $ordermonth, $day, $orderyear))."'";
+    else if ($orderyear > 0 && ! empty($orderday))
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $ordermonth, $orderday, $orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $ordermonth, $orderday, $orderyear))."'";
     else
     $sql.= " AND date_format(c.date_commande, '%m') = '".$ordermonth."'";
 }
@@ -181,10 +186,10 @@ else if ($orderyear > 0)
 }
 if ($deliverymonth > 0)
 {
-    if ($deliveryyear > 0 && empty($day))
+    if ($deliveryyear > 0 && empty($deliveryday))
     $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,$deliverymonth,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,$deliverymonth,false))."'";
-    else if ($deliveryyear > 0 && ! empty($day))
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $deliverymonth, $day, $deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $deliverymonth, $day, $deliveryyear))."'";
+    else if ($deliveryyear > 0 && ! empty($deliveryday))
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $deliverymonth, $deliveryday, $deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $deliverymonth, $deliveryday, $deliveryyear))."'";
     else
     $sql.= " AND date_format(c.date_livraison, '%m') = '".$deliverymonth."'";
 }
@@ -240,8 +245,10 @@ if ($resql)
 	$title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 
 	$param='&socid='.$socid.'&viewstatut='.$viewstatut;
+	if ($orderday)      		$param.='&orderday='.$orderday;
 	if ($ordermonth)      		$param.='&ordermonth='.$ordermonth;
 	if ($orderyear)       		$param.='&orderyear='.$orderyear;
+	if ($deliveryday)   		$param.='&deliveryday='.$deliveryday;
 	if ($deliverymonth)   		$param.='&deliverymonth='.$deliverymonth;
 	if ($deliveryyear)    		$param.='&deliveryyear='.$deliveryyear;
 	if ($search_ref)      		$param.='&search_ref='.$search_ref;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 2581bb382ca..772abae8362 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2015	   Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2015-2016 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
@@ -119,7 +119,6 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 // Do we click on purge search criteria ?
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
-    $search_categ='';
     $search_user='';
     $search_sale='';
     $search_product_category='';
@@ -132,6 +131,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
     $day='';
     $year='';
     $month='';
+    $day_lim='';
+    $year_lim='';
+    $month_lim='';
 }
 
 
@@ -261,13 +263,18 @@ if ($resql)
     }
 
     $param='&socid='.$socid;
+    if ($day)                $param.='&day='.$day;
     if ($month)              $param.='&month='.$month;
     if ($year)               $param.='&year=' .$year;
+    if ($day_lim)            $param.='&day_lim='.$day_lim;
+    if ($month_lim)          $param.='&month_lim='.$month_lim;
+    if ($year_lim)           $param.='&year_lim=' .$year_lim;
     if ($search_ref)         $param.='&search_ref=' .$search_ref;
     if ($search_refcustomer) $param.='&search_refcustomer=' .$search_refcustomer;
     if ($search_societe)     $param.='&search_societe=' .$search_societe;
     if ($search_sale > 0)    $param.='&search_sale=' .$search_sale;
     if ($search_user > 0)    $param.='&search_user=' .$search_user;
+    if ($search_product_category > 0)   $param.='$search_product_category=' .$search_product_category;
     if ($search_montant_ht != '')  $param.='&search_montant_ht='.$search_montant_ht;
     if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc;
 	if ($search_status != '') $param.='&search_status='.$search_status;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index a2b48c253df..a02f2f78440 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015	   juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015 	   Abbes Bahfir 	<bafbes@gmail.com>
- * Copyright (C) 2015	   Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2015-2016 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
@@ -93,6 +93,10 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))		// Both
 	$search_status="";
 	$year="";
 	$month="";
+	$day="";
+	$year_lim="";
+	$month_lim="";
+	$day_lim="";
 }
 
 /*
@@ -230,8 +234,12 @@ if ($resql)
 	}
 
 	$param='&socid='.$socid;
+	if ($day) 					$param.='&day='.urlencode($day);
 	if ($month) 				$param.='&month='.urlencode($month);
 	if ($year)  				$param.='&year=' .urlencode($year);
+	if ($day_lim) 				$param.='&day_lim='.urlencode($day_lim);
+	if ($month_lim) 			$param.='&month_lim='.urlencode($month_lim);
+	if ($year_lim)  			$param.='&year_lim=' .urlencode($year_lim);
 	if ($search_ref)          	$param.='&search_ref='.urlencode($search_ref);
 	if ($search_ref_supplier) 	$param.='&search_ref_supplier'.urlencode($search_ref_supplier);
 	if ($search_label)      	$param.='&search_label='.urlencode($search_label);

From c1ea597cb7fa4ebe7591a3678fd573921c304388 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 13:37:18 +0100
Subject: [PATCH 349/421] Redesign page with customer price to make it easier
 to understand.

---
 htdocs/core/lib/functions.lib.php |   1 +
 htdocs/product/price.php          | 367 ++++++++++++++++++------------
 2 files changed, 217 insertions(+), 151 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 33cd6a270da..d7575cc6ab5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2965,6 +2965,7 @@ function print_fiche_titre($title, $mesg='', $picto='title_generic.png', $pictoi
  *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
  * 	@param	int		$id					To force an id on html objects
  * 	@return	string
+ *  @see print_barre_list
  */
 function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictoisfullpath=0, $id=0)
 {
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index c9023447307..e3a3d0f62dd 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -876,17 +876,18 @@ print '<div style="clear:both"></div>';
 dol_fiche_end();
 
 
+
 /* ************************************************************************** */
 /*                                                                            */
 /* Barre d'action                                                             */
 /*                                                                            */
 /* ************************************************************************** */
 
-if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'add_customer_price')
+if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'showlog_default_price' || $action == 'add_customer_price')
 {
 	print "\n" . '<div class="tabsAction">' . "\n";
 
-	if (empty($conf->global->PRODUIT_MULTIPRICES))	// For everyone, except multiprices
+	if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 	{
     	if ($user->rights->produit->creer || $user->rights->service->creer) {
     		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
@@ -1065,9 +1066,6 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 	}
 	else
 	{
-		dol_fiche_head('');
-		
-
 		?>
 		<script>
 
@@ -1097,6 +1095,8 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '<input type="hidden" name="action" value="update_price">';
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
 
+		dol_fiche_head('');
+		
 		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
 			print $langs->trans('UseMultipriceRules'). ' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
 		}
@@ -1112,9 +1112,11 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
 			print '<td></td>';
 		}
-		print '</tr></thead><tbody>';
+		print '</tr></thead>';
 
-		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) {
+		print '<tbody>';
+		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) 
+		{
 			$var = !$var;
 
 			print '<tr '.$bc[$var].'>';
@@ -1163,146 +1165,168 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 			print '</tr>';
 		}
 
-		print '</tbody></table><br><div style="text-align: center">';
+		print '</tbody>';
+		
+		print '</table>';
+		
+		dol_fiche_end();
+		
+		print '<div style="text-align: center">';
 		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 		print '&nbsp;&nbsp;&nbsp;';
 		print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '"></div>';
 		print '</form>';
 
-		dol_fiche_end();
 	}
 }
 
-// List of price changes (ordered by descending date)
-$sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.recuperableonly,";
-$sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
-$sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
-$sql .= " FROM " . MAIN_DB_PREFIX . "product_price as p,";
-$sql .= " " . MAIN_DB_PREFIX . "user as u";
-$sql .= " WHERE fk_product = " . $object->id;
-$sql .= " AND p.entity IN (" . getEntity('productprice', 1) . ")";
-$sql .= " AND p.fk_user_author = u.rowid";
-if (! empty($socid) && ! empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = " . $soc->price_level;
-$sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
-// $sql .= $db->plimit();
-
-$result = $db->query($sql);
-if ($result)
+// List of price changes -log historic (ordered by descending date)
+if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_price') && ! in_array($action, array('edit_price','edit_vat')))
 {
-	$num = $db->num_rows($result);
-
-	if (! $num)
-	{
-		$db->free($result);
-
-		// Il doit au moins y avoir la ligne de prix initial.
-		// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
-		$object->updatePrice($object->price, $object->price_base_type, $user, $newprice_min);
-
-		$result = $db->query($sql);
-		$num = $db->num_rows($result);
-	}
-
-	if ($num > 0)
-	{
-		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print load_fiche_titre($langs->trans("DefaultPrice"),'','');
-
-		print '<table class="noborder" width="100%">';
-
-		print '<tr class="liste_titre">';
-		print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
-
-		if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
-			print '<td align="center">' . $langs->trans("PriceLevel") . '</td>';
-		}
-		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
-			print '<td align="center">' . $langs->trans("Type") . '</td>';
-		}
-
-		print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
-		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) || ! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) print '<td align="right">' . $langs->trans("VATRate") . '</td>';
-		print '<td align="right">' . $langs->trans("HT") . '</td>';
-		print '<td align="right">' . $langs->trans("TTC") . '</td>';
-		if (! empty($conf->dynamicprices->enabled)) {
-			print '<td align="right">' . $langs->trans("PriceExpressionSelected") . '</td>';
-		}
-		print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '</td>';
-		print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '</td>';
-		print '<td align="right">' . $langs->trans("ChangedBy") . '</td>';
-		if ($user->rights->produit->supprimer)
-			print '<td align="right">&nbsp;</td>';
-		print '</tr>';
-
-		$var = True;
-		$i = 0;
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($result);
-			$var = ! $var;
-			print "<tr $bc[$var]>";
-			// Date
-			print "<td>" . dol_print_date($db->jdate($objp->dp), "dayhour") . "</td>";
-
-			// Price level
-			if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
-				print '<td align="center">' . $objp->price_level . "</td>";
-			}
-			// Price by quantity
-			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
-			{
-				$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
-				print '<td align="center">' . $langs->trans($type) . "</td>";
-			}
-
-			print '<td align="center">' . $langs->trans($objp->price_base_type) . "</td>";
-			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) || ! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) print '<td align="right">' . vatrate($objp->tva_tx, true, $objp->recuperableonly) . "</td>";
-
-			//Price
-			if (! empty($objp->fk_price_expression) && ! empty($conf->dynamicprices->enabled))
-			{
-				$price_expression = new PriceExpression($db);
-				$res = $price_expression->fetch($objp->fk_price_expression);
-				$title = $price_expression->title;
-				print '<td align="right"></td>';
-				print '<td align="right"></td>';
-				print '<td align="right">' . $title . "</td>";
-			}
-			else
-			{
-				print '<td align="right">' . ($objp->price_base_type != 'TTC' ? price($objp->price) : ''). "</td>";
-				print '<td align="right">' . ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : '') . "</td>";
-				if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled
-					print '<td align="right"></td>';
-				}
-			}
-			print '<td align="right">' . ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '') . '</td>';
-			print '<td align="right">' . ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '') . '</td>';
-
-			// User
-			print '<td align="right"><a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $objp->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '</a></td>';
-
-			// Action
-			if ($user->rights->produit->supprimer)
-			{
-				print '<td align="right">';
-				if ($i > 0) {
-					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)
-				print '</td>';
-			}
-
-			print "</tr>\n";
-			$i ++;
-		}
-		$db->free($result);
-		print "</table>";
-		print "<br>";
-	}
-} else {
-	dol_print_error($db);
+    $sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.recuperableonly,";
+    $sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
+    $sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
+    $sql .= " FROM " . MAIN_DB_PREFIX . "product_price as p,";
+    $sql .= " " . MAIN_DB_PREFIX . "user as u";
+    $sql .= " WHERE fk_product = " . $object->id;
+    $sql .= " AND p.entity IN (" . getEntity('productprice', 1) . ")";
+    $sql .= " AND p.fk_user_author = u.rowid";
+    if (! empty($socid) && ! empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = " . $soc->price_level;
+    $sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+    // $sql .= $db->plimit();
+    
+    $result = $db->query($sql);
+    if ($result)
+    {
+    	$num = $db->num_rows($result);
+    
+    	if (! $num)
+    	{
+    		$db->free($result);
+    
+    		// Il doit au moins y avoir la ligne de prix initial.
+    		// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
+    		$object->updatePrice($object->price, $object->price_base_type, $user, $newprice_min);
+    
+    		$result = $db->query($sql);
+    		$num = $db->num_rows($result);
+    	}
+    
+    	if ($num > 0)
+    	{
+    	    $backbutton='<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">' . $langs->trans("Back") . '</a>';
+    	    	
+    		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"),'','','','','',$backbutton, 0, 0, 'title_accountancy.png');
+    
+    		print '<table class="noborder" width="100%">';
+    
+    		print '<tr class="liste_titre">';
+    		print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
+    
+    		if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
+    			print '<td align="center">' . $langs->trans("PriceLevel") . '</td>';
+    		}
+    		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+    			print '<td align="center">' . $langs->trans("Type") . '</td>';
+    		}
+    
+    		print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
+    		print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
+    		if (empty($conf->global->PRODUIT_MULTIPRICES)) print '<td align="right">' . $langs->trans("VATRate") . '</td>';
+    		print '<td align="right">' . $langs->trans("HT") . '</td>';
+    		print '<td align="right">' . $langs->trans("TTC") . '</td>';
+    		if (! empty($conf->dynamicprices->enabled)) {
+    			print '<td align="right">' . $langs->trans("PriceExpressionSelected") . '</td>';
+    		}
+    		print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '</td>';
+    		print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '</td>';
+    		print '<td align="right">' . $langs->trans("ChangedBy") . '</td>';
+    		if ($user->rights->produit->supprimer)
+    			print '<td align="right">&nbsp;</td>';
+    		print '</tr>';
+    
+    		$notfirstlineforlevel=array();
+    		
+    		$var = True;
+    		$i = 0;
+    		while ($i < $num)
+    		{
+    			$objp = $db->fetch_object($result);
+    			$var = ! $var;
+    			print "<tr $bc[$var]>";
+    			// Date
+    			print "<td>" . dol_print_date($db->jdate($objp->dp), "dayhour") . "</td>";
+    
+    			// Price level
+    			if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
+    				print '<td align="center">' . $objp->price_level . "</td>";
+    			}
+    			// Price by quantity
+    			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+    			{
+    				$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
+    				print '<td align="center">' . $langs->trans($type) . "</td>";
+    			}
+    
+    			print '<td align="center">' . $langs->trans($objp->price_base_type) . "</td>";
+    			if (empty($conf->global->PRODUIT_MULTIPRICES)) print '<td align="right">' . vatrate($objp->tva_tx, true, $objp->recuperableonly) . "</td>";
+    
+    			// Price
+    			if (! empty($objp->fk_price_expression) && ! empty($conf->dynamicprices->enabled))
+    			{
+    				$price_expression = new PriceExpression($db);
+    				$res = $price_expression->fetch($objp->fk_price_expression);
+    				$title = $price_expression->title;
+    				print '<td align="right"></td>';
+    				print '<td align="right"></td>';
+    				print '<td align="right">' . $title . "</td>";
+    			}
+    			else
+    			{
+    				print '<td align="right">' . ($objp->price_base_type != 'TTC' ? price($objp->price) : ''). "</td>";
+    				print '<td align="right">' . ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : '') . "</td>";
+    				if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled
+    					print '<td align="right"></td>';
+    				}
+    			}
+    			print '<td align="right">' . ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '') . '</td>';
+    			print '<td align="right">' . ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '') . '</td>';
+    
+    			// User
+    			print '<td align="right"><a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $objp->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '</a></td>';
+    
+    			// Action
+    			if ($user->rights->produit->supprimer)
+    			{
+    			    $candelete=0;
+    			    if (! empty($conf->global->PRODUIT_MULTIPRICES)) 
+    			    {
+    			        if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level]=1;
+    			        else $candelete=1;
+    			    }
+    			    elseif ($i > 0) $candelete=1;
+    			    
+    				print '<td align="right">';
+    				if ($candelete) 
+    				{
+    					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)
+    				print '</td>';
+    			}
+    
+    			print "</tr>\n";
+    			$i ++;
+    		}
+    		$db->free($result);
+    		print "</table>";
+    		print "<br>";
+    	}
+    } else {
+    	dol_print_error($db);
+    }
 }
 
 
@@ -1343,6 +1367,9 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
+		
+		dol_fiche_head();
+		
 		print '<table class="border" width="100%">';
 		print '<tr>';
 		print '<td class="fieldrequired">' . $langs->trans('ThirdParty') . '</td>';
@@ -1403,13 +1430,15 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		print '</table>';
 
-		print '<br><div class="center">';
+		dol_fiche_end();
+		
+		print '<div class="center">';
 		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
 		print '</div>';
 
-		print '<br></form>';
+		print '</form>';
 	}
 	elseif ($action == 'edit_customer_price')
 	{
@@ -1514,7 +1543,15 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		$option = '&socid=' . GETPOST('socid', 'int') . '&id=' . $object->id;
 
-		print_barre_liste($langs->trans('PriceByCustomerLog'), $page, $_SERVEUR['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
+		$staticsoc = new Societe($db);
+		$staticsoc->fetch(GETPOST('socid', 'int'));
+		
+		$title=$langs->trans('PriceByCustomerLog');
+		$title.=' - '.$staticsoc->getNomUrl(1);
+
+		$backbutton='<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">' . $langs->trans("Back") . '</a>';
+		
+		print_barre_liste($title, $page, $_SERVEUR['PHP_SELF'], $option, $sortfield, $sortorder, $backbutton, count($prodcustprice->lines), $nbtotalofrecords, 'title_accountancy.png');
 
 		if (count($prodcustprice->lines) > 0)
 		{
@@ -1568,14 +1605,10 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		} else {
 			print $langs->trans('None');
 		}
-
-		print "\n" . '<div class="tabsAction">' . "\n";
-		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">' . $langs->trans("Back") . '</a></div>';
-		print "\n</div><br>\n";
 	}
-	else
+	else if ($action != 'showlog_default_price')
 	{
-		// View mode
+		// List of all prices by customers
 
 		// Count total nb of records
 		$nbtotalofrecords = 0;
@@ -1590,7 +1623,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		$option = '&search_soc=' . $search_soc . '&id=' . $object->id;
 
-		print_barre_liste($langs->trans('PriceByCustomer'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
+		print_barre_liste($langs->trans('PriceByCustomer'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, 'title_accountancy.png');
 
 		print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
@@ -1623,12 +1656,44 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
     		print '</tr>';
 		}
 		
+		$var = False;
+		
+		
+		// Line for default price
+		print "<tr ".$bc[$var].">";
+		print "<td>" . $langs->trans("Default") . "</td>";
+		print "<td>" . "</td>";
+		
+		print '<td align="center">' . $langs->trans($object->price_base_type) . "</td>";
+		print '<td align="right">' . vatrate($object->tva_tx, true, $object->recuperableonly) . "</td>";
+		print '<td align="right">' . price($object->price) . "</td>";
+		print '<td align="right">' . price($object->price_ttc) . "</td>";
+		print '<td align="right">' . price($object->price_min) . '</td>';
+		print '<td align="right">' . price($object->price_min_ttc) . '</td>';
+		print '<td align="right">';
+		print '</td>';
+		if ($user->rights->produit->supprimer || $user->rights->service->supprimer)
+		{
+		    print '<td align="right">';
+		    print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_default_price&amp;id=' . $object->id . '">';
+		    print img_info($langs->trans('PriceByCustomerLog'));
+		    print '</a>';
+		    print ' ';
+		    print '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit_price&amp;id=' . $object->id . '">';
+		    print img_edit('default', 0, 'style="vertical-align: middle;"');
+		    print '</a>';
+		    print ' &nbsp; ';
+		    print '</td>';
+		}
+		print "</tr>\n";
+
+		
 		if (count($prodcustprice->lines) > 0)
 		{
-		    $var = False;
-
 			foreach ($prodcustprice->lines as $line)
 			{
+			    $var = ! $var;
+			    
 				print "<tr ".$bc[$var].">";
 				// Date
 				$staticsoc = new Societe($db);
@@ -1657,7 +1722,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					print '<td align="right">';
 					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_customer_price&amp;id=' . $object->id . '&amp;socid=' . $line->fk_soc . '">';
-					print img_info();
+					print img_info($langs->trans('PriceByCustomerLog'));
 					print '</a>';
 					print ' ';
 					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit_customer_price&amp;id=' . $object->id . '&amp;lineid=' . $line->id . '">';

From 1fa94e4d6a7bf964126600970c2ccb573e09a422 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 15:03:07 +0100
Subject: [PATCH 350/421] NEW Introduce position of records into dictionnary of
 type of contacts

---
 htdocs/admin/dict.php                              | 12 ++++++------
 htdocs/core/class/commonobject.class.php           | 11 ++++++-----
 htdocs/core/class/html.formcompany.class.php       |  4 ++--
 htdocs/core/tpl/contacts.tpl.php                   |  2 +-
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql     |  2 ++
 htdocs/install/mysql/tables/llx_c_type_contact.sql |  3 ++-
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index bd301ca80f2..17a0c7f1cd5 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -158,7 +158,7 @@ $tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.a
 $tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.position, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid";
 $tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAIN_DB_PREFIX."c_currencies AS c";
 $tabsql[10]= "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
-$tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
+$tabsql[11]= "SELECT t.rowid as rowid, t.element, t.source, t.code, t.libelle, t.position, t.active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
 $tabsql[12]= "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.fdm, c.decalage, c.active, c.sortorder FROM ".MAIN_DB_PREFIX.'c_payment_term AS c';
 $tabsql[13]= "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.accountancy_code FROM ".MAIN_DB_PREFIX."c_paiement AS c";
 $tabsql[14]= "SELECT e.rowid as rowid, e.code as code, e.libelle, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_country as c WHERE e.fk_pays=c.rowid and c.active=1";
@@ -191,7 +191,7 @@ $tabsqlsort[7] ="country ASC, code ASC, a.libelle ASC";
 $tabsqlsort[8] ="country DESC,".(! empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?' t.position ASC,':'')." libelle ASC";
 $tabsqlsort[9] ="label ASC";
 $tabsqlsort[10]="country ASC, code ASC, taux ASC, recuperableonly ASC, localtax1 ASC, localtax2 ASC";
-$tabsqlsort[11]="element ASC, source ASC, code ASC";
+$tabsqlsort[11]="t.element ASC, t.source ASC, t.position ASC, t.code ASC";
 $tabsqlsort[12]="sortorder ASC, code ASC";
 $tabsqlsort[13]="code ASC";
 $tabsqlsort[14]="country ASC, e.organization ASC, code ASC";
@@ -224,7 +224,7 @@ $tabfield[7] = "code,libelle,country,accountancy_code,deductible";
 $tabfield[8] = "code,libelle,country_id,country".(! empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?',position':'');
 $tabfield[9] = "code,label,unicode";
 $tabfield[10]= "country_id,country,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
-$tabfield[11]= "element,source,code,libelle";
+$tabfield[11]= "element,source,code,libelle,position";
 $tabfield[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage,sortorder";
 $tabfield[13]= "code,libelle,type,accountancy_code";
 $tabfield[14]= "code,libelle,price,organization,country_id,country";
@@ -257,7 +257,7 @@ $tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible";
 $tabfieldvalue[8] = "code,libelle,country".(! empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?',position':'');
 $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10]= "country,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
-$tabfieldvalue[11]= "element,source,code,libelle";
+$tabfieldvalue[11]= "element,source,code,libelle,position";
 $tabfieldvalue[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage,sortorder";
 $tabfieldvalue[13]= "code,libelle,type,accountancy_code";
 $tabfieldvalue[14]= "code,libelle,price,organization,country";
@@ -290,7 +290,7 @@ $tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible";
 $tabfieldinsert[8] = "code,libelle,fk_country".(! empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?',position':'');
 $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10]= "fk_pays,code,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
-$tabfieldinsert[11]= "element,source,code,libelle";
+$tabfieldinsert[11]= "element,source,code,libelle,position";
 $tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage,sortorder";
 $tabfieldinsert[13]= "code,libelle,type,accountancy_code";
 $tabfieldinsert[14]= "code,libelle,price,organization,fk_pays";
@@ -391,7 +391,7 @@ $tabhelp[7]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[8]  = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[9]  = array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency"));
 $tabhelp[10] = array('code'=>$langs->trans("EnterAnyCode"), 'taux'=>$langs->trans("SellTaxRate"), 'recuperableonly'=>$langs->trans("RecuperableOnly"), 'localtax1_type'=>$langs->trans("LocalTaxDesc"), 'localtax2_type'=>$langs->trans("LocalTaxDesc"));
-$tabhelp[11] = array();
+$tabhelp[11] = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[12] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[13] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[14] = array('code'=>$langs->trans("EnterAnyCode"));
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e5735f298cf..48683ee01df 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -874,18 +874,19 @@ abstract class CommonObject
      *      Return array with list of possible values for type of contacts
      *
      *      @param	string	$source     'internal', 'external' or 'all'
-     *      @param	string	$order		Sort order by : 'code' or 'rowid'
+     *      @param	string	$order		Sort order by : 'position', 'code', 'rowid'...
      *      @param  int		$option     0=Return array id->label, 1=Return array code->label
      *      @param  int		$activeonly 0=all status of contact, 1=only the active
      *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')
      *      @return array       		Array list of type of contacts (id->label if option=0, code->label if option=1)
      */
-    function liste_type_contact($source='internal', $order='', $option=0, $activeonly=0, $code='')
+    function liste_type_contact($source='internal', $order='position', $option=0, $activeonly=0, $code='')
     {
         global $langs;
 
-        if (empty($order)) $order='code';
-
+        if (empty($order)) $order='position';
+        if ($order == 'position') $order.=',code';
+        
         $tab = array();
         $sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -893,7 +894,7 @@ abstract class CommonObject
         if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
         if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$source."'";
         if (! empty($code)) $sql.= " AND tc.code='".$code."'";
-        $sql.= " ORDER by tc.".$order;
+        $sql.= $this->db->order($order,'ASC');
 
         //print "sql=".$sql;
         $resql=$this->db->query($sql);
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 0095469c31c..13525305265 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -696,11 +696,11 @@ class FormCompany
      *  @param  string		$selected       Default selected value
      *  @param  string		$htmlname		HTML select name
      *  @param  string		$source			Source ('internal' or 'external')
-     *  @param  string		$sortorder		Sort criteria
+     *  @param  string		$sortorder		Sort criteria ('position', 'code', ...)
      *  @param  int			$showempty      1=Add en empty line
      *  @return	void
      */
-	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='code', $showempty=0)
+	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0)
 	{
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index de3d79a790d..e014bea9e06 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -118,7 +118,7 @@ $userstatic=new User($db);
 			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0); ?>
 		</div>
 		<div class="tagtd maxwidthonsmartphone">
-			<?php $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid'); ?>
+			<?php $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid', 0, '', '', 0, 'minwidth200'); ?>
 		</div>
 		<div class="tagtd maxwidthonsmartphone">
 			<?php
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 4596288fcd7..3dd639a179e 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -33,6 +33,8 @@ ALTER TABLE llx_product_customer_price_log ADD COLUMN localtax1_type varchar(10)
 ALTER TABLE llx_product_customer_price_log ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
 
 
+ALTER TABLE llx_c_type_contact ADD COLUMN position integer NOT NULL DEFAULT 0;
+
 
 ALTER TABLE llx_product ADD COLUMN  model_pdf	varchar(255) default '';
 
diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql
index 27bb90d3475..b764041cb6e 100644
--- a/htdocs/install/mysql/tables/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql
@@ -34,5 +34,6 @@ create table llx_c_type_contact
   code          varchar(32) NOT NULL,
   libelle 	    varchar(64)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL,
-  module        varchar(32) NULL
+  module        varchar(32) NULL,
+  position      integer NOT NULL DEFAULT 0
 )ENGINE=innodb;

From 4250fe155ac46b9b146c9d655e62f1ca2eb82c36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 15:42:07 +0100
Subject: [PATCH 351/421] Fix showing ref of shipment on orders (lines too
 long)

---
 htdocs/core/lib/pdf.lib.php | 50 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index ad584e21d86..09c8acb5b38 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1879,31 +1879,33 @@ function pdf_getLinkedObjects($object,$outputlangs)
 		{
 			$outputlangs->load('orders');
 			$outputlangs->load('sendings');
-			foreach($objects as $elementobject)
+			foreach($objects as $x => $elementobject)
 			{
-				$elementobject->fetchObjectLinked();
-
-				if (isset($elementobject->linkedObjects['commande']) && count($elementobject->linkedObjects['commande']) > 0)
-				{
-    				$order = reset($elementobject->linkedObjects['commande']);  // Get first order
-    
-    				if (! empty($object->linkedObjects['commande']))	// There is already a link to order so we show only info of shipment
-    				{
-    					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-    					$linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
-    					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
-    					$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-    				}
-    				else	// We show both info of order and shipment
-    				{
-    					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-    					$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
-    					$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
-    					$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
-    					$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-    					$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
-    				}
-				}
+			    $order=null;
+			    // We concat this record info into fields xxx_value. title is overwrote.
+			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
+			    {
+			        $elementobject->fetchObjectLinked();
+			        if (! empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);
+			    }
+			    if (! is_object($order))
+			    {
+			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+			        if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
+			        $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
+			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
+			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / '; 
+			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+			    }
+			    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);
+			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
+			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+			        //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
+			    }
 			}
 		}
 	}

From 0f040750063a70d0222afe77d8e5f6163d0d6851 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 16:13:48 +0100
Subject: [PATCH 352/421] Few pixels won

---
 htdocs/theme/eldy/style.css.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index aae89345b93..b1efbaaafaa 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -813,7 +813,7 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis
 
 a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
     font-weight: normal;
-	padding: 0px 5px 0px 5px;
+	padding: 0px 5px 0px 3px;
 	white-space: nowrap;
 	/*	text-shadow: 1px 1px 1px #000000; */
 	color: #<?php echo $colortextbackhmenu; ?>;
@@ -4043,7 +4043,7 @@ border-top-right-radius: 6px;
 
 }
 
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 10; ?>px)
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.7, 0) + 10; ?>px)
 {
 	.mainmenuaspan {
     	display: none;

From 9a0af064bf6533e9c476a606624c365cc85b32e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 19:05:02 +0100
Subject: [PATCH 353/421] Prepare rc2

---
 build/makepack-dolibarr.pl | 14 +++++++-------
 htdocs/filefunc.inc.php    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index c8b3c7664e2..0983ec5d0ef 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -148,9 +148,9 @@ $FILENAMEEXEDOLIWAMP = "DoliWamp-$MAJOR.$MINOR.$BUILD";
 $ARCH='noarch';
 $newbuild = $BUILD;
 $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev (fedora)
-$newbuild =~ s/beta/0.2.beta1/gi;				# beta (fedora)
-$newbuild =~ s/rc./0.3.rc1/gi;					# rc (fedora)
-if ($newbuild !~ /-/) { $newbuild.='-0.3'; }	# finale (fedora)
+$newbuild =~ s/beta(.?)/0.2.beta/gi;			# beta (fedora)    (we want beta1, beta2, betax to be same package name)
+$newbuild =~ s/rc(.?)/0.3.rc/gi;				# rc (fedora)      (we want rc1, rc2, rcx to be same package name)
+if ($newbuild !~ /-/) { $newbuild.='-0.4'; }	# finale (fedora)
 #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
 #$newbuild =~ s/beta/1/gi;						# beta
 #$newbuild =~ s/rc./2/gi;						# rc
@@ -162,10 +162,10 @@ $FILENAMERPM=$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm";
 # For Deb
 $newbuild = $BUILD;
 $newbuild =~ s/(dev|alpha)/1/gi;                # dev
-$newbuild =~ s/beta/2/gi;                       # beta
-$newbuild =~ s/rc./3/gi;                        # rc
-if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale is same than rc. 
-# now newbuild is 0-1 or 0-3 for example. Note that for native package (see debian/source/format), we should not use a dash part but to get a better version management
+$newbuild =~ s/beta(.?)/2/gi;                   # beta    			(we want beta1, beta2, betax to be same package name)
+$newbuild =~ s/rc(.?)/3/gi;                     # rc				(we want rc1, rc2, rcx to be same package name)
+if ($newbuild !~ /-/) { $newbuild.='-4'; }      # finale is same than rc. 
+# now newbuild is 0-1 or 0-4 for example. Note that for native package (see debian/source/format), we should not use a dash part but to get a better version management
 $build = $newbuild;
 $build =~ s/-.*$//g;
 # now build is 0 for example
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 84cb17669da..498572fffe1 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','3.9.0-rc');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.9.0-rc2');
 
 if (! defined('EURO')) define('EURO',chr(128));
 

From 4cf59d3f9b66ca03076fce06936e49285bf07ff2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Feb 2016 19:13:25 +0100
Subject: [PATCH 354/421] Fix if option
 WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER is on, we must not show unpaid
 orders.

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 70e2564829e..c39b585d7b1 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -628,7 +628,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 /*
  * Customers orders to be billed
  */
-if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $user->rights->commande->lire)
+if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $user->rights->commande->lire && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER))
 {
 	$commandestatic=new Commande($db);
 	$langs->load("orders");

From 673cf602e93dbcc429c0c8da4580cd05f0c4a224 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 26 Feb 2016 20:12:39 +0100
Subject: [PATCH 355/421] NEW Added Malta VAT into migration script

---
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 3dd639a179e..c1ba9683df5 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -307,3 +307,9 @@ ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_tva double(2
 ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
 
 ALTER TABLE llx_product_lang ADD COLUMN import_key varchar(14) DEFAULT NULL;
+
+-- MALTA VATS (id country=148)
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1481,  148, '18','0','VAT standard rate',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1482,  148, '7','0','VAT reduced rate',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1483,  148, '5','0','VAT super-reduced rate', 1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1484,  148, '0','0','VAT Rate 0', 1);

From 7691e8c01891396f4419c5af1dc3cb4e75eeb61b Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 26 Feb 2016 22:17:22 +0100
Subject: [PATCH 356/421] FIX : Improve and add missing translations As is not
 the branch develop, instead of transifex, we use GIT

---
 htdocs/langs/en_US/projects.lang  | 1 +
 htdocs/langs/es_ES/boxes.lang     | 6 +++---
 htdocs/langs/es_ES/companies.lang | 4 ++--
 htdocs/langs/es_ES/projects.lang  | 1 +
 htdocs/langs/fr_FR/projects.lang  | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 6fa62f96905..979fd4670bb 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -192,3 +192,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index bedacd37bb5..28241fdb79a 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -45,13 +45,13 @@ BoxTitleLastModifiedProspects=Los %s últimos clientes potenciales modificados
 BoxTitleLastProductsInContract=Los %s últimos productos/servicios contratados
 BoxTitleLastModifiedMembers=Últimos %s miembros 
 BoxTitleLastFicheInter=Las %s últimas intervenciones modificadas
-BoxTitleOldestUnpaidCustomerBills=%s facturas a clientes más antiguras pendientes de cobro
-BoxTitleOldestUnpaidSupplierBills=%s facturas de proveedores más antiguas pendientes de pago
+BoxTitleOldestUnpaidCustomerBills=Las %s facturas a clientes más antiguras pendientes de cobro
+BoxTitleOldestUnpaidSupplierBills=Las %s facturas de proveedores más antiguas pendientes de pago
 BoxTitleCurrentAccounts=Balance de cuentas abiertas
 BoxTitleSalesTurnover=Volumen de ventas realizado
 BoxTitleTotalUnpaidCustomerBills=Facturas a clientes pendientes de cobro
 BoxTitleTotalUnpaidSuppliersBills=Facturas de proveedores pendientes de pago
-BoxTitleLastModifiedContacts=Los %s últimos contactos/direcciones modificadas
+BoxTitleLastModifiedContacts=Los %s últimos contactos/direcciones modificados
 BoxMyLastBookmarks=Mis %s últimos marcadores
 BoxOldestExpiredServices=Servicios antiguos expirados
 BoxLastExpiredServices=Los %s contratos más antiguos con servicios activos expirados
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 22f46c2c4dc..7e2fea3d2af 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -266,8 +266,8 @@ CustomerRelativeDiscountShort=Descuento relativo
 CustomerAbsoluteDiscountShort=Descuento fijo
 CompanyHasRelativeDiscount=Este cliente tiene un descuento por defecto de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente no tiene descuentos relativos por defecto
-CompanyHasAbsoluteDiscount=Este cliente tiene <b>%s %s</b> descuentos disponibles (descuentos, anticipos...)
-CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> anticipos disponibles
+CompanyHasAbsoluteDiscount=Este cliente tiene <b>%s %s</b> en descuentos o anticipos disponibles
+CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> en anticipos disponibles
 CompanyHasNoAbsoluteDiscount=Este cliente no tiene más descuentos fijos disponibles
 CustomerAbsoluteDiscountAllUsers=Descuentos fijos en curso (acordado por todos los usuarios)
 CustomerAbsoluteDiscountMy=Descuentos fijos en curso (acordados personalmente)
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index c1fdad6cb99..0c68fbd1cf5 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -198,3 +198,4 @@ OppStatusNEGO=Negociación
 OppStatusPENDING=Pendiente
 OppStatusWIN=Ganado
 OppStatusLOST=Perdido
+Budget=Presupuesto
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index d9e0c374dda..13bc1fc4765 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -198,3 +198,4 @@ OppStatusNEGO=Négociation
 OppStatusPENDING=En attente
 OppStatusWIN=Gagné
 OppStatusLOST=Perdu
+Budget=Budget
\ No newline at end of file

From b34459c94947ee7ba85f313c9308db37dd152a76 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 26 Feb 2016 22:31:36 +0100
Subject: [PATCH 357/421] FIX : Improve and add missing translations As is not
 the branch develop, instead of transifex, we use GIT

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

diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 64a71bfaf52..3223320d657 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1091,7 +1091,7 @@ SendmailOptionMayHurtBuggedMTA=La funcionalidad de enviar correo electrónico a
 TranslationSetup=Configuración traducción
 TranslationDesc=La elección del idioma mostrado en pantalla se modifica:<br>* A nivel global desde el menú <strong>Inicio - Configuración - Entorno</strong><br>* De manera específica al usuario desde la pestaña <strong>Interfaz usuario</strong> de su ficha de usuario (hacer clic en su login en la parte superior izquierda de la pantalla).
 TranslationOverwriteDesc=También puede sobreescribir algún valor completando/editando la tabla siguiente. Debe utilizar  "%s" para el código de idioma, "%s" para la clave que encuentra en el archivo langs/xx_XX/somefile.lang y "%s" para el nuevo valor que desea utilizar como nueva traducción.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Debe activar al menos un módulo.
 ClassNotFoundIntoPathWarning=No se ha encontrado la clase %s en su path PHP
 YesInSummer=Sí en verano

From c2c6d77caa67c46b2144c04fec739c25eaedb7c8 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 26 Feb 2016 22:43:25 +0100
Subject: [PATCH 358/421] FIX : Improve and add missing translations As is not
 the branch develop, instead of transifex, we use GIT

---
 htdocs/langs/es_ES/cron.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index eef866fdbea..1997727d542 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -40,8 +40,8 @@ CronNone=Ninguna
 CronDtStart=No antes de
 CronDtEnd=No después de
 CronDtNextLaunch=Sig. ejec.
-CronDtLastLaunch=Start date of last execution
-CronDtLastResult=End date of last execution
+CronDtLastLaunch=Fecha inicio última ejec.
+CronDtLastResult=Fecha finalización última ejec.
 CronFrequency=Frecuencia
 CronClass=Clase
 CronMethod=Metodo

From 41fb60e4a28f327994cfaba79003bdf0945511da Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 27 Feb 2016 06:38:48 +0100
Subject: [PATCH 359/421] Fixed: comestic correction of company card

---
 htdocs/societe/commerciaux.php |  2 +-
 htdocs/societe/consumption.php |  2 +-
 htdocs/societe/document.php    |  8 ++++----
 htdocs/societe/note.php        | 14 +++++++-------
 htdocs/societe/rib.php         |  6 +++---
 htdocs/societe/soc.php         |  4 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index b35e7096ef3..92ce3c614ce 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -126,7 +126,7 @@ if ($socid)
 	print '<table class="border centpercent">';
 
 	print '<tr>';
-    print '<td class="titlefield">'.$langs->trans('CustomerCode').'</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
+    print '<td class="titlefield" width="25%">'.$langs->trans('CustomerCode').'</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
     print $object->code_client;
     if ($object->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
     print '</td>';
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 0c5e6646889..b70f0e576d7 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -124,7 +124,7 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border" width="100%">';
 
 // Alias names (commercial, trademark or alias names)
-print '<tr id="name_alias"><td class="titlefield"><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+print '<tr id="name_alias"><td class="titlefield" width="25%"><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
 print '<td colspan="3">'.$object->name_alias.'</td></tr>';
 
 if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 2c951ed8670..d37310ab269 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -91,7 +91,7 @@ llxHeader('',$title,$help_url);
 if ($object->id)
 {
 	/*
-	 * Affichage onglets
+	 * Show tabs
 	 */
 	if (! empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
@@ -117,7 +117,7 @@ if ($object->id)
 	print '<table class="border centpercent">';
 
 	// Alias names (commercial, trademark or alias names)
-	print '<tr><td class="titlefield">'.$langs->trans('AliasNames').'</td><td colspan="3">';
+	print '<tr><td class="titlefield" width="25%">'.$langs->trans('AliasNames').'</td><td colspan="3">';
 	print $object->name_alias;
 	print "</td></tr>";
 
@@ -145,10 +145,10 @@ if ($object->id)
 		print '</td></tr>';
 	}
 
-	// Nbre fichiers
+	// Number of files
 	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
-	//Total taille
+	// Total size
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
 	print '</table>';
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index ceb5fa6eac5..acd7f32d375 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2001-2003,2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011      Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012      Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010           Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2015      Marcos García            <marcosgdf@gmail.com>
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013      Florian Henry	  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.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
@@ -83,7 +83,7 @@ if ($id > 0)
     print '<table class="border centpercent">';
 
 	// Alias names (commercial, trademark or alias names)
-	print '<tr><td class="titlefield">'.$langs->trans('AliasNames').'</td><td colspan="3">';
+	print '<tr><td class="titlefield" width="25%">'.$langs->trans('AliasNames').'</td><td colspan="3">';
 	print $object->name_alias;
 	print "</td></tr>";
 
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 1d0fccfe33d..c7f087daf72 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -247,7 +247,7 @@ if ($socid && $action != 'edit' && $action != "create")
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border centpercent">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("LabelRIB").'</td>';
+    print '<tr><td class="titlefield" width="25%">'.$langs->trans("LabelRIB").'</td>';
     print '<td colspan="4">'.$account->label.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BankName").'</td>';
@@ -466,7 +466,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    print '<tr><td valign="top" width="35%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+    print '<tr><td valign="top" width="25%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
     print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
 
     print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
@@ -600,7 +600,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    print '<tr><td valign="top" width="35%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+    print '<tr><td valign="top" width="25%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
     print '<td colspan="4"><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
 
     print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index ddc23769f46..df7bcd03278 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1905,7 +1905,7 @@ else
         print '<table class="border tableforfield" width="100%">';
 
 	    // Alias names (commercial, trademark or alias names)
-	    print '<tr><td class="titlefield">'.$langs->trans('AliasNames').'</td><td>';
+	    print '<tr><td class="titlefield" width="25%">'.$langs->trans('AliasNames').'</td><td>';
 	    print $object->name_alias;
 	    print "</td></tr>";
 
@@ -2148,7 +2148,7 @@ else
         print '<table class="border tableforfield" width="100%">';
         
         // Legal
-        print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
+        print '<tr><td width="25%">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
 
         // Capital
         print '<tr><td>'.$langs->trans('Capital').'</td><td>';

From c907cd139c3abff2cc5fa5305071a5b728b15469 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 27 Feb 2016 08:15:58 +0100
Subject: [PATCH 360/421] Lot of corrections

---
 htdocs/accountancy/bookkeeping/card.php       | 66 +++++++++++--------
 htdocs/accountancy/bookkeeping/list.php       | 35 +++++-----
 htdocs/accountancy/bookkeeping/listbyyear.php | 45 ++++++-------
 htdocs/accountancy/journal/sellsjournal.php   | 14 ++--
 htdocs/fourn/card.php                         |  2 +-
 htdocs/fourn/facture/card.php                 |  2 +-
 htdocs/societe/soc.php                        |  2 +-
 7 files changed, 89 insertions(+), 77 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 2d7242ff225..b77bc5446af 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.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
@@ -18,13 +18,14 @@
  */
 
 /**
- * \file htdocs/accountancy/bookkeeping/card.php
- * \ingroup Accounting Expert
- * \brief Page to show account
+ * \file 		htdocs/accountancy/bookkeeping/card.php
+ * \ingroup 	Advanced accountancy
+ * \brief 		Page to show book-entry
  */
 require '../../main.inc.php';
 
 // Class
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
@@ -190,6 +191,9 @@ else if ($action == "confirm_create") {
 	}
 }
 
+/*
+ * View
+ */
 llxHeader();
 
 $html = new Form($db);
@@ -237,29 +241,32 @@ if ($action == 'create') {
 	
 	print '<table class="border" width="100%">';
 	print '<tr>';
-	print '<td>' . $langs->trans("NumMvts") . '</td>';
+	print '<td width="25%">' . $langs->trans("NumMvts") . '</td>';
 	print '<td>' . $next_num_mvt . '</td>';
 	print '</tr>';
+	
 	print '<tr>';
 	print '<td>' . $langs->trans("Docdate") . '</td>';
 	print '<td>';
 	print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1);
 	print '</td>';
-	
 	print '</tr>';
+	
 	print '<tr>';
 	print '<td>' . $langs->trans("Codejournal") . '</td>';
-	
 	print '<td>' . $html->selectarray('code_journal', $code_journal_array) . '</td>';
 	print '</tr>';
+	
 	print '<tr>';
 	print '<td>' . $langs->trans("Docref") . '</td>';
 	print '<td><input type="text" size="20" name="doc_ref" value=""/></td>';
 	print '</tr>';
+	
 	print '<tr>';
 	print '<td>' . $langs->trans("Doctype") . '</td>';
 	print '<td><input type="text" size="20" name="doc_type" value=""/></td>';
 	print '</tr>';
+	
 	print '</table>';
 	
 	dol_fiche_end();
@@ -281,7 +288,7 @@ if ($action == 'create') {
 		
 		print '<table class="border" width="100%">';
 		print '<tr class="pair">';
-		print '<td>' . $langs->trans("NumMvts") . '</td>';
+		print '<td width="25%">' . $langs->trans("NumMvts") . '</td>';
 		print '<td>' . $book->piece_num . '</td>';
 		print '</tr>';
 		print '<tr class="impair">';
@@ -301,6 +308,7 @@ if ($action == 'create') {
 		print '<td>' . $book->doc_type . '</td>';
 		print '</tr>';
 		print '</table>';
+		print '<br />';
 		
 		$result = $book->fetch_all_per_mvt($piece_num);
 		if ($result < 0) {
@@ -328,11 +336,11 @@ if ($action == 'create') {
 				print_liste_field_titre($langs->trans("Numerocompte"));
 				print_liste_field_titre($langs->trans("Code_tiers"));
 				print_liste_field_titre($langs->trans("Labelcompte"));
-				print_liste_field_titre($langs->trans("Debit"));
-				print_liste_field_titre($langs->trans("Credit"));
-				print_liste_field_titre($langs->trans("Amount"));
-				print_liste_field_titre($langs->trans("Sens"));
-				print_liste_field_titre('');
+				print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="center"');
+				print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="center"');
+				print_liste_field_titre($langs->trans("Amount"), "", "", "", "", 'align="center"');
+				print_liste_field_titre($langs->trans("Sens"), "", "", "", "", 'align="center"');
+				print_liste_field_titre($langs->trans("Action"), "", "", "", "", 'width="60" align="center"');
 				
 				print "</tr>\n";
 				
@@ -352,24 +360,24 @@ if ($action == 'create') {
 						print $formventilation->select_auxaccount($line->code_tiers, 'code_tiers', 1);
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
-						print '<td><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
-						print '<td><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
-						print '<td>' . $line->montant . '</td>';
-						print '<td>' . $line->sens . '</td>';
+						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
+						print '<td align="right"><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
+						print '<td align="right">' . price($line->montant) . '</td>';
+						print '<td align="center">' . $line->sens . '</td>';
 						print '<td>';
 						print '<input type="hidden" name="id" value="' . $line->id . '">' . "\n";
 						print '<input type="submit" class="button" name="update" value="' . $langs->trans("Update") . '">';
 						print '</td>';
 					} else {
-						print '<td>' . $line->numero_compte . '</td>';
-						print '<td>' . $line->code_tiers . '</td>';
+						print '<td>' . length_accountg($line->numero_compte) . '</td>';
+						print '<td>' . length_accounta($line->code_tiers) . '</td>';
 						print '<td>' . $line->label_compte . '</td>';
-						print '<td>' . $line->debit . '</td>';
-						print '<td>' . $line->credit . '</td>';
-						print '<td>' . $line->montant . '</td>';
-						print '<td>' . $line->sens . '</td>';
+						print '<td align="right">' . price($line->debit) . '</td>';
+						print '<td align="right">' . price($line->credit) . '</td>';
+						print '<td align="right">' . price($line->montant) . '</td>';
+						print '<td align="center">' . $line->sens . '</td>';
 						
-						print '<td>';
+						print '<td align="center">';
 						print '<a href="./card.php?action=update&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
 						print img_edit();
 						print '</a>&nbsp;';
@@ -400,8 +408,8 @@ if ($action == 'create') {
 					print $formventilation->select_auxaccount($code_tiers, 'code_tiers', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
-					print '<td><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
-					print '<td><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
+					print '<td align="right"><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
+					print '<td align="right"><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
 					print '<td></td>';
 					print '<td></td>';
 					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '"></td>';
@@ -417,4 +425,4 @@ if ($action == 'create') {
 }
 
 llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index d6925ac1995..387df40122c 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com> 
+/* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.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
@@ -19,9 +19,9 @@
  */
 
 /**
- * \file htdocs/accountancy/bookkeeping/list.php
- * \ingroup Accounting Expert
- * \brief List operation of book keeping
+ * \file 		htdocs/accountancy/bookkeeping/list.php
+ * \ingroup 	Advanced accountancy
+ * \brief 		List operation of book keeping
  */
 require '../../main.inc.php';
 
@@ -260,8 +260,8 @@ if ($action == 'delbookkeeping') {
 			$date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
 			print $date . $sep;
 			print $line->doc_ref . $sep;
-			print length_accounta($line->numero_compte) . $sep;
-			print length_accountg($line->code_tiers) . $sep;
+			print length_accountg($line->numero_compte) . $sep;
+			print length_accounta($line->code_tiers) . $sep;
 			print price($line->debit) . $sep;
 			print price($line->credit) . $sep;
 			
@@ -277,7 +277,7 @@ if ($action == 'delbookkeeping') {
 			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
 			print $date . $sep;
 			print $line->code_journal . $sep;
-			print length_accounta($line->numero_compte) . $sep;
+			print length_accountg($line->numero_compte) . $sep;
 			print $line->piece_num . $sep;
 			print $line->doc_ref . $sep;
 			print price($line->debit) . $sep;
@@ -289,6 +289,9 @@ if ($action == 'delbookkeeping') {
 	}
 } 
 
+/*
+ * View
+ */
 else {
 	
 	$title_page = $langs->trans("Bookkeeping") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
@@ -352,8 +355,8 @@ else {
 	
 	print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 	print '<div class="tabsAction">' . "\n";
-	print '<div class="inline-block divButAction"><input type="submit"  name="button_delmvt" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
-	print '<a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a>';
+	print '<div class="inline-block divButAction"><input type="submit" name="button_delmvt" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
+	print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
 	// print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=export_csv">' . $langs->trans("Export") . '</a>';
 	print '<div class="inline-block divButAction"><input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" /></div>';
 	
@@ -396,12 +399,12 @@ else {
 	
 	print '<tr class="liste_titre">';
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="GET">';
-	print '<td><input type="text" name="search_mvt_num" size="8" value="' . $search_mvt_num . '"></td>';
+	print '<td><input type="text" name="search_mvt_num" size="6" value="' . $search_mvt_num . '"></td>';
 	print '<td class="liste_titre">';
 	print $langs->trans('From') . ': ';
 	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
 	print '<br>';
-	print $langs->trans('To') . ': ';
+	print $langs->trans('to') . ': ';
 	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
 	// print $form->select_date($search_doc_date, 'doc_date', 0, 0, 1);
 	print '</td>';
@@ -412,7 +415,7 @@ else {
 	print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
 	// print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
 	print '<br>';
-	print $langs->trans('To');
+	print $langs->trans('to');
 	print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
 	print '</td>';
 	// print '<td><input type="text" name="search_accountancy_code" size="8" value="' . $search_accountancy_code . '"></td>';
@@ -422,7 +425,7 @@ else {
 	print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 	// print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
 	print '<br>';
-	print $langs->trans('To');
+	print $langs->trans('to');
 	print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 	print '</td>';
 	// print '<td><input type="text" name="search_accountancy_aux_code" size="8" value="' . $search_accountancy_aux_code . '"></td>';
@@ -468,7 +471,7 @@ else {
 		// print '<td align="center">' . $line->sens . '</td>';
 		print '<td align="right">' . $line->code_journal . '</td>';
 		print '<td align="center">';
-		print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>';
+		print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
 		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $options . '&page=' . $page . '">' . img_delete() . '</a>';
 		print '</td>';
 		print "</tr>\n";
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index 002d5670a0c..1989328b2ca 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com> 
- * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+/* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com> 
+ * Copyright (C) 2013-2016 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
@@ -19,9 +19,9 @@
  */
 
 /**
- * \file htdocs/accountancy/bookkeeping/listbyyear.php
- * \ingroup Accounting Expert
- * \brief Book keeping by year
+ * \file 		htdocs/accountancy/bookkeeping/listbyyear.php
+ * \ingroup 	Advanced accountancy
+ * \brief 		Book keeping by year
  */
 require '../../main.inc.php';
 
@@ -183,13 +183,13 @@ print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
 print $formventilation->select_account($search_numero_compte_start, 'search_numero_compte_start', 1, array (), 1, 1, '');
-print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
+print $langs->trans('to') . ' ' . $langs->trans('AccountAccounting') . ': ';
 print $formventilation->select_account($search_numero_compte_end, 'search_numero_compte_end', 1, array (), 1, 1, '');
 print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
 print $formventilation->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
-print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+print $langs->trans('to') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
 print $formventilation->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
 print '</div>';
 print "<table class=\"noborder\" width=\"100%\">";
@@ -203,15 +203,14 @@ print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF']
 print_liste_field_titre($langs->trans("ThirdPartyAccount"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, "", $sortfield, $sortorder);
-print '<th class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '"></td>';
+print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
 print "</tr>\n";
-print '<tr class="liste_titre">';
 
+print '<tr class="liste_titre">';
 print '<td class="liste_titre">';
 print '<input type="text" size=4 class="flat" name="search_piece_num" value="' . $search_piece_num . '"/>';
 print '</td>';
@@ -249,15 +248,18 @@ print '</td>';
 print '<td class="liste_titre">';
 print '</td>';
 
-print '<td class="liste_titre">';
+print '<td class="liste_titre" align="center">';
 print '<input type="text" size=2 class="flat" name="search_sens" value="' . $search_sens . '"/>';
 print '</td>';
 
-print '<td class="liste_titre">';
+print '<td class="liste_titre" align="center">';
 print '<input type="text" size=3 class="flat" name="search_code_journal" value="' . $search_code_journal . '"/>';
 print '</td>';
 
-print '<td class="liste_titre">';
+print '<td align="right" colspan="2" class="liste_titre">';
+print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+print '&nbsp;';
+print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
 print '</td>';
 
 print "</tr>\n";
@@ -268,7 +270,6 @@ foreach ( $object->lines as $line ) {
 	$var = ! $var;
 	
 	print "<tr $bc[$var]>";
-	
 	print '<td>' . $line->piece_num . '</td>' . "\n";
 	print '<td>' . $line->doc_type . '</td>' . "\n";
 	print '<td>' . dol_print_date($line->doc_date) . '</td>';
@@ -279,9 +280,9 @@ foreach ( $object->lines as $line ) {
 	print '<td align="right">' . price($line->debit) . '</td>';
 	print '<td align="right">' . price($line->credit) . '</td>';
 	print '<td align="right">' . price($line->montant) . '</td>';
-	print '<td>' . $line->sens . '</td>';
-	print '<td>' . $line->code_journal . '</td>';
-	print '<td><a href="./card.php?action=update&amp;piece_num=' . $line->piece_num . '">' . img_edit() . '</a></td>';
+	print '<td align="center">' . $line->sens . '</td>';
+	print '<td align="right">' . $line->code_journal . '</td>';
+	print '<td align="center"><a href="./card.php?action=update&amp;piece_num=' . $line->piece_num . '">' . img_edit() . '</a></td>';
 	print "</tr>\n";
 }
 print "</table>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 4678a677597..5166d503b06 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -4,9 +4,9 @@
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
  * Copyright (C) 2013		Christophe Battarel		<christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2015	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016	Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016	Olivier Geffroy			<jeff@jeffinfo.com>
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,9 +24,9 @@
  */
 
 /**
- * \file htdocs/accountancy/journal/sellsjournal.php
- * \ingroup Accounting Expert
- * \brief Page with sells journal
+ * \file 		htdocs/accountancy/journal/sellsjournal.php
+ * \ingroup 	Advanced accountancy
+ * \brief 		Page with sells journal
  */
 require '../../main.inc.php';
 
@@ -40,10 +40,10 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 // Langs
+$langs->load("commercial");
 $langs->load("compta");
 $langs->load("bills");
 $langs->load("other");
-$langs->load("main");
 $langs->load("accountancy");
 
 $date_startmonth = GETPOST('date_startmonth');
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 3deb2dc1c45..61c2d3862af 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -139,7 +139,7 @@ if ($object->id > 0)
 	print '<table width="100%" class="border">';
 
 	// Alias names (commercial, trademark or alias names)
-	print '<tr><td class="titlefield">'.$langs->trans('AliasNameShort').'</td><td colspan="3">';
+	print '<tr><td class="titlefield" width="25%">'.$langs->trans('AliasNameShort').'</td><td colspan="3">';
 	print $object->name_alias;
 	print "</td></tr>";
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 20ba703e63e..4b07e7aa639 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1336,7 +1336,7 @@ if ($action == 'create')
     print '<table class="border" width="100%">';
 
     // Ref
-    print '<tr><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
+    print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
 
     // Third party
     print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index df7bcd03278..ffb587fcc53 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1479,7 +1479,7 @@ else
 			}
 			
             // Name
-            print '<tr><td>'.fieldLabel('ThirdPartyName','name',1).'</td>';
+            print '<tr><td width="25%">'.fieldLabel('ThirdPartyName','name',1).'</td>';
 	        print '<td colspan="3"><input type="text" size="60" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus"></td></tr>';
 
 	        // Alias names (commercial, trademark or alias names)

From 27b86be62bab220e424298bb339ac4b9f480096e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 27 Feb 2016 09:29:28 +0100
Subject: [PATCH 361/421] Remove from 4.0

---
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index c1ba9683df5..196995eea93 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -308,8 +308,3 @@ ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ttc double(2
 
 ALTER TABLE llx_product_lang ADD COLUMN import_key varchar(14) DEFAULT NULL;
 
--- MALTA VATS (id country=148)
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1481,  148, '18','0','VAT standard rate',1);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1482,  148, '7','0','VAT reduced rate',1);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1483,  148, '5','0','VAT super-reduced rate', 1);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1484,  148, '0','0','VAT Rate 0', 1);

From 77173344fe88ac95af2a9dbac4d591e9363b3b3b Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 27 Feb 2016 09:36:09 +0100
Subject: [PATCH 362/421] NEW : Add Malta VAT into 3.9

---
 htdocs/install/mysql/data/llx_c_tva.sql        | 6 ++++++
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 7c44f09620f..7e3560d04bb 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -170,6 +170,12 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (12
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (124,  12,  '7','0','VAT super-reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (125,  12,  '0','0','VAT Rate 0', 1);
 
+-- MALTA (id country=148)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1481,  148, '18','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1482,  148, '7','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1483,  148, '5','0','VAT super-reduced rate', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1484,  148, '0','0','VAT Rate 0', 1);
+
 -- NEDERLAND (id country=17)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (171, 17,  '19','0','Algemeen BTW tarief',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (172, 17,   '6','0','Verlaagd BTW tarief', 1);
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 7eb1fd46269..b6be65f725c 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -597,3 +597,9 @@ ALTER TABLE llx_holiday ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 -- Fix Argentina provences
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2326', 2305, '', 0, 'MISIONES', 'Misiones', 1);
 UPDATE llx_c_departements SET ncc = "FORMOSA", nom = "Formosa" WHERE nom = "Formosa Misiones";
+
+-- MALTA VATS (id country=148)
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1481,  148, '18','0','VAT standard rate',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1482,  148, '7','0','VAT reduced rate',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1483,  148, '5','0','VAT super-reduced rate', 1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1484,  148, '0','0','VAT Rate 0', 1);

From 486488795a5afa321567a478ad4e4c3a4035d721 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 27 Feb 2016 09:44:48 +0100
Subject: [PATCH 363/421] FIX : Remove bad migration file for this version

---
 .../install/mysql/migration/3.9.0-4.0.0.sql   | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 htdocs/install/mysql/migration/3.9.0-4.0.0.sql

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
deleted file mode 100644
index f8a74fec247..00000000000
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ /dev/null
@@ -1,25 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 4.0.0 or higher.
---
--- 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 drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
--- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
--- 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 make pk to be auto increment (mysql):    VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
--- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
--- To set a field as NULL:                     VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP 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.
--- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
--- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
-
-
-ALTER TABLE llx_accounting_bookkeeping ADD COLUMN validated tinyint DEFAULT 0 NOT NULL;

From c86a1a30d5055ecce80a907da6a0ae61e66c1396 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 11:32:49 +0100
Subject: [PATCH 364/421] Fix a lot of fixes to have the french vat npr working
 better

---
 htdocs/comm/propal.php                             | 10 +++++-----
 htdocs/comm/propal/class/propal.class.php          | 10 ++++++----
 htdocs/commande/card.php                           |  2 ++
 htdocs/commande/class/commande.class.php           |  7 +++++--
 htdocs/compta/facture.php                          |  8 ++++++--
 htdocs/compta/facture/class/facture.class.php      |  8 +++++---
 htdocs/contrat/card.php                            |  6 ++++--
 htdocs/core/class/html.form.class.php              |  1 +
 htdocs/core/lib/functions.lib.php                  |  8 +++++---
 htdocs/fourn/class/fournisseur.product.class.php   |  1 -
 htdocs/fourn/commande/card.php                     | 13 +++++++------
 htdocs/fourn/facture/card.php                      | 14 +++++++-------
 htdocs/product/card.php                            |  6 ++++--
 htdocs/product/fournisseurs.php                    |  5 ++++-
 htdocs/supplier_proposal/card.php                  |  7 +++----
 .../class/supplier_proposal.class.php              |  7 ++++---
 16 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 07c51e76916..7d85567f480 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -467,9 +467,7 @@ if (empty($reshook))
 											$array_options = $lines[$i]->array_options;
 										}
 
-										$tva_tx=get_default_tva($mysoc, $object->thirdparty);
-
-										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
+										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
 
 										if ($result > 0) {
 											$lineid = $result;
@@ -753,6 +751,8 @@ if (empty($reshook))
 				// If prices fields are update
 					$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 					$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+					if (empty($tva_tx)) $tva_npr=0;
+					
 					$pu_ht = $prod->price;
 					$pu_ttc = $prod->price_ttc;
 					$price_min = $prod->price_min;
@@ -873,8 +873,8 @@ if (empty($reshook))
 			$date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
 
 			// Local Taxes
-			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
-			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
+			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $tva_npr);
 
 			$info_bits = 0;
 			if ($tva_npr)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 922f24cb8b6..7905af12030 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -248,9 +248,10 @@ class Propal extends CommonObject
             $productdesc = $prod->description;
 
             $tva_tx = get_default_tva($mysoc,$this->client,$prod->id);
-            // local taxes
-            $localtax1_tx = get_default_localtax($mysoc,$this->client,1,$prod->tva_tx);
-            $localtax2_tx = get_default_localtax($mysoc,$this->client,2,$prod->tva_tx);
+            $tva_npr = get_default_npr($mysoc,$this->client,$prod->id);
+            if (empty($tva_tx)) $tva_npr=0;
+            $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->client,$tva_npr);
+            $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->client,$tva_npr);
 
             // multiprix
             if($conf->global->PRODUIT_MULTIPRICES && $this->client->price_level)
@@ -271,7 +272,8 @@ class Propal extends CommonObject
             $line->remise_percent=$remise_percent;
             $line->tva_tx=$tva_tx;
 	        $line->fk_unit=$prod->fk_unit;
-
+			if ($tva_npr) $line->info_bits = 1;
+			
             $this->lines[]=$line;
         }
     }
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index c58516f4fea..e63e3b9a5dc 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -680,6 +680,8 @@ if (empty($reshook))
 				// Update if prices fields are defined
 					$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 					$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+					if (empty($tva_tx)) $tva_npr=0;
+					
 					$pu_ht = $prod->price;
 					$pu_ttc = $prod->price_ttc;
 					$price_min = $prod->price_min;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index eb240c852fc..8f8edcf15a3 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1421,8 +1421,11 @@ class Commande extends CommonOrder
             $prod->fetch($idproduct);
 
             $tva_tx = get_default_tva($mysoc,$this->client,$prod->id);
-            $localtax1_tx=get_localtax($tva_tx,1,$this->client);
-            $localtax2_tx=get_localtax($tva_tx,2,$this->client);
+            $tva_npr = get_default_npr($mysoc,$this->client,$prod->id);
+            if (empty($tva_tx)) $tva_npr=0;
+            $localtax1_tx=get_localtax($tva_tx,1,$this->client,$mysoc,$tva_npr);
+            $localtax2_tx=get_localtax($tva_tx,2,$this->client,$mysoc,$tva_npr);
+            
             // multiprix
             if($conf->global->PRODUIT_MULTIPRICES && $this->client->price_level)
             $price = $prod->multiprices[$this->client->price_level];
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 28c4694412f..1288278c32d 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1356,6 +1356,8 @@ if (empty($reshook))
 				// Update if prices fields are defined
 					$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 					$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+					if (empty($tva_tx)) $tva_npr=0;
+					
 					$pu_ht = $prod->price;
 					$pu_ttc = $prod->price_ttc;
 					$price_min = $prod->price_min;
@@ -1372,6 +1374,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 (empty($tva_tx)) $tva_npr=0;
 						}
 					}
 					elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
@@ -1455,6 +1458,7 @@ if (empty($reshook))
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 				$tva_tx = str_replace('*', '', $tva_tx);
+				if (empty($tva_tx)) $tva_npr=0;
 				$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 				$desc = $product_desc;
 				$type = GETPOST('type');
@@ -1466,8 +1470,8 @@ if (empty($reshook))
 			$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : '');    // If buying_price is '0', we must keep this value
 
 			// Local Taxes
-			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc);
-			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc);
+			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
 			
 			$info_bits = 0;
 			if ($tva_npr)
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 0b34c42cbad..95356149622 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -539,8 +539,10 @@ class Facture extends CommonInvoice
 						$res=$prod->fetch($_facrec->lines[$i]->fk_product);
 					}
 					$tva_tx = get_default_tva($mysoc,$soc,$prod->id);
-					$localtax1_tx=get_localtax($tva_tx,1,$soc);
-					$localtax2_tx=get_localtax($tva_tx,2,$soc);
+					$tva_npr = get_default_npr($mysoc,$soc,$prod->id);
+					if (empty($tva_tx)) $tva_npr=0;
+					$localtax1_tx=get_localtax($tva_tx,1,$soc,$mysoc,$tva_npr);
+					$localtax2_tx=get_localtax($tva_tx,2,$soc,$mysoc,$tva_npr);
 
 					$result_insert = $this->addline(
 						$_facrec->lines[$i]->desc,
@@ -551,7 +553,7 @@ class Facture extends CommonInvoice
 						$localtax2_tx,
 						$_facrec->lines[$i]->fk_product,
 						$_facrec->lines[$i]->remise_percent,
-						'','',0,0,'','HT',0,
+						'','',0,$tva_npr,'','HT',0,
 						$_facrec->lines[$i]->product_type,
 						$_facrec->lines[$i]->rang,
 						$_facrec->lines[$i]->special_code,
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index d910ebb6a79..c8504a186d4 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -492,6 +492,8 @@ if (empty($reshook))
 	
 	            $tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
 	            $tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
+	            if (empty($tva_tx)) $tva_npr=0;
+	            
 	            $pu_ht = $prod->price;
 	            $pu_ttc = $prod->price_ttc;
 	            $price_min = $prod->price_min;
@@ -552,8 +554,8 @@ if (empty($reshook))
 				$fk_unit= GETPOST('units', 'alpha');
 	        }
 	
-	        $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty);
-	        $localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty);
+	        $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty,$mysoc,$tva_npr);
+	        $localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty,$mysoc,$tva_npr);
 	
 			// ajout prix achat
 			$fk_fournprice = $_POST['fournprice'];
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index df2041cc070..1f18d1ac26c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4201,6 +4201,7 @@ class Form
         	{
         		$defaulttx=get_default_tva($societe_vendeuse,$societe_acheteuse,$idprod);
         		$defaultnpr=get_default_npr($societe_vendeuse,$societe_acheteuse,$idprod);
+        		if (empty($defaulttx)) $defaultnpr=0;
         	}
 
         	// Si taux par defaut n'a pu etre determine, on prend dernier de la liste.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d7575cc6ab5..d70719c4d4f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3452,14 +3452,15 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs)
  *	Return localtax rate for a particular vat, when selling a product with vat $vatrate, from a $thirdparty_buyer to a $thirdparty_seller
  *  Note: This function applies same rules than get_default_tva
  *
- * 	@param	float		$vatrate		        Vat rate. Can be '8.5' or '8.5 (8.5NPR)' for example
+ * 	@param	float		$vatrate		        Vat rate. Can be '8.5' or '8.5 (VATCODEX)' for example
  * 	@param  int			$local		         	Local tax to search and return (1 or 2 return only tax rate 1 or tax rate 2)
  *  @param  Societe		$thirdparty_buyer    	Object of buying third party
  *  @param	Societe		$thirdparty_seller		Object of selling third party
+ *  @param	int			$vatnpr					If vat rate is NPR or not
  * 	@return	mixed			   					0 if not found, localtax rate if found
  *  @see get_default_tva
  */
-function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller="")
+function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller="", $vatnpr=0)
 {
 	global $db, $conf, $mysoc;
 
@@ -3568,7 +3569,8 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";
+   	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";		// If we have the code, we use it in priority
+   	else $sql.= " AND t.recuperableonly ='".$npr."'";
    	dol_syslog("get_localtax", LOG_DEBUG);
    	$resql=$db->query($sql);
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 0bf0492b411..63b3e833a4c 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -191,7 +191,6 @@ class ProductFournisseur extends Product
         if ($delivery_time_days != '' && ! is_numeric($delivery_time_days)) $delivery_time_days = '';
         if ($price_base_type == 'TTC')
 		{
-			//$ttx = get_default_tva($fourn,$mysoc,$this->id);	// We must use the VAT rate defined by user and not calculate it
 			$ttx = $tva_tx;
 			$buyprice = $buyprice/(1+($ttx/100));
 		}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index a53bcb78d80..922e0d61d38 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -350,12 +350,13 @@ if (empty($reshook))
 	    		$desc = $productsupplier->description;
 	    		if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
 
-	    		$tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 	    		$type = $productsupplier->type;
-
-	    		// Local Taxes
-	    		$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
-	    		$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
+	    		
+	    		$tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
+	    		$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
+				if (empty($tva_tx)) $tva_npr=0;
+	    		$localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
+	    		$localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
 	    		$result=$object->addline(
 	    			$desc,
@@ -371,7 +372,7 @@ if (empty($reshook))
 	    			'HT',
 	    			$pu_ttc,
 	    			$type,
-	    			'',
+	    			$tva_npr,
 	    			'',
 	    			$date_start,
 	    			$date_end,
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 73def71adc1..1409cb94266 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -726,17 +726,17 @@ if (empty($reshook))
 	            $desc = $productsupplier->description;
 	            if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
 
-	            $tvatx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
-	            $npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
-
-	            $localtax1_tx= get_localtax($tvatx, 1, $mysoc,$object->thirdparty);
-	            $localtax2_tx= get_localtax($tvatx, 2, $mysoc,$object->thirdparty);
+	            $tva_tx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
+	            $tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
+				if (empty($tva_tx)) $tva_npr=0;
+	            $localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
+	            $localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
 	            $type = $productsupplier->type;
 	            $price_base_type = 'HT';
 
 	            // TODO Save the product supplier ref into database into field ref_supplier (must rename field ref into ref_supplier first)
-	            $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, $date_start, $date_end, 0, $npr, $price_base_type, $type, -1, 0, $array_options, $productsupplier->fk_unit);
+	            $result=$object->addline($desc, $productsupplier->fourn_pu, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $productsupplier->fk_unit);
 	        }
 	    	if ($idprod == -2 || $idprod == 0)
 	        {
@@ -783,7 +783,7 @@ if (empty($reshook))
 	            $price_base_type = 'HT';
 	        }
 
-			$result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit);
+			$result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit);
 	    }
 
 	    //print "xx".$tva_tx; exit;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 987754a36ae..ef126a85b52 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -620,8 +620,10 @@ if (empty($reshook))
             $desc = $object->description;
 
             $tva_tx = get_default_tva($mysoc, $soc, $object->id);
-            $localtax1_tx = get_localtax($tva_tx, 1, $soc);
-            $localtax2_tx = get_localtax($tva_tx, 2, $soc);
+            $tva_npr = get_default_npr($mysoc, $soc, $object->id);
+            if (empty($tva_tx)) $tva_npr=0;
+            $localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);
+            $localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);
 
             $pu_ht = $object->price;
             $pu_ttc = $object->price_ttc;
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index d825a1f2c66..96020e81ada 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -425,7 +425,9 @@ if ($id > 0 || $ref)
 				$mysoc2->name='Fictive seller with same country';
 				$mysoc2->tva_assuj=1;
 				$default_vat=get_default_tva($mysoc2, $mysoc, $object->id, 0);
-
+				$default_npr=get_default_npr($mysoc2, $mysoc, $object->id, 0);
+				if (empty($default_vat)) $default_npr=$default_vat;
+				
 				print '<tr><td class="fieldrequired">'.$langs->trans("VATRateForSupplierProduct").'</td>';
 				print '<td>';
 				//print $form->load_tva('tva_tx',$object->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
@@ -434,6 +436,7 @@ if ($id > 0 || $ref)
 				    $tmpproductsupplier=new ProductFournisseur($db);
 				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
 					$default_vat=$tmpproductsupplier->fourn_tva_tx;
+					$default_npr=$tmpproductsupplier->fourn_tva_npr;
 				}
 				else
 				{
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e0ba1c18dd5..a66c849bf3a 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -351,9 +351,7 @@ if (empty($reshook))
 										$array_option = $lines[$i]->array_options;
 									}
 
-									$tva_tx=get_default_tva($mysoc, $object->thirdparty);
-
-									$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option);
+									$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option);
 
 									if ($result > 0) {
 										$lineid = $result;
@@ -576,7 +574,8 @@ if (empty($reshook))
 				// If prices fields are update
 					$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 					$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-
+					if (empty($tva_tx)) $tva_npr=0;
+					
 					//On garde le prix indiqué dans l'input pour la demande de prix fournisseur
 					//$pu_ht = $prod->price;
 					$pu_ht = price2num($price_ht, 'MU');
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index abbaed6d5f4..b5319210fc7 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -199,9 +199,10 @@ class SupplierProposal extends CommonObject
             $productdesc = $prod->description;
 
             $tva_tx = get_default_tva($mysoc,$this->client,$prod->id);
-            // local taxes
-            $localtax1_tx = get_default_localtax($mysoc,$this->client,1,$prod->tva_tx);
-            $localtax2_tx = get_default_localtax($mysoc,$this->client,2,$prod->tva_tx);
+            $tva_npr = get_default_npr($mysoc,$this->client,$prod->id);
+            if (empty($tva_tx)) $tva_npr=0;
+            $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->client,$tva_npr);
+            $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->client,$tva_npr);
 
             // multiprix
             if($conf->global->PRODUIT_MULTIPRICES && $this->client->price_level)

From 997fd5ba5de8e50c0ddecaf821142c9448b480f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 11:59:51 +0100
Subject: [PATCH 365/421] Fix do not show no price because e already have
 default

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index e3a3d0f62dd..168c844768e 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -887,7 +887,7 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $
 {
 	print "\n" . '<div class="tabsAction">' . "\n";
 
-	if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+	if (empty($conf->global->PRODUIT_MULTIPRICES))
 	{
     	if ($user->rights->produit->creer || $user->rights->service->creer) {
     		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
@@ -1606,7 +1606,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			print $langs->trans('None');
 		}
 	}
-	else if ($action != 'showlog_default_price')
+	else if ($action != 'showlog_default_price' && $action != 'edit_price')
 	{
 		// List of all prices by customers
 
@@ -1738,14 +1738,14 @@ 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 ".$bc[false].">";
 			print '<td colspan="'.$colspan.'">'.$langs->trans('None').'</td>';
 			print "</tr>";
-		}
+		}*/
 
 		print "</table>";
 

From 8807222f24ef7a5de00b2addb0c2c86e0200784a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 11:32:49 +0100
Subject: [PATCH 366/421] Fix a lot of fixes to have the french vat npr working
 better

---
 htdocs/comm/propal.php                             | 10 +++++-----
 htdocs/comm/propal/class/propal.class.php          | 10 ++++++----
 htdocs/commande/card.php                           |  2 ++
 htdocs/commande/class/commande.class.php           |  7 +++++--
 htdocs/compta/facture.php                          |  8 ++++++--
 htdocs/compta/facture/class/facture.class.php      |  8 +++++---
 htdocs/contrat/card.php                            |  6 ++++--
 htdocs/core/class/html.form.class.php              |  1 +
 htdocs/core/lib/functions.lib.php                  |  8 +++++---
 htdocs/fourn/class/fournisseur.product.class.php   |  1 -
 htdocs/fourn/commande/card.php                     | 13 +++++++------
 htdocs/fourn/facture/card.php                      | 14 +++++++-------
 htdocs/product/card.php                            |  6 ++++--
 htdocs/product/fournisseurs.php                    |  5 ++++-
 htdocs/supplier_proposal/card.php                  |  7 +++----
 .../class/supplier_proposal.class.php              |  7 ++++---
 16 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index f6870cbd595..5406ba72a26 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -461,9 +461,7 @@ if (empty($reshook))
 											$array_options = $lines[$i]->array_options;
 										}
 
-										$tva_tx=get_default_tva($mysoc, $object->thirdparty);
-
-										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
+										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
 
 										if ($result > 0) {
 											$lineid = $result;
@@ -747,6 +745,8 @@ if (empty($reshook))
 				// If prices fields are update
 					$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 					$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+					if (empty($tva_tx)) $tva_npr=0;
+					
 					$pu_ht = $prod->price;
 					$pu_ttc = $prod->price_ttc;
 					$price_min = $prod->price_min;
@@ -867,8 +867,8 @@ if (empty($reshook))
 			$date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
 
 			// Local Taxes
-			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
-			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
+			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $tva_npr);
 
 			$info_bits = 0;
 			if ($tva_npr)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 460b574c246..5a45d884e09 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -239,9 +239,10 @@ class Propal extends CommonObject
             $productdesc = $prod->description;
 
             $tva_tx = get_default_tva($mysoc,$this->client,$prod->id);
-            // local taxes
-            $localtax1_tx = get_default_localtax($mysoc,$this->client,1,$prod->tva_tx);
-            $localtax2_tx = get_default_localtax($mysoc,$this->client,2,$prod->tva_tx);
+            $tva_npr = get_default_npr($mysoc,$this->client,$prod->id);
+            if (empty($tva_tx)) $tva_npr=0;
+            $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->client,$tva_npr);
+            $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->client,$tva_npr);
 
             // multiprix
             if($conf->global->PRODUIT_MULTIPRICES && $this->client->price_level)
@@ -262,7 +263,8 @@ class Propal extends CommonObject
             $line->remise_percent=$remise_percent;
             $line->tva_tx=$tva_tx;
 	        $line->fk_unit=$prod->fk_unit;
-
+			if ($tva_npr) $line->info_bits = 1;
+			
             $this->lines[]=$line;
         }
     }
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d7b2bab080a..d8ac0b6d63d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -643,6 +643,8 @@ if (empty($reshook))
 				// Update if prices fields are defined
 					$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 					$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+					if (empty($tva_tx)) $tva_npr=0;
+					
 					$pu_ht = $prod->price;
 					$pu_ttc = $prod->price_ttc;
 					$price_min = $prod->price_min;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 915e8a1e08c..9302c702ff1 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1382,8 +1382,11 @@ class Commande extends CommonOrder
             $prod->fetch($idproduct);
 
             $tva_tx = get_default_tva($mysoc,$this->client,$prod->id);
-            $localtax1_tx=get_localtax($tva_tx,1,$this->client);
-            $localtax2_tx=get_localtax($tva_tx,2,$this->client);
+            $tva_npr = get_default_npr($mysoc,$this->client,$prod->id);
+            if (empty($tva_tx)) $tva_npr=0;
+            $localtax1_tx=get_localtax($tva_tx,1,$this->client,$mysoc,$tva_npr);
+            $localtax2_tx=get_localtax($tva_tx,2,$this->client,$mysoc,$tva_npr);
+            
             // multiprix
             if($conf->global->PRODUIT_MULTIPRICES && $this->client->price_level)
             $price = $prod->multiprices[$this->client->price_level];
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index d922ce35d96..8f6f9f204ac 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1314,6 +1314,8 @@ if (empty($reshook))
 				// Update if prices fields are defined
 					$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 					$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+					if (empty($tva_tx)) $tva_npr=0;
+					
 					$pu_ht = $prod->price;
 					$pu_ttc = $prod->price_ttc;
 					$price_min = $prod->price_min;
@@ -1330,6 +1332,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 (empty($tva_tx)) $tva_npr=0;
 						}
 					}
 					elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
@@ -1413,6 +1416,7 @@ if (empty($reshook))
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 				$tva_tx = str_replace('*', '', $tva_tx);
+				if (empty($tva_tx)) $tva_npr=0;
 				$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 				$desc = $product_desc;
 				$type = GETPOST('type');
@@ -1424,8 +1428,8 @@ if (empty($reshook))
 			$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : '');    // If buying_price is '0', we must keep this value
 
 			// Local Taxes
-			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc);
-			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc);
+			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
 			
 			$info_bits = 0;
 			if ($tva_npr)
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index c66bbb6d1c2..7c761ccb40f 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -484,8 +484,10 @@ class Facture extends CommonInvoice
 						$res=$prod->fetch($_facrec->lines[$i]->fk_product);
 					}
 					$tva_tx = get_default_tva($mysoc,$soc,$prod->id);
-					$localtax1_tx=get_localtax($tva_tx,1,$soc);
-					$localtax2_tx=get_localtax($tva_tx,2,$soc);
+					$tva_npr = get_default_npr($mysoc,$soc,$prod->id);
+					if (empty($tva_tx)) $tva_npr=0;
+					$localtax1_tx=get_localtax($tva_tx,1,$soc,$mysoc,$tva_npr);
+					$localtax2_tx=get_localtax($tva_tx,2,$soc,$mysoc,$tva_npr);
 
 					$result_insert = $this->addline(
 						$_facrec->lines[$i]->desc,
@@ -496,7 +498,7 @@ class Facture extends CommonInvoice
 						$localtax2_tx,
 						$_facrec->lines[$i]->fk_product,
 						$_facrec->lines[$i]->remise_percent,
-						'','',0,0,'','HT',0,
+						'','',0,$tva_npr,'','HT',0,
 						$_facrec->lines[$i]->product_type,
 						$_facrec->lines[$i]->rang,
 						$_facrec->lines[$i]->special_code,
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 37ec345295b..babda9eff3c 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -458,6 +458,8 @@ if (empty($reshook))
 	
 	            $tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
 	            $tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
+	            if (empty($tva_tx)) $tva_npr=0;
+	            
 	            $pu_ht = $prod->price;
 	            $pu_ttc = $prod->price_ttc;
 	            $price_min = $prod->price_min;
@@ -518,8 +520,8 @@ if (empty($reshook))
 				$fk_unit= GETPOST('units', 'alpha');
 	        }
 	
-	        $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty);
-	        $localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty);
+	        $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty,$mysoc,$tva_npr);
+	        $localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty,$mysoc,$tva_npr);
 	
 			// ajout prix achat
 			$fk_fournprice = $_POST['fournprice'];
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index be1bfc0c7fc..482acbbab46 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4083,6 +4083,7 @@ class Form
         	{
         		$defaulttx=get_default_tva($societe_vendeuse,$societe_acheteuse,$idprod);
         		$defaultnpr=get_default_npr($societe_vendeuse,$societe_acheteuse,$idprod);
+        		if (empty($defaulttx)) $defaultnpr=0;
         	}
 
         	// Si taux par defaut n'a pu etre determine, on prend dernier de la liste.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c9917e5852d..2b987ec1cbd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3317,14 +3317,15 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
  *	Return localtax rate for a particular vat, when selling a product with vat $vatrate, from a $thirdparty_buyer to a $thirdparty_seller
  *  Note: This function applies same rules than get_default_tva
  *
- * 	@param	float		$vatrate		        Vat rate. Can be '8.5' or '8.5 (8.5NPR)' for example
+ * 	@param	float		$vatrate		        Vat rate. Can be '8.5' or '8.5 (VATCODEX)' for example
  * 	@param  int			$local		         	Local tax to search and return (1 or 2 return only tax rate 1 or tax rate 2)
  *  @param  Societe		$thirdparty_buyer    	Object of buying third party
  *  @param	Societe		$thirdparty_seller		Object of selling third party
+ *  @param	int			$vatnpr					If vat rate is NPR or not
  * 	@return	mixed			   					0 if not found, localtax rate if found
  *  @see get_default_tva
  */
-function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller="")
+function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller="", $vatnpr=0)
 {
 	global $db, $conf, $mysoc;
 
@@ -3433,7 +3434,8 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";
+   	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";		// If we have the code, we use it in priority
+   	else $sql.= " AND t.recuperableonly ='".$npr."'";
    	dol_syslog("get_localtax", LOG_DEBUG);
    	$resql=$db->query($sql);
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 4865eac6951..e13528c0382 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -190,7 +190,6 @@ class ProductFournisseur extends Product
         if ($delivery_time_days != '' && ! is_numeric($delivery_time_days)) $delivery_time_days = '';
         if ($price_base_type == 'TTC')
 		{
-			//$ttx = get_default_tva($fourn,$mysoc,$this->id);	// We must use the VAT rate defined by user and not calculate it
 			$ttx = $tva_tx;
 			$buyprice = $buyprice/(1+($ttx/100));
 		}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 50df02b1bff..a0cf8bc11bb 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -340,12 +340,13 @@ if (empty($reshook))
 	    		$desc = $productsupplier->description;
 	    		if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
 
-	    		$tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 	    		$type = $productsupplier->type;
-
-	    		// Local Taxes
-	    		$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
-	    		$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
+	    		
+	    		$tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
+	    		$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
+				if (empty($tva_tx)) $tva_npr=0;
+	    		$localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
+	    		$localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
 	    		$result=$object->addline(
 	    			$desc,
@@ -361,7 +362,7 @@ if (empty($reshook))
 	    			'HT',
 	    			$pu_ttc,
 	    			$type,
-	    			'',
+	    			$tva_npr,
 	    			'',
 	    			$date_start,
 	    			$date_end,
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 4b07e7aa639..e7b766e1777 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -706,17 +706,17 @@ if (empty($reshook))
 	            $desc = $productsupplier->description;
 	            if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
 
-	            $tvatx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
-	            $npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
-
-	            $localtax1_tx= get_localtax($tvatx, 1, $mysoc,$object->thirdparty);
-	            $localtax2_tx= get_localtax($tvatx, 2, $mysoc,$object->thirdparty);
+	            $tva_tx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
+	            $tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
+				if (empty($tva_tx)) $tva_npr=0;
+	            $localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
+	            $localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
 	            $type = $productsupplier->type;
 	            $price_base_type = 'HT';
 
 	            // TODO Save the product supplier ref into database into field ref_supplier (must rename field ref into ref_supplier first)
-	            $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, $date_start, $date_end, 0, $npr, $price_base_type, $type, -1, 0, $array_options, $productsupplier->fk_unit);
+	            $result=$object->addline($desc, $productsupplier->fourn_pu, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $productsupplier->fk_unit);
 	        }
 	    	if ($idprod == -2 || $idprod == 0)
 	        {
@@ -763,7 +763,7 @@ if (empty($reshook))
 	            $price_base_type = 'HT';
 	        }
 
-			$result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit);
+			$result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit);
 	    }
 
 	    //print "xx".$tva_tx; exit;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index c66984028cb..c269e560a4c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -568,8 +568,10 @@ if (empty($reshook))
             $desc = $object->description;
 
             $tva_tx = get_default_tva($mysoc, $soc, $object->id);
-            $localtax1_tx = get_localtax($tva_tx, 1, $soc);
-            $localtax2_tx = get_localtax($tva_tx, 2, $soc);
+            $tva_npr = get_default_npr($mysoc, $soc, $object->id);
+            if (empty($tva_tx)) $tva_npr=0;
+            $localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);
+            $localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);
 
             $pu_ht = $object->price;
             $pu_ttc = $object->price_ttc;
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 0fe2769803d..2665ae8fd1e 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -423,7 +423,9 @@ if ($id > 0 || $ref)
 				$mysoc2->name='Fictive seller with same country';
 				$mysoc2->tva_assuj=1;
 				$default_vat=get_default_tva($mysoc2, $mysoc, $object->id, 0);
-
+				$default_npr=get_default_npr($mysoc2, $mysoc, $object->id, 0);
+				if (empty($default_vat)) $default_npr=$default_vat;
+				
 				print '<tr><td class="fieldrequired">'.$langs->trans("VATRateForSupplierProduct").'</td>';
 				print '<td>';
 				//print $form->load_tva('tva_tx',$object->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
@@ -432,6 +434,7 @@ if ($id > 0 || $ref)
 				    $tmpproductsupplier=new ProductFournisseur($db);
 				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
 					$default_vat=$tmpproductsupplier->fourn_tva_tx;
+					$default_npr=$tmpproductsupplier->fourn_tva_npr;
 				}
 				else
 				{
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 2a64fa5d4c5..cf5e75f0669 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -344,9 +344,7 @@ if (empty($reshook))
 										$array_option = $lines[$i]->array_options;
 									}
 
-									$tva_tx=get_default_tva($mysoc, $object->thirdparty);
-
-									$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option);
+									$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option);
 
 									if ($result > 0) {
 										$lineid = $result;
@@ -561,7 +559,8 @@ if (empty($reshook))
 				// If prices fields are update
 					$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 					$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-
+					if (empty($tva_tx)) $tva_npr=0;
+					
 					//On garde le prix indiqué dans l'input pour la demande de prix fournisseur
 					//$pu_ht = $prod->price;
 					$pu_ht = price2num($price_ht, 'MU');
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 54a578a1e61..2350d8d5be1 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -191,9 +191,10 @@ class SupplierProposal extends CommonObject
             $productdesc = $prod->description;
 
             $tva_tx = get_default_tva($mysoc,$this->client,$prod->id);
-            // local taxes
-            $localtax1_tx = get_default_localtax($mysoc,$this->client,1,$prod->tva_tx);
-            $localtax2_tx = get_default_localtax($mysoc,$this->client,2,$prod->tva_tx);
+            $tva_npr = get_default_npr($mysoc,$this->client,$prod->id);
+            if (empty($tva_tx)) $tva_npr=0;
+            $localtax1_tx = get_localtax($tva_tx,1,$mysoc,$this->client,$tva_npr);
+            $localtax2_tx = get_localtax($tva_tx,2,$mysoc,$this->client,$tva_npr);
 
             // multiprix
             if($conf->global->PRODUIT_MULTIPRICES && $this->client->price_level)

From 1bf188db863da4134fff7b38a4af09ae23fb967b Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 27 Feb 2016 14:34:32 +0100
Subject: [PATCH 367/421] Fix: Double line

---
 htdocs/core/lib/report.lib.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index e8cecacf589..fa05e632983 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -48,8 +48,6 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat
 	
 	if(! empty($varlink)) $varlink = '?'.$varlink;
 
-	if(! empty($varlink)) $varlink = '?'.$varlink;
-
 	$h=0;
 	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
 	$head[$h][1] = $langs->trans("Report");

From 4dd50460d36a4b490bdf11681a8a46158048b19f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 15:50:06 +0100
Subject: [PATCH 368/421] Fix MAIN_THIRDPARTY_CREATION_INDIVIDUAL syntax error
 in name

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

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index b376a8c2765..4bad452110b 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -763,7 +763,7 @@ else
          *  Creation
          */
 		$private=GETPOST("private","int");
-		if (! empty($conf->global->MAIN_THIRPARTY_CREATION_INDIVIDUAL) && ! isset($_GET['private']) && ! isset($_POST['private'])) $private=1;
+		if (! empty($conf->global->MAIN_THIRDPARTY_CREATION_INDIVIDUAL) && ! isset($_GET['private']) && ! isset($_POST['private'])) $private=1;
     	if (empty($private)) $private=0;
 
         // Load object modCodeTiers

From fe83a6595abe8781bf6dd32509f00aaea5496fef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 16:17:49 +0100
Subject: [PATCH 369/421] Remove duplicate translation keys

---
 htdocs/langs/en_US/products.lang | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 06057792ec6..33b536d3ab3 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement

From ba6dadb6fa97af3b1fe927c97b7c35c2b6fb38ad Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 27 Feb 2016 16:21:40 +0100
Subject: [PATCH 370/421] Fix: Use getNomUrl to show account_parent instead of
 rowid of the account

---
 htdocs/accountancy/admin/account.php | 35 ++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 8ebaa93d96c..3f251e0090b 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.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
@@ -17,9 +17,9 @@
  */
 
 /**
- * \file htdocs/accountancy/admin/account.php
- * \ingroup Accounting Expert
- * \brief List accounting account
+ * \file 		htdocs/accountancy/admin/account.php
+ * \ingroup		Advanced accountancy
+ * \brief		List accounting account
  */
 require '../../main.inc.php';
 
@@ -104,10 +104,12 @@ llxHeader('', $langs->trans("ListAccounts"));
 
 $pcgver = $conf->global->CHARTOFACCOUNTS;
 
-$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.pcg_subtype, aa.account_number, aa.account_parent , aa.label, aa.active ";
-$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa, " . MAIN_DB_PREFIX . "accounting_system as asy";
-$sql .= " WHERE aa.fk_pcg_version = asy.pcg_version";
-$sql .= " AND asy.rowid = " . $pcgver;
+$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.pcg_subtype, aa.account_number, aa.account_parent , aa.label, aa.active, ";
+$sql .= " a2.rowid as rowid2, a2.label as label2, a2.account_number as account_number2";
+$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON aa.account_parent = a2.rowid";
+$sql .= " WHERE asy.rowid = " . $pcgver;
 
 if (strlen(trim($search_account))) {
 	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
@@ -175,6 +177,7 @@ if ($result) {
 	$var = false;
 	
 	$accountstatic = new AccountingAccount($db);
+	$accountparent = new AccountingAccount($db);
 	
 	while ( $i < min($num, $limit) ) {
 		$obj = $db->fetch_object($resql);
@@ -186,7 +189,19 @@ if ($result) {
 		print '<tr ' . $bc[$var] . '>';
 		print '<td>' . $accountstatic->getNomUrl(1) . '</td>';
 		print '<td>' . $obj->label . '</td>';
-		print '<td>' . $obj->account_parent . '</td>';
+
+		if ($obj->account_parent)
+        {
+			$accountparent->id = $obj->rowid2;
+			$accountparent->label = $obj->label2;
+			$accountparent->account_number = $obj->account_number2;
+		
+			print '<td>' . $accountparent->getNomUrl(1) . '</td>';
+		}
+		else
+		{
+			print '<td>&nbsp;</td>';
+		}
 		print '<td>' . $obj->pcg_type . '</td>';
 		print '<td>' . $obj->pcg_subtype . '</td>';
 		print '<td>';

From 0136a1742efbe9662e0bc024476fe95be483633b Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 27 Feb 2016 16:21:59 +0100
Subject: [PATCH 371/421] Spaces !!!

---
 htdocs/accountancy/journal/bankjournal.php | 110 ++++++++++-----------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 8eaf497fbf0..90d63ef05f8 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -23,9 +23,9 @@
  */
 
 /**
- * \file htdocs/accountancy/journal/bankjournal.php
- * \ingroup Accounting Expert
- * \brief Page with bank journal
+ * \file 		htdocs/accountancy/journal/bankjournal.php
+ * \ingroup 	Advanced accountancy
+ * \brief 		Page with bank journal
  */
 require '../../main.inc.php';
 
@@ -72,7 +72,7 @@ $now = dol_now();
 if ($user->societe_id > 0 && empty($id_bank_account))
 	accessforbidden();
 	
-	/*
+/*
  * View
  */
 $year_current = strftime("%Y", dol_now());
@@ -127,7 +127,7 @@ $journal = $bank_code_journal->accountancy_journal;
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
-	
+
 	$num = $db->num_rows($result);
 	// Variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
@@ -135,22 +135,22 @@ if ($result) {
 	$accountancy_account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : $langs->trans("CodeNotDef"));
 	$accountancy_account_pay_vat = (! empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : $langs->trans("CodeNotDef"));
 	$accountancy_account_pay_donation = (! empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : $langs->trans("CodeNotDef"));
-	
+
 	$tabpay = array ();
 	$tabbq = array ();
 	$tabtp = array ();
 	$tabtype = array ();
-	
+
 	$i = 0;
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
-		
+
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
 				'code_client' => $obj->code_compta 
 		);
-		
+
 		// Controls
 		$compta_bank = $obj->account_number;
 		if ($obj->label == '(SupplierInvoicePayment)')
@@ -159,8 +159,8 @@ if ($result) {
 			$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $cptcli);
 		if ($obj->typeop == '(BankTransfert)')
 			$compta_soc = $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH;
-			
-			// Variable bookkeeping
+
+		// Variable bookkeeping
 		$tabpay[$obj->rowid]["date"] = $obj->do;
 		$tabpay[$obj->rowid]["type_payment"] = $obj->fk_type;
 		$tabpay[$obj->rowid]["ref"] = $obj->label;
@@ -171,12 +171,12 @@ if ($result) {
 			$tabpay[$obj->rowid]["lib"] = dol_trunc($obj->label, 60);
 		}
 		$links = $object->get_url($obj->rowid);
-		
+
 		// get_url may return -1 which is not traversable
 		if (is_array($links)) {
 			foreach ( $links as $key => $val ) {
 				$tabtype[$obj->rowid] = $links[$key]['type'];
-				
+
 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
@@ -197,7 +197,7 @@ if ($result) {
 				} else if ($links[$key]['type'] == 'sc') {
 					$chargestatic->id = $links[$key]['url_id'];
 					$chargestatic->ref = $links[$key]['url_id'];
-					
+
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
 						if ($reg[1] == 'socialcontribution')
@@ -208,14 +208,14 @@ if ($result) {
 					}
 					$chargestatic->ref = $chargestatic->lib;
 					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
-					
+
 					$sqlmid = 'SELECT cchgsoc.accountancy_code';
 					$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
 					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
 					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
 					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
 					$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
-					
+
 					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
 					$resultmid = $db->query($sqlmid);
 					if ($resultmid) {
@@ -247,9 +247,9 @@ if ($result) {
 				 }*/
 			}
 		}
-		
+
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
-		
+
 		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
 		
 		$i ++;
@@ -265,7 +265,7 @@ if ($result) {
 // Write bookkeeping
 if ($action == 'writebookkeeping') {
 	$now = dol_now();
-	
+
 	$error = 0;
 	foreach ( $tabpay as $key => $val ) {
 		// Bank
@@ -286,9 +286,9 @@ if ($action == 'writebookkeeping') {
 			$bookkeeping->code_journal = $journal;
 			$bookkeeping->fk_user_author = $user->id;
 			$bookkeeping->date_create = $now;
-			
+
 			if ($tabtype[$key] == 'payment') {
-				
+
 				$sqlmid = 'SELECT fac.facnumber';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
@@ -301,7 +301,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_ref = $objmid->facnumber;
 				}
 			} else if ($tabtype[$key] == 'payment_supplier') {
-				
+
 				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
@@ -315,7 +315,7 @@ if ($action == 'writebookkeeping') {
 					;
 				}
 			}
-			
+
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
@@ -338,12 +338,12 @@ if ($action == 'writebookkeeping') {
 			$bookkeeping->code_journal = $journal;
 			$bookkeeping->fk_user_author = $user->id;
 			$bookkeeping->date_create = $now;
-			
+
 			if ($tabtype[$key] == 'sc') {
 				$bookkeeping->code_tiers = '';
 				$bookkeeping->numero_compte = $k;
 			} else if ($tabtype[$key] == 'payment') {
-				
+
 				$sqlmid = 'SELECT fac.facnumber';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
@@ -358,7 +358,7 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->code_tiers = $k;
 				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 			} else if ($tabtype[$key] == 'payment_supplier') {
-				
+
 				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
@@ -373,7 +373,7 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->code_tiers = $k;
 				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 			} else if ($tabtype[$key] == 'company') {
-				
+
 				$sqlmid = 'SELECT fac.facnumber';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
@@ -392,7 +392,7 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->doc_ref = $k;
 				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 			}
-			
+
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
@@ -400,7 +400,7 @@ if ($action == 'writebookkeeping') {
 			}
 		}
 	}
-	
+
 	if (empty($error)) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
@@ -408,25 +408,25 @@ if ($action == 'writebookkeeping') {
 // Export
 if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-	
+
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
-	
+
 	$companystatic = new Client($db);
-	
+
 	// Model Cegid Expert Export
 	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 
 	{
 		$sep = ";";
-		
+
 		foreach ( $tabpay as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-			
+
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
-			
+
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-			
+
 			// Bank
 			foreach ( $tabbq[$key] as $k => $mt ) {
 				print $date . $sep;
@@ -439,7 +439,7 @@ if ($action == 'export_csv') {
 				print $val["ref"] . $sep;
 				print "\n";
 			}
-			
+
 			// Third party
 			if (is_array($tabtp[$key])) {
 				foreach ( $tabtp[$key] as $k => $mt ) {
@@ -477,10 +477,10 @@ if ($action == 'export_csv') {
 		// Model Classic Export
 		foreach ( $tabpay as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), 'day');
-			
+
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
-			
+
 			// Bank
 			foreach ( $tabbq[$key] as $k => $mt ) {
 				print '"' . $date . '"' . $sep;
@@ -491,7 +491,7 @@ if ($action == 'export_csv') {
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 				print "\n";
 			}
-			
+
 			// Third party
 			if (is_array($tabtp[$key])) {
 				foreach ( $tabtp[$key] as $k => $mt ) {
@@ -520,23 +520,23 @@ if ($action == 'export_csv') {
 	}
 } else {
 	$form = new Form($db);
-	
+
 	llxHeader('', $langs->trans("FinanceJournal"));
-	
+
 	$nom = $langs->trans("FinanceJournal") . ' - ' . $journal;
 	$builddate = time();
 	$description = $langs->trans("DescFinanceJournal") . '<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	
+
 	$varlink = 'id_account=' . $id_bank_account;
 	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
 			'action' => '' 
 	), '', $varlink);
-	
+
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	
+
 	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-	
+
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -550,12 +550,12 @@ if ($action == 'export_csv') {
 		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
-	
+
 	/*
 	 * Show result array
 	 */
 	print '<br><br>';
-	
+
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
@@ -566,10 +566,10 @@ if ($action == 'export_csv') {
 	print "<td>" . $langs->trans("PaymentMode") . "</td>";
 	print "<td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
-	
+
 	$var = true;
 	$r = '';
-	
+
 	foreach ( $tabpay as $key => $val ) {
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 		
@@ -579,8 +579,8 @@ if ($action == 'export_csv') {
 		if ($val["lib"] == '(CustomerInvoicePayment)') {
 			$reflabel = $langs->trans('CustomerInvoicePayment');
 		}
-			
-			// Bank
+
+		// Bank
 		foreach ( $tabbq[$key] as $k => $mt ) {
 			print "<tr " . $bc[$var] . ">";
 			print "<td>" . $date . "</td>";
@@ -592,7 +592,7 @@ if ($action == 'export_csv') {
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 			print "</tr>";
 		}
-		
+
 		// Third party
 		if (is_array($tabtp[$key])) {
 			foreach ( $tabtp[$key] as $k => $mt ) {
@@ -623,9 +623,9 @@ if ($action == 'export_csv') {
 		}
 		$var = ! $var;
 	}
-	
+
 	print "</table>";
-	
+
 	llxFooter();
 }
 $db->close();

From 526ea743e060c7a7ba865d37c8a29ecc6d61dfc2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 17:56:59 +0100
Subject: [PATCH 372/421] Fix: the view my task must show only task you are
 assigned to

---
 htdocs/projet/activity/index.php | 63 ++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 39f728263ad..7d87dbae298 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -49,6 +49,7 @@ $now = dol_now();
 
 $projectstatic=new Project($db);
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);  // Return all projects I have permission on because I want my tasks and some of my task may be on a public projet that is not my project
+$taskstatic=new Task($db);
 $tasktmp=new Task($db);
 
 $title=$langs->trans("Activities");
@@ -125,7 +126,7 @@ if ( $resql )
 		$projectstatic->title=$row->title;
 		print $projectstatic->getNomUrl(1, '', 1);
 		print '</td>';
-		print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
+		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
 		print "</tr>\n";
 		$total += $row->nb;
 	}
@@ -138,7 +139,7 @@ else
 }
 print '<tr class="liste_total">';
 print '<td>'.$langs->trans('Total').'</td>';
-print '<td align="right">'.convertSecondToTime($total).'</td>';
+print '<td align="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
 print "</tr>\n";
 print "</table>";
 
@@ -181,7 +182,7 @@ if ($db->type != 'pgsql')
 			$projectstatic->title=$row->title;
 			print $projectstatic->getNomUrl(1, '', 1);
 			print '</td>';
-			print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
+			print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
 			print "</tr>\n";
 			$total += $row->nb;
 		}
@@ -194,7 +195,7 @@ if ($db->type != 'pgsql')
 	}
 	print '<tr class="liste_total">';
 	print '<td>'.$langs->trans('Total').'</td>';
-	print '<td align="right">'.convertSecondToTime($total).'</td>';
+	print '<td align="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
 	print "</tr>\n";
 	print "</table>";
 }
@@ -240,7 +241,7 @@ if ( $resql )
 		$projectstatic->title=$row->title;
 		print $projectstatic->getNomUrl(1, '', 1);
 		print '</td>';
-		print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
+		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
 		print "</tr>\n";
 		$total += $row->nb;
 	}
@@ -253,7 +254,7 @@ else
 }
 print '<tr class="liste_total">';
 print '<td>'.$langs->trans('Total').'</td>';
-print '<td align="right">'.convertSecondToTime($total).'</td>';
+print '<td align="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
 print "</tr>\n";
 print "</table><br>";
 
@@ -292,7 +293,7 @@ if ( $resql )
 		$projectstatic->title=$row->title;
 		print $projectstatic->getNomUrl(1, '', 1);
 		print '</td>';
-		print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
+		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
 		print "</tr>\n";
 		$var=!$var;
 	}
@@ -304,7 +305,7 @@ else
 }
 print '<tr class="liste_total">';
 print '<td>'.$langs->trans('Total').'</td>';
-print '<td align="right">'.convertSecondToTime($total).'</td>';
+print '<td align="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
 print "</tr>\n";
 print "</table>";
 
@@ -342,7 +343,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
 			$projectstatic->title=$row->title;
 			print $projectstatic->getNomUrl(1, '', 1);
 			print '</td>';
-			print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
+			print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
 			print "</tr>\n";
 			$var=!$var;
 		}
@@ -354,7 +355,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
 	}
 	print '<tr class="liste_total">';
 	print '<td>'.$langs->trans('Total').'</td>';
-	print '<td align="right">'.convertSecondToTime($total).'</td>';
+	print '<td align="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
 	print "</tr>\n";
 	print "</table>";
 }
@@ -366,6 +367,38 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 if (empty($conf->global->PROJECT_HIDE_TASKS))
 {
+    // Get id of types of contacts for projects (This list never contains a lot of elements)
+    $listofprojectcontacttype=array();
+    $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+    $sql.= " WHERE ctc.element = '" . $projectstatic->element . "'";
+    $sql.= " AND ctc.source = 'internal'";
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        while($obj = $db->fetch_object($resql))
+        {
+            $listofprojectcontacttype[$obj->rowid]=$obj->code;
+        }
+    }
+    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();
+    $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+    $sql.= " WHERE ctc.element = '" . $taskstatic->element . "'";
+    $sql.= " AND ctc.source = 'internal'";
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        while($obj = $db->fetch_object($resql))
+        {
+            $listoftaskcontacttype[$obj->rowid]=$obj->code;
+        }
+    }
+    else dol_print_error($db);
+    if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0]='0';         // To avoid sql syntax error if not found
+    
+
 	// Tasks for all resources of all opened projects and time spent for each task/resource
 
 	$max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
@@ -376,8 +409,16 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tasktime on tasktime.fk_task = t.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on tasktime.fk_user = u.rowid";
+	if ($mine)
+	{
+	    $sql.= ", " . MAIN_DB_PREFIX . "element_contact as ect";
+	}
 	$sql.= " WHERE p.entity = ".$conf->entity;
-	if ($mine || empty($user->rights->projet->all->lire)) $sql.= " AND p.rowid IN (".$projectsListId.")";
+	if ($mine || empty($user->rights->projet->all->lire)) $sql.= " AND p.rowid IN (".$projectsListId.")";  // project i have permission on
+	if ($mine)     // this may duplicate record if we are contact twice
+	{
+        $sql.= " AND ect.fk_c_type_contact IN (".join(',',array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$user->id;
+	}
 	if ($socid)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 	$sql.= " AND p.fk_statut=1";
 	$sql.= " GROUP BY p.ref, p.title, p.rowid, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";

From 15503f12b917629bc7cee091ad3d646dc8ecda39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 18:29:01 +0100
Subject: [PATCH 373/421] FIX Removed a bugged list. Fixed another one to not
 count data of previous year.

---
 htdocs/projet/activity/index.php | 115 ++++++++++++++++---------------
 1 file changed, 59 insertions(+), 56 deletions(-)

diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 7d87dbae298..480294607f6 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -201,65 +201,68 @@ if ($db->type != 'pgsql')
 }
 
 
-// TODO Do not use week function to be compatible with all database
+/*
 if ($db->type != 'pgsql')
 {
+    print '<br>';
+    
+    // Affichage de la liste des projets de la semaine
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td>'.$langs->trans("ActivityOnProjectThisWeek").'</td>';
+    print '<td align="right">'.$langs->trans("Time").'</td>';
+    print "</tr>\n";
+    
+    $sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
+    $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+    $sql.= " , ".MAIN_DB_PREFIX."projet_task as t";
+    $sql.= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
+    $sql.= " WHERE t.fk_projet = p.rowid";
+    $sql.= " AND p.entity = ".$conf->entity;
+    $sql.= " AND tt.fk_task = t.rowid";
+    $sql.= " AND tt.fk_user = ".$user->id;
+    $sql.= " AND task_date >= '".dol_get_first_day($year, $month).'" AND ...";
+    $sql.= " AND p.rowid in (".$projectsListId.")";
+    $sql.= " GROUP BY p.rowid, p.ref, p.title";
+    
+    $resql = $db->query($sql);
+    if ( $resql )
+    {
+    	$total = 0;
+    	$var=true;
+    
+    	while ($row = $db->fetch_object($resql))
+    	{
+    		$var=!$var;
+    		print "<tr ".$bc[$var].">";
+    		print '<td>';
+    		$projectstatic->id=$row->rowid;
+    		$projectstatic->ref=$row->ref;
+    		$projectstatic->title=$row->title;
+    		print $projectstatic->getNomUrl(1, '', 1);
+    		print '</td>';
+    		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
+    		print "</tr>\n";
+    		$total += $row->nb;
+    	}
+    
+    	$db->free($resql);
+    }
+    else
+    {
+    	dol_print_error($db);
+    }
+    print '<tr class="liste_total">';
+    print '<td>'.$langs->trans('Total').'</td>';
+    print '<td align="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
+    print "</tr>\n";
+    print "</table><br>";
+
+}
+*/
+
 print '<br>';
 
-/* Affichage de la liste des projets de la semaine */
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("ActivityOnProjectThisWeek").'</td>';
-print '<td align="right">'.$langs->trans("Time").'</td>';
-print "</tr>\n";
-
-$sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
-$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-$sql.= " , ".MAIN_DB_PREFIX."projet_task as t";
-$sql.= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
-$sql.= " WHERE t.fk_projet = p.rowid";
-$sql.= " AND p.entity = ".$conf->entity;
-$sql.= " AND tt.fk_task = t.rowid";
-$sql.= " AND tt.fk_user = ".$user->id;
-$sql.= " AND week(task_date) = '".strftime("%W",time())."'";
-$sql.= " AND p.rowid in (".$projectsListId.")";
-$sql.= " GROUP BY p.rowid, p.ref, p.title";
-
-$resql = $db->query($sql);
-if ( $resql )
-{
-	$total = 0;
-	$var=true;
-
-	while ($row = $db->fetch_object($resql))
-	{
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-		print '<td>';
-		$projectstatic->id=$row->rowid;
-		$projectstatic->ref=$row->ref;
-		$projectstatic->title=$row->title;
-		print $projectstatic->getNomUrl(1, '', 1);
-		print '</td>';
-		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
-		print "</tr>\n";
-		$total += $row->nb;
-	}
-
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-print '<tr class="liste_total">';
-print '<td>'.$langs->trans('Total').'</td>';
-print '<td align="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
-print "</tr>\n";
-print "</table><br>";
-
-}
-
 /* Affichage de la liste des projets du mois */
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -275,7 +278,7 @@ $sql.= " WHERE t.fk_projet = p.rowid";
 $sql.= " AND p.entity = ".$conf->entity;
 $sql.= " AND tt.fk_task = t.rowid";
 $sql.= " AND tt.fk_user = ".$user->id;
-$sql.= " AND date_format(task_date,'%y-%m') = '".strftime("%y-%m",$now)."'";
+$sql.= " AND task_date BETWEEN '".dol_get_first_day($year, $month).'" AND "'.dol_get_last_day($year, $month)."'";
 $sql.= " AND p.rowid in (".$projectsListId.")";
 $sql.= " GROUP BY p.rowid, p.ref, p.title";
 

From 1038e92354824b5995a89d8dd72f456677a35309 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 18:42:57 +0100
Subject: [PATCH 374/421] FIX sql request and total for time spen for current
 month

---
 htdocs/projet/activity/index.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 480294607f6..e9db844a1f7 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -46,6 +46,10 @@ $langs->load("projects");
  */
 
 $now = dol_now();
+$tmp=dol_getdate($now);
+$day=$tmp['mday'];
+$month=$tmp['mon'];
+$year=$tmp['year'];
 
 $projectstatic=new Project($db);
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);  // Return all projects I have permission on because I want my tasks and some of my task may be on a public projet that is not my project
@@ -221,7 +225,7 @@ if ($db->type != 'pgsql')
     $sql.= " AND p.entity = ".$conf->entity;
     $sql.= " AND tt.fk_task = t.rowid";
     $sql.= " AND tt.fk_user = ".$user->id;
-    $sql.= " AND task_date >= '".dol_get_first_day($year, $month).'" AND ...";
+    $sql.= " AND task_date >= '".$db->idate(dol_get_first_day($year, $month)).'" AND ...";
     $sql.= " AND p.rowid in (".$projectsListId.")";
     $sql.= " GROUP BY p.rowid, p.ref, p.title";
     
@@ -278,13 +282,15 @@ $sql.= " WHERE t.fk_projet = p.rowid";
 $sql.= " AND p.entity = ".$conf->entity;
 $sql.= " AND tt.fk_task = t.rowid";
 $sql.= " AND tt.fk_user = ".$user->id;
-$sql.= " AND task_date BETWEEN '".dol_get_first_day($year, $month).'" AND "'.dol_get_last_day($year, $month)."'";
+$sql.= " AND task_date BETWEEN '".$db->idate(dol_get_first_day($year, $month))."' AND '".$db->idate(dol_get_last_day($year, $month))."'";
 $sql.= " AND p.rowid in (".$projectsListId.")";
 $sql.= " GROUP BY p.rowid, p.ref, p.title";
 
 $resql = $db->query($sql);
 if ( $resql )
 {
+    $total = 0;
+    
 	$var=false;
 
 	while ($row = $db->fetch_object($resql))
@@ -299,6 +305,7 @@ if ( $resql )
 		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
 		print "</tr>\n";
 		$var=!$var;
+		$total += $row->nb;
 	}
 	$db->free($resql);
 }

From 193699a1b3170bc8fac8da49526d069e5f478f93 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 18:47:02 +0100
Subject: [PATCH 375/421] Fix duration format

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

diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index e9db844a1f7..d2f2d80bf94 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -502,13 +502,13 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 			print '<td align="center">'.dol_print_date($db->jdate($obj->dateo),'day').'</td>';
 			print '<td align="center">'.dol_print_date($db->jdate($obj->datee),'day').'</td>';
 			print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
-			print convertSecondToTime($obj->planned_workload, 'all');
+			print convertSecondToTime($obj->planned_workload, 'allhourmin');
 			print '</a></td>';
 			print '<td align="right">';
 			print ($obj->taskid>0)?$obj->progress.'%':'';
 			print '</td>';
 			print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
-			print convertSecondToTime($obj->timespent, 'all');
+			print convertSecondToTime($obj->timespent, 'allhourmin');
 			print '</a></td>';
 			print '<td align="right">';
 			if (! empty($obj->taskid))

From 6b7551c5d279ef943ed01adeb9299230dba01c79 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 19:12:45 +0100
Subject: [PATCH 376/421] Fix: Introduce hidden option to disable feature than
 hangs when too much data

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

diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index d2f2d80bf94..31c1e950ea7 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -375,7 +375,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
-if (empty($conf->global->PROJECT_HIDE_TASKS))
+if (empty($conf->global->PROJECT_HIDE_TASKS) && empty($conf->global->PROJECT_HIDE_LIST_HOME_AREA))
 {
     // Get id of types of contacts for projects (This list never contains a lot of elements)
     $listofprojectcontacttype=array();

From 39d6d16c029a895f596a3f37d2f19c3226a8105c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Feb 2016 19:20:11 +0100
Subject: [PATCH 377/421] Fix bad picto "shared project"

---
 htdocs/projet/activity/index.php | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index c565dff3352..5950f7ab43b 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -107,7 +107,7 @@ print '<td width="50%">'.$langs->trans('ActivityOnProjectToday').'</td>';
 print '<td width="50%" align="right">'.$langs->trans("Time").'</td>';
 print "</tr>\n";
 
-$sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
+$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
 $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 $sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
@@ -117,7 +117,7 @@ $sql.= " AND tt.fk_task = t.rowid";
 $sql.= " AND tt.fk_user = ".$user->id;
 $sql.= " AND date_format(task_date,'%y-%m-%d') = '".strftime("%y-%m-%d",$now)."'";
 $sql.= " AND p.rowid in (".$projectsListId.")";
-$sql.= " GROUP BY p.rowid, p.ref, p.title";
+$sql.= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 $resql = $db->query($sql);
 if ( $resql )
@@ -133,6 +133,7 @@ if ( $resql )
 		$projectstatic->id=$row->rowid;
 		$projectstatic->ref=$row->ref;
 		$projectstatic->title=$row->title;
+		$projectstatic->public=$row->public;
 		print $projectstatic->getNomUrl(1, '', 1);
 		print '</td>';
 		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
@@ -163,7 +164,7 @@ if ($db->type != 'pgsql')
 	print '<td align="right">'.$langs->trans("Time").'</td>';
 	print "</tr>\n";
 
-	$sql = "SELECT p.rowid, p.ref, p.title, sum(tt.task_duration) as nb";
+	$sql = "SELECT p.rowid, p.ref, p.title, p.public, sum(tt.task_duration) as nb";
 	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 	$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 	$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
@@ -173,7 +174,7 @@ if ($db->type != 'pgsql')
 	$sql.= " AND tt.fk_user = ".$user->id;
 	$sql.= " AND date_format(date_add(task_date, INTERVAL 1 DAY),'%y-%m-%d') = '".strftime("%y-%m-%d",$now)."'";
 	$sql.= " AND p.rowid in (".$projectsListId.")";
-	$sql.= " GROUP BY p.rowid, p.ref, p.title";
+	$sql.= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 	$resql = $db->query($sql);
 	if ( $resql )
@@ -189,6 +190,7 @@ if ($db->type != 'pgsql')
 			$projectstatic->id=$row->rowid;
 			$projectstatic->ref=$row->ref;
 			$projectstatic->title=$row->title;
+			$projectstatic->public=$row->public;
 			print $projectstatic->getNomUrl(1, '', 1);
 			print '</td>';
 			print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
@@ -222,7 +224,7 @@ if ($db->type != 'pgsql')
     print '<td align="right">'.$langs->trans("Time").'</td>';
     print "</tr>\n";
     
-    $sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
+    $sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
     $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
     $sql.= " , ".MAIN_DB_PREFIX."projet_task as t";
     $sql.= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
@@ -248,6 +250,7 @@ if ($db->type != 'pgsql')
     		$projectstatic->id=$row->rowid;
     		$projectstatic->ref=$row->ref;
     		$projectstatic->title=$row->title;
+    		$projectstatic->public=$row->public;
     		print $projectstatic->getNomUrl(1, '', 1);
     		print '</td>';
     		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
@@ -279,7 +282,7 @@ print '<td>'.$langs->trans("ActivityOnProjectThisMonth").': '.dol_print_date($no
 print '<td align="right">'.$langs->trans("Time").'</td>';
 print "</tr>\n";
 
-$sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
+$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
 $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 $sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
@@ -289,7 +292,7 @@ $sql.= " AND tt.fk_task = t.rowid";
 $sql.= " AND tt.fk_user = ".$user->id;
 $sql.= " AND task_date BETWEEN '".$db->idate(dol_get_first_day($year, $month))."' AND '".$db->idate(dol_get_last_day($year, $month))."'";
 $sql.= " AND p.rowid in (".$projectsListId.")";
-$sql.= " GROUP BY p.rowid, p.ref, p.title";
+$sql.= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 $resql = $db->query($sql);
 if ( $resql )
@@ -305,6 +308,7 @@ if ( $resql )
 		$projectstatic->id=$row->rowid;
 		$projectstatic->ref=$row->ref;
 		$projectstatic->title=$row->title;
+		$projectstatic->public=$row->public;
 		print $projectstatic->getNomUrl(1, '', 1);
 		print '</td>';
 		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
@@ -333,7 +337,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
 	print '<td align="right">'.$langs->trans("Time").'</td>';
 	print "</tr>\n";
 
-	$sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
+	$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
 	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 	$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 	$sql.= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
@@ -343,7 +347,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
 	$sql.= " AND tt.fk_user = ".$user->id;
 	$sql.= " AND YEAR(task_date) = '".strftime("%Y",$now)."'";
 	$sql.= " AND p.rowid in (".$projectsListId.")";
-	$sql.= " GROUP BY p.rowid, p.ref, p.title";
+	$sql.= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 	$var=false;
 	$resql = $db->query($sql);
@@ -356,6 +360,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
 			$projectstatic->id=$row->rowid;
 			$projectstatic->ref=$row->ref;
 			$projectstatic->title=$row->title;
+			$projectstatic->public=$row->public;
 			print $projectstatic->getNomUrl(1, '', 1);
 			print '</td>';
 			print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
@@ -418,7 +423,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 
 	$max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
 
-	$sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent";
+	$sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, p.public, t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent";
 	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
@@ -436,7 +441,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 	}
 	if ($socid)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 	$sql.= " AND p.fk_statut=1";
-	$sql.= " GROUP BY p.ref, p.title, p.rowid, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";
+	$sql.= " GROUP BY p.ref, p.title, p.rowid, p.fk_statut, p.fk_opp_status, p.public, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";
 	$sql.= " ORDER BY t.dateo desc, t.rowid desc, t.datee";
 	$sql.= $db->plimit($max+1);	// We want more to know if we have more than limit
 
@@ -484,6 +489,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 			$projectstatic->id=$obj->projectid;
 			$projectstatic->ref=$obj->ref;
 			$projectstatic->title=$obj->title;
+			$projectstatic->public=$obj->public;
 			print $projectstatic->getNomUrl(1,'',16,'','<br>');
 			//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$obj->projectid.'">'.$obj->title.'</a>';
 			print '</td>';

From 2ee74a80d91da370fb8cd2c766bddc49887e79ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Feb 2016 00:00:08 +0100
Subject: [PATCH 378/421] NEW Enhance navigation of project module

---
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/core/lib/project.lib.php   |  5 +-
 htdocs/langs/en_US/projects.lang  |  3 ++
 htdocs/projet/tasks.php           | 42 +++++++--------
 htdocs/projet/tasks/task.php      |  4 +-
 htdocs/projet/tasks/time.php      | 87 ++++++++++++++++++++++++++-----
 6 files changed, 105 insertions(+), 38 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d70719c4d4f..ab4ded9f296 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2965,7 +2965,7 @@ function print_fiche_titre($title, $mesg='', $picto='title_generic.png', $pictoi
  *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
  * 	@param	int		$id					To force an id on html objects
  * 	@return	string
- *  @see print_barre_list
+ *  @see print_barre_liste
  */
 function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictoisfullpath=0, $id=0)
 {
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 3d4c0594208..92229a72d23 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -260,9 +260,10 @@ function project_admin_prepare_head()
  * @param	int			$taskrole			Array of roles of user for each tasks
  * @param	int			$projectsListId		List of id of project allowed to user (string separated with comma)
  * @param	int			$addordertick		Add a tick to move task
+ * @param   int         $projectidfortotallink     0 or Id of project to use on total line (link to see all time consumed for project)
  * @return	void
  */
-function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0)
+function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0, $projectidfortotallink=0)
 {
 	global $user, $bc, $langs;
 	global $projectstatic, $taskstatic;
@@ -492,7 +493,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
+		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
 		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
+		if ($projectidfortotallink > 0) print '</a>';
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
 		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 0e4dfe82b9c..5470374b5e4 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 4abb9122eb2..434b8e79886 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -207,7 +207,7 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="border" width="100%">';
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-
+	
 	// Ref
 	print '<tr><td width="30%">';
 	print $langs->trans("Ref");
@@ -391,25 +391,12 @@ else if ($id > 0 || ! empty($ref))
 
 	print '</div>';
 
-	print '<br>';
-
-
-	// Link to switch in "my task" / "all task"
-	print '<table width="100%"><tr><td align="right">';
-	if ($mode == 'mine')
-	{
-		print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("DoNotShowMyTasksOnly").'</a>';
-		//print ' - ';
-		//print $langs->trans("ShowMyTaskOnly");
-	}
-	else
-	{
-		//print $langs->trans("DoNotShowMyTaskOnly");
-		//print ' - ';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mode=mine">'.$langs->trans("ShowMyTasksOnly").'</a>';
-	}
-	print '</td></tr></table>';
 
+	$title=$langs->trans("ListOfTasks");
+	$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$object->id.'&withproject=1">'.$langs->trans("GoToListOfTimeConsumed").'</a>';
+	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
+	print load_fiche_titre($title,$linktotasks,'title_generic.png');
+	
 	// Get list of tasks in tasksarray and taskarrayfiltered
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
 	$tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $socid, 0);
@@ -436,11 +423,24 @@ else if ($id > 0 || ! empty($ref))
 	print '<td align="right">'.$langs->trans("ProgressDeclared").'</td>';
 	print '<td>&nbsp;</td>';
 	print "</tr>\n";
+
 	if (count($tasksarray) > 0)
 	{
-		// Show all lines in taskarray (recursive function to go down on tree)
+    	// Link to switch in "my task" / "all task"
+    	print '<tr class="liste_titre nodrag nodrop"><td colspan="9">';
+    	if ($mode == 'mine')
+    	{
+    	    print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("DoNotShowMyTasksOnly").'</a>';
+    	}
+    	else
+    	{
+    	    print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mode=mine">'.$langs->trans("ShowMyTasksOnly").'</a>';
+    	}
+    	print '</td></tr>';
+	
+	    // 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, $id, 1);
+		$nboftaskshown=projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id);
 	}
 	else
 	{
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 3804715cb7c..1a3b1921713 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -220,6 +220,8 @@ if ($id > 0 || ! empty($ref))
 
 			print '<table class="border" width="100%">';
 
+			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+				
 			// Ref
 			print '<tr><td width="30%">';
 			print $langs->trans("Ref");
@@ -230,7 +232,7 @@ if ($id > 0 || ! empty($ref))
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
 				$projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
 			}
-			print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1');
+			print $form->showrefnav($projectstatic,'project_ref',$linkback,1,'ref','ref','',$param.'&withproject=1');
 			print '</td></tr>';
 
 			print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projectstatic->title.'</td></tr>';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 5ed3655615e..976e0013431 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -194,7 +194,16 @@ if (! empty($project_ref) && ! empty($withproject))
 	}
 }
 
+// To show all time lines for project
+$projectidforalltimes=0;
+if (GETPOST('projectid'))
+{
+    $projectidforalltimes=GETPOST('projectid','int');
+    
+}
 
+
+    
 /*
  * View
  */
@@ -205,20 +214,28 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $userstatic = new User($db);
 
-if ($id > 0 || ! empty($ref))
+if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 {
 	/*
 	 * Fiche projet en mode visu
  	 */
-	if ($object->fetch($id, $ref) >= 0)
+    if ($projectidforalltimes)
+    {
+        $result=$projectstatic->fetch($projectidforalltimes);
+        if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+    }
+    elseif ($object->fetch($id, $ref) >= 0)
 	{
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 
 		$object->project = clone $projectstatic;
+    }
+	
+    $userWrite = $projectstatic->restrictedProjectArea($user,'write');
 
-		$userWrite = $projectstatic->restrictedProjectArea($user,'write');
-
+	if ($projectstatic->id > 0)
+	{
 		if ($withproject)
 		{
 			// Tabs for project
@@ -230,6 +247,8 @@ if ($id > 0 || ! empty($ref))
 
 			print '<table class="border" width="100%">';
 
+	       $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+			
 			// Ref
 			print '<tr><td width="30%">';
 			print $langs->trans("Ref");
@@ -240,7 +259,7 @@ if ($id > 0 || ! empty($ref))
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
 				$projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
 			}
-			print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1');
+			print $form->showrefnav($projectstatic,'project_ref',$linkback,1,'ref','ref','',$param.'&withproject=1');
 			print '</td></tr>';
 
 			// Label
@@ -275,8 +294,35 @@ if ($id > 0 || ! empty($ref))
 			print '</table>';
 
 			dol_fiche_end();
+			
+			
+			/*
+			 * Actions
+			 */
+			print '<div class="tabsAction">';
+			
+			if ($user->rights->projet->all->creer || $user->rights->projet->creer)
+			{
+			    if ($object->public || $userWrite > 0)
+			    {
+			        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans('AddTask').'</a>';
+			    }
+			    else
+			    {
+			        print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'</a>';
+			    }
+			}
+			else
+			{
+			    print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
+			}
+			
+			print '</div>';			
 		}
-
+	}
+	
+	if (empty($projectidforalltimes))
+	{
 		$head=task_prepare_head($object);
 		dol_fiche_head($head, 'task_time', $langs->trans("Task"),0,'projecttask');
 
@@ -423,21 +469,24 @@ if ($id > 0 || ! empty($ref))
 			print '</td></tr>';
 
 			print '</table></form>';
+			
+			print '<br>';
 		}
-
-		print '<br>';
-
+	}
+	
+	if ($projectstatic->id > 0)
+	{	
 		/*
 		 *  List of time spent
 		 */
 		$tasks = array();
 		
-		$sql = "SELECT t.rowid, t.task_date, t.task_datehour, t.task_date_withhour, t.task_duration, t.fk_user, t.note, t.thm";
+		$sql = "SELECT t.rowid, t.fk_task, t.task_date, t.task_datehour, t.task_date_withhour, t.task_duration, t.fk_user, t.note, t.thm";
 		$sql.= ", u.lastname, u.firstname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 		$sql .= " , ".MAIN_DB_PREFIX."user as u";
-		$sql .= " WHERE t.fk_task =".$object->id;
-		$sql .= " AND t.fk_user = u.rowid";
+		$sql .= " WHERE t.fk_user = u.rowid";
+		if (empty($projectidforalltimes)) $sql .= " AND t.fk_task =".$object->id;
 		$sql .= " ORDER BY t.task_date DESC, t.task_datehour DESC, t.rowid DESC";
 
 		$var=true;
@@ -445,6 +494,16 @@ if ($id > 0 || ! empty($ref))
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
+			$totalnboflines=$num;
+
+			if (! empty($projectidforalltimes))
+			{
+			    $title=$langs->trans("ListTaskTimeUserProject");
+			    $linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("GoToListOfTasks").'</a>';
+			    //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
+			    print load_fiche_titre($title,$linktotasks,'title_generic.png');
+			}
+
 			$i = 0;
 			while ($i < $num)
 			{
@@ -569,12 +628,12 @@ if ($id > 0 || ! empty($ref))
 			else if ($user->rights->projet->creer)
 			{
 				print '&nbsp;';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?'.($projectidforalltimes?'projectid='.$projectidforalltimes.'&amp;':'').'id='.$task_time->fk_task.'&amp;action=editline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
 				print img_edit();
 				print '</a>';
 
 				print '&nbsp;';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?'.($projectidforalltimes?'projectid='.$projectidforalltimes.'&amp;':'').'id='.$task_time->fk_task.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
 				print img_delete();
 				print '</a>';
 			}

From 1df8e50a1b7b6b3ce0a8b5c3f2aef564205b145d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Feb 2016 00:19:12 +0100
Subject: [PATCH 379/421] NEW Add statistics on number of projets on home page

---
 htdocs/index.php                      | 32 ++++++++++++++++------
 htdocs/projet/class/project.class.php | 38 +++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index af3636f2b99..3050758b7d1 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -168,7 +168,9 @@ if (empty($user->societe_id))
 	    ! empty($conf->contrat->enabled) && $user->rights->contrat->activer,
 		! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
 		! empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
-		! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire);
+	    ! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
+	    ! empty($conf->projet->enabled) && $user->rights->projet->lire
+	    );
 	    // Class file containing the method load_state_board for each line
 	    $includes=array(
 	        DOL_DOCUMENT_ROOT."/user/class/user.class.php",
@@ -184,7 +186,9 @@ if (empty($user->societe_id))
     	    DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
-    		DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php");
+	        DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
+            DOL_DOCUMENT_ROOT."/projet/class/project.class.php" 
+	    );
 	    // Name class containing the method load_state_board for each line
 	    $classes=array('User',
 	                   'Client',
@@ -199,7 +203,9 @@ if (empty($user->societe_id))
 	                   'Contrat',
 	                   'CommandeFournisseur',
 	                   'FactureFournisseur',
-					   'ExpenseReport');
+					   'ExpenseReport',
+	                   'Project'
+	    );
 	    // Cle array returned by the method load_state_board for each line
 	    $keys=array('users',
 	                'customers',
@@ -214,7 +220,9 @@ if (empty($user->societe_id))
 	                'Contracts',
 	                'supplier_orders',
 	                'supplier_invoices',
-					'expensereports');
+					'expensereports',
+	                'projects'
+	    );
 	    // Dashboard Icon lines
 	    $icons=array('user',
 	                 'company',
@@ -229,7 +237,9 @@ if (empty($user->societe_id))
 	                 'order',
 	                 'order',
 	                 'bill',
-					 'trip');
+					 'trip',
+	                 'project'
+	    );
 	    // Translation keyword
 	    $titres=array("Users",
 	                  "ThirdPartyCustomersStats",
@@ -244,7 +254,9 @@ if (empty($user->societe_id))
 	                  "Contracts",
 	                  "SuppliersOrders",
 	                  "SuppliersInvoices",
-					  "ExpenseReports");
+					  "ExpenseReports",
+	                  "Projects"
+	    );
 	    // Dashboard Link lines
 	    $links=array(
 	        DOL_URL_ROOT.'/user/index.php',
@@ -260,7 +272,9 @@ if (empty($user->societe_id))
     	    DOL_URL_ROOT.'/contrat/list.php',
     	    DOL_URL_ROOT.'/fourn/commande/list.php',
     	    DOL_URL_ROOT.'/fourn/facture/list.php',
-    		DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm');
+    		DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm',
+	        DOL_URL_ROOT.'/projet/list.php?mainmenu=project'
+	    );
 	    // Translation lang files
 	    $langfile=array("users",
 	                    "companies",
@@ -273,7 +287,9 @@ if (empty($user->societe_id))
 	                    "orders",
 	                    "bills",
 						"contracts",
-						"trips");
+						"trips",
+	                    "projects"
+	    );
 
 
 	    // Loop and displays each line of table
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index bf08da2231e..b9a0e8ab55a 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1664,6 +1664,44 @@ class Project extends CommonObject
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 	
+	
+	/**
+	 *      Charge indicateurs this->nb pour le tableau de bord
+	 *
+	 *      @return     int         <0 if KO, >0 if OK
+	 */
+	function load_state_board()
+	{
+	    global $conf;
+	
+	    $this->nb=array();
+	
+	    $sql = "SELECT count(u.rowid) as nb";
+	    $sql.= " FROM ".MAIN_DB_PREFIX."projet as u";
+	    $sql.= " WHERE";
+	    //$sql.= " WHERE u.fk_statut > 0";
+	    //$sql.= " AND employee != 0";
+	    $sql.= " u.entity IN (".getEntity('projet', 1).")";
+	
+	    $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 action delayed?
 	 *

From be9a14443326aba7cf21f4fa3eb89039abe1db67 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Feb 2016 12:43:00 +0100
Subject: [PATCH 380/421] FIX Add a test to show bugged module with a bad
 declaration of dictionaries to avoid to see clean module to be breaked.

---
 htdocs/core/lib/admin.lib.php | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 12470310ae4..29651b84344 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -591,7 +591,7 @@ function listOfSessions()
                     //$sessValues = 'newtoken|s:32:"1239f7a0c4b899200fe9ca5ea394f307";dol_loginmesg|s:0:"";newtoken|s:32:"1236457104f7ae0f328c2928973f3cb5";dol_loginmesg|s:0:"";token|s:32:"123615ad8d650c5cc4199b9a1a76783f";dol_login|s:5:"admin";dol_authmode|s:8:"dolibarr";dol_tz|s:1:"1";dol_tz_string|s:13:"Europe/Berlin";dol_dst|i:0;dol_dst_observed|s:1:"1";dol_dst_first|s:0:"";dol_dst_second|s:0:"";dol_screenwidth|s:4:"1920";dol_screenheight|s:3:"971";dol_company|s:12:"MyBigCompany";dol_entity|i:1;mainmenu|s:4:"home";leftmenuopened|s:10:"admintools";idmenu|s:0:"";leftmenu|s:10:"admintools";';
                     
                     if (preg_match('/dol_login/i',$sessValues) && // limit to dolibarr session
-                    (preg_match('/dol_entity\|i:'.$conf->entity.';/i',$sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i',$sessValues)) && // limit to current entity
+                        (preg_match('/dol_entity\|i:'.$conf->entity.';/i',$sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i',$sessValues)) && // limit to current entity
                     preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i',$sessValues)) // limit to company name
                     {
                         $tmp=explode('_', $file);
@@ -982,21 +982,29 @@ function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql
                                 //var_dump($objMod->dictionaries['tabname']);
                                 $taborder[] = 0;
                                 $tabfieldcheck[] = array(); $tabhelp[] = array();
+                                $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp=0;
                                 foreach($objMod->dictionaries['tabname'] as $val)
                                 {
                                     $taborder[] = count($tabname)+1;
+                                    $nbtabname++;
                                     $tabname[] = $val;
                                 }
-                                foreach($objMod->dictionaries['tablib'] as $val) $tablib[] = $val;
-                                foreach($objMod->dictionaries['tabsql'] as $val) $tabsql[] = $val;
-                                foreach($objMod->dictionaries['tabsqlsort'] as $val) $tabsqlsort[] = $val;
-                                foreach($objMod->dictionaries['tabfield'] as $val) $tabfield[] = $val;
-                                foreach($objMod->dictionaries['tabfieldvalue'] as $val) $tabfieldvalue[] = $val;
-                                foreach($objMod->dictionaries['tabfieldinsert'] as $val) $tabfieldinsert[] = $val;
-                                foreach($objMod->dictionaries['tabrowid'] as $val) $tabrowid[] = $val;
-                                foreach($objMod->dictionaries['tabcond'] as $val) $tabcond[] = $val;
-                                if (! empty($objMod->dictionaries['tabfieldcheck'])) foreach($objMod->dictionaries['tabfieldcheck'] as $val) $tabfieldcheck[] = $val;
-                                if (! empty($objMod->dictionaries['tabhelp'])) foreach($objMod->dictionaries['tabhelp'] as $val) $tabhelp[] = $val;
+                                foreach($objMod->dictionaries['tablib'] as $val)         { $nbtablib++; $tablib[] = $val; }
+                                foreach($objMod->dictionaries['tabsql'] as $val)         { $nbtabsql++; $tabsql[] = $val; }
+                                foreach($objMod->dictionaries['tabsqlsort'] as $val)     { $nbtabsqlsort++; $tabsqlsort[] = $val; }
+                                foreach($objMod->dictionaries['tabfield'] as $val)       { $nbtabfield++; $tabfield[] = $val; }
+                                foreach($objMod->dictionaries['tabfieldvalue'] as $val)  { $nbtabfieldvalue++; $tabfieldvalue[] = $val; }
+                                foreach($objMod->dictionaries['tabfieldinsert'] as $val) { $nbtabfieldinsert++; $tabfieldinsert[] = $val; }
+                                foreach($objMod->dictionaries['tabrowid'] as $val)       { $nbtabrowid++; $tabrowid[] = $val; }
+                                foreach($objMod->dictionaries['tabcond'] as $val)        { $nbtabcond++; $tabcond[] = $val; }
+                                if (! empty($objMod->dictionaries['tabfieldcheck'])) foreach($objMod->dictionaries['tabfieldcheck'] as $val) { $nbtabfieldcheck++; $tabfieldcheck[] = $val; }
+                                if (! empty($objMod->dictionaries['tabhelp'])) foreach($objMod->dictionaries['tabhelp'] as $val)             { $nbtabhelp++; $tabhelp[] = $val; }
+                                
+                                if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort)
+                                {
+                                    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";
+                                }
                                 //foreach($objMod->dictionaries['tabsqlsort'] as $val) $tablib[] = $val;
                                 //$tabname = array_merge ($tabname, $objMod->dictionaries['tabname']);
                                 //var_dump($tabcond);

From b7e0faa332f82eab0f040f4443c52b3b44878a7d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Feb 2016 14:01:21 +0100
Subject: [PATCH 381/421] More complete css

---
 htdocs/theme/eldy/style.css.php | 4 ++++
 htdocs/theme/md/style.css.php   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index e1f58616f36..310da9087aa 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -520,10 +520,14 @@ div.myavailability {
 .minwidth100 { min-width: 100px; }
 .minwidth200 { min-width: 200px; }
 .minwidth300 { min-width: 300px; }
+.minwidth400 { min-width: 400px; }
+.minwidth500 { min-width: 500px; }
 .maxwidth100 { max-width: 100px; }
 .maxwidth150 { max-width: 150px; }
 .maxwidth200 { max-width: 200px; }
 .maxwidth300 { max-width: 300px; }
+.maxwidth400 { max-width: 400px; }
+.maxwidth500 { max-width: 500px; }
 .titlefield { width: 30%; }
 <?php if (! empty($dol_optimize_smallscreen)) { ?>
 .hideonsmartphone { display: none; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index baa772e85dd..38ac3d13c1e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -516,10 +516,14 @@ div.myavailability {
 .minwidth100 { min-width: 100px; }
 .minwidth200 { min-width: 200px; }
 .minwidth300 { min-width: 300px; }
+.minwidth400 { min-width: 400px; }
+.minwidth500 { min-width: 500px; }
 .maxwidth100 { max-width: 100px; }
 .maxwidth150 { max-width: 150px; }
 .maxwidth200 { max-width: 200px; }
 .maxwidth300 { max-width: 300px; }
+.maxwidth400 { max-width: 400px; }
+.maxwidth500 { max-width: 500px; }
 .titlefield { width: 30%; }
 <?php if (! empty($dol_optimize_smallscreen)) { ?>
 .hideonsmartphone { display: none; }

From 4b28dadd6e87e227fd56a2b4ac83f45cbea77c32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Feb 2016 14:44:09 +0100
Subject: [PATCH 382/421] More complete instruction to convert image to theme

---
 htdocs/theme/eldy/img/menus/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/img/menus/README.md b/htdocs/theme/eldy/img/menus/README.md
index 12cd9da537a..3b04bafbc9b 100644
--- a/htdocs/theme/eldy/img/menus/README.md
+++ b/htdocs/theme/eldy/img/menus/README.md
@@ -4,9 +4,10 @@ Tutorial to create a new image for menu:
 1) First find an image.
 2) With Gimp, open image and check there is a alpha channel. If not add one.
 3) Convert image into back and white (Menu Image - Mode - Grey levels).
-4) Use the degrade tool with option:
-* Erase color
+4) Use the degrade tool with option (Menu Tools - Paint - Degrade - CTRL+L):
+* Mode: Erase color (you can also try "Elear only") 
 * Opacity: 50 +/-
 * Offset: 0
 * Shape: Linear
+* Select on image top of file and drag to bottom.
 Il est possible aussi d'augmenter la transparence globale depuis le calque.

From 77490bff713824d7d7ccecf7dc2d41dad52b3c51 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Mon, 29 Feb 2016 10:07:48 +0100
Subject: [PATCH 383/421] FIX: Status filter don't work

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

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index a02f2f78440..8704e781a30 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -304,7 +304,7 @@ if ($resql)
 	print '<input class="flat" type="text" size="6" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
 	print '</td><td class="liste_titre" align="right">';
 	$liststatus=array('0'=>$langs->trans("Draft"),'1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
-	print $form->selectarray('filtre', $liststatus, $search_status, 1);
+	print $form->selectarray('search_status', $liststatus, $search_status, 1);
 	print '</td><td class="liste_titre" align="right">';
 	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

From 45f4c45618e6f74ac53f91952bc35f0d92270461 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 10:09:21 +0100
Subject: [PATCH 384/421] Fix lintian warnings

---
 build/debian/README.howto               | 22 ++++++++++++++++------
 build/debian/dolibarr.lintian-overrides |  5 ++++-
 build/debian/source/lintian-overrides   |  3 +++
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 build/debian/source/lintian-overrides

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 6b2360b78b5..6632d6e8e84 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -159,10 +159,12 @@ Comment line in /etc/mysql/my.cnf if required and restart mysql
 
 Create a chroot called "unstable-amd64-sbuild".
 Chroot env is stored into /srv/chroot directory.
-> sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
+> sudo sbuild-createchroot --keyring=unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
 
 Pour lister les env chroot
 > schroot -l
+or
+> ls /srv/chroot
 
 Puis pour se connecter et préparer l'environnement 
 > schroot -c name_of_chroot
@@ -170,7 +172,7 @@ Puis pour se connecter et préparer l'environnement
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get install links mysql-client
 
-Pour tester un package
+To test a package
 > On host server, stop any server on port 80 and 3306 (same port will be used by chroot env)
 > cp ../build-area/* /srv/chroot/unstable/tmp
 > sudo schroot -c name_of_chroot
@@ -211,8 +213,12 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 
 * Some files are removed from archive by the get-orig-source.sh 
 
+* Modify the tag file to replace sRGB.icc with correct free version and rename file into
+tcpdf_x.y.z+dfsgw.orig.tar.xz
+(x.y.z = version, w start from 1 and is increased for each new import)
+
 * Staying into git root directory, run
-> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
+> git-import-orig -vv ../tcpdf_x.y.z+dfsgw.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
 and enter version when requested with format
 x.y.z+dfsgw
 (x.y.z = version, w start from 1 and is increased for each new import)
@@ -220,8 +226,8 @@ x.y.z+dfsgw
 Note: If there was errors solved manually, you may need to make a git commit
 
 * Add an entry into debian/changelog
-> dch -v x.y.z+dfsg-1 "My comment" will add entry.
-For example: dch -v x.y.z+dfsg-1 "New upstream release." for a new version
+> dch -v x.y.z+dfsgw-1 "My comment" will add entry.
+For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version
 Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
 
 Warning: Date must have format reported by "date -R"
@@ -239,7 +245,9 @@ Note: You can use git-buildpackage -us -uc -d                if you want to test
 Note: Package is built into directory ../build-area
 Note: To compare 2 packages: debdiff package1.dsc package2.dsc
 
-* Test package (see dedicated chapter to test it with debian unstable env)
+* Test package
+> cp ../build-area/* /srv/chroot/unstable/tmp
+See rest of process into dedicated chapter "To test a package" to test it with debian unstable env
 
 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
@@ -333,6 +341,8 @@ Note: Package is built into directory ../build-area
 Note: To compare 2 packages: debdiff package1.dsc package2.dsc
 
 * Test package (see dedicated chapter to test it with debian unstable env)
+> cp ../build-area/* /srv/chroot/unstable/tmp
+See rest of process into dedicated chapter "To test a package" to test it with debian unstable env
 
 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
diff --git a/build/debian/dolibarr.lintian-overrides b/build/debian/dolibarr.lintian-overrides
index 7578a575776..90120971ce9 100644
--- a/build/debian/dolibarr.lintian-overrides
+++ b/build/debian/dolibarr.lintian-overrides
@@ -4,4 +4,7 @@ dolibarr: non-standard-dir-perm var/lib/dolibarr/documents/ 2775 != 0755
 dolibarr: desktop-command-not-in-package usr/share/applications/dolibarr.desktop xdg-open
 # We use <IfVersion> to include the correct configuration for each apache version
 dolibarr: apache2-deprecated-auth-config Order
-dolibarr: apache2-deprecated-auth-config Allow
\ No newline at end of file
+dolibarr: apache2-deprecated-auth-config Allow
+# Ignore warning required for a good install process
+dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
+dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf
\ No newline at end of file
diff --git a/build/debian/source/lintian-overrides b/build/debian/source/lintian-overrides
new file mode 100644
index 00000000000..a6c41886810
--- /dev/null
+++ b/build/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# Remove warning, we want to keep both standard and minified sources.
+dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/*
+dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jquery/*
\ No newline at end of file

From 21c7aacddb1cb7b963503acaf9ecbb2ecafe47b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 10:22:38 +0100
Subject: [PATCH 385/421] Fix add hidden option
 INVOICE_DEFAULT_UNPAYED_SORT_ORDER to be able to provide backward
 compatibility with old behaviour.

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8f7b805f4d5..fd0a61b638f 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -83,6 +83,7 @@ if ($page == -1) {
     $page = 0;
 }
 $offset = $limit * $page;
+if (! $sortorder && ! empty($conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER) && $search_status == 1) $sortorder=$conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER;
 if (! $sortorder) $sortorder='DESC';
 if (! $sortfield) $sortfield='f.datef';
 

From d2c71fbf8f8ee7354e2d22268c72a0adb1c447d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 10:35:18 +0100
Subject: [PATCH 386/421] Fix alias name was visible twice.

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

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index dc2d6b6a516..c4fb84fa30f 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -980,6 +980,10 @@ else
             print '<td colspan=2>&nbsp;</td></tr>';
         }
 
+        // Alias names (commercial, trademark or alias names)
+        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+	    print '<td colspan="3"><input type="text" size="60" name="name_alias" id="name_alias_input" value="'.$object->name_alias.'" size="32"></td></tr>';
+
         // Prospect/Customer
         print '<tr><td width="25%">'.fieldLabel('ProspectCustomer','customerprospect',1).'</td>';
 	    print '<td width="25%" class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
@@ -1034,10 +1038,6 @@ else
             print '</td></tr>';
         }
 
-        // Alias names (commercial, trademark or alias names)
-        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	    print '<td colspan="3"><input type="text" name="name_alias" id="name_alias_input" value="'.$object->name_alias.'" size="32"></td></tr>';
-
         // Address
         print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
 	    print '<td colspan="3"><textarea name="address" id="address" cols="80" rows="'._ROWS_2.'" wrap="soft">';
@@ -1484,7 +1484,7 @@ else
 
 	        // Alias names (commercial, trademark or alias names)
 	        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	        print '<td colspan="3"><input type="text" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'" size="32"></td></tr>';
+	        print '<td colspan="3"><input type="text" size="60" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
             // Prefix
             if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
@@ -1904,11 +1904,6 @@ else
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
-	    // Alias names (commercial, trademark or alias names)
-	    print '<tr><td class="titlefield" width="25%">'.$langs->trans('AliasNames').'</td><td>';
-	    print $object->name_alias;
-	    print "</td></tr>";
-
     	// Prospect/Customer
     	print '<tr><td>'.$langs->trans('ProspectCustomer').'</td><td>';
     	print $object->getLibCustProspStatut();

From 2eaa21ea5c039229e4fb4918b568cac2f174b2fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 10:50:52 +0100
Subject: [PATCH 387/421] Fix minor css error (pixel size must have "px").
 Compatibility with old behaviour.

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

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index e5615aa66ba..2fc860cb116 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -592,7 +592,7 @@ if ($id > 0)
                 if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 ) {
                     print " ".img_warning();
                 }
-				print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
+				print '</td><td align="right" width="80px">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 				print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td align="right" style="min-width: 60px" class="nowrap">'.$propal_static->LibStatut($objp->fk_statut,5).'</td></tr>';
 				$i++;
@@ -673,7 +673,7 @@ if ($id > 0)
                 $commande_static->total_tva = $objp->total_tva;
                 $commande_static->total_ttc = $objp->total_ttc;
                 print $commande_static->getNomUrl(1);
-				print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n";
+				print '</td><td align="right" width="80px">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n";
 				print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td align="right" style="min-width: 60px" class="nowrap">'.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'</td></tr>';
 				$i++;
@@ -737,7 +737,7 @@ if ($id > 0)
                 print $sendingstatic->getNomUrl(1);
                 print '</td>';
                 if ($objp->date_creation > 0) {
-                    print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->date_creation),'day').'</td>';
+                    print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->date_creation),'day').'</td>';
                 } else {
                     print '<td align="right"><b>!!!</b></td>';
                 }
@@ -797,8 +797,8 @@ if ($id > 0)
 				print $contrat->getNomUrl(1,12);
 				print "</td>\n";
 				print '<td class="nowrap">'.dol_trunc($objp->refsup,12)."</td>\n";
-				print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n";
-				print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->dcon),'day')."</td>\n";
+				print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n";
+				print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->dcon),'day')."</td>\n";
 				print '<td width="20">&nbsp;</td>';
 				print '<td align="right" class="nowrap">';
 				$contrat->fetch_lines();
@@ -855,9 +855,9 @@ if ($id > 0)
 
 				print "<tr ".$bc[$var].">";
 				print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/card.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a></td>'."\n";
-                //print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
-				print '<td align="right" width="120">'.convertSecondToTime($objp->duration).'</td>'."\n";
-				print '<td align="right" width="100">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
+                //print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
+				print '<td align="right" style="min-width: 60px">'.convertSecondToTime($objp->duration).'</td>'."\n";
+				print '<td align="right" class="nowrap" style="min-width: 60px">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
 				print '</tr>';
 				$var=!$var;
 				$i++;
@@ -907,7 +907,7 @@ if ($id > 0)
 
 			    $tableaushown=1;
 				print '<tr class="liste_titre">';
-				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").' <span class="badge">'.$num.'</span></a></td>';
+				print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").' <span class="badge">'.$num.'</span></a></td>';
                 print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
@@ -929,15 +929,24 @@ if ($id > 0)
 				print '</td>';
 				if ($objp->df > 0)
 				{
-					print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->df),'day').'</td>';
+					print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->df),'day').'</td>';
 				}
 				else
 				{
 					print '<td align="right"><b>!!!</b></td>';
 				}
-				print '<td align="right" width="120">'.price($objp->total_ht).'</td>';
+				print '<td align="right" style="min-width: 60px">';
+				print price($objp->total_ht);
+				print '</td>';
 
-				print '<td align="right" class="nowrap" width="100" >'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'</td>';
+				if (! empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
+				{
+    				print '<td align="right" style="min-width: 60px">';
+    				print price($objp->total_ttc);
+    				print '</td>';
+				}
+				
+				print '<td align="right" class="nowrap" style="min-width: 60px">'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'</td>';
 				print "</tr>\n";
 				$i++;
 			}

From 972d95a3c6fbc75e7a5d51eb8f54803169f039bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 13:21:09 +0100
Subject: [PATCH 388/421] Better translation for nature of contact

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

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index e014bea9e06..665768dbef4 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -56,7 +56,7 @@ $userstatic=new User($db);
 
 <?php if ($permission) { ?>
 	<form class="tagtr liste_titre">
-		<div class="tagtd"><?php echo $langs->trans("Source"); ?></div>
+		<div class="tagtd"><?php echo $langs->trans("Nature"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("ThirdParty"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("Contacts"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("ContactType"); ?></div>
@@ -136,7 +136,7 @@ $userstatic=new User($db);
 	} ?>
 
 	<form class="tagtr liste_titre">
-		<div class="tagtd"><?php echo $langs->trans("Source"); ?></div>
+		<div class="tagtd"><?php echo $langs->trans("Nature"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("ThirdParty"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("Contacts"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("ContactType"); ?></div>

From c197ce31b635ba4c2cded2559ec94205dc364f8e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 13:24:59 +0100
Subject: [PATCH 389/421] NEW Add the admin info on combo of type of contact

---
 htdocs/core/class/html.formcompany.class.php | 6 +++++-
 htdocs/core/tpl/contacts.tpl.php             | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 13525305265..9091b4aead0 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -702,6 +702,8 @@ class FormCompany
      */
 	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0)
 	{
+	    global $user, $langs;
+	    
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
@@ -713,7 +715,9 @@ class FormCompany
 				if ($key == $selected) print ' selected';
 				print '>'.$value.'</option>';
 			}
-			print "</select>\n";
+			print "</select>";
+			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			print "\n";
 		}
 	}
 
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 665768dbef4..88169314211 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -58,7 +58,7 @@ $userstatic=new User($db);
 	<form class="tagtr liste_titre">
 		<div class="tagtd"><?php echo $langs->trans("Nature"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("ThirdParty"); ?></div>
-		<div class="tagtd"><?php echo $langs->trans("Contacts"); ?></div>
+		<div class="tagtd"><?php echo $langs->trans("Users").'/'.$langs->trans("Contacts"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("ContactType"); ?></div>
 		<div class="tagtd">&nbsp;</div>
 		<div class="tagtd">&nbsp;</div>
@@ -138,7 +138,7 @@ $userstatic=new User($db);
 	<form class="tagtr liste_titre">
 		<div class="tagtd"><?php echo $langs->trans("Nature"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("ThirdParty"); ?></div>
-		<div class="tagtd"><?php echo $langs->trans("Contacts"); ?></div>
+		<div class="tagtd"><?php echo $langs->trans("Users").'/'.$langs->trans("Contacts"); ?></div>
 		<div class="tagtd"><?php echo $langs->trans("ContactType"); ?></div>
 		<div class="tagtd" align="center"><?php echo $langs->trans("Status"); ?></div>
 		<div class="tagtd">&nbsp;</div>

From b31fd917ab47ba83b0a598e78e227a7b2c99d91b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 13:28:20 +0100
Subject: [PATCH 390/421] Always show email field into popup of contact

---
 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 2feb3f73b05..33c00af16a2 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -915,7 +915,7 @@ class Contact extends CommonObject
         $label.= '<br><b>' . $langs->trans("Name") . ':</b> '.$this->getFullName($langs);
         //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
         if (! empty($this->poste)) $label.= '<br><b>' . $langs->trans("Poste") . ':</b> '.$this->poste;
-        if (! empty($this->email)) $label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
+        $label.= '<br><b>' . $langs->trans("EMail") . ':</b> '.$this->email;
         $phonelist=array();
         if ($this->phone_pro) $phonelist[]=$this->phone_pro;
         if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;

From 64374bec00cc448040c1ed2b7a2a617b43674fb2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 15:28:06 +0100
Subject: [PATCH 391/421] Fix avoid wrapping in select2 combo list

---
 htdocs/includes/jquery/plugins/select2/select2.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/includes/jquery/plugins/select2/select2.css b/htdocs/includes/jquery/plugins/select2/select2.css
index 2d07a0343b0..16da8373f6f 100644
--- a/htdocs/includes/jquery/plugins/select2/select2.css
+++ b/htdocs/includes/jquery/plugins/select2/select2.css
@@ -28,7 +28,7 @@ Version: 3.5.2 Timestamp: Sat Nov  1 14:43:36 EDT 2014
 .select2-container .select2-choice {
     display: block;
     height: 26px;
-    padding: 0 0 0 8px;
+    padding: 0 0 0 5px;
     overflow: hidden;
     position: relative;
 

From a3d4340b820c1a2d7df43d7f3d14847fb1257037 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 15:30:52 +0100
Subject: [PATCH 392/421] Fix useless truncation

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index b319072dc68..2ba0d4e4565 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -610,23 +610,23 @@ if ($result)
         if (! empty($arrayfields['p.lastname']['checked']))
         {
             print '<td valign="middle">';
-		  print $contactstatic->getNomUrl(1,'',20);
+		  print $contactstatic->getNomUrl(1,'',0);
 		  print '</td>';
         }
 		// Firstname
         if (! empty($arrayfields['p.firstname']['checked']))
         {
-            print '<td>'.dol_trunc($obj->firstname,20).'</td>';
+            print '<td>'.$obj->firstname.'</td>';
         }
     	// Zip
         if (! empty($arrayfields['p.zip']['checked']))
         {
-            print '<td>'.dol_trunc($obj->zip,20).'</td>';
+            print '<td>'.$obj->zip.'</td>';
         }
     	// Town
         if (! empty($arrayfields['p.town']['checked']))
         {
-            print '<td>'.dol_trunc($obj->town,20).'</td>';
+            print '<td>'.$obj->town.'</td>';
         }
         // Function
         if (! empty($arrayfields['p.poste']['checked']))

From 846d78dfbaa358a66e0e94aa81641a0b0ebad9d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 15:43:00 +0100
Subject: [PATCH 393/421] FIX Edition of delay (nb of days) for payment term
 "Immediate" was broken.

---
 htdocs/admin/dict.php                 | 19 ++++++++++---------
 htdocs/compta/facture.php             | 11 ++---------
 htdocs/core/class/html.form.class.php |  4 ++--
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 6c2b1f6a027..abd62bc05ac 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1318,18 +1318,19 @@ if ($id)
                     }
 
                     // Can an entry be erased or disabled ?
-                    $iserasable=1;$isdisable=1;	// true by default
-
+                    $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
                     if (isset($obj->code) && $id != 10)
                     {
-                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $isdisable = 0; }
-                    	else if ($obj->code == 'RECEP') { $iserasable = 0; $isdisable = 0; }
-                    	else if ($obj->code == 'EF0')   { $iserasable = 0; $isdisable = 0; }
+                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'EF0')   { $iserasable = 0; $canbedisabled = 0; }
                     }
 
                     if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
-                    if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $isdisable=0; $isdisable = 0; }
-
+                    if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled=0; $canbedisabled = 0; }
+                    $canbemodified=$iserasable;
+                    if ($obj->code == 'RECEP') $canbemodified=1;
+                        
                     $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?urlencode($obj->code):'').'&amp;id='.$id.'&amp;';
 
 					// Favorite
@@ -1344,7 +1345,7 @@ if ($id)
 
                     // Active
                     print '<td align="center" class="nowrap">';
-                    if ($isdisable) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                    if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
                     else
                  	{
                  		if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
@@ -1355,7 +1356,7 @@ if ($id)
                     print "</td>";
 
                     // Modify link
-                    if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+                    if ($canbemodified) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
                     else print '<td>&nbsp;</td>';
 
                     // Delete link
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 8f6f9f204ac..55e5b1e063b 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1846,14 +1846,7 @@ $now = dol_now();
 llxHeader('', $langs->trans('Bill'), 'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
 
 
-
-/**
- * *******************************************************************
- *
- * Mode creation
- *
- * ********************************************************************
- */
+// Mode creation
 
 if ($action == 'create')
 {
@@ -1999,7 +1992,7 @@ if ($action == 'create')
 	else
 	{
 		print '<td colspan="2">';
-		print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 1);
+		print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty');
 		// Option to reload page to retrieve customer informations. Note, this clear other input
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
 		{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 482acbbab46..0fdf4365ae7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -894,7 +894,7 @@ class Form
      *	@param	string	$selected       Preselected type
      *	@param  string	$htmlname       Name of field in form
      *  @param  string	$filter         optional filters criteras (example: 's.rowid <> x', 's.client IN (1,3)')
-     *	@param	string	$showempty		Add an empty field (Can be '1' or text to use on empty line)
+     *	@param	string	$showempty		Add an empty field (Can be '1' or text to use on empty line like 'SelectThirdParty')
      * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
      * 	@param	int		$forcecombo		Force to use combo box
      *  @param	array	$events			Ajax event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
@@ -949,7 +949,7 @@ class Form
      *	@param	string	$selected       Preselected type
      *	@param  string	$htmlname       Name of field in form
      *  @param  string	$filter         optional filters criteras (example: 's.rowid <> x', 's.client in (1,3)')
-     *	@param	string	$showempty		Add an empty field (Can be '1' or text to use on empty line)
+     *	@param	string	$showempty		Add an empty field (Can be '1' or text to use on empty line like 'SelectThirdParty')
      * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
      * 	@param	int		$forcecombo		Force to use combo box
      *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

From f9162aa444dca1730980ed06049ea7d970918505 Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Mon, 29 Feb 2016 19:05:42 +0100
Subject: [PATCH 394/421] new:advanced permissions to validate and unvalidate
 interventions

---
 htdocs/core/modules/modFicheinter.class.php | 16 ++++++++++++++++
 htdocs/fichinter/card.php                   | 20 ++++++++++----------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 4578a3e60a9..c8929a67a8d 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -131,6 +131,22 @@ class modFicheinter extends DolibarrModules
         $this->rights[$r][4] = 'ficheinter_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
         $this->rights[$r][5] = 'send';
 
+        $r++;
+        $this->rights[$r][0] = 69;
+        $this->rights[$r][1] = 'Valider les fiches d\'intervention ';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'ficheinter_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'validate';
+
+        $r++;
+        $this->rights[$r][0] = 70;
+        $this->rights[$r][1] = 'Dévalider les fiches d\'intervention';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'ficheinter_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'unvalidate';
+
         //Exports
         //--------
         $r=1;
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 4ba91ba7e96..8d164adaa41 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1660,17 +1660,17 @@ else if ($id > 0 || ! empty($ref))
 	{
 		if ($user->societe_id == 0)
 		{
-			if ($action != 'editdescription' && ($action != 'presend'))
-			{
-				// Validate
-				if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS)))
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
-					print '>'.$langs->trans("Validate").'</a></div>';
-				}
+            if ($action != 'editdescription' && ($action != 'presend')) {
+                // Validate
+                if ($object->statut == 0 && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
+                    if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->validate)) {
+                        print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id=' . $object->id . '&action=validate"';
+                        print '>' . $langs->trans("Validate") . '</a></div>';
+                    }
+                }
 
-				// Modify
-				if ($object->statut == 1 && $user->rights->ficheinter->creer)
+                // Modify
+                if ($object->statut == 1 && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate)))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modify">';
 					if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify");

From 10d04e63c1c1a59df280c6ee1dc33ec873dde6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 29 Feb 2016 22:59:08 +0100
Subject: [PATCH 395/421] Update bonprelevement.class.php

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 3f813e00938..62a2b01dd58 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1261,6 +1261,7 @@ class BonPrelevement extends CommonObject
 			$dateTime_ECMA = dol_print_date($date_actu, '%Y-%m-%dT%H:%M:%S');
 			$fileDebiteurSection = '';
 			$fileEmetteurSection = '';
+			$ListOfFactures = '';
 			$i = 0;
 			$j = 0;
 			$this->total = 0;
@@ -1277,7 +1278,7 @@ class BonPrelevement extends CommonObject
 				while ($j < $num)
 				{
 					$objfac = $this->db->fetch_object($resql);
-					$ListOfFactures = $ListOfFactures . $objfac->fac . ",";
+					$ListOfFactures .= ($j>0?',':'') . $objfac->fac;
 					$j++;
 				}
 			}

From a26f88084326c5b4f0d7674848a66370678bd5f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Mar 2016 00:59:42 +0100
Subject: [PATCH 396/421] Fix missing declarion of form Fix by adding
 MAIN_USE_OLD_SEARCH_FORM to restore a way for backward compatibility Fix to
 have delay for payment term at least 1 day (to avoid immediate warning after
 creation of an invoice)

---
 htdocs/don/list.php                              | 1 +
 htdocs/expedition/list.php                       | 1 +
 htdocs/fourn/commande/list.php                   | 1 +
 htdocs/index.php                                 | 2 ++
 htdocs/install/mysql/data/llx_c_payment_term.sql | 8 ++++----
 htdocs/main.inc.php                              | 6 +++---
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 83e1db184a5..3db04cdb7cc 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -79,6 +79,7 @@ $fieldstosearchall = array(
  * View
  */
 
+$form=new Form($db);
 if (! empty($conf->projet->enabled)) $projectstatic=new Project($db);
 
 llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index ccd10d7c550..36dfb1db55e 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -76,6 +76,7 @@ $fieldstosearchall = array(
  * View
  */
 
+$form=new Form($db);
 $companystatic=new Societe($db);
 $shipment=new Expedition($db);
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index a3e0d8c9c33..9f99df55add 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -93,6 +93,7 @@ if (empty($user->socid)) $fieldstosearchall["cf.note_private"]="NotePrivate";
  *	View
  */
 
+$form=new Form($db);
 $thirdpartytmp = new Fournisseur($db);
 $commandestatic=new CommandeFournisseur($db);
 $formfile = new FormFile($db);
diff --git a/htdocs/index.php b/htdocs/index.php
index 6058e5a70c8..0b6bbbbc4a9 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -65,6 +65,8 @@ if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax dis
  * View
  */
 
+if (! is_object($form)) $form=new Form($db);
+
 // Title
 $title=$langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
 if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$langs->trans("HomeArea").' - '.$conf->global->MAIN_APPLICATION_TITLE;
diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql
index 1e61b31a2b8..68aae57ff4f 100644
--- a/htdocs/install/mysql/data/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/data/llx_c_payment_term.sql
@@ -27,11 +27,11 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (1,'RECEP',       1,1, 'A réception de facture','Réception de facture',0,0);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (1,'RECEP',       1,1, 'A réception de facture','Réception de facture',0,1);
 insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (2,'30D',         2,1, '30 jours','Réglement à 30 jours',0,30);
 insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (3,'30DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 30 jours fin de mois',1,30);
 insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (4,'60D',         4,1, '60 jours','Réglement à 60 jours',0,60);
 insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (5,'60DENDMONTH', 5,1, '60 jours fin de mois','Réglement à 60 jours fin de mois',1,60);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (6,'PT_ORDER',    6,1, 'A réception de commande','A réception de commande',0,0);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (7,'PT_DELIVERY', 7,1, 'Livraison','Règlement à la livraison',0,0);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (8,'PT_5050',     8,1, '50 et 50','Règlement 50% à la commande, 50% à la livraison',0,0);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (6,'PT_ORDER',    6,1, 'A réception de commande','A réception de commande',0,1);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (7,'PT_DELIVERY', 7,1, 'Livraison','Règlement à la livraison',0,1);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (8,'PT_5050',     8,1, '50 et 50','Règlement 50% à la commande, 50% à la livraison',0,1);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1127b6dc5cf..07a6ae7dc8c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1445,7 +1445,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    // Show menu entries
     	print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
 	    $menumanager->atarget=$target;
-	    $menumanager->showmenu('top');      // This contains a \n
+	    $menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
 	    print "</div>\n";
 
 	    //$form=new Form($db);
@@ -1609,7 +1609,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 
 	    print "\n";
 
-	    if ($conf->use_javascript_ajax && $conf->browser->layout != 'phone')
+	    if ($conf->use_javascript_ajax && $conf->browser->layout != 'phone' && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 	    {
     	    if (! is_object($form)) $form=new Form($db);
     	    $selected=-1;
@@ -1655,7 +1655,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
     	        $searchform.=printSearchForm(DOL_URL_ROOT.'/user/list.php', DOL_URL_ROOT.'/user/list.php', $langs->trans("Users"), 'user', 'sall', 'M', 'searchleftuser', img_object('','user'));
     	    }
 	    }
-        
+  
 	    // Execute hook printSearchForm
 	    $parameters=array('searchform'=>$searchform);
 	    $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks

From 72b532b7ebf484e18f039611fdff34512b1561f0 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 1 Mar 2016 11:31:27 +0100
Subject: [PATCH 397/421] FIX non instanciated values

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index babda9eff3c..e75342f252b 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1392,9 +1392,9 @@ else
             print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="updateligne">';
-            print '<input type="hidden" name="elrowid" value="'.GETPOST('rowid').'">';
-            print '<input type="hidden" name="idprod" value="'.($objp->fk_product?$objp->fk_product:'0').'">';
-            print '<input type="hidden" name="fournprice" value="'.($objp->fk_fournprice?$objp->fk_fournprice:'0').'">';
+            print '<input type="hidden" name="elrowid" value="'.$object->lines[$cursorline-1]->id.'">';
+            print '<input type="hidden" name="idprod" value="'.(!empty($object->lines[$cursorline-1]->fk_product) ? $object->lines[$cursorline-1]->fk_product : 0).'">';
+            print '<input type="hidden" name="fournprice" value="'.(!empty($object->lines[$cursorline-1]->fk_fournprice) ? $object->lines[$cursorline-1]->fk_fournprice : 0).'">';
 
             // Area with common detail of line
             print '<table class="notopnoleftnoright allwidth tableforservicepart1" width="100%">';

From e646f28c0ab10f6545a9d982596b82e4196601c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 1 Mar 2016 15:46:06 +0100
Subject: [PATCH 398/421] Documented properties of Account class

---
 htdocs/compta/bank/class/account.class.php | 202 ++++++++++++++++-----
 1 file changed, 157 insertions(+), 45 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index cf38669d554..a5e108a2c96 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
  * Copyright (C) 2005-2010	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2015-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2015		Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,61 +35,171 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
  */
 class Account extends CommonObject
 {
-    public $element='bank_account';
-    public $table_element='bank_account';
+    public $element = 'bank_account';
+    public $table_element = 'bank_account';
 
     /**
      * @var	int		Use id instead of rowid
      * @deprecated
      * @see id
      */
-    var $rowid;
+    public $rowid;
 
-    var $label;
-    //! 1=Compte courant/check/carte, 2=Compte liquide, 0=Compte épargne
-    var $courant;
-    var $type;      // same as courant
-    //! Name
-    var $bank;
-    var $clos;
-    var $rappro=1;    // If bank need to be conciliated
-    var $url;
-    //! BBAN field for French Code banque
-    var $code_banque;
-    //! BBAN field for French Code guichet
-    var $code_guichet;
-    //! BBAN main account number
-    var $number;
-    //! BBAN field for French Cle de controle
-    var $cle_rib;
-    //! BIC/SWIFT number
-    var $bic;
-    //! IBAN number (International Bank Account Number)
-    var $iban;			// stored into iban_prefix field into database
-    var $proprio;
-    var $owner_address;
+    /**
+     * Label
+     * @var string
+     */
+    public $label;
 
-    var $state_id;
-    var $state_code;
-    var $state;
+    /**
+     * Bank account type. Check TYPE_ constants
+     * @var int
+     */
+    public $courant;
 
-    var $type_lib=array();
+    /**
+     * Bank account type. Check TYPE_ constants
+     * @var int
+     */
+    public $type;
 
-    var $account_number;
-	var $accountancy_journal;
+    /**
+     * Bank name
+     * @var string
+     */
+    public $bank;
 
-    var $currency_code;
-    var $min_allowed;
-    var $min_desired;
-    var $comment;
+    /**
+     * Status
+     * @var int
+     */
+    public $clos = self::STATUS_OPEN;
 
+    /**
+     * Does it need to be conciliated?
+     * @var int
+     */
+    public $rappro=1;
+
+    /**
+     * Webpage
+     * @var string
+     */
+    public $url;
+
+    /**
+     * Bank number. If in SEPA area, you should move to IBAN field
+     * @var string
+     */
+    public $code_banque;
+
+    /**
+     * Branch number. If in SEPA area, you should move to IBAN field
+     * @var string
+     */
+    public $code_guichet;
+
+    /**
+     * Account number. If in SEPA area, you should move to IBAN field
+     * @var string
+     */
+    public $number;
+
+    /**
+     * Bank account number control digit. If in SEPA area, you should move to IBAN field
+     * @var string
+     */
+    public $cle_rib;
+
+    /**
+     * BIC/Swift code
+     * @var string
+     */
+    public $bic;
+
+    /**
+     * IBAN number (International Bank Account Number). Stored into iban_prefix field into database
+     * @var
+     */
+    public $iban;
+
+    /**
+     * Name of account holder
+     * @var string
+     */
+    public $proprio;
+
+    /**
+     * Address of account holder
+     * @var string
+     */
+    public $owner_address;
+
+    public $state_id;
+    public $state_code;
+    public $state;
+
+    public $type_lib=array();
+
+    /**
+     * Accountancy code
+     * @var string
+     */
+    public $account_number;
+	public $accountancy_journal;
+
+    /**
+     * Currency code
+     * @var string
+     */
+    public $currency_code;
+
+    /**
+     * Authorized minimum balance
+     * @var float
+     */
+    public $min_allowed;
+
+    /**
+     * Desired minimum balance
+     * @var float
+     */
+    public $min_desired;
+
+    /**
+     * Notes
+     * @var string
+     */
+    public $comment;
+
+    /**
+     * Date of the initial balance. Used in Account::create
+     * @var int
+     */
+    public $date_solde;
+
+    /**
+     * Current account
+     */
+    const TYPE_CURRENT = 1;
+    /**
+     * Cash account
+     */
+    const TYPE_CASH = 2;
+    /**
+     * Savings account
+     */
+    const TYPE_SAVINGS = 0;
+
+    const STATUS_OPEN = 0;
+    const STATUS_CLOSED = 1;
 
     /**
      *  Constructor
      *
      *  @param	DoliDB		$db		Database handler
      */
-    function __construct($db)
+    function __construct(DoliDB $db)
     {
         global $langs;
 
@@ -98,14 +208,16 @@ class Account extends CommonObject
         $this->clos = 0;
         $this->solde = 0;
 
-        $this->type_lib[0]=$langs->trans("BankType0");
-        $this->type_lib[1]=$langs->trans("BankType1");
-        $this->type_lib[2]=$langs->trans("BankType2");
+        $this->type_lib = array(
+            self::TYPE_SAVINGS => $langs->trans("BankType0"),
+            self::TYPE_CURRENT => $langs->trans("BankType1"),
+            self::TYPE_CASH => $langs->trans("BankType2"),
+        );
 
-        $this->status[0]=$langs->trans("StatusAccountOpened");
-        $this->status[1]=$langs->trans("StatusAccountClosed");
-
-        return 1;
+        $this->status = array(
+            self::STATUS_OPEN => $langs->trans("StatusAccountOpened"),
+            self::STATUS_CLOSED => $langs->trans("StatusAccountOpened")
+        );
     }
 
 

From a58dda76edf5c34fe2a90aaf4b644823f61e4d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 1 Mar 2016 17:28:08 +0100
Subject: [PATCH 399/421] Update product.lib.php

---
 htdocs/core/lib/product.lib.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index d946ef2b588..be46f28c498 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -133,9 +133,14 @@ function product_prepare_head($object)
     // Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+        if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        $nbFiles += count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    }
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');

From d39dca21d7a0d2ff1b1d86fa68afe5576f74bfcb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Mar 2016 22:48:35 +0100
Subject: [PATCH 400/421] =?UTF-8?q?Add=20franc=20guin=C3=A9en=20in=20curre?=
 =?UTF-8?q?ncy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/install/mysql/data/llx_c_currencies.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index 90785b52fc3..5b766d2006d 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -69,6 +69,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EUR'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FKP', '[163]', 1,				'Falkland Islands (Malvinas) Pound');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FJD', '[36]', 1,				'Fiji Dollar');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GHC', '[162]', 1,				'Ghana Cedis');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GNF', '[70,71]', 1,				'Franc Guinéen');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GIP', '[163]', 1,				'Gibraltar Pound');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GTQ', '[81]', 1,				'Guatemala Quetzal');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GGP', '[163]', 1,				'Guernsey Pound');

From e63ab857d8b91af98664768b3a43b1cb0cdec621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Wed, 2 Mar 2016 11:21:56 +0100
Subject: [PATCH 401/421] FIX #4583 Incorrect call of Categories::containing
 throws a DoliDB error

Close #4583
---
 htdocs/categories/class/categorie.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 18f13a44813..e1e44a475ed 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1241,7 +1241,7 @@ class Categorie extends CommonObject
 
 		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as ct, " . MAIN_DB_PREFIX . "categorie as c";
-		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_" . $this->MAP_CAT_FK[$type] . " = " . $id . " AND c.type = " . $this->MAP_ID[$type];
+		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_" . $this->MAP_CAT_FK[$type] . " = " . (int) $id . " AND c.type = " . $this->MAP_ID[$type];
 		$sql .= " AND c.entity IN (" . getEntity( 'category', 1 ) . ")";
 
 		$res = $this->db->query($sql);

From 123d6fb6e57730ab0ac33d69d0e2664de7f501ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Wed, 2 Mar 2016 11:29:42 +0100
Subject: [PATCH 402/421] FIX #4425 Missing "VAT" translation in supplier order
 popup

Close #4425
---
 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 7685c715494..e7777f82cd5 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -583,7 +583,7 @@ class CommandeFournisseur extends CommonOrder
         if (! empty($this->total_ht))
             $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
         if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('TVA') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+            $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);
 

From aa457346835b3fb0379b875882c47dfed387cae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Wed, 2 Mar 2016 11:38:40 +0100
Subject: [PATCH 403/421] FIX #4434 Weird behaviour when enabling multiprices

Close #4434
---
 htdocs/product/admin/product.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index c188fb94973..b8c07df87a5 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -56,7 +56,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 }
 
 // Clean param
-if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) $conf->global->PRODUIT_MULTIPRICES_LIMIT = 5;
+if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) {
+	dolibarr_set_const($db, 'PRODUIT_MULTIPRICES_LIMIT', 5, 'chaine', 0, '', $conf->entity);
+}
 
 
 

From 6f5481896b7d0926fc4a669cdce84d24f71a0545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Wed, 2 Mar 2016 12:38:34 +0100
Subject: [PATCH 404/421] FIX #4453 SEPA Direct Debit generated XML shows a
 trailing comma in RmtInf field

Close #4453
---
 .../prelevement/class/bonprelevement.class.php  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 62a2b01dd58..610fe257732 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1261,28 +1261,25 @@ class BonPrelevement extends CommonObject
 			$dateTime_ECMA = dol_print_date($date_actu, '%Y-%m-%dT%H:%M:%S');
 			$fileDebiteurSection = '';
 			$fileEmetteurSection = '';
-			$ListOfFactures = '';
 			$i = 0;
-			$j = 0;
 			$this->total = 0;
 
 			/*
 			 * section Debiteur (sepa Debiteurs bloc lines)
 			 */
 
+			$tmp_invoices = array();
+
 			$sql = "SELECT f.facnumber as fac FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."prelevement_facture as pf, ".MAIN_DB_PREFIX."societe as soc, ".MAIN_DB_PREFIX."c_country as p, ".MAIN_DB_PREFIX."societe_rib as rib WHERE pl.fk_prelevement_bons = ".$this->id." AND pl.rowid = pf.fk_prelevement_lignes AND pf.fk_facture = f.rowid AND soc.fk_pays = p.rowid AND soc.rowid = f.fk_soc AND rib.fk_soc = f.fk_soc AND rib.default_rib = 1";
 			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$num = $this->db->num_rows($resql);
-				while ($j < $num)
-				{
-					$objfac = $this->db->fetch_object($resql);
-					$ListOfFactures .= ($j>0?',':'') . $objfac->fac;
-					$j++;
+			if ($resql) {
+				while ($objfac = $this->db->fetch_object($resql)) {
+					$tmp_invoices[] = $objfac->fac;
 				}
 			}
 
+	        $ListOfFactures = implode($tmp_invoices);
+
 			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
 			$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
 			$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";

From 222ce45e0c69363f889f057d5ac3090aae8b406f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 2 Mar 2016 18:57:34 +0100
Subject: [PATCH 405/421] Update 3.9.0-4.0.0.sql

---
 htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 196995eea93..b91c50fd05d 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -306,5 +306,19 @@ ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ht double(24
 ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
 ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
 
+ALTER TABLE llx_expensereport ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_expensereport ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_expensereport ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_expensereport ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_expensereport ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_expensereport ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_expensereport_det ADD COLUMN fk_multicurrency integer;
+ALTER TABLE llx_expensereport_det ADD COLUMN multicurrency_code varchar(255);
+ALTER TABLE llx_expensereport_det ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0;
+ALTER TABLE llx_expensereport_det ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0;
+ALTER TABLE llx_expensereport_det ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
+ALTER TABLE llx_expensereport_det ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;
+
 ALTER TABLE llx_product_lang ADD COLUMN import_key varchar(14) DEFAULT NULL;
 

From 19a9a02e6a1ea12411529605b098caee7a8d1661 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 01:08:15 +0100
Subject: [PATCH 406/421] Fix script is able to manage rc versions

---
 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 0983ec5d0ef..db61a84d133 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -355,7 +355,7 @@ if ($nboftargetok) {
 		
 		# Test that the ChangeLog is ok
 		$TMPBUILDTOCHECKCHANGELOG=$BUILD;
-		$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc//;
+		$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc\d*//;
 		print "Check if ChangeLog is ok for version $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG\n";
 		$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG" "$SOURCE/ChangeLog" 2>&1`;
 		if (! $ret)

From b1c1de422fc356334a0f536ca0112bb25816279b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 10:05:40 +0100
Subject: [PATCH 407/421] Enhance look of cron job list

---
 htdocs/core/lib/cron.lib.php |  2 +-
 htdocs/cron/list.php         | 30 +++++++++++++-----------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 6aeaad4d628..d7a0a57ac37 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -116,7 +116,7 @@ function dol_print_cron_urls()
 	{
 		print $langs->trans("CronExplainHowToRunUnix");
 		print '<br>';
-		print '<textarea rows="'.ROWS_1.'" style="width:80%">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' &gt; '.DOL_DOCUMENT_ROOT.'/cron_run_jobs.php.log</textarea><br>';
+		print '<textarea rows="'.ROWS_1.'" style="width:80%">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
 	}
 	else
 	{
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 24edb62aac8..eb365dbd5b8 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -182,8 +182,18 @@ print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $stringcurrentdate, $num, 0, 'title_setup', 0, '', '', $limit);
 
-print $langs->trans('CronInfo');
-print "<br><br>";
+
+// Line with explanation and button new job
+if (! $user->rights->cron->create)
+{
+    $buttontoshow.='<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronCreateJob").'</a>';
+}
+else
+{
+    $buttontoshow.='<a class="butAction" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>';
+}
+print '<table class="centpercent"><tr><td>'.$langs->trans('CronInfo').'</td><td class="right">'.$buttontoshow.'</td></tr></table>';
+print '<br>';
 
 
 print '<table width="100%" class="noborder">';
@@ -359,21 +369,7 @@ print '</table>';
 print '</from>';
 
 
-
-print "\n<div class=\"tabsAction\">\n";
-
-if (! $user->rights->cron->create)
-{
-	print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronCreateJob").'</a>';
-}
-else
-{
-	print '<a class="butAction" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>';
-}
-
-print '</div>';
-
-print '<br>';
+print '<br><br>';
 
 
 dol_print_cron_urls();

From fd2166ed11f2bcc62cd4272e4143c37a69f8c3ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 10:42:49 +0100
Subject: [PATCH 408/421] Minor enhancement on new recurring invoice generation

---
 htdocs/compta/facture.php           | 12 ++++++++++++
 htdocs/compta/facture/fiche-rec.php |  2 +-
 htdocs/compta/index.php             |  2 +-
 htdocs/core/lib/functions.lib.php   |  7 ++++---
 htdocs/langs/en_US/bills.lang       |  6 +++++-
 htdocs/langs/fr_FR/companies.lang   |  2 +-
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index ec12242b4e4..2fcdfb7f6a0 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1999,6 +1999,18 @@ if ($action == 'create')
 
 	}
 
+	if ($origin == 'contrat')
+	{
+	    $langs->load("admin");
+	    $text=$langs->trans("ToCreateARecurringInvoice");
+	    $text.=' '.$langs->trans("ToCreateARecurringInvoiceGene", $langs->transnoentitiesnoconv("MenuFinancial"), $langs->transnoentitiesnoconv("BillsCustomers"), $langs->transnoentitiesnoconv("ListOfTemplates"));
+	    if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE))
+	    {
+	       $text.=' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
+	    }
+	    print info_admin($text, 0, 0, 0).'<br>';
+	}
+	
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
 	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index adcdeb64744..469cbf44ca9 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -309,7 +309,7 @@ if ($action == 'create')
 		
 		// Number max of generation
 		print "<tr><td>".$langs->trans("MaxPeriodNumber")."</td><td>";
-		print "<input type='text' name='nb_gen_max' value='' size='5' />";
+		print '<input type="text" name="nb_gen_max" value="'.GETPOST('nb_gen_max').'" size="5" />';
 		print "</td></tr>";
 
 		// Auto validate the invoice
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index c39b585d7b1..855a04d2f39 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -116,7 +116,7 @@ if (count($listofsearchfields))
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
+		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="14"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';
 		$i++;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ab4ded9f296..493afb9e4cc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2648,14 +2648,15 @@ function img_searchclear($titlealt = 'default', $other = '')
 }
 
 /**
- *	Show information for admin users
+ *	Show information for admin users or standard users
  *
  *	@param	string	$text			Text info
  *	@param  integer	$infoonimgalt	Info is shown only on alt of star picto, otherwise it is show on output after the star picto
  *	@param	int		$nodiv			No div
+ *  @param  int     $admin          1=Info for admin users. 0=Info for standard users (change only the look)
  *	@return	string					String with info text
  */
-function info_admin($text, $infoonimgalt = 0, $nodiv=0)
+function info_admin($text, $infoonimgalt = 0, $nodiv=0, $admin=1)
 {
 	global $conf, $langs;
 
@@ -2664,7 +2665,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv=0)
 		return img_picto($text, 'info', 'class="hideonsmartphone"');
 	}
 
-	return ($nodiv?'':'<div class="info hideonsmartphone">').img_picto($langs->trans('InfoAdmin'), ($nodiv?'info':'info_black'), 'class="hideonsmartphone"').' '.$text.($nodiv?'':'</div>');
+	return ($nodiv?'':'<div class="'.($admin?'info':'').' hideonsmartphone">').img_picto($admin?$langs->trans('InfoAdmin'):$langs->trans('Note'), ($nodiv?'info':'info_black'), 'class="hideonsmartphone"').' '.$text.($nodiv?'':'</div>');
 }
 
 
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index f8102373089..ec04f9e2596 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -470,4 +470,8 @@ PDFCrevetteDescription=Invoice PDF template Crevette. A invoice template if you
 PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
\ No newline at end of file
+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 you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index f31f2cbd2c4..28188642d59 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -63,7 +63,7 @@ UserTitle=Titre civilité
 Surname=Surnom/Pseudo
 Address=Adresse
 State=Département/Canton
-StateShort=Etat
+StateShort=Département
 Region=Région
 Country=Pays
 CountryCode=Code pays

From 360e20258226031f81d128ec4cf3cf0014eb15bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 11:39:13 +0100
Subject: [PATCH 409/421] Add fields to search on extrafields

---
 htdocs/societe/list.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index ba33236aefe..8ded8a64c72 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -779,6 +779,13 @@ if ($resql)
 			if (! empty($arrayfields["ef.".$key]['checked'])) 
 			{
 				print '<td class="liste_titre">';
+				$typeofextrafield=$extrafields->attribute_type[$key];
+				if (in_array($typeofextrafield, array('varchar', 'int')))
+				{
+    				$crit=$val;
+    				$tmpkey=preg_replace('/search_options_/','',$key);
+    				print '<input class="flat" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+				}
 				print '</td>';
 			}
 	   }

From aa34dffef5c799044ab4f2855648f0443064ca3a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 12:09:13 +0100
Subject: [PATCH 410/421] Search on select list is supported for extra fields

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 8ded8a64c72..0108ff1b55b 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -778,11 +778,12 @@ if ($resql)
 	   {
 			if (! empty($arrayfields["ef.".$key]['checked'])) 
 			{
-				print '<td class="liste_titre">';
-				$typeofextrafield=$extrafields->attribute_type[$key];
-				if (in_array($typeofextrafield, array('varchar', 'int')))
+			    $typeofextrafield=$extrafields->attribute_type[$key];
+			    if (in_array($typeofextrafield, array('int'))) print '<td class="liste_titre right">'; 
+			    else print '<td class="liste_titre">';
+			    if (in_array($typeofextrafield, array('varchar', 'int', 'select')))
 				{
-    				$crit=$val;
+				    $crit=$val;
     				$tmpkey=preg_replace('/search_options_/','',$key);
     				print '<input class="flat" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
 				}

From f3745511fd8d7b9c7f366e8bf11a1d16a6496922 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 12:15:17 +0100
Subject: [PATCH 411/421] Fix missing translation

---
 htdocs/core/boxes/box_services_expired.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 52f3777e2af..578d83e0b66 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -118,7 +118,11 @@ class box_services_expired extends ModeleBoxes
     				$i++;
     			}
 
-    			if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoExpiredServices"));
+    			if ($num==0) 
+    			{
+    			    $langs->load("contracts");
+    			    $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoExpiredServices"));
+    			}
 
 				$db->free($resql);
     		}

From d842d05639c7912f7e73d08e071a2884e39f8b19 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 12:31:29 +0100
Subject: [PATCH 412/421] Fix bug in date compare

---
 htdocs/compta/facture/fiche-rec.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 469cbf44ca9..76f796f78b6 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -905,8 +905,8 @@ else
 		 */
 		print '<div class="tabsAction">';
 
-		if ($object->statut == Facture::STATUS_DRAFT)
-		{
+		//if ($object->statut == Facture::STATUS_DRAFT)   // there is no draft status on templates.
+		//{
 		    if ($user->rights->facture->creer)
 		    {
     		    if (empty($object->frequency) || $object->date_when <= $today)
@@ -922,9 +922,10 @@ else
     	    {
     		    print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("CreateBill").'</a></div>';
     		}
-		}
+		//}
 
-		if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
+		//if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
+		if ($user->rights->facture->supprimer)
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
 		}
@@ -1014,7 +1015,7 @@ else
 					print '<td align="center">';
 					if ($user->rights->facture->creer)
 					{
-				        if (empty($objp->frequency) || $objp->date_when <= $today)
+				        if (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
 				        {
                             print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
                             print $langs->trans("CreateBill").'</a>';

From 3cbeca26e72b63c959827ccc9186d263be74da77 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 13:16:46 +0100
Subject: [PATCH 413/421] NEW When creating a template invoice from a draft
 invoice, if there is link to contract on draft invoice, link is kept on
 template invoice.

---
 .../facture/class/facture-rec.class.php       | 20 ++++++++---
 htdocs/compta/facture/fiche-rec.php           | 35 +++++++++++++++++--
 htdocs/langs/en_US/bills.lang                 |  1 -
 3 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 14ec77600c7..ac2345e250a 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -163,9 +163,7 @@ class FactureRec extends Facture
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."facture_rec");
 
-				/*
-				 * Lines
-				 */
+				// Add lines
 				$num=count($facsrc->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
@@ -192,6 +190,20 @@ class FactureRec extends Facture
 						$error++;
 					}
 				}
+				
+			    // Add object linked
+			    if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+			    {
+			        foreach($this->linked_objects as $origin => $origin_id)
+			        {
+			            $ret = $this->add_object_linked($origin, $origin_id);
+			            if (! $ret)
+			            {
+			                $this->error=$this->db->lasterror();
+			                $error++;
+			            }
+			        }
+			    }				    
 
 				if ($error)
 				{
@@ -205,7 +217,7 @@ class FactureRec extends Facture
 			}
 			else
 			{
-				$this->error=$this->db->error().' sql='.$sql;
+			    $this->error=$this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 76f796f78b6..4e753433419 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -121,12 +121,31 @@ if ($action == 'add')
 		
 		$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
 		$object->date_when = $date_next_execution;
+
+		// Get first contract linked to invoice used to generate template
+		if (GETPOST('facid','int') > 0)
+		{
+            $srcObject = new Facture($db);
+            $srcObject->fetch(GETPOST('facid','int'));
+            
+            $srcObject->fetchObjectLinked();
+            
+            if (! empty($srcObject->linkedObjectsIds['contrat']))
+            {
+                $contractidid = reset($srcObject->linkedObjectsIds['contrat']);
+            }
+
+            $object->origin = 'contrat';
+            $object->origin_id = $contractidid;
+            $object->linked_objects[$object->origin] = $object->origin_id;
+		}
 		
 		if ($object->create($user, $id) > 0)
 		{
 			$id = $object->id;
-			header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $id);
-			exit;
+
+   			header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $id);
+   			exit;
 		}
 		else
 		{
@@ -932,6 +951,16 @@ else
 
 		print '</div>';
 		
+		
+
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+		
+		// Linked object block
+		$somethingshown = $form->showLinkedObjectBlock($object);
+		
+        print '</div></div>';
+
 	}
 	else
 	{
@@ -970,7 +999,7 @@ else
         	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
         	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
             
-	       print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecord,'title_accountancy.png',0,'','',$limit);
+	        print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecord,'title_accountancy.png',0,'','',$limit);
 
 			print $langs->trans("ToCreateAPredefinedInvoice").'<br><br>';
 
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index ec04f9e2596..d757137fb7b 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -319,7 +319,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s

From 40144eee8d828f06a14414fc372c4590d5ac95bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 13:38:16 +0100
Subject: [PATCH 414/421] NEW linked object can show now the recurring invoices
 with other linked objects.

---
 .../tpl/linkedobjectblockForRec.tpl.php       | 68 +++++++++++++++++++
 htdocs/core/class/commonobject.class.php      |  8 +++
 htdocs/core/class/html.form.class.php         | 10 ++-
 htdocs/langs/en_US/bills.lang                 |  1 +
 4 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php

diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
new file mode 100644
index 00000000000..a5870ac190e
--- /dev/null
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -0,0 +1,68 @@
+<?php
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2014       Marcos García <marcosgdf@gmail.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 <http://www.gnu.org/licenses/>.
+ *
+ */
+?>
+
+<!-- BEGIN PHP TEMPLATE -->
+
+<?php
+
+global $user;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+$langs->load("bills");
+echo '<br>';
+print load_fiche_titre($langs->trans("RelatedRecurringCustomerInvoices"), '', '');
+?>
+<table class="noborder allwidth">
+<tr class="liste_titre">
+	<td><?php echo $langs->trans("Ref"); ?></td>
+	<!-- <td align="center"><?php echo $langs->trans("RefCustomer"); ?></td>
+	<td align="center"><?php echo $langs->trans("Date"); ?></td>-->
+	<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
+	<!-- <td align="right"><?php echo $langs->trans("Status"); ?></td> -->
+	<td></td>
+</tr>
+<?php
+$var=true;
+$total=0;
+foreach($linkedObjectBlock as $key => $objectlink)
+{
+	$var=!$var;
+?>
+<tr <?php echo $GLOBALS['bc'][$var]; ?> >
+    <td><?php echo $objectlink->getNomUrl(1); ?></td>
+	<!-- <td align="center"><?php echo $objectlink->ref_client; ?></td>
+	<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td> -->
+	<td align="right"><?php
+		if ($user->rights->facture->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
+	<!-- <td align="right"><?php echo $objectlink->getLibStatut(3); ?></td> -->
+	<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
+</tr>
+<?php
+}
+?>
+</table>
+
+<!-- END PHP TEMPLATE -->
\ No newline at end of file
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 48683ee01df..a65573a7947 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2524,6 +2524,9 @@ abstract class CommonObject
                     if ($objecttype == 'facture')			{
                         $classpath = 'compta/facture/class';
                     }
+                    else if ($objecttype == 'facturerec')			{
+                        $classpath = 'compta/facture/class'; $module = 'facture';
+                    }
                     else if ($objecttype == 'propal')			{
                         $classpath = 'comm/propal/class';
                     }
@@ -2548,7 +2551,9 @@ abstract class CommonObject
                         $classpath = 'contrat/class'; $subelement = 'contrat'; $module = 'contratabonnement';
                     }
 
+                    // Set classfile
                     $classfile = strtolower($subelement); $classname = ucfirst($subelement);
+                    
                     if ($objecttype == 'invoice_supplier') {
                         $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
                     }
@@ -2558,6 +2563,9 @@ abstract class CommonObject
                     else if ($objecttype == 'supplier_proposal')   {
                         $classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
                     }
+                    else if ($objecttype == 'facturerec')   {
+                        $classfile = 'facture-rec'; $classname = 'FactureRec';
+                    }
                     
                     // Here $module, $classfile and $classname are set
                     if ($conf->$module->enabled && (($element != $this->element) || $alsosametype))
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c5ee5301210..be3452f10dc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5103,12 +5103,18 @@ class Form
         			$subelement = $regs[2];
         			$tplpath = $element.'/'.$subelement;
         		}
-        		   		
+        		$tplname='linkedobjectblock';
+        		
         		// To work with non standard path
         		if ($objecttype == 'facture')          {
         			$tplpath = 'compta/'.$element;
         			if (empty($conf->facture->enabled)) continue;	// Do not show if module disabled
         		}
+        	    else if ($objecttype == 'facturerec')          {
+        			$tplpath = 'compta/facture';
+        			$tplname = 'linkedobjectblockForRec';
+        			if (empty($conf->facture->enabled)) continue;	// Do not show if module disabled
+        		}
         		else if ($objecttype == 'propal')           {
         			$tplpath = 'comm/'.$element;
         			if (empty($conf->propal->enabled)) continue;	// Do not show if module disabled
@@ -5138,7 +5144,7 @@ class Form
         		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/'.$tplpath.'/tpl'));
         		foreach($dirtpls as $reldir)
         		{
-        			$res=@include dol_buildpath($reldir.'/linkedobjectblock.tpl.php');
+                    $res=@include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');
         			if ($res) break;
         		}
         	}
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index d757137fb7b..970f42d8a2e 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -219,6 +219,7 @@ 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 before
 DateEcheance=Due date limit

From 7dc5fd334f56831799c3e29420b46ab2d4fe38fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 19:21:17 +0100
Subject: [PATCH 415/421] Italian vat to 22

---
 htdocs/install/mysql/data/llx_c_tva.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 7e3560d04bb..4226413be59 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -121,7 +121,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (11
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1163, 116,   '0','0','VAT rate 0',1);
 
 -- ITALY (id country=3)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 31,  3,  '21','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 31,  3,  '22','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 32,  3,  '10','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 33,  3,   '4','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 34,  3,   '0','0','VAT Rate 0',1);

From 974879ea9d51eac89b96258424ef23d7f7aa86dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 20:19:40 +0100
Subject: [PATCH 416/421] NEW Disabled users are striked.

---
 htdocs/societe/class/societe.class.php        |  4 ++-
 htdocs/societe/commerciaux.php                | 25 +++++++++++++++----
 .../tpl/linesalesrepresentative.tpl.php       |  1 +
 htdocs/theme/eldy/style.css.php               |  3 +++
 htdocs/theme/md/style.css.php                 |  4 +++
 htdocs/user/class/user.class.php              |  2 +-
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index babd8387c5b..cb966901a44 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1662,7 +1662,7 @@ class Societe extends CommonObject
 
         $reparray=array();
 
-        $sql = "SELECT u.rowid, u.lastname, u.firstname, u.email";
+        $sql = "SELECT u.rowid, u.lastname, u.firstname, u.email, u.statut, u.entity";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
         $sql.= " WHERE u.rowid = sc.fk_user AND sc.fk_soc =".$this->id;
         $sql.= " AND entity in (0, ".$conf->entity.")";
@@ -1679,6 +1679,8 @@ class Societe extends CommonObject
                 $reparray[$i]['lastname']=$obj->lastname;
                 $reparray[$i]['firstname']=$obj->firstname;
                 $reparray[$i]['email']=$obj->email;
+                $reparray[$i]['statut']=$obj->statut;
+                $reparray[$i]['entity']=$obj->entity;
                 $i++;
             }
             return $reparray;
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 92ce3c614ce..152f655835e 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -141,7 +141,7 @@ if ($socid)
 	print '<tr><td>'.$langs->trans("SalesRepresentatives").'</td>';
 	print '<td colspan="3">';
 
-	$sql = "SELECT u.rowid, u.lastname, u.firstname";
+	$sql = "SELECT u.rowid, u.login, u.fk_soc, u.lastname, u.firstname, u.statut, u.entity";
 	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 	$sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE sc.fk_soc =".$object->id;
@@ -154,6 +154,8 @@ if ($socid)
 		$num = $db->num_rows($resql);
 		$i = 0;
 
+		$tmpuser = new User($db);
+		
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -165,10 +167,20 @@ if ($socid)
 				null; // actions in normal case
       		}
 
-			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">';
+      		$tmpuser->id = $obj->rowid;
+      		$tmpuser->firstname = $obj->firstname;
+      		$tmpuser->lastname = $obj->lastname;
+      		$tmpuser->statut = $obj->statut;
+      		$tmpuser->login = $obj->login;
+      		$tmpuser->entity = $obj->entity;
+      		$tmpuser->societe_id = $obj->fk_soc;
+      		print $tmpuser->getNomUrl(1);
+      		
+			/*print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">';
 			print img_object($langs->trans("ShowUser"),"user").' ';
 			print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n";
-			print '</a>&nbsp;';
+			print '</a>';*/
+			print '&nbsp;';
 			if ($user->rights->societe->creer)
 			{
 			    print '<a href="commerciaux.php?socid='.$_GET["socid"].'&amp;delcommid='.$obj->rowid.'">';
@@ -205,7 +217,7 @@ if ($socid)
 		$langs->load("users");
 		$title=$langs->trans("ListOfUsers");
 
-		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.login";
+		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.login, u.statut";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 		$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
 		if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut<>0 ";
@@ -224,6 +236,7 @@ if ($socid)
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("Name").'</td>';
 			print '<td>'.$langs->trans("Login").'</td>';
+			print '<td>'.$langs->trans("Status").'</td>';
 			print '<td>&nbsp;</td>';
 			print "</tr>\n";
 
@@ -238,7 +251,9 @@ if ($socid)
 				print img_object($langs->trans("ShowUser"),"user").' ';
 				print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n";
 				print '</a>';
-				print '</td><td>'.$obj->login.'</td>';
+				print '</td>';
+				print '<td>'.$obj->login.'</td>';
+				print '<td>'.User::LibStatut($obj->statut,0).'</td>';
 				print '<td><a href="commerciaux.php?socid='.$_GET["socid"].'&amp;commid='.$obj->rowid.'">'.$langs->trans("Add").'</a></td>';
 
 				print '</tr>'."\n";
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 6ad5a81b7f2..22d99d3e9c3 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -29,6 +29,7 @@
                 $userstatic->id=$val['id'];
                 $userstatic->lastname=$val['lastname'];
                 $userstatic->firstname=$val['firstname'];
+                $userstatic->statut=$val['statut'];
                 print $userstatic->getNomUrl(1);
                 $i++;
                 if ($i < $nbofsalesrepresentative) print ', ';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 43ac20f6f56..ad72cd5f5ad 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -526,6 +526,9 @@ div.myavailability {
 .selectlimit {
 	margin-right: 10px !important;
 }
+.strikefordisabled {
+	text-decoration: line-through;
+}
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3f1246b6035..1266f5799a2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -514,6 +514,10 @@ div.myavailability {
 .selectlimit {
 	margin-right: 10px !important;
 }
+.strikefordisabled {
+	text-decoration: line-through;
+}
+
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 9266ebb4d7f..1b260f4142f 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2015,7 +2015,7 @@ class User extends CommonObject
 		}
 		if (abs($withpictoimg) != 2) 
 		{
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block valignmiddle'.($morecss?' usertext'.$morecss:'').'">';
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block valignmiddle'.($this->statut?'':' strikefordisabled').($morecss?' usertext'.$morecss:'').'">';
 			if ($mode == 'login') $result.=dol_trunc($this->login, $maxlen);
 			else $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='</div>';

From 99553c82300db77792585fa8c4b24a49593ac966 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 20:39:38 +0100
Subject: [PATCH 417/421] FIX Can not disable an opened service on a contract

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index e75342f252b..f5c718e04c1 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1720,7 +1720,7 @@ else
                     {
                         $tmpaction='activateline';
                         if ($objp->statut == 4) $tmpaction='unactivateline';
-						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->unactiver)) {
+						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver)) {
 							print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
 							print img_edit();
 							print '</a>';

From 071ca6d1c478194275b50b91ba18565ffc2113af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 20:46:42 +0100
Subject: [PATCH 418/421] Fix enable/disabled contract

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index f5c718e04c1..7b8f1d1d293 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1769,7 +1769,7 @@ else
                 print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne').'&amp;action=active" method="post">';
                 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-                print '<table class="notopnoleftnoright tableforservicepart2" width="100%">';
+                print '<table class="noborder tableforservicepart2" width="100%">';
 
                 // Definie date debut et fin par defaut
                 $dateactstart = $objp->date_debut;
@@ -1789,15 +1789,15 @@ else
                 }
 
                 print '<tr '.$bc[$var].'>';
-                print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td>';
+                print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td class="nohover">';
                 print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active",1,0,1);
                 print '</td>';
 
-                print '<td class="nohover">'.$langs->trans("DateEndPlanned").'</td><td>';
+                print '<td class="nohover">'.$langs->trans("DateEndPlanned").'</td><td class="nohover">';
                 print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active",1,0,1);
                 print '</td>';
 
-                print '<td align="center nohover" rowspan="2" valign="middle">';
+                print '<td align="center nohover" rowspan="2" valign="middle" class="nohover">';
                 print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"><br>';
                 print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
                 print '</td>';

From 14ab10328c7140915b8b305466c7b0e35642311a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 20:48:11 +0100
Subject: [PATCH 419/421] Minor fixes

---
 htdocs/contrat/card.php          | 2 +-
 htdocs/user/class/user.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index c44c1fc36bb..61db6a2da80 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1754,7 +1754,7 @@ else
                     {
                         $tmpaction='activateline';
                         if ($objp->statut == 4) $tmpaction='unactivateline';
-						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->unactiver)) {
+						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver)) {
 							print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
 							print img_edit();
 							print '</a>';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 1b260f4142f..b6f2165c745 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2015,7 +2015,7 @@ class User extends CommonObject
 		}
 		if (abs($withpictoimg) != 2) 
 		{
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block valignmiddle'.($this->statut?'':' strikefordisabled').($morecss?' usertext'.$morecss:'').'">';
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block valignmiddle'.((! isset($this->statut) || $this->statut)?'':' strikefordisabled').($morecss?' usertext'.$morecss:'').'">';
 			if ($mode == 'login') $result.=dol_trunc($this->login, $maxlen);
 			else $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='</div>';

From 453466f23f44ea0304ba827a74748eac05140e06 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Mar 2016 21:14:20 +0100
Subject: [PATCH 420/421] Fix draft invoice must be destroyed once converted
 into template

---
 .../facture/class/facture-rec.class.php       |  2 +-
 htdocs/compta/facture/fiche-rec.php           | 44 +++++++++++++++----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index ac2345e250a..87e2fea156c 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -77,7 +77,7 @@ class FactureRec extends Facture
 	 *
 	 * 	@param		User	$user		User object
 	 * 	@param		int		$facid		Id of source invoice
-	 *	@return		int					<0 if KO, id of invoice if OK
+	 *	@return		int					<0 if KO, id of invoice created if OK
 	 */
 	function create($user, $facid)
 	{
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 4e753433419..81eeed8a5b9 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -123,7 +123,7 @@ if ($action == 'add')
 		$object->date_when = $date_next_execution;
 
 		// Get first contract linked to invoice used to generate template
-		if (GETPOST('facid','int') > 0)
+		if ($id > 0)
 		{
             $srcObject = new Facture($db);
             $srcObject->fetch(GETPOST('facid','int'));
@@ -133,22 +133,48 @@ if ($action == 'add')
             if (! empty($srcObject->linkedObjectsIds['contrat']))
             {
                 $contractidid = reset($srcObject->linkedObjectsIds['contrat']);
-            }
 
-            $object->origin = 'contrat';
-            $object->origin_id = $contractidid;
-            $object->linked_objects[$object->origin] = $object->origin_id;
+                $object->origin = 'contrat';
+                $object->origin_id = $contractidid;
+                $object->linked_objects[$object->origin] = $object->origin_id;
+            }
 		}
 		
-		if ($object->create($user, $id) > 0)
-		{
-			$id = $object->id;
+		$db->begin();
 
-   			header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $id);
+		$oldinvoice = new Facture($db);
+		$oldinvoice->fetch($id);
+		
+		$result = $object->create($user, $oldinvoice->id);
+		if ($result > 0)
+		{
+			$result=$oldinvoice->delete(0, 1);
+			if ($result < 0)
+			{
+			    $error++;
+    		    setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
+    		    $action = "create";
+			}
+		}
+		else
+		{
+		    $error++;
+		    setEventMessages($object->error, $object->errors, 'errors');
+		    $action = "create";
+		}
+			
+		if (! $error)
+		{
+			$db->commit();
+			
+			header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
    			exit;
 		}
 		else
 		{
+		    $db->rollback();
+		    
+		    $error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = "create";
 		}

From fba3970835a8effad784b2a6fcb286b5cce959b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Mar 2016 01:09:31 +0100
Subject: [PATCH 421/421] Fix missing loading lang

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

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 4cd7b84f150..59cbbecd6b2 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -50,6 +50,8 @@ class Utils
 	{
 		global $conf, $langs, $dolibarr_main_data_root;
 		
+		$langs->load("admin");
+		
 		dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG);
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';