Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00 · 2018-02-08 15:20:24 +01:00 · eccdc9a075
commit eccdc9a075
parent ddcb1e2bb6 2b2e68c78d
616 changed files with 2610 additions and 1740 deletions
--- a/4
+++ b/4
@ -287,7 +287,9 @@ Following changes may create regressions for some external modules, but were nec
 * Jquery plugin tableDnd updated. You now need to use decodeURI on the return value of tableDnDSerialize() 
  and add 'td.' to the beginning of the dragHandle match string. 
 * IE8 and earlier and Firefox 12 and earlier (< 2012) are no more supported. 
-
+* The module ExpenseReport use numbering rules that you can setup (like other modules do). If you need to 
+  keep the hard coded numbering rule of expenses report used in 6.0, just add constant
+  EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1.
 * If you use the external module "multicompany", you must also upgrade the module. Multicompany module for
  Dolibarr v7 is required because with Dolibarr v7, payment modes and payment conditions are management as data
  that are dedicated to each company. If you keep your old version of multicompany module, mode and
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@ -59,6 +59,8 @@ class AccountingJournal extends CommonObject
 	 */
 	function fetch($rowid = null, $journal_code = null)
 	{
+		global $conf;
+
 		if ($rowid || $journal_code)
 		{
 			$sql = "SELECT rowid, code, label, nature, active";
@ -66,8 +68,11 @@ class AccountingJournal extends CommonObject
 			$sql .= " WHERE";
 			if ($rowid) {
 				$sql .= " rowid = " . (int) $rowid;
-			} elseif ($journal_code) {
+			}
+			elseif ($journal_code)
+			{
 				$sql .= " code = '" . $this->db->escape($journal_code) . "'";
+				$sql .= " AND entity  = " . $conf->entity;
 			}

 			dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@ -39,6 +39,8 @@ class lettering extends BookKeeping
 	 */
 	public function lettrageTiers($socid)
 	{
+		global $conf;
+
 		$error = 0;

 		$object = new Societe($this->db);
@ -91,7 +93,8 @@ class lettering extends BookKeeping
 					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
 					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk ON (bk.fk_doc = payf.fk_bank AND bk.code_journal='" . $obj->code_journal . "')";
 					$sql .= " WHERE payfacf.fk_paiementfourn = '" . $obj->url_id . "' ";
-					$sql .= " AND code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=4) ";
+					$sql .= " AND facf.entity = ".$conf->entity;
+					$sql .= " AND code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=4 AND entity=".$conf->entity.") ";
 					$sql .= " AND ( ";
 					if (! empty($object->code_compta)) {
 						$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
@ -118,7 +121,8 @@ class lettering extends BookKeeping
 						$sql = 'SELECT bk.rowid, facf.ref, facf.ref_supplier ';
 						$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
 						$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk ON(  bk.fk_doc = facf.rowid AND facf.rowid IN (" . implode(',', $ids_fact) . "))";
-						$sql .= " WHERE bk.code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=3) ";
+						$sql .= " WHERE bk.code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=3 AND entity=".$conf->entity.") ";
+						$sql .= " AND facf.entity = ".$conf->entity;
 						$sql .= " AND ( ";
 						if (! empty($object->code_compta)) {
 							$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
@ -149,7 +153,8 @@ class lettering extends BookKeeping
 					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
 					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk ON (bk.fk_doc = pay.fk_bank AND bk.code_journal='" . $obj->code_journal . "')";
 					$sql .= " WHERE payfac.fk_paiement = '" . $obj->url_id . "' ";
-					$sql .= " AND bk.code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=4) ";
+					$sql .= " AND bk.code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=4 AND entity=".$conf->entity.") ";
+					$sql .= " AND fac.entity = ".$conf->entity;
 					$sql .= " AND ( ";
 					if (! empty($object->code_compta)) {
 						$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
@ -176,7 +181,8 @@ class lettering extends BookKeeping
 						$sql = 'SELECT bk.rowid, fac.ref, fac.ref_supplier ';
 						$sql .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
 						$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk ON(  bk.fk_doc = fac.rowid AND fac.rowid IN (" . implode(',', $ids_fact) . "))";
-						$sql .= " WHERE code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=2) ";
+						$sql .= " WHERE code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=2 AND entity=".$conf->entity.") ";
+						$sql .= " AND fac.entity = ".$conf->entity;
 						$sql .= " AND ( ";
 						if (! empty($object->code_compta)) {
 							$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@ -1048,7 +1048,7 @@ class ActionComm extends CommonObject
 	    		$response = new WorkboardResponse();
 	    		$response->warning_delay = $conf->agenda->warning_delay/60/60/24;
 	    		$response->label = $langs->trans("ActionsToDo");
-	    		$response->url = DOL_URL_ROOT.'/comm/action/list.php?status=todo&amp;mainmenu=agenda';
+	    		$response->url = DOL_URL_ROOT.'/comm/action/list.php?actioncode=0&amp;status=todo&amp;mainmenu=agenda';
 	    		if ($user->rights->agenda->allactions->read) $response->url.='&amp;filtert=-1';
 	    		$response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
    		}
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@ -140,6 +140,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
   }
 }

+
 /*
 *	Actions
 */
@ -353,15 +354,15 @@ if ($resql)
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	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 ($resourceid) $nav.='<input type="hidden" name="resourceid" value="'.$resourceid.'">';
-	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.'">';
+
+	//if ($actioncode)    $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
+	//if ($resourceid)      $nav.='<input type="hidden" name="resourceid" value="'.$resourceid.'">';
+	if ($filter)          $nav.='<input type="hidden" name="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;

    dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@ -41,15 +41,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->projet->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

-$langs->load('companies');
-$langs->load('propal');
-$langs->load('compta');
-$langs->load('bills');
-$langs->load('orders');
-$langs->load('products');
+$langs->loadLangs(array('companies','propal','compta','bills','orders','products'));

 $socid=GETPOST('socid','int');

@ -141,7 +135,7 @@ $checkedtypetiers=0;
 $arrayfields=array(
 	'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
 	'p.ref_client'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
-	'pr.ref'=>array('label'=>$langs->trans("Project"), 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled)?0:1)),
+	'pr.ref'=>array('label'=>$langs->trans("ProjectRef"), 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled)?0:1)),
 	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
 	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
 	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
@ -237,6 +231,7 @@ $formother = new FormOther($db);
 $formfile = new FormFile($db);
 $formpropal = new FormPropal($db);
 $companystatic=new Societe($db);
+$projectstatic=new Project($db);
 $formcompany=new FormCompany($db);

 $help_url='EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@ -217,6 +217,7 @@ if (empty($reshook))
 			if (! empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
+				$outputlangs->load('products');
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$ret = $object->fetch($id); // Reload to get new records
@ -529,6 +530,7 @@ if (empty($reshook))
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
+						$outputlangs->load('products');
 					}
 					$model=$object->modelpdf;
 					$ret = $object->fetch($id); // Reload to get new records
@ -606,7 +608,6 @@ if (empty($reshook))
 					$result=$object->set_draft($user, $idwarehouse);
 					if ($result<0) setEventMessages($object->error, $object->errors, 'errors');

-
 					// Define output language
 					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 					{
@ -617,6 +618,7 @@ if (empty($reshook))
 						if (! empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
+							$outputlangs->load('products');
 						}
 						$model=$object->modelpdf;
 						$ret = $object->fetch($id); // Reload to get new records
@ -1495,6 +1497,7 @@ if (empty($reshook))
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
+					$outputlangs->load('products');
 				}
 				$model=$object->modelpdf;
 				$ret = $object->fetch($id); // Reload to get new records
@ -1747,6 +1750,7 @@ if (empty($reshook))
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
+						$outputlangs->load('products');
 					}

 					$desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
@ -1770,6 +1774,7 @@ if (empty($reshook))
 						if (! empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
+							$outputlangs->load('products');
 						}
 						if (! empty($prod->customcode))
 							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
@ -1835,6 +1840,7 @@ if (empty($reshook))
 						if (! empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
+							$outputlangs->load('products');
 						}
 						$model=$object->modelpdf;
 						$ret = $object->fetch($id); // Reload to get new records
@ -2012,6 +2018,7 @@ if (empty($reshook))
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
+						$outputlangs->load('products');
 					}

 					$ret = $object->fetch($id); // Reload to get new records
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@ -72,6 +72,7 @@ $search_product_category=GETPOST('search_product_category','int');
 $search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','alpha');
 $search_refcustomer=GETPOST('search_refcustomer','alpha');
 $search_type=GETPOST('search_type','int');
+$search_project=GETPOST('search_project','alpha');
 $search_societe=GETPOST('search_societe','alpha');
 $search_montant_ht=GETPOST('search_montant_ht','alpha');
 $search_montant_vat=GETPOST('search_montant_vat','alpha');
@ -151,6 +152,7 @@ $arrayfields=array(
 	'f.type'=>array('label'=>$langs->trans("Type"), 'checked'=>0),
 	'f.date'=>array('label'=>$langs->trans("DateInvoice"), 'checked'=>1),
 	'f.date_lim_reglement'=>array('label'=>$langs->trans("DateDue"), 'checked'=>1),
+	'p.ref'=>array('label'=>$langs->trans("ProjectRef"), 'checked'=>0),
 	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
 	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
 	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
@ -362,7 +364,8 @@ $sql.= ' f.datec as date_creation, f.tms as date_update,';
 $sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
-$sql.= " country.code as country_code";
+$sql.= " country.code as country_code,";
+$sql.= " p.rowid as project_id, p.ref as project_ref";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
 if (! $sall) $sql.= ', SUM(pf.amount) as dynamount_payed';
@ -381,6 +384,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 if (! $sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
 if ($sall || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as pd ON f.rowid=pd.fk_facture';
 if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 if ($search_user > 0)
@ -488,7 +492,8 @@ if (! $sall)
 	$sql.= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
 	$sql.= ' typent.code,';
 	$sql.= ' state.code_departement, state.nom,';
-	$sql.= ' country.code';
+	$sql.= ' country.code,';
+	$sql.= " p.rowid, p.ref";

 	foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
 	{
@ -714,12 +719,12 @@ if ($resql)
 	// Project
 	if (! empty($arrayfields['p.ref']['checked']))
 	{
-		print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
+		print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirpdarty
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
-	   print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
+		print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
 	}
 	// Town
 	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
@ -838,6 +843,7 @@ if ($resql)
 	if (! empty($arrayfields['f.type']['checked']))               print_liste_field_titre($arrayfields['f.type']['label'],$_SERVER["PHP_SELF"],'f.type','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.date']['checked']))               print_liste_field_titre($arrayfields['f.date']['label'],$_SERVER['PHP_SELF'],'f.datef','',$param,'align="center"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'],$_SERVER['PHP_SELF'],"f.date_lim_reglement",'',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.ref']['checked']))                print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER['PHP_SELF'],"p.ref",'',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.nom']['checked']))                print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],'s.nom','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.town']['checked']))               print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.zip']['checked']))                print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
@ -864,6 +870,8 @@ if ($resql)
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";

+	$projectstatic=new Project($db);
+
 	if ($num > 0)
 	{
 		$i=0;
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@ -73,10 +73,9 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',

 llxHeader('',$langs->trans("WithdrawalsReceipts"));

-$sql = "SELECT p.rowid, p.ref, p.amount, p.statut";
-$sql.= ", p.datec";
+$sql = "SELECT p.rowid, p.ref, p.amount, p.statut, p.datec";
 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-$sql.= " WHERE p.entity = ".$conf->entity;
+$sql.= " WHERE p.entity IN (".getEntity('facture').")";
 if ($search_ref) $sql.=natural_search("p.ref", $search_ref);
 if ($search_amount) $sql.=natural_search("p.amount", $search_amount, 1);

--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@ -284,7 +284,7 @@ class BonPrelevement extends CommonObject
 		$sql.= ", p.fk_user_credit";
 		$sql.= ", p.statut";
 		$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-		$sql.= " WHERE p.entity = ".$conf->entity;
+		$sql.= " WHERE p.entity IN (".getEntity('facture').")";
 		if ($rowid > 0) $sql.= " AND p.rowid = ".$rowid;
 		else $sql.= " AND p.ref = '".$this->db->escape($ref)."'";

--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@ -279,7 +279,7 @@ print load_fiche_titre($langs->trans("LastWithdrawalReceipts",$limit),'','');
 $sql = "SELECT p.rowid, p.ref, p.amount, p.statut";
 $sql.= ", p.datec";
 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-$sql.= " WHERE p.entity = ".$conf->entity;
+$sql.= " WHERE p.entity IN (".getEntity('facture').")";
 $sql.= " ORDER BY datec DESC";
 $sql.=$db->plimit($limit);

--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@ -2,7 +2,7 @@
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2018 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
@ -101,7 +101,7 @@ if ($socid) $sql.= " AND s.rowid = ".$socid;
 if ($search_line) $sql.= " AND pl.rowid = '".$db->escape($search_line)."'";
 if ($search_bon) $sql.= natural_search("p.ref", $search_bon);
 if ($search_code) $sql.= natural_search("s.code_client", $search_code);
-if ($search_company) natural_search("s.nom", $search_company);
+if ($search_company) $sql.= natural_search("s.nom", $search_company);

 $sql.= $db->order($sortfield,$sortorder);

@ -123,13 +123,14 @@ if ($result)

    $urladd = "&amp;statut=".$statut;
    $urladd .= "&amp;search_bon=".$search_bon;
-
-    print_barre_liste($langs->trans("WithdrawalsLines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit);
+	if ($limit > 0 && $limit != $conf->liste_limit) $urladd.='&limit='.urlencode($limit);

    print"\n<!-- debut table -->\n";
    print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';

-    $moreforfilter='';
+	print_barre_liste($langs->trans("WithdrawalsLines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit);
+
+	$moreforfilter='';

    print '<div class="div-table-responsive">';
    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@ -740,7 +740,7 @@ else
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as label, date_format($column,'%Y-%m') as dm, sum(p.amount) as amount";
 			$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
 			$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
-			$sql.= " WHERE p.entity = ".$conf->entity;
+			$sql.= " WHERE p.entity IN (".getEntity('payment_salary').")";
 			if (! empty($date_start) && ! empty($date_end))
 				$sql.= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";

@ -813,7 +813,7 @@ else
 				$sql = "SELECT p.rowid, p.ref, u.rowid as userid, u.firstname, u.lastname, date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
 				$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 				$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
-				$sql.= " WHERE p.entity = ".getEntity('expensereport');
+				$sql.= " WHERE p.entity IN (".getEntity('expensereport').")";
 				$sql.= " AND p.fk_statut>=5";

 				$column='p.date_valid';
@ -823,7 +823,7 @@ else
 				$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 				$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity IN (".getEntity('c_paiement').")";
-				$sql.= " WHERE p.entity = ".getEntity('expensereport');
+				$sql.= " WHERE p.entity IN (".getEntity('expensereport').")";
 				$sql.= " AND p.fk_statut>=5";

 				$column='pe.datep';
@ -898,7 +898,7 @@ else
 			{
 		    	$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
 		    	$sql.= " FROM ".MAIN_DB_PREFIX."don as p";
-		    	$sql.= " WHERE p.entity = ".$conf->entity;
+		    	$sql.= " WHERE p.entity IN (".getEntity('donation').")";
 		    	$sql.= " AND fk_statut in (1,2)";
 			}
 			else
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@ -638,7 +638,7 @@ if (! empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $m
 	$subtotal_ttc = 0;
 	$sql = "SELECT p.label as nom, date_format(".$column.",'%Y-%m') as dm, sum(p.amount) as amount";
 	$sql .= " FROM " . MAIN_DB_PREFIX . "payment_salary as p";
-	$sql .= " WHERE p.entity = " . $conf->entity;
+	$sql .= " WHERE p.entity IN (".getEntity('payment_salary').")";
 	if (! empty($date_start) && ! empty($date_end))
 		$sql.= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
 	$sql .= " GROUP BY p.label, dm";
@ -686,7 +686,7 @@ if (! empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES'
 		$sql = "SELECT date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport');
+		$sql.= " WHERE p.entity IN (".getEntity('expensereport').")";
 		$sql.= " AND p.fk_statut>=5";

 		$column='p.date_valid';
@ -699,7 +699,7 @@ if (! empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES'
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity IN (".getEntity('c_paiement').")";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport');
+		$sql.= " WHERE p.entity IN (".getEntity('expensereport').")";
 		$sql.= " AND p.fk_statut>=5";

 		$column='pe.datep';
@ -752,7 +752,7 @@ if (! empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
    if ($modecompta == 'CREANCES-DETTES') {
        $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
        $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
-        $sql.= " WHERE p.entity = ".$conf->entity;
+        $sql.= " WHERE p.entity IN (".getEntity('donation').")";
        $sql.= " AND fk_statut in (1,2)";
 		if (! empty($date_start) && ! empty($date_end))
 			$sql.= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@ -111,7 +111,7 @@ class box_activity extends ModeleBoxes
        		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
        		$sql.= ")";
-        		$sql.= " WHERE p.entity = ".$conf->entity;
+        		$sql.= " WHERE p.entity IN (".getEntity('propal').")";
        		$sql.= " AND p.fk_soc = s.rowid";
        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
        		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@ -1301,7 +1301,10 @@ abstract class CommonObject
 		if ($resql)
 		{
 			$row = $this->db->fetch_row($resql);
-			$result = $this->fetch($row[0]);
+			// Test for avoid error -1
+			if ($row[0] > 0) {
+				$result = $this->fetch($row[0]);
+			}
 		}

 		return $result;
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@ -829,11 +829,11 @@ class ExtraFields
 	 * @param  string  $moreparam      To add more parametes on html input tag
 	 * @param  string  $keysuffix      Prefix string to add after name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $keyprefix      Suffix string to add before name and id of field (can be used to avoid duplicate names)
-	 * @param  mixed   $showsize       Value for css to define size. May also be a numeric.
+	 * @param  string  $morecss        More css (to defined size of field. Old behaviour: may also be a numeric)
 	 * @param  int     $objectid       Current object id
 	 * @return string
 	 */
-	function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $showsize=0, $objectid=0)
+	function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0)
 	{
 		global $conf,$langs,$form;

@ -866,45 +866,41 @@ class ExtraFields
 			else return '';
 		}

-		if (empty($showsize))
+		if (empty($morecss))
 		{
 			if ($type == 'date')
 			{
-				//$showsize=10;
-				$showsize = 'minwidth100imp';
+				$morecss = 'minwidth100imp';
 			}
 			elseif ($type == 'datetime')
 			{
-				//$showsize=19;
-				$showsize = 'minwidth200imp';
+				$morecss = 'minwidth200imp';
 			}
 			elseif (in_array($type,array('int','integer','double','price')))
 			{
-				//$showsize=10;
-				$showsize = 'maxwidth75';
+				$morecss = 'maxwidth75';
 			}
 			elseif ($type == 'url')
 			{
-				$showsize='minwidth400';
+				$morecss='minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$showsize='';
+				$morecss='';
 			}
 			else
 			{
 				if (round($size) < 12)
 				{
-					$showsize = 'minwidth100';
+					$morecss = 'minwidth100';
 				}
 				else if (round($size) <= 48)
 				{
-					$showsize = 'minwidth200';
+					$morecss = 'minwidth200';
 				}
 				else
 				{
-					//$showsize=48;
-					$showsize = 'minwidth400';
+					$morecss = 'minwidth400';
 				}
 			}
 		}
@ -926,15 +922,15 @@ class ExtraFields
 		{
 			$tmp=explode(',',$size);
 			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
 		}
 		elseif (preg_match('/varchar/', $type))
 		{
-			$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
 		}
 		elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 		}
 		elseif ($type == 'text')
 		{
@ -946,7 +942,7 @@ class ExtraFields
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
 		}
 		elseif ($type == 'boolean')
@ -957,21 +953,21 @@ class ExtraFields
 			} else {
 				$checked=' value="1" ';
 			}
-			$out='<input type="checkbox" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
 		}
 		elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
-			$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
 		}
 		elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
-			$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
 		}
 		elseif ($type == 'select')
 		{
@ -982,7 +978,7 @@ class ExtraFields
 				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}

-			$out.='<select class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
 			$out.='<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
@ -1004,7 +1000,7 @@ class ExtraFields
 				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}

-			$out.='<select class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
 			if (is_array($param['options']))
 			{
 				$param_list=array_keys($param['options']);
@ -1173,7 +1169,7 @@ class ExtraFields
 			$out='';
 			foreach ($param['options'] as $keyopt => $val)
 			{
-				$out.='<input class="flat '.$showsize.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
+				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
 				$out.=' value="'.$keyopt.'"';
 				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
 				$out.= ($value==$keyopt?'checked':'');
@ -1335,7 +1331,7 @@ class ExtraFields
 		elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$showsize.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
 		}
 		if (!empty($hidden)) {
 			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@ -330,7 +330,7 @@ class FormProjets
 		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
 		$sql.= ', '.MAIN_DB_PREFIX.'projet_task as t';
-		$sql.= " WHERE p.entity = ".$conf->entity;
+		$sql.= " WHERE p.entity IN (".getEntity('project').")";
 		$sql.= " AND t.fk_projet = p.rowid";
 		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@ -1421,7 +1421,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 	{
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
-	$sql.= " WHERE p.entity = ".$conf->entity;
+	$sql.= " WHERE p.entity IN (".getEntity('project').")";
 	$sql.= " AND p.rowid IN (".$projectsListId.")";
 	if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 	if ($mytasks)
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@ -10,7 +10,7 @@ delete from llx_menu where menu_handler=__HANDLER__ and entity=__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 ('', '1', 1__+MAX_llx_menu__, __HANDLER__, 'top', 'home',        '', 0, '/index.php?mainmenu=home&amp;leftmenu=', 'Home', -1, '', '', '', 2, 10, __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 ('societe|fournisseur', '( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',  2__+MAX_llx_menu__, __HANDLER__, 'top', 'companies',   '', 0, '/societe/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __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 ('product|service', '$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products',    '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __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 ('product|service', '$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products',    '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'ProductsPipeServices', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __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 ('propal|commande|fournisseur|contrat|ficheinter', '$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial',  '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __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 ('facture|don|tax|salaries|loan|banque', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled || $conf->banque->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'billing', '', 0, '/compta/index.php?mainmenu=billing&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read || $user->rights->banque->lire', '', 2, 50, __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 ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 52, __ENTITY__);
@ -300,12 +300,12 @@ 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->projet->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 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 ('', '$conf->projet->enabled', __HANDLER__, 'left', 3603__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->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->projet->enabled && $conf->global->PROJECT_USE_TASKS', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 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->projet->enabled && $conf->global->PROJECT_USE_TASKS', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 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->projet->enabled && $conf->global->PROJECT_USE_TASKS', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 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 ('', '$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->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->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 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->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 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->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 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 ('', '$conf->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->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->projet->enabled && $conf->global->PROJECT_USE_TASKS', __HANDLER__, 'left', 3400__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 0, 'projects', '$user->rights->projet->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->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3400__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 0, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);

 -- Project - 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', 3804__+MAX_llx_menu__, 'project', 'cat', 7__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=6', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@ -299,16 +299,17 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->AddPage();
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $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_top = 90+$top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
+				$tab_height = 130-$top_shift;
 				$tab_height_newpage = 150;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;

 				// Incoterm
 				$height_incoterms = 0;
@ -1307,16 +1308,22 @@ class pdf_einstein extends ModelePDFCommandes

 		$posy+=2;

+		$top_shift = 0;
 		// Show list of linked objects
+		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-
+		if ($current_y < $pdf->getY())
+		{
+			$top_shift = $pdf->getY() - $current_y;
+		}
+		
 		if ($showaddress)
 		{
 			// Sender properties
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);

 			// Show sender
-			$posy=42;
+			$posy=42+$top_shift;
 			$posx=$this->marge_gauche;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
 			$hautcadre=40;
@ -1368,7 +1375,7 @@ class pdf_einstein extends ModelePDFCommandes
 			// Show recipient
 			$widthrecbox=100;
 			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42;
+			$posy=42+$top_shift;
 			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;

@ -1393,6 +1400,7 @@ class pdf_einstein extends ModelePDFCommandes
 		}

 		$pdf->SetTextColor(0,0,0);
+		return $top_shift;
 	}

 	/**
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@ -108,8 +108,8 @@ class pdf_standard extends ModeleExpenseReport
 		$this->posxdate=88;
 		$this->posxtype=107;
 		$this->posxprojet=120;
-		$this->posxtva=136;
-		$this->posxup=152;
+		$this->posxtva=138;
+		$this->posxup=154;
 		$this->posxqty=168;
 		$this->postotalttc=178;
        if (empty($conf->projet->enabled)) {
@ -328,7 +328,7 @@ class pdf_standard extends ModeleExpenseReport
                        $nextColumnPosX = $this->posxprojet;
                    }

-					$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, dol_trunc($outputlangs->transnoentities($object->lines[$i]->type_fees_code), 12), 0, 'C');
+					$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, dol_trunc($outputlangs->transnoentities($object->lines[$i]->type_fees_code), 10), 0, 'C');

                    // Project
 					if (! empty($conf->projet->enabled))
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@ -101,6 +101,59 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 	{
 		global $db,$conf;

+		// For backward compatibility and restore old behavior to get ref of expense report
+		if ($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE)
+		{
+			$fuser = null;
+			if ($object->fk_user_author > 0)
+			{
+				$fuser=new User($db);
+				$fuser->fetch($object->fk_user_author);
+			}
+
+			$expld_car = (empty($conf->global->NDF_EXPLODE_CHAR))?"-":$conf->global->NDF_EXPLODE_CHAR;
+			$num_car = (empty($conf->global->NDF_NUM_CAR_REF))?"5":$conf->global->NDF_NUM_CAR_REF;
+
+			$sql = 'SELECT MAX(de.ref_number_int) as max';
+			$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport de';
+
+			$result = $db->query($sql);
+
+			if($db->num_rows($result) > 0):
+			$objp = $db->fetch_object($result);
+			$newref = $objp->max;
+			$newref++;
+			while(strlen($newref) < $num_car):
+				$newref = "0".$newref;
+			endwhile;
+			else:
+				$newref = 1;
+			while(strlen($newref) < $num_car):
+				$newref = "0".$newref;
+			endwhile;
+			endif;
+
+			$ref_number_int = ($newref+1)-1;
+			$update_number_int = true;
+
+			$user_author_infos = dolGetFirstLastname($fuser->firstname, $fuser->lastname);
+
+			$prefix="ER";
+			if (! empty($conf->global->EXPENSE_REPORT_PREFIX)) $prefix=$conf->global->EXPENSE_REPORT_PREFIX;
+			$newref = str_replace(' ','_', $user_author_infos).$expld_car.$prefix.$newref.$expld_car.dol_print_date($object->date_debut,'%y%m%d');
+
+			$sqlbis = 'UPDATE '.MAIN_DB_PREFIX.'expensereport SET ref_number_int = '.$ref_number_int.' WHERE rowid = '.$object->id;
+			$resqlbis = $db->query($sqlbis);
+			if (! $resqlbis)
+			{
+				dol_print_error($resqlbis);
+				exit;
+			}
+
+			dol_syslog("mod_expensereport_jade::getNextValue return ".$newref);
+			return $newref;
+		}
+
 		// D'abord on recupere la valeur max
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@ -334,15 +334,16 @@ class pdf_crabe extends ModelePDFFactures
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;

-				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $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_top = 90+$top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
+				$tab_height = 130-$top_shift;
 				$tab_height_newpage = 150;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;

 				// Incoterm
 				$height_incoterms = 0;
@ -1679,9 +1680,15 @@ class pdf_crabe extends ModelePDFFactures

 		$posy+=1;

+		$top_shift = 0;
 		// Show list of linked objects
+		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
-
+		if ($current_y < $pdf->getY())
+		{
+			$top_shift = $pdf->getY() - $current_y;
+		}
+		
 		if ($showaddress)
 		{
 			// Sender properties
@ -1689,6 +1696,7 @@ class pdf_crabe extends ModelePDFFactures

 			// Show sender
 			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy+=$top_shift;
 			$posx=$this->marge_gauche;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;

@ -1744,6 +1752,7 @@ class pdf_crabe extends ModelePDFFactures
 			$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=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy+=$top_shift;
 			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;

@ -1768,6 +1777,7 @@ class pdf_crabe extends ModelePDFFactures
 		}

 		$pdf->SetTextColor(0,0,0);
+		return $top_shift;
 	}

 	/**
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@ -299,15 +299,18 @@ 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('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price');
 			$this->import_tables_creator_array[$r]=array('sp'=>'fk_user');
-			$this->import_fields_array[$r]=array('sp.fk_product'=>"ProductOrService*",
-					'sp.fk_soc'=>"Supplier*", 'sp.ref_fourn'=>'SupplierRef', 'sp.quantity'=>"QtyMin*", 'sp.tva_tx'=>'VATRate',
+			$this->import_fields_array[$r]=array(
+					'sp.fk_product'=>"ProductOrService*",
+					'sp.fk_soc'=>"Supplier*", 'sp.ref_fourn'=>'SupplierRef', 'sp.quantity'=>"QtyMin*", 'sp.tva_tx'=>'VATRate', 'sp.default_vat_code'=>'VATCode'
+			);
+			if (is_object($mysoc) && $mysoc->useNPR())       $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('sp.recuperableonly'=>'VATNPR'));
+			if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+			if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+			$this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array(
 					'sp.price'=>"PriceQtyMinHT*",
 					'sp.unitprice'=>'UnitPriceHT*',	// TODO Make this field not required and calculate it from price and qty
 					'sp.remise_percent'=>'DiscountQtyMin'
-			);
-			if (is_object($mysoc) && $mysoc->useNPR())       $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('sp.recuperableonly'=>'NPR'));
-			if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
-			if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+			));
 			$this->import_convertvalue_array[$r]=array(
 					'sp.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'),
 					'sp.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'Product')
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@ -264,7 +264,7 @@ class modProjet extends DolibarrModules
        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task";
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' WHERE p.entity = '.$conf->entity;
+		$this->export_sql_end[$r] .=" WHERE p.entity IN (".getEntity('project').")";


 		// Import list of tasks
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@ -272,12 +272,18 @@ 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('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price');
 				$this->import_tables_creator_array[$r]=array('sp'=>'fk_user');
-				$this->import_fields_array[$r]=array('sp.fk_product'=>"ProductOrService*",
-						'sp.fk_soc'=>"Supplier*", 'sp.ref_fourn'=>'SupplierRef', 'sp.quantity'=>"QtyMin*", 'sp.tva_tx'=>'VATRate',
-						'sp.price'=>"PriceQtyMinHT*",
-						'sp.unitprice'=>'UnitPriceHT*',	// TODO Make this file not required and calculate it from price and qty
-						'sp.remise_percent'=>'DiscountQtyMin'
+				$this->import_fields_array[$r]=array(
+					'sp.fk_product'=>"ProductOrService*",
+					'sp.fk_soc'=>"Supplier*", 'sp.ref_fourn'=>'SupplierRef', 'sp.quantity'=>"QtyMin*", 'sp.tva_tx'=>'VATRate', 'sp.default_vat_code'=>'VATCode'
 				);
+				if (is_object($mysoc) && $mysoc->useNPR())       $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('sp.recuperableonly'=>'VATNPR'));
+				if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+				if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+				$this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array(
+					'sp.price'=>"PriceQtyMinHT*",
+					'sp.unitprice'=>'UnitPriceHT*',	// TODO Make this field not required and calculate it from price and qty
+					'sp.remise_percent'=>'DiscountQtyMin'
+				));

 				$this->import_convertvalue_array[$r]=array(
 						'sp.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'),
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@ -411,7 +411,7 @@ class modSociete extends DolibarrModules
 		$r++;
 		$this->import_code[$r]=$this->rights_class.'_'.$r;
 		$this->import_label[$r]="ImportDataset_company_3";	// Translation key
-		$this->import_icon[$r]='account';
+		$this->import_icon[$r]='company';
 		$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('sr'=>MAIN_DB_PREFIX.'societe_rib');
 		$this->import_fields_array[$r]=array('sr.fk_soc'=>"ThirdPartyName*",'sr.bank'=>"Bank",
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@ -331,16 +331,17 @@ class pdf_azur extends ModelePDFPropales
 	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
                //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;

-				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $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_top = 90+$top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42+$top_shift:10);
+				$tab_height = 130-$top_shift;
 				$tab_height_newpage = 150;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;

 				// Incoterm
 				$height_incoterms = 0;
@ -1492,9 +1493,15 @@ class pdf_azur extends ModelePDFPropales

 		$posy+=2;

+		$top_shift = 0;
 		// Show list of linked objects
+		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-
+		if ($current_y < $pdf->getY())
+		{
+			$top_shift = $pdf->getY() - $current_y;
+		}
+		
 		if ($showaddress)
 		{
 			// Sender properties
@ -1511,7 +1518,7 @@ class pdf_azur extends ModelePDFPropales
 		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);

 			// Show sender
-			$posy=42;
+			$posy=42+$top_shift;
 		 	$posx=$this->marge_gauche;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
 			$hautcadre=40;
@ -1562,7 +1569,7 @@ class pdf_azur extends ModelePDFPropales
 			// Show recipient
 			$widthrecbox=100;
 			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42;
+			$posy=42+$top_shift;
 			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;

@ -1587,6 +1594,7 @@ class pdf_azur extends ModelePDFPropales
 		}

 		$pdf->SetTextColor(0,0,0);
+		return $top_shift;
 	}

 	/**
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@ -73,7 +73,7 @@ if ($action == 'presend')
 	{
 		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang($newlang);
-		$outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','supplier_proposal','interventions'));
+		$outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','products','supplier_proposal','interventions'));
 	}

 	$topicmail='';
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@ -28,7 +28,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 			elseif (! in_array($typeofextrafield, array('datetime','timestamp')))
 			{
 				// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
-				echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_');
+				$morecss='';
+				if ($typeofextrafield == 'sellist') $morecss='maxwidth200';
+				echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_', $morecss);
 			}
 			elseif (in_array($typeofextrafield, array('datetime','timestamp')))
 			{
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@ -270,7 +270,7 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
    {
        $xml = simplexml_load_string($resgetcommitstrip['content']);
        $little = $xml->channel->item[0]->children('content',true);
-        print $little->encoded;
+        print preg_replace('/width="650" height="658"/', '', $little->encoded);
    }
 }

--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@ -315,11 +315,16 @@ if (empty($reshook))

    if ($action == "confirm_validate" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->creer)
    {
+    	$error = 0;
+
+    	$db->begin();
+
    	$object = new ExpenseReport($db);
    	$object->fetch($id);
+
    	$result = $object->setValidate($user);

-    	if ($result > 0)
+    	if ($result >= 0)
    	{
    		// Define output language
    		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
@ -338,8 +343,13 @@ if (empty($reshook))
    			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
    		}
    	}
+    	else
+    	{
+    		setEventMessages($object->error, $object->errors, 'errors');
+    		$error++;
+    	}

-    	if ($result > 0 && $object->fk_user_validator > 0)
+    	if (! $error && $result > 0 && $object->fk_user_validator > 0)
    	{
    		$langs->load("mails");

@ -387,8 +397,6 @@ if (empty($reshook))
    				{
    					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
    					setEventMessages($mesg, null, 'mesgs');
-    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    					exit;
    				}
    				else
    				{
@ -418,10 +426,17 @@ if (empty($reshook))
    			$action='';
    		}
    	}
-    	else
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
+
+		if (! $error)
+		{
+			$db->commit();
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		}
+		else
+		{
+			$db->rollback();
+		}
    }

    if ($action == "confirm_save_from_refuse" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->creer)
@ -1955,7 +1970,7 @@ else
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
 				print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';

-				print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive-no-min">';
 				print '<table id="tablelines" class="noborder" width="100%">';

 				if (!empty($object->lines))
@ -2014,7 +2029,10 @@ else
 								print '</td>';
 							}
 							// print '<td style="text-align:center;">'.$langs->trans("TF_".strtoupper(empty($objp->type_fees_libelle)?'OTHER':$objp->type_fees_libelle)).'</td>';
-							print '<td style="text-align:center;">'.($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans(($line->type_fees_code))).'</td>';
+							print '<td style="text-align:center;">';
+							$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
+							print $labeltype;
+							print '</td>';
 							print '<td style="text-align:left;">'.$line->comments.'</td>';
 							print '<td style="text-align:right;">'.vatrate($line->vatrate,true).'</td>';
 							print '<td style="text-align:right;">'.price($line->value_unit).'</td>';
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@ -1223,6 +1223,8 @@ class Fichinter extends CommonObject
 	 */
 	function fetch_lines()
 	{
+		$this->lines = array();
+
 		$sql = 'SELECT rowid, description, duree, date, rang';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet';
 		$sql.=' WHERE fk_fichinter = '.$this->id .' ORDER BY rang ASC, date ASC' ;
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@ -151,7 +151,7 @@ $arrayfields=array(
 	'f.label'=>array('label'=>$langs->trans("Label"), 'checked'=>0),
 	'f.datef'=>array('label'=>$langs->trans("DateInvoice"), 'checked'=>1),
 	'f.date_lim_reglement'=>array('label'=>$langs->trans("DateDue"), 'checked'=>1),
-	'p.ref'=>array('label'=>$langs->trans("Project"), 'checked'=>0),
+	'p.ref'=>array('label'=>$langs->trans("ProjectRef"), 'checked'=>0),
 	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
 	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
 	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
@ -619,12 +619,12 @@ if ($resql)
 	// Project
 	if (! empty($arrayfields['p.ref']['checked']))
 	{
-		print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
+		print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirpdarty
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
-		print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
+		print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
 	}
 	// Town
 	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
@ -744,7 +744,7 @@ if ($resql)
 	if (! empty($arrayfields['f.label']['checked']))              print_liste_field_titre($arrayfields['f.label']['label'],$_SERVER['PHP_SELF'],"f.libelle,f.rowid",'',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.datef']['checked']))              print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER['PHP_SELF'],'f.datef,f.rowid','',$param,'align="center"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'],$_SERVER['PHP_SELF'],"f.date_lim_reglement",'',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.ref']['checked']))                print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER['PHP_SELF'],"p.ref",'',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.ref']['checked']))                print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER['PHP_SELF'],"p.ref",'',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.nom']['checked']))                print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],'s.nom','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.town']['checked']))               print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.zip']['checked']))                print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
--- a/htdocs/install/mysql/data/llx_accounting_abc.sql
+++ b/htdocs/install/mysql/data/llx_accounting_abc.sql
@ -28,12 +28,13 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --

-INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('VT', 'Sale Journal', 2, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AC', 'Purchase Journal', 3, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('BQ', 'Bank Journal', 4, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('OD', 'Other Journal', 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AN', 'Has new Journal', 9, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('ER', 'Expense Report Journal', 5, 1);
+
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('VT', 'Sale Journal',           2, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AC', 'Purchase Journal',       3, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('BQ', 'Bank Journal',           4, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('OD', 'Other Journal',          1, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AN', 'Has new Journal',        9, 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('ER', 'Expense Report Journal', 5, 1, 1);


 -- Description of chart of account FR PCG99-ABREGE
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@ -269,9 +269,10 @@ MAIN_MAIL_SMTP_SERVER=بروتوكول نقل البريد الإلكتروني
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=بروتوكول نقل البريد الإلكتروني / SMTPS ميناء (غير محددة في مثل PHP على أنظمة يونكس)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=بروتوكول نقل البريد الإلكتروني / SMTPS المضيف (غير محددة في مثل PHP على أنظمة يونكس)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= إرسال منهجية خفية الكربون نسخة من جميع رسائل البريد الإلكتروني المرسلة إلى
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_SENDMODE=طريقة استخدام لإرسال رسائل البريد الإلكتروني
 MAIN_MAIL_SMTPS_ID=إذا الهوية SMTP التوثيق اللازم
 MAIN_MAIL_SMTPS_PW=كلمة السر اذا SMTP التوثيق اللازم
@ -415,7 +416,7 @@ ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=يجب أن يكون المعلمات ObjectName: CLASSPATH <br> بناء الجملة: ObjectName: CLASSPATH <br> مثال: سوسيتيه: سوسيتيه / فئة / societe.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=بعض البلدان تطبق 2 أو 3 الضرائب على كل خط الفاتورة. إذا كان هذا هو الحال، واختيار نوع لضريبة الثانية والثالثة ومعدل. نوع ممكن هي: <br> 1: يتم تطبيق الضرائب المحلية على المنتجات والخدمات دون الضريبة على القيمة المضافة (يحسب localtax على كمية بدون ضريبة) <br> 2: الضرائب المحلية تنطبق على المنتجات والخدمات بما في ذلك ضريبة القيمة المضافة (يحسب localtax على كمية + ضريبة الرئيسي) <br> 3: تطبيق الضرائب المحلية على المنتجات بدون ضريبة القيمة المضافة (يحسب localtax على كمية بدون ضريبة) <br> 4: الضرائب المحلية تنطبق على المنتجات بما في ذلك ضريبة القيمة المضافة (يحسب localtax على كمية + ضريبة القيمة المضافة الرئيسية) <br> 5: تطبق الضرائب المحلية على الخدمات دون الضريبة على القيمة المضافة (يحسب localtax على كمية بدون ضريبة) <br> 6: الضرائب المحلية تنطبق على الخدمات بما في ذلك ضريبة القيمة المضافة (يحسب localtax على كمية + الضريبة)
@ -488,7 +489,7 @@ Module30Name=فواتير
 Module30Desc=ويلاحظ اعتماد الفواتير وإدارة العملاء. فواتير إدارة الموردين
 Module40Name=الموردين
 Module40Desc=الموردين وإدارة وشراء (الأوامر والفواتير)
-Module42Name=Syslog
+Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=المحررين
 Module49Desc=المحررين إدارة
@ -551,6 +552,8 @@ Module520Desc=إدارة القروض
 Module600Name=Notifications on business events
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
 Module700Name=التبرعات
 Module700Desc=التبرعات إدارة
 Module770Name=تقارير المصاريف
@ -571,8 +574,8 @@ Module2300Name=المهام المجدولة
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
 Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=إدارة المحتوى الإلكتروني
-Module2500Desc=حفظ وتبادل الوثائق
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=خدمات API / ويب (خادم SOAP)
 Module2600Desc=تمكين الخدمات API Dolibarr الخادم SOAP توفير
 Module2610Name=خدمات API / ويب (خادم REST)
@ -586,8 +589,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP التحويلات Maxmind القدرات
 Module3100Name=سكايب
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module3200Name=Non Reversible Logs
-Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
+Module3200Name=Unalterable Archives
+Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=شركة متعددة
@ -598,7 +601,7 @@ Module10000Name=Websites
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=ترك إدارة الطلبات
 Module20000Desc=أعلن وتابع الموظفين يترك طلبات
-Module39000Name=الكثير المنتج
+Module39000Name=Products lots
 Module39000Desc=الكثير أو الرقم التسلسلي، وتناول الطعام عن طريق وبيع عن طريق إدارة التسجيل على المنتجات
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@ -148,6 +148,7 @@ ErrorDiscountAlreadyUsed=خطأ الخصم المستخدمة بالفعل
 ErrorInvoiceAvoirMustBeNegative=خطأ ، والصحيح يجب أن يكون للفاتورة بمبلغ سلبي
 ErrorInvoiceOfThisTypeMustBePositive=خطأ ، وهذا النوع من فاتورة يجب أن يكون إيجابيا المبلغ
 ErrorCantCancelIfReplacementInvoiceNotValidated=خطأ ، لا يمكن إلغاء الفاتورة التي حلت محلها اخرى الفاتورة التي لا تزال في حالة مشروع
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
 BillFrom=من
 BillTo=مشروع قانون ل
 ActionsOnBill=الإجراءات على فاتورة
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@ -56,6 +56,7 @@ Address=عنوان
 State=الولاية / المقاطعة
 StateShort=حالة
 Region=المنطقة
+Region-State=Region - State
 Country=قطر
 CountryCode=رمز البلد
 CountryId=بلد معرف
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing / Payment
+MenuFinancial=Billing | Payment
 TaxModuleSetupToModifyRules=الذهاب إلى <a href="%s">الإعداد حدة الضرائب</a> لتعديل قواعد حساب
 TaxModuleSetupToModifyRulesLT=الذهاب إلى <a href="%s">إعداد الشركة</a> لتعديل قواعد حساب
 OptionMode=الخيار المحاسبة
--- a/htdocs/langs/ar_SA/ecm.lang
+++ b/htdocs/langs/ar_SA/ecm.lang
@ -14,8 +14,8 @@ ECMNbOfFilesInDir=عدد من الملفات في دليل
 ECMNbOfSubDir=من دون أدلة
 ECMNbOfFilesInSubDir=عدد الملفات في الدلائل الفرعية
 ECMCreationUser=مبدع
-ECMArea=منطقة EDM
-ECMAreaDesc=يسمح للمنطقة EDM (إدارة الوثائق الالكترونية) التي لانقاذ والمشاركة والبحث بسرعة كل نوع من الوثائق في Dolibarr.
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
 ECMAreaDesc2=* أدلة تلقائية تملأ تلقائيا عند إضافة الوثائق من بطاقة عنصر. <br> * دليل أدلة يمكن استخدامها لانقاذ وثائق ليست مرتبطة بشكل خاص عنصر.
 ECMSectionWasRemoved=دليل <b>٪ ق</b> حذفت.
 ECMSectionWasCreated=Directory <b>%s</b> has been created.
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@ -87,6 +87,7 @@ MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.

 # Libelle des modules de liste de destinataires mailing
 LineInFile=خط المستندات في ملف ٪
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@ -498,6 +498,8 @@ AddPhoto=إضافة الصورة
 DeletePicture=حذف صورة
 ConfirmDeletePicture=تأكيد الصورة الحذف؟
 Login=تسجيل الدخول
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
 CurrentLogin=تسجيل الدخول الحالي
 EnterLoginDetail=Enter login details
 January=كانون الثاني
@ -885,7 +887,7 @@ Select2NotFound=لا نتائج لبحثك
 Select2Enter=أدخل
 Select2MoreCharacter=or more character
 Select2MoreCharacters=أحرف أو أكثر
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=تحميل المزيد من النتائج ...
 Select2SearchInProgress=بحث في التقدم ...
 SearchIntoThirdparties=الأطراف الثالثة
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@ -162,9 +162,9 @@ SizeUnitinch=بوصة
 SizeUnitfoot=قدم
 SizeUnitpoint=نقطة
 BugTracker=علة تعقب
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br />Check your inbox.
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
 BackToLoginPage=عودة إلى صفحة تسجيل الدخول
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
+AuthenticationDoesNotAllowSendNewPassword=طريقة التوثيق <b>٪ ق.</b> <br> في هذا الوضع ، لا يمكن معرفة Dolibarr أو تغيير كلمة السر الخاصة بك. <br> اتصل بمسؤول النظام إذا كنت تريد تغيير كلمة السر الخاصة بك.
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>الأستاذ عيد ٪ ق</b> هي المعلومات التي تعتمد على طرف ثالث. <br> على سبيل المثال ، لبلد <b>ق ٪</b> انها رمز <b>٪ ق.</b>
 DolibarrDemo=Dolibarr تخطيط موارد المؤسسات وإدارة علاقات العملاء التجريبي
@ -227,7 +227,9 @@ Chart=Chart
 PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
-
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
 ##### Export #####
 ExportsArea=صادرات المنطقة
 AvailableFormats=الأشكال المتاحة
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for personnel expenses
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=الراتب
 Salaries=الرواتب
 NewSalaryPayment=دفع الرواتب جديد
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@ -6,6 +6,7 @@ Permission=إذن
 Permissions=أذونات
 EditPassword=تعديل كلمة السر
 SendNewPassword=تجديد وإرسال كلمة السر
+SendNewPasswordLink=Send link to reset password
 ReinitPassword=تجديد كلمة المرور
 PasswordChangedTo=تغيير كلمة السر : ٪ ق
 SubjectNewPassword=Your new password for %s
@ -43,7 +44,9 @@ NewGroup=مجموعة جديدة
 CreateGroup=إنشاء مجموعة
 RemoveFromGroup=إزالة من المجموعة
 PasswordChangedAndSentTo=تم تغيير كلمة المرور وترسل إلى <b>٪ ق.</b>
+PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=طلب تغيير كلمة السر لإرسالها إلى <b>٪ ق ٪ ق.</b>
+ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=مجموعات المستخدمين
 LastGroupsCreated=Latest %s created groups
 LastUsersCreated=Latest %s users created
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@ -269,9 +269,10 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Хост (По подразбиране в php.
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Порт (Не дефиниран в PHP на Unix подобни системи)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Хост (Не дефиниран в PHP на Unix подобни системи)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= Изпрати систематично скрит въглероден копие на всички изпратени имейли
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_SENDMODE=Метод за изпращане на имейли
 MAIN_MAIL_SMTPS_ID=SMTP ID, ако разпознаване, изискван
 MAIN_MAIL_SMTPS_PW=SMTP парола, ако разпознаване, изискван
@ -415,7 +416,7 @@ ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
@ -488,7 +489,7 @@ Module30Name=Фактури
 Module30Desc=Фактура и управление на кредитно известие за клиентите. Фактура за управление на доставчици
 Module40Name=Доставчици
 Module40Desc=Управление и изкупуване на доставчика (нареждания и фактури)
-Module42Name=Дневник
+Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Редактори
 Module49Desc=Управление на редактор
@ -551,6 +552,8 @@ Module520Desc=Management of loans
 Module600Name=Notifications on business events
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
 Module700Name=Дарения
 Module700Desc=Управление на дарения
 Module770Name=Expense reports
@ -571,8 +574,8 @@ Module2300Name=Планирани задачи
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
 Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Електронно Управление на Съдържанието
-Module2500Desc=Запазване и споделяне на документи
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API services (Web services SOAP)
 Module2600Desc=Enable the Dolibarr SOAP server providing API services
 Module2610Name=API services (Web services REST)
@ -586,8 +589,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind реализации възможности
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module3200Name=Non Reversible Logs
-Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
+Module3200Name=Unalterable Archives
+Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
 Module4000Name=ЧР
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Няколко фирми
@ -598,7 +601,7 @@ Module10000Name=Websites
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
+Module39000Name=Products lots
 Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@ -148,6 +148,7 @@ ErrorDiscountAlreadyUsed=Грешка, вече се използва отстъ
 ErrorInvoiceAvoirMustBeNegative=Грешка, коригиращата фактура трябва да има отрицателна сума
 ErrorInvoiceOfThisTypeMustBePositive=Грешка, този тип фактура трябва да има положителна стойност,
 ErrorCantCancelIfReplacementInvoiceNotValidated=Грешка, не може да се анулира фактура, която е била заменена от друга фактура, която все още е в състояние на чернова
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
 BillFrom=От
 BillTo=За
 ActionsOnBill=Действия по фактура
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@ -56,6 +56,7 @@ Address=Адрес
 State=Област
 StateShort=State
 Region=Регион
+Region-State=Region - State
 Country=Държава
 CountryCode=Код на държавата
 CountryId=ID на държава
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing / Payment
+MenuFinancial=Billing | Payment
 TaxModuleSetupToModifyRules=Отидете на <a href="%s">Настройка модул данъци</a> за да промените правилата за изчисляване
 TaxModuleSetupToModifyRulesLT=Отидете на <a href="%s">Настройка на фирмата</a> за да промените правилата за изчисляване
 OptionMode=Опция за счетоводство
--- a/htdocs/langs/bg_BG/ecm.lang
+++ b/htdocs/langs/bg_BG/ecm.lang
@ -14,8 +14,8 @@ ECMNbOfFilesInDir=Брой на файловете в директорията
 ECMNbOfSubDir=Брой на под-директориите
 ECMNbOfFilesInSubDir=Брой на файловете в под-директориите
 ECMCreationUser=Създател
-ECMArea=EDM
-ECMAreaDesc=EDM (Електронно Управление на Документи) ви позволява да записвате, споделяте и търсите бързо всякакви документи в Dolibarr.
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
 ECMAreaDesc2=* Автоматично създадените директории се запълват автоматично при добавяне на документи в картата на даден елемент.<br>* Ръчно създадените директории могат да бъдат използвани, за да запазите документи, които не са свързани с определен елемент.
 ECMSectionWasRemoved=Директорията <b>%s</b> беше изтрита.
 ECMSectionWasCreated=Directory <b>%s</b> has been created.
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@ -87,6 +87,7 @@ MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.

 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s във файла
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@ -498,6 +498,8 @@ AddPhoto=Добавяне на снимка
 DeletePicture=Изтрий снимка
 ConfirmDeletePicture=Потвърди изтриване на снимка?
 Login=Потребител
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
 CurrentLogin=Текущ потребител
 EnterLoginDetail=Enter login details
 January=Януари
@ -885,7 +887,7 @@ Select2NotFound=Няма намерени резултати
 Select2Enter=Въвеждане
 Select2MoreCharacter=or more character
 Select2MoreCharacters=или повече знаци
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Зараждане на повече резултати...
 Select2SearchInProgress=Търсене в ход...
 SearchIntoThirdparties=Трети лица
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@ -162,9 +162,9 @@ SizeUnitinch=инч
 SizeUnitfoot=фут
 SizeUnitpoint=точка
 BugTracker=Регистър на бъгове
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br />Check your inbox.
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
 BackToLoginPage=Назад към страницата за вход
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
+AuthenticationDoesNotAllowSendNewPassword=Режимът за удостоверяване е <b>%s.</b> <br> В този режим, системата не може да знае, нито да промени паролата ви. <br> Свържете се с вашия системен администратор, ако искате да смените паролата си.
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Проф. Id %s</b> е информация, в зависимост от трета държава, която е страна. <br> Например, за страната <b>%s,</b> това е код <b>%s.</b>
 DolibarrDemo=Dolibarr ERP/CRM демо
@ -227,7 +227,9 @@ Chart=Chart
 PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
-
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
 ##### Export #####
 ExportsArea=Секция за експорт
 AvailableFormats=Налични формати
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for personnel expenses
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Заплата
 Salaries=Заплати
 NewSalaryPayment=Ново заплащане на заплата
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@ -6,6 +6,7 @@ Permission=Право
 Permissions=Права
 EditPassword=Редактиране на паролата
 SendNewPassword=Регенериране и изпращане на паролата
+SendNewPasswordLink=Send link to reset password
 ReinitPassword=Регенериране на паролата
 PasswordChangedTo=Паролата е променена на: %s
 SubjectNewPassword=Your new password for %s
@ -43,7 +44,9 @@ NewGroup=Нова група
 CreateGroup=Създай група
 RemoveFromGroup=Премахни от групата
 PasswordChangedAndSentTo=Паролата е сменена и изпратена на <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Заявка за промяна на паролата на <b>%s</b> е изпратена на <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Потребители и групи
 LastGroupsCreated=Latest %s created groups
 LastUsersCreated=Latest %s users created
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@ -269,9 +269,10 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@ -415,7 +416,7 @@ ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
@ -488,7 +489,7 @@ Module30Name=Invoices
 Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
+Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
@ -551,6 +552,8 @@ Module520Desc=Management of loans
 Module600Name=Notifications on business events
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@ -571,8 +574,8 @@ Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
 Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
 Module2600Desc=Enable the Dolibarr SOAP server providing API services
 Module2610Name=API/Web services (REST server)
@ -586,8 +589,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module3200Name=Non Reversible Logs
-Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
+Module3200Name=Unalterable Archives
+Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
@ -598,7 +601,7 @@ Module10000Name=Websites
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
+Module39000Name=Products lots
 Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@ -148,6 +148,7 @@ ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@ -56,6 +56,7 @@ Address=Address
 State=State/Province
 StateShort=State
 Region=Region
+Region-State=Region - State
 Country=Country
 CountryCode=Country code
 CountryId=Country id
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing / Payment
+MenuFinancial=Billing | Payment
 TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
 TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
 OptionMode=Option for accountancy
--- a/htdocs/langs/bn_BD/ecm.lang
+++ b/htdocs/langs/bn_BD/ecm.lang
@ -14,8 +14,8 @@ ECMNbOfFilesInDir=Number of files in directory
 ECMNbOfSubDir=Number of sub-directories
 ECMNbOfFilesInSubDir=Number of files in sub-directories
 ECMCreationUser=Creator
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
 ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
 ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
 ECMSectionWasCreated=Directory <b>%s</b> has been created.
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@ -87,6 +87,7 @@ MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.

 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@ -498,6 +498,8 @@ AddPhoto=Add picture
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
 CurrentLogin=Current login
 EnterLoginDetail=Enter login details
 January=January
@ -885,7 +887,7 @@ Select2NotFound=No result found
 Select2Enter=Enter
 Select2MoreCharacter=or more character
 Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@ -162,9 +162,9 @@ SizeUnitinch=inch
 SizeUnitfoot=foot
 SizeUnitpoint=point
 BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br />Check your inbox.
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
 BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
@ -227,7 +227,9 @@ Chart=Chart
 PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
-
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
--- a/htdocs/langs/bn_BD/salaries.lang
+++ b/htdocs/langs/bn_BD/salaries.lang
@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for personnel expenses
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@ -6,6 +6,7 @@ Permission=Permission
 Permissions=Permissions
 EditPassword=Edit password
 SendNewPassword=Regenerate and send password
+SendNewPasswordLink=Send link to reset password
 ReinitPassword=Regenerate password
 PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
@ -43,7 +44,9 @@ NewGroup=New group
 CreateGroup=Create group
 RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s created groups
 LastUsersCreated=Latest %s users created
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@ -269,9 +269,10 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@ -415,7 +416,7 @@ ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
@ -488,7 +489,7 @@ Module30Name=Fakture
 Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
 Module40Name=Dobavljači
 Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
+Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
@ -551,6 +552,8 @@ Module520Desc=Management of loans
 Module600Name=Notifications on business events
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
 Module700Name=Donacije
 Module700Desc=Donation management
 Module770Name=Izvještaj o troškovima
@ -571,8 +574,8 @@ Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
 Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
 Module2600Desc=Enable the Dolibarr SOAP server providing API services
 Module2610Name=API/Web services (REST server)
@ -586,8 +589,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module3200Name=Non Reversible Logs
-Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
+Module3200Name=Unalterable Archives
+Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
 Module4000Name=Kadrovska služba
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
@ -598,7 +601,7 @@ Module10000Name=Websites
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
+Module39000Name=Products lots
 Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@ -148,6 +148,7 @@ ErrorDiscountAlreadyUsed=Greška, popust se već koristi
 ErrorInvoiceAvoirMustBeNegative=Greška, na popravljenem računu mora biti negativni iznos
 ErrorInvoiceOfThisTypeMustBePositive=Greška, ovaj tip fakture mora imati pozitivnu količinu
 ErrorCantCancelIfReplacementInvoiceNotValidated=Greška, ne možete poništiti fakturu koju je zamijenila druga faktura a koja je još u statusu nacrta
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
 BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na fakturi
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@ -56,6 +56,7 @@ Address=Adresa
 State=Država/Provincija
 StateShort=Pokrajina
 Region=Region
+Region-State=Region - State
 Country=Država
 CountryCode=Šifra države
 CountryId=ID države
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing / Payment
+MenuFinancial=Billing | Payment
 TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
 TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
 OptionMode=Opcija za računovodstvo
--- a/htdocs/langs/bs_BA/ecm.lang
+++ b/htdocs/langs/bs_BA/ecm.lang
@ -14,8 +14,8 @@ ECMNbOfFilesInDir=Broj fajlova u direktoriju
 ECMNbOfSubDir=Broj poddirektorija
 ECMNbOfFilesInSubDir=Broj fajlova u poddirektoriju
 ECMCreationUser=Kreator
-ECMArea=Područje za EDM
-ECMAreaDesc=Područje za EDM (Elektronsko upravljanje dokumentima) vam omogućava da snimite, podijelite ili brzo tražite sve tipove dokumenata u Dolibarr-u.
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
 ECMAreaDesc2=* Automatski direktoriji se popunjavaju automatski nakon dodavanja dokumenata sa kartice elementa. <br> * Manuelni direktoriji se mogu koristit za snimanje dokumenata koji nisu povezani za određeni element.
 ECMSectionWasRemoved=Direktorij <b>%s</b> je obrisan.
 ECMSectionWasCreated=Directory <b>%s</b> has been created.
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@ -87,6 +87,7 @@ MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.

 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linija %s u fajlu
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@ -498,6 +498,8 @@ AddPhoto=Dodaj sliku
 DeletePicture=Obriši sliku
 ConfirmDeletePicture=Potvrdi brisanje slike?
 Login=Pristup
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
 CurrentLogin=Trenutni pristup
 EnterLoginDetail=Unesi detalje prijave
 January=januar
@ -885,7 +887,7 @@ Select2NotFound=Nije pronađen rezultat
 Select2Enter=Potvrdi
 Select2MoreCharacter=ili više karaktera
 Select2MoreCharacters=ili više karaktera
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Učitavam više rezultata...
 Select2SearchInProgress=Pretraga u toku...
 SearchIntoThirdparties=Subjekti
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@ -162,9 +162,9 @@ SizeUnitinch=inch
 SizeUnitfoot=foot
 SizeUnitpoint=point
 BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br />Check your inbox.
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
 BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
@ -227,7 +227,9 @@ Chart=Chart
 PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
-
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for personnel expenses
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@ -6,6 +6,7 @@ Permission=Dozvola
 Permissions=Dozvole
 EditPassword=Uredi šifru
 SendNewPassword=Ponovo generiši i pošalji šifru
+SendNewPasswordLink=Send link to reset password
 ReinitPassword=Ponovo generiši šifru
 PasswordChangedTo=Šifra promijenjena na: %s
 SubjectNewPassword=Vaša šifra za %s
@ -43,7 +44,9 @@ NewGroup=Nova grupa
 CreateGroup=Kreiraj grupu
 RemoveFromGroup=Ukloni iz grupe
 PasswordChangedAndSentTo=Šifra promijenjena i poslana korisniku <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Zahtjev za promjenu šifre za <b>%s</b> poslana na <b>%s</b>.
+ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Korisnici i grupe
 LastGroupsCreated=Posljednjih %s napravljenih grupa
 LastUsersCreated=Posljednjih %s napravljenih korisnika
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@ -25,8 +25,8 @@ Chartofaccounts=Pla comptable
 CurrentDedicatedAccountingAccount=Compte dedicat actual
 AssignDedicatedAccountingAccount=Nou compte per assignar
 InvoiceLabel=Etiqueta de factura
-OverviewOfAmountOfLinesNotBound=Visió general de quantitat de línies no comptabilitzades al compte comptable
-OverviewOfAmountOfLinesBound=Visió general de quantitat de línies ja comptabilitzades al compte comptable
+OverviewOfAmountOfLinesNotBound=Vista general de la quantitat de línies no comptabilitzades en un compte comptable
+OverviewOfAmountOfLinesBound=Vista general de la quantitat de línies ja comptabilitzades en un compte comptable
 OtherInfo=Altra informació
 DeleteCptCategory=Eliminar el compte comptable del grup
 ConfirmDeleteCptCategory=Estàs segur que vols eliminar aquest compte comptable del grup de comptabilitat?
@ -158,7 +158,7 @@ NumPiece=Número de peça
 TransactionNumShort=Número de transacció
 AccountingCategory=Grups personalitzats
 GroupByAccountAccounting=Agrupar per compte comptable
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+AccountingAccountGroupsDesc=Pots definir aquí alguns grups de compte comptable. S'utilitzaran per a informes comptables personalitzats.
 ByAccounts=Per comptes
 ByPredefinedAccountGroups=Per grups predefinits
 ByPersonalizedAccountGroups=Per grups personalitzats
@ -173,7 +173,7 @@ DelBookKeeping=Elimina el registre del libre major
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Informe-diari de despeses
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=Es tracta d'una vista dels registres que són vinculats al compte de comptabilitat i es poden registrar a la Ledger.
+DescJournalOnlyBindedVisible=Aquesta és una vista de registres que estan comptabilitzats a un compte comptable i que poden registrar-se al Llibre major.
 VATAccountNotDefined=Comptes comptables de IVA sense definir
 ThirdpartyAccountNotDefined=Comptes comptables de tercers (clients o proveïdors) sense definir
 ProductAccountNotDefined=Comptes comptables per al producte sense definir
@ -191,7 +191,7 @@ DescThirdPartyReport=Consulti aquí la llista de tercers (cliente i proveïdors)
 ListAccounts=Llistat dels comptes comptables
 UnknownAccountForThirdparty=Compte comptable de tercer desconeguda, utilitzarem %s
 UnknownAccountForThirdpartyBlocking=Compte comptable de tercer desconegut. Error de bloqueig
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Compte de tercers desconegut i compte d'espera no definit. Error de bloqueig

 Pcgtype=Grup de compte
 Pcgsubtype=Subgrup de compte
@ -224,6 +224,8 @@ GeneralLedgerSomeRecordWasNotRecorded=Algunes de les transaccions no s'han regis
 NoNewRecordSaved=No hi ha més registres pel diari
 ListOfProductsWithoutAccountingAccount=Llista de productes no comptabilitzats en cap compte comptable
 ChangeBinding=Canvia la comptabilització
+Accounted=Comptabilitzat en el llibre major
+NotYetAccounted=Encara no comptabilitzat en el llibre major

 ## Admin
 ApplyMassCategories=Aplica categories massives
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@ -269,9 +269,10 @@ MAIN_MAIL_SMTP_SERVER=Nom host o ip del servidor SMTP (Per defecte en php.ini: <
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port del servidor SMTP (No definit en PHP en sistemes de tipus Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom servidor o ip del servidor SMTP (No definit en PHP en sistemes de tipus Unix)
 MAIN_MAIL_EMAIL_FROM=Remitent del correu per a correus automàtics (Valor per defecte a php.ini: <b>1%s</b>)
-MAIN_MAIL_ERRORS_TO=Remitent pels correus enviats retornant errors
+MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= Envia automàticament una còpia oculta de tots els e-mails enviats a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar l'enviament de tots els correus (per fer proves o en llocs tipus demo)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_SENDMODE=Mètode d'enviament d'e-mails
 MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP si es requereix autenticació SMTP
 MAIN_MAIL_SMTPS_PW=Contrasenya autentificació SMTP si es requereix autenticació SMTP
@ -415,7 +416,7 @@ ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies d
 ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')<br><br> per exemple : <br>1,valor1<br>2,valor2<br>3,valor3<br>...
 ExtrafieldParamHelpsellist=Llista de valors que provenen d'una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtre<br>Exemple : c_typent:libelle:id::filter<br><br>- idfilter ha de ser necessàriament una "primary int key" <br>- el filtre pot ser una comprovació senzilla (eg active=1) per mostrar només valors actius<br>També es pot emprar $ID$ al filtre per representar el ID de l'actual objecte en curs<br>Per fer un SELECT al filtre empreu $SEL$<br>Si voleu filtrar per algun camp extra ("extrafields") empreu la sintaxi extra.codicamp=... (a on codicamp és el codi del camp extra)<br><br>Per tenir la llista depenent d'una altre llista d'atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column:filter <br><br>Per tenir la llista depenent d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filter<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per representar l'ID actual de l'objecte en curs <br>Per fer un SELECT en el filtre utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per tenir la llista depenent d'una altra llista: c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
-ExtrafieldParamHelplink=Els paràmetres han de ser Nom del Objecte:Url de la Clase<br>Sintàxi: Nom Object:Url Clase<br>Exemple: Societe:societe/class/societe.class.php
+ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName: Classpath<br>Sintaxi: ObjectName:Classpath<br>Exemples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Llibreria utilitzada per generar PDF
 WarningUsingFPDF=Atenció: El seu arxiu <b>conf.php</b> conté la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Això fa que s'usi la llibreria FPDF per generar els seus arxius PDF. Aquesta llibreria és antiga i no cobreix algunes funcionalitats (Unicode, transparència d'imatges, idiomes ciríl · lics, àrabs o asiàtics, etc.), Pel que pot tenir problemes en la generació dels PDF.<br> Per resoldre-ho, i disposar d'un suport complet de PDF, pot descarregar la <a href="http://www.tcpdf.org/" target="_blank"> llibreria TCPDF </a>, i a continuació comentar o eliminar la línia <b>$dolibarr_pdf_force_fpdf=1</b>, i afegir al seu lloc <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
 LocalTaxDesc=Alguns països apliquen 2 o 3 impostos en cada línia de factura. Si aquest és el cas, escull el tipus pel segon i el tercer impost i el seu valor. Els tipus possibles són: <br>1: impostos locals aplicats en productes i serveis sense IVA (l'impost local serà calculat en el total sense impostos)<br>2: impost local aplicat en productes i serveis amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>3: impost local aplicat en productes sense IVA (l'impost local serà calculat en el total sense impost)<br>4: impost local aplicat en productes amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>5: impost local aplicat en serveis sense IVA (l'impost local serà calculat amb el total sense impost)<br>6: impost local aplicat en serveis amb IVA inclòs (l'impost local serà calculat amb el total + IVA)
@ -488,7 +489,7 @@ Module30Name=Factures
 Module30Desc=Gestió de factures i abonaments de clients. Gestió factures de proveïdors
 Module40Name=Proveïdors
 Module40Desc=Gestió de proveïdors
-Module42Name=Syslog
+Module42Name=Registre de depuració
 Module42Desc=Generació de registres/logs (fitxer, syslog, ...). Aquests registres són per a finalitats tècniques/depuració.
 Module49Name=Editors
 Module49Desc=Gestió d'editors
@ -551,6 +552,8 @@ Module520Desc=Gestió de préstecs
 Module600Name=Notificacions sobre events de negoci
 Module600Desc=Enviar notificacions per correu (arran de cert esdeveniments de negoci) a usuaris (configuració a establir per a cada usuari), a contactes de tercers (configuració a establir per a cada tercer) o a adreces fixes
 Module600Long=Tingueu en compte que aquest mòdul està dedicat a enviar correus electrònics en temps real quan es produeix un esdeveniment de negoci dedicat. Si cerqueu una característica per enviar recordatoris per correu electrònic dels esdeveniments de l'agenda, aneu a la configuració del mòdul Agenda.
+Module610Name=Variants de producte
+Module610Desc=Permet la creació de variants de producte en funció dels atributs (color, mida, ...)
 Module700Name=Donacions
 Module700Desc=Gestió de donacions
 Module770Name=Informes de despeses
@ -571,8 +574,8 @@ Module2300Name=Tasques programades
 Module2300Desc=Gestió de tasques programades (alias cron o taula chrono)
 Module2400Name=Esdeveniments/Agenda
 Module2400Desc=Segueix els esdeveniments realitzats o propers. Permet a l'aplicació registrar esdeveniments automàtics per seguiment o registra manualment els esdeveniments o cites.
-Module2500Name=Gestió Electrònica de Documents
-Module2500Desc=Permet administrar una base de documents
+Module2500Name=SGD / GCE
+Module2500Desc=Sistema de gestió de documents / Gestió de continguts electrònics. Organització automàtica dels vostres documents generats o emmagatzemats. Compartiu-los quan ho necessiteu.
 Module2600Name=Serveis API/WEB (servidor SOAP)
 Module2600Desc=Habilita el servidor SOAP de Dolibarr que ofereix serveis API
 Module2610Name=Serveis API/WEB (servidor REST)
@ -586,8 +589,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacitats de conversió GeoIP Maxmind
 Module3100Name=Skype
 Module3100Desc=Afegeix un botó d'Skype a les fitxes dels usuaris / tercers / contactes / socis
-Module3200Name=Registres no reversibles
-Module3200Desc=Activa el registre d'alguns esdeveniments de negoci en un registre no reversible. Els esdeveniments s'arxiven en temps real. El registre és una taula d'esdeveniments encadenats que es pot llegir i exportar. Aquest mòdul pot ser obligatori per a alguns països.
+Module3200Name=Arxius inalterables
+Module3200Desc=Activa el registre d'alguns esdeveniments de negoci en un registre inalterable. Els esdeveniments s'arxiven en temps real. El registre és una taula d'esdeveniments encadenats que només es poden llegir i exportar. Aquest mòdul pot ser obligatori per a alguns països.
 Module4000Name=RRHH
 Module4000Desc=Gestió de recursos humans (gestionar departaments, empleats, contractes i "feelings")
 Module5000Name=Multi-empresa
@ -890,7 +893,7 @@ DictionaryStaff=Empleats
 DictionaryAvailability=Temps de lliurament
 DictionaryOrderMethods=Mètodes de comanda
 DictionarySource=Orígens de pressupostos/comandes
-DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancyCategory=Grups personalitzats per informes
 DictionaryAccountancysystem=Models de plans comptables
 DictionaryAccountancyJournal=Diari de comptabilitat
 DictionaryEMailTemplates=Models d'emails
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@ -148,6 +148,7 @@ ErrorDiscountAlreadyUsed=Error, el descompte ja s'està utilitzant
 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'.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Aquesta part o una altra ja s'utilitza, de manera que la sèrie de descompte no es pot treure.
 BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
@ -178,7 +179,7 @@ ConfirmCancelBillQuestion=Per quina raó vols classificar aquesta factura com 'a
 ConfirmClassifyPaidPartially=Està 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 un descompte atorgat perquè el pagament es va fer abans de temps. Regularitzo l'IVA d'aquest descompte amb un abonament.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscount=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps.
 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 atorgat perquè el pagament es va fer abans de temps. Recupero l'IVA d'aquest descompte, sense un abonament.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@ -56,6 +56,7 @@ Address=Adreça
 State=Província
 StateShort=Estat
 Region=Regió
+Region-State=Regió - Estat
 Country=Pais
 CountryCode=Codi pais
 CountryId=Id pais
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Facturació / pagament
+MenuFinancial=Billing | Payment
 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
@ -24,7 +24,7 @@ PaymentsNotLinkedToInvoice=Pagaments vinculats a cap factura, per la qual cosa s
 PaymentsNotLinkedToUser=Pagaments no vinculats a un usuari
 Profit=Benefici
 AccountingResult=Resultat comptable
-BalanceBefore=Balance (before)
+BalanceBefore=Balanç (abans)
 Balance=Saldo
 Debit=Dèbit
 Credit=Crèdit
@ -40,26 +40,26 @@ LT1Summary=Resum d'impostos 2
 LT2Summary=Resum fiscal 3
 LT1SummaryES=Balanç del RE
 LT2SummaryES=Balanç d'IRPF
-LT1SummaryIN=Balanç CGST
-LT2SummaryIN=Balanç SGST
+LT1SummaryIN=Balanç RE
+LT2SummaryIN=Balanç IRPF
 LT1Paid=Impostos pagats 2
 LT2Paid=Impostos pagats 3
 LT1PaidES=RE pagat
 LT2PaidES=IRPF Pagat
-LT1PaidIN=CGST pagat
-LT2PaidIN=SGST pagat
+LT1PaidIN=RE pagat
+LT2PaidIN=IRPF pagat
 LT1Customer=Impostos vendes 2
 LT1Supplier=Impostos compres 2
 LT1CustomerES=Vendes RE
 LT1SupplierES=Compres RE
-LT1CustomerIN=CGST vendes
-LT1SupplierIN=Compres CGST
+LT1CustomerIN=Vendes RE
+LT1SupplierIN=Compres RE
 LT2Customer=Impostos vendes 3
 LT2Supplier=Impostos compres 3
 LT2CustomerES=IRPF Vendes
 LT2SupplierES=IRPF compres
-LT2CustomerIN=Vendes SGST
-LT2SupplierIN=Compres SGST
+LT2CustomerIN=Vendes IRPF
+LT2SupplierIN=Compres IRPF
 VATCollected=IVA recuperat
 ToPay=A pagar
 SpecialExpensesArea=Àrea per tots els pagaments especials
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@ -14,8 +14,8 @@ ECMNbOfFilesInDir=Nombre d'arxius a la carpeta
 ECMNbOfSubDir=nombre de subcarpetes
 ECMNbOfFilesInSubDir=Nombre d'arxius en les subcarpetes
 ECMCreationUser=Creador
-ECMArea=Àrea GED
-ECMAreaDesc=L'àrea GED (Gestió Electrònica de Documents) li permet controlar ràpidament els documents en Dolibarr.
+ECMArea=Àrea SGD/GCE
+ECMAreaDesc=L'àrea SGD / GCE (Sistema de Gestió de Documents / Gestió de Continguts Electrònics) et permet desar, compartir i cercar ràpidament tot tipus de documents a Dolibarr.
 ECMAreaDesc2=Podeu crear carpetes manuals i adjuntar els documents<br>Les carpetes automàtiques són emplenades automàticament en l'addició d'un document en una fitxa.
 ECMSectionWasRemoved=La carpeta <b>%s</b> ha estat eliminada
 ECMSectionWasCreated=S'ha creat el directori <b>%s</b>.
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@ -87,6 +87,7 @@ MailingModuleDescEmailsFromFile=Correus electrònics desde fitxer
 MailingModuleDescEmailsFromUser=Entrada de correus electrònics per usuari
 MailingModuleDescDolibarrUsers=Usuaris amb correus electrònics
 MailingModuleDescThirdPartiesByCategories=Tercers (per categories)
+SendingFromWebInterfaceIsNotAllowed=L'enviament des de la interfície web no està permès.

 # Libelle des modules de liste de destinataires mailing
 LineInFile=Línea %s en archiu
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@ -365,29 +365,29 @@ Totalforthispage=Total per aquesta pàgina
 TotalTTC=Total
 TotalTTCToYourCredit=Total a crèdit
 TotalVAT=Total IVA
-TotalVATIN=IGST total
+TotalVATIN=IVA total
 TotalLT1=Total impost 2
 TotalLT2=total Impost 3
 TotalLT1ES=Total RE
 TotalLT2ES=Total IRPF
-TotalLT1IN=CGST total
-TotalLT2IN=SGST total
+TotalLT1IN=RE total
+TotalLT2IN=IRPF total
 HT=Sense IVA
 TTC=IVA inclòs
 INCVATONLY=IVA inclòs
 INCT=Inc. tots els impostos
 VAT=IVA
-VATIN=IGST
+VATIN=IVA
 VATs=IVAs
-VATINs=Impostos IGST
+VATINs=Impostos IVA
 LT1=Impost sobre vendes 2
 LT1Type=Tipus de l'impost sobre vendes 2
 LT2=Impost sobre vendes 3
 LT2Type=Tipus de l'impost sobre vendes 3
 LT1ES=RE
 LT2ES=IRPF
-LT1IN=CGST
-LT2IN=SGST
+LT1IN=RE
+LT2IN=IRPF
 VATRate=Taxa IVA
 DefaultTaxRate=Tipus impositiu per defecte
 Average=Mitja
@ -498,6 +498,8 @@ AddPhoto=Afegir foto
 DeletePicture=Elimina la imatge
 ConfirmDeletePicture=Confirmes l'eliminació de la imatge?
 Login=Login
+LoginEmail=Codi d'usuari (correu electrònic)
+LoginOrEmail=Codi d'usuari o correu electrònic
 CurrentLogin=Login actual
 EnterLoginDetail=Introduir detalls del login
 January=gener
@ -885,7 +887,7 @@ Select2NotFound=No s'han trobat resultats
 Select2Enter=Entrar
 Select2MoreCharacter=o més caràcter
 Select2MoreCharacters=o més caràcters
-Select2MoreCharactersMore=<strong>Sintaxi de cerca:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd>Qualsevol caràcter</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Començar amb</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Acabar amb</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Sintaxi de cerca:</strong><br><kbd><strong> |</strong></kbd><kbd> O</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Qualsevol caràcter</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Comença amb</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> Finalitza amb</kbd> (ab$)<br>
 Select2LoadingMoreResults=Carregant més resultats
 Select2SearchInProgress=Busqueda en progrés...
 SearchIntoThirdparties=Tercers
@ -912,5 +914,5 @@ CommentPage=Espai de comentaris
 CommentAdded=Comentari afegit
 CommentDeleted=Comentari suprimit
 Everybody=Projecte compartit
-PayedBy=Payed by
-PayedTo=Payed to
+PayedBy=Pagat per
+PayedTo=Pagat a
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@ -43,6 +43,8 @@ PathToModulePackage=Ruta al zip del paquet del mòdul/aplicació
 PathToModuleDocumentation=Ruta al fitxer de documentació del mòdul/aplicació
 SpaceOrSpecialCharAreNotAllowed=Els espais o caràcters especials no estan permesos.
 FileNotYetGenerated=El fitxer encara no s'ha generat
+RegenerateClassAndSql=Esborra i regenera fitxers de classe i sql
+RegenerateMissingFiles=Genera els fitxers que falten
 SpecificationFile=Arxiu amb regles de negoci
 LanguageFile=Arxiu del llenguatge
 ConfirmDeleteProperty=Esteu segur que voleu suprimir la propietat <strong>%s</strong> Això canviarà el codi a la classe PHP, però també eliminarà la columna de la definició de la taula de l'objecte.
--- a/htdocs/langs/ca_ES/multicurrency.lang
+++ b/htdocs/langs/ca_ES/multicurrency.lang
@ -7,7 +7,7 @@ multicurrency_syncronize_error=Error de sincronització: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilitza la data del document per trobar el tipus de canvi, en lloc d'utilitzar la conversió més recent coneguda
 multicurrency_useOriginTx=Quan un objecte es crea des d'un altre, manté la conversió original de l'objecte origen (en cas contrari, utilitza l'última conversió coneguda)
 CurrencyLayerAccount=API Moneda-Layer
-CurrencyLayerAccount_help_to_synchronize=Hauríeu de crear un compte al seu lloc web per utilitzar aquesta funcionalitat. <br>Obteniu la vostra <b>clau per l'API</b><br /> Si utilitzeu un compte gratuït, no podeu canviar la <b>moneda d'origen</b> (USD per defecte) <br /> Però si la vostra moneda principal no és USD, podeu utilitzar <b>una moneda alternativa d'origen</b> per forçar la vostra moneda principal<br /> <br />Esteu limitat a 1000 sincronitzacions per mes
+CurrencyLayerAccount_help_to_synchronize=Pots crear un compte al lloc web per utilitzar aquesta funcionalitat <br>Obté la teva <b>clau API </b><br>Si fas servir un compte gratuït, no pots canviar la <b>moneda d'origen</b> (USD per defecte)<br>Però si la teva moneda principal no és USD, pots utilitzar la <b>moneda alternativa d'origen</b> per forçar la teva moneda principal<br><br>Estàs limitat a 1000 sincronitzacions al mes
 multicurrency_appId=Clau API
 multicurrency_appCurrencySource=Moneda origen
 multicurrency_alternateCurrencySource=Moneda d'origen alternativa
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@ -162,9 +162,9 @@ SizeUnitinch=polzada
 SizeUnitfoot=peu
 SizeUnitpoint=punt
 BugTracker=Incidències
-SendNewPasswordDesc=Aquest formulari us permet sol·licitar una nova contrasenya. Se us enviarà a la vostra adreça electrònica. El canvi es farà efectiu una vegada que feu clic a l'enllaç de confirmació al correu electrònic. <br /> Comproveu la vostra safata d'entrada.
+SendNewPasswordDesc=Aquest formulari et permet sol·licitar una nova contrasenya. S'enviarà a la teva adreça de correu electrònic. <br> El canvi es farà efectiu una vegada facis clic a l'enllaç de confirmació del correu electrònic. <br> Comprova la teva safata d'entrada.
 BackToLoginPage=Tornar a la pàgina de connexió
-AuthenticationDoesNotAllowSendNewPassword=El mode d'autenticació és <b>%s</b>. <br>En aquest mode, Dolibarr no pot saber ni canviar la vostra contrasenya. <br /> Contacteu l'administrador del sistema si voleu canviar la vostra contrasenya.
+AuthenticationDoesNotAllowSendNewPassword=El mode d'autenticació de Dolibarr està configurat com "<b>%s</b>".<br>En aquest mode Dolibarr no pot conèixer ni modificar la seva contrasenya<br>Contacti amb l'administrador per conèixer les modalitats de canvi.
 EnableGDLibraryDesc=Instala o habilita la llibreria GD en la teva instal·lació PHP per poder utilitzar aquesta opció.
 ProfIdShortDesc=<b>Prof Id %s </b> és una informació que depèn del país del tercer. <br>Per exemple, per al país <b>%s</b>, és el codi <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
@ -227,7 +227,9 @@ Chart=Gràfic
 PassEncoding=Codificació de contrasenya
 PermissionsAdd=Permisos afegits
 PermissionsDelete=Permisos eliminats
-
+YourPasswordMustHaveAtLeastXChars=La teva contrasenya ha de tenir almenys <strong>%s</strong> \ncaràcters
+YourPasswordHasBeenReset=La teva contrasenya s'ha restablert correctament
+ApplicantIpAddress=Adreça IP del sol·licitant
 ##### Export #####
 ExportsArea=Àrea d'exportacions
 AvailableFormats=Formats disponibles
--- a/htdocs/langs/ca_ES/printing.lang
+++ b/htdocs/langs/ca_ES/printing.lang
@ -49,4 +49,6 @@ DirectPrintingJobsDesc=Aquesta pàgina llista els treballs de impressió torbats
 GoogleAuthNotConfigured=No s'ha configurat Google OAuth. Habilita el mòdul OAuth i indica un Google ID/Secret.
 GoogleAuthConfigured=Les credencials OAuth de Google es troben en la configuració del mòdul OAuth.
 PrintingDriverDescprintgcp=Variables de configuració del driver d'impressió Google Cloud Print.
+PrintingDriverDescprintipp=Variables de configuració per imprimir amb el controlador Cups.
 PrintTestDescprintgcp=Llista d'impressores per Google Cloud Print
+PrintTestDescprintipp=Llista d'impressores per a Cups.
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilitzat per usuaris tercers
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=S'utilitzarà un compte comptable dedicat definit en la fitxa d'usuari per a omplir el Llibre Major, o com valor predeterminar de la comptabilitat del Llibre Major si no es defineix un compte comptable en la fitxa d'usuari.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable per defecte per a despeses de personal
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable per defecte per als pagaments salarials
 Salary=Sou
 Salaries=Sous
 NewSalaryPayment=Nou pagament de sous
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@ -6,6 +6,7 @@ Permission=Permís
 Permissions=Permisos
 EditPassword=Canviar contrasenya
 SendNewPassword=Enviar una contrasenya nova
+SendNewPasswordLink=Envia enllaç per reiniciar la contrasenya
 ReinitPassword=Generar una contrasenya nova
 PasswordChangedTo=Contrasenya modificada en: %s
 SubjectNewPassword=La teva nova paraula de pas per a %s
@ -43,7 +44,9 @@ NewGroup=Nou grup
 CreateGroup=Crear el grup
 RemoveFromGroup=Eliminar del grup
 PasswordChangedAndSentTo=Contrasenya canviada i enviada a <b>%s</b>.
+PasswordChangeRequest=Sol·licitud per canviar la contrasenya de <b>%s</b>
 PasswordChangeRequestSent=Petició de canvi de contrasenya per a <b>%s</b> enviada a <b>%s</b>.
+ConfirmPasswordReset=Confirma la restauració de la contrasenya
 MenuUsersAndGroups=Usuaris i grups
 LastGroupsCreated=Últims %s grups creats
 LastUsersCreated=Últims %s usuaris creats
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@ -26,7 +26,7 @@ LastWithdrawalReceipt=Últims %s rebuts domiciliats
 MakeWithdrawRequest=Fer una petició de pagament per domiciliació bancària
 WithdrawRequestsDone=%s domiciliacions registrades
 ThirdPartyBankCode=Codi banc del tercer
-NoInvoiceCouldBeWithdrawed=No s'ha domiciliat cap factura. Assegureu-vos que les factures són d'empreses amb les dades de comptes bancaris correctes.
+NoInvoiceCouldBeWithdrawed=No s'ha domiciliat cap factura amb èxit. Comprova que les factures es troben en empreses amb un BAN vàlid per defecte i que aquest BAN té un RUM amb mode <strong>%s</strong>.
 ClassCredited=Classificar com "Abonada"
 ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
 TransData=Data enviament
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@ -269,9 +269,10 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (Výchozí nastavení v php.ini: <b>%s</
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Nedefinováno v PHP na Unixových systémech)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Hosts (Nedefinováno v PHP na Unixových systémech)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
 MAIN_MAIL_AUTOCOPY_TO= Poslat systémovou skrytou kopii všech odeslaných e-mailů na
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
 MAIN_MAIL_SENDMODE=Metoda odesílání e-mailů
 MAIN_MAIL_SMTPS_ID=SMTP ID je-li vyžadováno ověření
 MAIN_MAIL_SMTPS_PW=SMTP heslo je-li vyžadováno ověření
@ -415,7 +416,7 @@ ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parametry musí být objectname: Classpath <br> Syntaxe: objectname: Classpath <br> Příklad: Societe: Societe / třída / societe.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Knihovna používaná pro generování PDF
 WarningUsingFPDF=Upozornění: Váš <b>conf.php</b> obsahuje direktivu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že můžete používat knihovnu FPDF pro generování PDF souborů. Tato knihovna je stará a nepodporuje mnoho funkcí (Unicode, obraz transparentnost, azbuka, arabské a asijské jazyky, ...), takže může dojít k chybám při generování PDF. <br> Chcete-li vyřešit tento a mají plnou podporu generování PDF, stáhněte si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knihovny</a> , pak komentář nebo odebrat řádek <b>$ dolibarr_pdf_force_fpdf = 1,</b> a místo něj doplnit <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
 LocalTaxDesc=Některé země uplatňovat 2 nebo 3 daně na každé faktuře řádek. Pokud se jedná o tento případ, zvolit typ pro druhé a třetí daňové a jeho rychlosti. Možné typ jsou: <br> 1: místní daň vztahovat na výrobky a služby bez DPH (localtax je vypočtena na částku bez daně) <br> 2: místní daň platí o produktech a službách, včetně DPH (localtax je vypočtena na částku + hlavní daně) <br> 3: místní daň vztahovat na výrobky bez DPH (localtax je vypočtena na částku bez daně) <br> 4: místní daň vztahovat na produkty, včetně DPH (DPH se vypočítá na množství + hlavní DPH) <br> 5: místní daň platí o službách bez DPH (localtax je vypočtena na částku bez daně) <br> 6: místní daň platí o službách, včetně DPH (localtax je vypočtena na částku + daň)
@ -488,7 +489,7 @@ Module30Name=Faktury
 Module30Desc=Faktura a dobropis řízení pro zákazníky. Faktura řízení pro dodavatele
 Module40Name=Dodavatelé
 Module40Desc=Dodavatel řízení a nákupu (objednávky a faktury)
-Module42Name=Záznamy
+Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Redakce
 Module49Desc=Editor pro správu
@ -551,6 +552,8 @@ Module520Desc=Správa úvěrů
 Module600Name=Notifications on business events
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
 Module700Name=Dary
 Module700Desc=Darování řízení
 Module770Name=Zpráva výdajů
@ -571,8 +574,8 @@ Module2300Name=Naplánované úlohy
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Události / Agenda
 Module2400Desc=Postupujte udělal a nadcházející události. Nechť Aplikační protokoly automatických akcí pro účely sledování nebo zaznamenávat manuální akce či Rendez-vous.
-Module2500Name=Elektronický Redakční
-Module2500Desc=Uložit a sdílet dokumenty
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API / Webové služby (SOAP server)
 Module2600Desc=Povolit Dolibarr SOAP serveru poskytující služby API
 Module2610Name=API / webové služby REST (server)
@ -586,8 +589,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverze možnosti
 Module3100Name=Skype
 Module3100Desc=Přidání tlačítka Skype na uživatele /subjekty/ Kontakty / členy karet
-Module3200Name=Non Reversible Logs
-Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
+Module3200Name=Unalterable Archives
+Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-společnost
@ -598,7 +601,7 @@ Module10000Name=Webové stránky
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Nechte řízení požadavků
 Module20000Desc=Deklarovat a dodržovat zaměstnanci opustí požadavky
-Module39000Name=Množství produktu
+Module39000Name=Products lots
 Module39000Desc=Šarže nebo sériové číslo, jíst-by a sell-managementem data o produktech
 Module50000Name=Paybox
 Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@ -148,6 +148,7 @@ ErrorDiscountAlreadyUsed=Chyba, sleva byla již použita
 ErrorInvoiceAvoirMustBeNegative=Chyba, správná faktura musí mít zápornou částku
 ErrorInvoiceOfThisTypeMustBePositive=Chyba, tento typ faktury musí mít kladnou částku
 ErrorCantCancelIfReplacementInvoiceNotValidated=Chyba, nelze zrušit, pokud faktura, která byla nahrazena jinou fakturu je stále ve stavu návrhu
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
 BillFrom=Z
 BillTo=Na
 ActionsOnBill=Akce na faktuře
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@ -56,6 +56,7 @@ Address=Adresa
 State=Stát/Okres
 StateShort=State
 Region=Kraj
+Region-State=Region - State
 Country=Země
 CountryCode=Kód země
 CountryId=ID země
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing / Payment
+MenuFinancial=Billing | Payment
 TaxModuleSetupToModifyRules=Přejít na <a href="%s">Nastavení daní</a> pro změnu výpočtu daní
 TaxModuleSetupToModifyRulesLT=Jděte na <a href="%s">Nastavení firmy</a> pro úpravu podmínek pro kalkulaci
 OptionMode=Volba pro účetnictví
--- a/htdocs/langs/cs_CZ/ecm.lang
+++ b/htdocs/langs/cs_CZ/ecm.lang
@ -14,8 +14,8 @@ ECMNbOfFilesInDir=Počet souborů v adresáři
 ECMNbOfSubDir=Počet podadresářů
 ECMNbOfFilesInSubDir=Počet souborů v podadresářích
 ECMCreationUser=Tvůrce
-ECMArea=EDM oblast
-ECMAreaDesc=EDM (Electronic Document Management) plocha umožňuje uložit, sdílet a rychle vyhledávat všechny druhy dokumentů v Dolibarr.
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
 ECMAreaDesc2=* Automatické adresáře jsou vyplněny automaticky při přidávání dokumentů z karty prvku. <br> * Manuální adresáře lze použít k uložení dokladů, které nejsou spojené s konkrétním prvkem.
 ECMSectionWasRemoved=Rejstřík <b>%s</b> byl vymazán.
 ECMSectionWasCreated=Directory <b>%s</b> has been created.
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@ -87,6 +87,7 @@ MailingModuleDescEmailsFromFile=Emaily ze souboru
 MailingModuleDescEmailsFromUser=Emaily zadávané uživatelem
 MailingModuleDescDolibarrUsers=Uživatelé s e-maily
 MailingModuleDescThirdPartiesByCategories=Subjekty (podle kategorií)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.

 # Libelle des modules de liste de destinataires mailing
 LineInFile=Řádek  %s v souboru
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@ -498,6 +498,8 @@ AddPhoto=Přidat obrázek
 DeletePicture=Odstranit obrázek
 ConfirmDeletePicture=Potvrdit odstranění obrázku?
 Login=Přihlášení
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
 CurrentLogin=Aktuální přihlášení
 EnterLoginDetail=Zadejte přihlašovací údaje
 January=Leden
@ -885,7 +887,7 @@ Select2NotFound=nalezen žádný výsledek
 Select2Enter=Zadejte
 Select2MoreCharacter=nebo více znaků
 Select2MoreCharacters=nebo více znaků
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
 Select2LoadingMoreResults=Načítání dalších výsledků ...
 Select2SearchInProgress=Probíhá vyhledávání ...
 SearchIntoThirdparties=Subjekty
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@ -162,9 +162,9 @@ SizeUnitinch=palec
 SizeUnitfoot=stopa
 SizeUnitpoint=bod
 BugTracker=Hlášení chyb
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br />Check your inbox.
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
 BackToLoginPage=Zpět na přihlašovací stránku
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
+AuthenticationDoesNotAllowSendNewPassword=Režim ověřování je <b>%s.</b> <br> V tomto režimu Dolibarr nepozná, zda může změnit vaše heslo. <br> Obraťte se na správce systému, pokud chcete heslo změnit.
 EnableGDLibraryDesc=Nainstalujte nebo povolte GD knihovnu ve vaší PHP pro využití této možnosti
 ProfIdShortDesc=<b>Prof Id %s</b> je informace v závislosti na třetích stranách země. <br> Například pro země <b>%s,</b> je to kód <b>%s.</b>
 DolibarrDemo=Dolibarr ERP/CRM demo
@ -227,7 +227,9 @@ Chart=Schéma
 PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
-
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
 ##### Export #####
 ExportsArea=Exportní plocha
 AvailableFormats=Dostupné formáty
--- a/htdocs/langs/cs_CZ/salaries.lang
+++ b/htdocs/langs/cs_CZ/salaries.lang
@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Účtovací účet ve výchozím nastavení personálních nákladů
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Mzda
 Salaries=Mzdy
 NewSalaryPayment=Nová platba mzdy
--- a/Show More
+++ b/Show More