Merge pull request #2 from Dolibarr/develop

update 17072015

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = uz: uz_UZ, sw: sw_SW
+lang_map = uz: uz_UZ, sw: sw_SW, sr@latin: sr_RS
 
 [dolibarr.accountancy]
 file_filter = htdocs/langs/<lang>/accountancy.lang

ChangeLog

@@ -70,19 +70,14 @@ FIX: No check warehouse is provided if module stock is not enabled.
 FIX: Payed invoices are showed as canceled FIX: Bad date filter on customer order
 FIX: Ref/label of product on contract line was not visible, nor into page, nor into PDF.
 FIX: Removed concatenation on undeclared variable
-FIX: remove deprecated property 'libelle' on product object
+FIX: Remove deprecated property 'libelle' on product object
-FIX: Removed HTML file preventing PHP service
+FIX: Replaced some deprecated call
-FIX: Removed undeclared variable
+FIX: Replaced some deprecated property
-FIX: Removed undeclared variables
-FIX: Removed unused variable
-FIX: Replaced deprecated call
-FIX: Replaced deprecated property
 FIX: Save of filters into export profiles failed.
 FIX: "script" balise with wrong syntax
 FIX: send mail, copy sendto don't read the list of contact
 FIX: top links menu have target attribute with wrong value
 FIX: total amount in tpl linked object are not reset
-FIX: Typo
 FIX; Unknown field 'sc.fk_soc' in field list
 FIX: update usergroup name
 FIX: Variable declared boolean
@@ -100,7 +95,6 @@ FIX: Missing visibility of static property
 NEW: Add a button to purge criteria in user list
 NEW: add all assigned users and all extrafields data in new event when we createFromClone
 NEW: Add a new component to select categories/tags from the main edit page of product. The dedicated tab is also removed.
-NEW: add an explorer for REST API consultation & documentation
 NEW: Add a search field and report on hrm area
 NEW: Add a tab document in donation card
 NEW: Add bank account owner in invoice/proposal/orders footer
@@ -113,7 +107,6 @@ NEW: Add exemple of setup for multitail to render dolibarr log files
 NEW: Add filter on status on invoice list
 NEW: Add filter on task ref and task label into list of tasks
 NEW: Add filter on user contact or user task into task list
-NEW: Add function dolCopyDir to copy directory with recursive content.
 NEW: Add gender property managed on user card FIX: Better error messages when uploading photo of user when permission to write are not granted
 NEW: Add help tooltips on fields of dictionary edit pages. Fix: visible list of tasks are for opened project only.
 NEW: Add hidden option MAIN_MAILFORM_DISABLE_ENTERKEY to disable the key enter into the form to send email.
@@ -125,7 +118,6 @@ NEW: Add option THEME_ELDY_DISABLE_IMAGE to disable images into menu eldy.
 NEW: add PDF icon on linked element into project
 NEW: add "productpricecard" hook and uniformize code
 NEW: Add ref and label of project into export
-NEW: add restler framework First step to build REST API into Dolibarr
 NEW: Add search box for supplier order search.
 NEW: Add status into filters of graph
 NEW: Add tab document on salaries payment
@@ -165,7 +157,6 @@ NEW: Hidden option THEME_ELDY_USE_HOVER is stable enough to become officialy vis
 NEW: If module salaries is on, you can set a hourly value for tome consumed by users. Each time a user enter its time consumed on a project, a calculation is done to provide the cost for human services. This value appears into the "Transversal view" of project.
 NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status into each dispathing line of supplier order to "verify" a reception is ok. Status of order can be set to "total/done" only if line is verified.
 NEW: Into the overview of projects, the name of thirdparty appears into combo lists of elements to link to project.
-NEW: Introduce function dolGetFirstLineOfText
 NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 approvals to make a supplier order approved. Activating this option introduce a new permission to the second level approval.
 NEW: Introduce TCPDI as replacement of FPDI.
 NEW: List of recent modified supplier product prices in Supplier card
@@ -175,7 +166,6 @@ NEW: Product stock and subproduct stock are independant
 NEW: Propal merge product card PDF into azur
 NEW: Rename install etape to step
 NEW: Replace category edition page on members with new select2 component.
-NEW: script to build API class from existing class
 NEW: Show difference between timespent by everybody and time spent by user making timesheet into timesheet pages. NEW: Can enter start hours of task when creating timesheet
 NEW: Show last official stable version into system - update page.
 NEW: Show photo of logged user into login top right block. NEW: If no photo is available for user, we show a generic photo depending on gender
@@ -208,22 +198,29 @@ NEW: Add module batch management.
 For translators:
 NEW: Update language files.
 NEW: When a translation is not available we always jump to en_US and only en_US.
+NEW: All language tranlsations (except source en_US) is now managed on https://www.transifex.com/projects/p/dolibarr/.
+FIX: Typo errors in translation.
 
 For developers:
 NEW: Function yn can show a visual checkbox.
 NEW: Introduced select2 jquery plugin.
-NEW: Possibility to add javascript in main login page with "getLoginPageOptions" hook
+NEW: Possibility to add javascript in main login page with "getLoginPageOptions" hook.
-NEW: possibility to defined a tab for all entities in module descriptor
+NEW: possibility to defined a tab for all entities in module descriptor.
+NEW: add restler framework First step to build REST API into Dolibarr.
+NEW: add an explorer for REST API consultation & documentation.
+NEW: script to build API class from existing class.
+NEW: Add function dolCopyDir to copy directory with recursive content.
+NEW: Introduce function dolGetFirstLineOfText.
 
-WARNING: Following changes may create regression for some external modules, but was necessary to make
+WARNING: Following changes may create regression for some external modules, but were necessary to make
 Dolibarr better:
-- Removed hoo supplierorderdao into supplier order creation. This is a business event, so we must use the 
+- Removed hook supplierorderdao into supplier order creation. This is a business event, so we must use the 
   trigger ORDER_SUPPLIER_CREATE instead.
 - Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook development rules. They are
   "addreplace" hooks, so you must return content with "->resprints='mycontent'" and not with "return 'mycontent'"  
-- All fields "fk_societe" were renamed into "fk_soc".
+- All fields "fk_societe" and "fk_soc" are now named "fk_soc" (same name for all fields).
 - Method select_PriceBaseType and load_PriceBaseType were merged into selectPriceBaseType.
-- The trigger USER_LOGIN* are deprecated. They are still working but you should prefer use the 
+- The triggers USER_LOGIN* are deprecated. They are still working but you should prefer use the 
   hook afterLogin or afterLoginFailed instead.
 
 

build/makepack-dolibarr.pl

@@ -427,6 +427,7 @@ if ($nboftargetok) {
 
 		$ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
 
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ansible`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
@@ -435,6 +436,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/multitail`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
@@ -476,12 +478,12 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/oscim*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
 		# Removed other test files
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/api/explorer`;				# This is a dev tool
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;

htdocs/admin/ihm.php

@@ -141,7 +141,7 @@ if ($action == 'edit')	// Edit
     // Default language
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
-    print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'main_lang_default',1);
+    print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'main_lang_default', 1, 0, 0, 0, 0, 'minwidth300');
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';

htdocs/admin/system/filecheck.php

@@ -77,17 +77,22 @@ if (file_exists($xmlfile))
     $xml = simplexml_load_file($xmlfile);
     if ($xml)
     {
-        $ret = getFilesUpdated($xml->dolibarr_root_dir[0]);		// Fill array $file_list
+    	$file_list = array();
+        $ret = getFilesUpdated($file_list, $xml->dolibarr_root_dir[0]);		// Fill array $file_list
+
         print '<table class="noborder">';
         print '<tr class="liste_titre">';
         print '<td>' . $langs->trans("FilesMissing") . '</td>';
+        print '<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
         print '</tr>'."\n";
         $var = true;
-        foreach ($file_list['missing'] as $file)
+        $tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
+        foreach ($tmpfilelist as $file)
         {
             $var = !$var;
             print '<tr ' . $bc[$var] . '>';
-            print '<td>'.$file.'</td>' . "\n";
+            print '<td>'.$file['filename'].'</td>' . "\n";
+            print '<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
             print "</tr>\n";
         }
         print '</table>';
@@ -97,17 +102,22 @@ if (file_exists($xmlfile))
         print '<table class="noborder">';
         print '<tr class="liste_titre">';
         print '<td>' . $langs->trans("FilesUpdated") . '</td>';
+        print '<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
+        print '<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
         print '<td align="right">' . $langs->trans("Size") . '</td>';
-        print '<td align="center">' . $langs->trans("DateModification") . '</td>';
+        print '<td align="right">' . $langs->trans("DateModification") . '</td>';
         print '</tr>'."\n";
         $var = true;
-        foreach ($file_list['updated'] as $file)
+        $tmpfilelist = dol_sort_array($file_list['updated'], 'filename');
+        foreach ($tmpfilelist as $file)
         {
             $var = !$var;
             print '<tr ' . $bc[$var] . '>';
-            print '<td>'.$file.'</td>' . "\n";
+            print '<td>'.$file['filename'].'</td>' . "\n";
-            print '<td align="right">'.dol_print_size(dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file)).'</td>' . "\n";
+            print '<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-            print '<td align="center">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file),'dayhour').'</td>' . "\n";
+            print '<td align="center">'.$file['md5'].'</td>' . "\n";
+            print '<td align="right">'.dol_print_size(dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename'])).'</td>' . "\n";
+            print '<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
             print "</tr>\n";
         }
         print '</table>';
@@ -124,34 +134,36 @@ $db->close();
 
 
 /**
- * Function to get list of updated or modified files
+ * Function to get list of updated or modified files.
+ * $file_list is used as global variable
  *
+ * @param	array				$file_list	Array for response
  * @param   SimpleXMLElement	$dir    	SimpleXMLElement of files to test
  * @param   string   			$path   	Path of file
  * @return  array               			Array of filenames
  */
-function getFilesUpdated(SimpleXMLElement $dir, $path = '')
+function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '')
 {
-    global $file_list;
     $exclude = 'install';
 
     foreach ($dir->md5file as $file)
     {
         $filename = $path.$file['name'];
 
-        if (preg_match('#'.$exclude.'#', $filename))
+        if (preg_match('#'.$exclude.'#', $filename)) continue;
-            continue;
 
-        if (!file_exists(DOL_DOCUMENT_ROOT.'/'.$filename)) {
+        if (!file_exists(DOL_DOCUMENT_ROOT.'/'.$filename))
-            $file_list['missing'][] = $filename;
+        {
-        } else {
+            $file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>(string) $file);
+        }
+        else
+		{
             $md5_local = md5_file(DOL_DOCUMENT_ROOT.'/'.$filename);
-            if ($md5_local != (string) $file)
+            if ($md5_local != (string) $file) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>(string) $file, 'md5'=>(string) $md5_local);
-                $file_list['updated'][] = $filename;
         }
     }
 
-    foreach ($dir->dir as $subdir)
+    foreach ($dir->dir as $subdir) getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/');
-        getFilesUpdated($subdir, $path.$subdir['name'].'/');
+
     return $file_list;
 }

htdocs/admin/system/perf.php

@@ -172,7 +172,7 @@ jQuery(document).ready(function() {
   var compcssstring;
   getcssurl = $.ajax({
     type: "GET",
-    url: \''.DOL_URL_ROOT.'/includes/jquery/css/smoothness/jquery-ui.custom.css\',
+    url: \''.DOL_URL_ROOT.'/includes/jquery/css/smoothness/jquery-ui.css\',
     cache: false,
     /* async: false, */
     /*crossDomain: true, */

htdocs/admin/tools/dolibarr_export.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2006-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2006-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -66,6 +66,8 @@ $form=new Form($db);
 $formfile = new FormFile($db);
 
 $label=$db::LABEL;
+$type=$db->type;
+//var_dump($db);
 
 $help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad';
 llxHeader('','',$help_url);
@@ -101,8 +103,8 @@ jQuery(document).ready(function() {
 	});
 
 	<?php
-	    if ($label == 'MySQL')      print 'jQuery("#radio_dump_mysql").click();';
+	    if (in_array($type, array('mysql', 'mysqli')))  print 'jQuery("#radio_dump_mysql").click();';
-	    if ($label == 'PostgreSQL') print 'jQuery("#radio_dump_postgresql").click();';
+	    if (in_array($type, array('pgsql'))) print 'jQuery("#radio_dump_postgresql").click();';
 	?>
 });
 </script>
@@ -133,7 +135,7 @@ print '<br>';
 
 print_titre($title?$title:$langs->trans("BackupDumpWizard"));
 
-print '<table width="100%" class="'.($useinecm?'nobordernopadding':'liste').'">';
+print '<table width="100%" class="'.($useinecm?'nobordernopadding':'liste').' nohover">';
 print '<tr class="liste_titre">';
 print '<td class="liste_titre">';
 print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b><br>';
@@ -148,7 +150,7 @@ print '<tr '.$bc[false].'><td style="padding-left: 8px">';
 		<div id="div_container_exportoptions">
 		<fieldset id="exportoptions"><legend><?php echo $langs->trans("ExportMethod"); ?></legend>
 		<?php
-		if ($label == 'MySQL')
+		if (in_array($type, array('mysql', 'mysqli')))
 		{
 			?>
 			<div class="formelementrow"><input type="radio" name="what" value="mysql" id="radio_dump_mysql" />
@@ -160,7 +162,7 @@ print '<tr '.$bc[false].'><td style="padding-left: 8px">';
 			</div>
 			<?php
 		}
-		else if ($label == 'PostgreSQL')
+		else if (in_array($type, array('pgsql')))
 		{
 			?>
 			<div class="formelementrow"><input type="radio" name="what"	value="postgresql" id="radio_dump_postgresql" />
@@ -182,7 +184,7 @@ print '<tr '.$bc[false].'><td style="padding-left: 8px">';
 
 		<div id="div_container_sub_exportoptions">
 		<?php
-		if ($label == 'MySQL')
+		if (in_array($type, array('mysql', 'mysqli')))
 		{
 			?> <!--  Fieldset mysqldump -->
 			<fieldset id="mysql_options"><legend><?php echo $langs->trans("MySqlExportParameters"); ?></legend>
@@ -317,7 +319,7 @@ print '<tr '.$bc[false].'><td style="padding-left: 8px">';
 		<?php
 		}
 
-		if ($label == 'PostgreSQL')
+		if (in_array($type, array('pgsql')))
 		{
 			?> <!--  Fieldset pg_dump -->
 			<fieldset id="postgresql_options"><legend><?php echo $langs->trans("PostgreSqlExportParameters"); ?></legend>
@@ -382,9 +384,9 @@ print '<tr '.$bc[false].'><td style="padding-left: 8px">';
 	value="<?php
 $prefix='dump';
 $ext='.sql';
-if ($label == 'MySQL')      { $prefix='mysqldump'; $ext='sql'; }
+if (in_array($type, array('mysql', 'mysqli')))  { $prefix='mysqldump'; $ext='sql'; }
 //if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
-if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='sql'; }
+if (in_array($type, array('pgsql'))) { $prefix='pg_dump'; $ext='sql'; }
 $file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
 echo $file;
 ?>" /> <br>
@@ -394,7 +396,7 @@ echo $file;
 
 // Define compressions array
 $compression=array();
-if ($label == 'MySQL')
+if (in_array($type, array('mysql', 'mysqli')))
 {
 	$compression['none'] = array('function' => '',       'id' => 'radio_compression_none', 'label' => $langs->trans("None"));
 	$compression['gz'] = array('function' => 'gzopen', 'id' => 'radio_compression_gzip', 'label' => $langs->trans("Gzip"));

htdocs/admin/tools/listevents.php

@@ -289,7 +289,7 @@ if ($result)
 	if ($num)
 	{
 		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
+		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
 		print '</div>';
 	}
 }

htdocs/comm/card.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville        <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne                 <eric.seigne@ryxeo.com>
  * Copyright (C) 2006      Andre Cianfarani            <acianfa@free.fr>
  * Copyright (C) 2005-2012 Regis Houssin               <regis.houssin@capnetworks.com>
@@ -227,8 +227,8 @@ if ($id > 0)
 	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
 	print '</td></tr>';
 
-	// Alias names (commercial, trademark or alias names)
+	// Alias name (commercial, trademark or alias name)
-	print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans('AliasNameShort').'</td><td colspan="3">';
 	print $object->name_alias;
 	print "</td></tr>";
 

htdocs/commande/card.php

@@ -1950,7 +1950,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('AvailabilityPeriod');
 		print '</td>';
-		if ($action != 'editavailability' && $object->brouillon)
+		if ($action != 'editavailability')
 			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="3">';
@@ -1966,7 +1966,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Source');
 		print '</td>';
-		if ($action != 'editdemandreason' && ! empty($object->brouillon))
+		if ($action != 'editdemandreason')
 			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="3">';
@@ -1975,14 +1975,15 @@ if ($action == 'create' && $user->rights->commande->creer)
 		} else {
 			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
 		}
-		// Removed because using dictionary is an admin feature, not a user feature. Ther is already the "star" to show info to admin users.
+		// Removed because using dictionary is an admin feature, not a user feature. There is already the "star" to show info to admin users.
 		// This is to avoid too heavy screens and have an uniform look and feel for all screens.
 		// print '</td><td>';
 		// print '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=22&origin=order&originid='.$object->id.'">'.$langs->trans("DictionarySource").'</a>';
 		print '</td></tr>';
 
 		// Project
-		if (! empty($conf->projet->enabled)) {
+		if (! empty($conf->projet->enabled))
+		{
 			$langs->load('projects');
 			print '<tr><td height="10">';
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -2001,7 +2002,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '</td></tr>';
 		}
 
-		if ($soc->outstanding_limit) {
+		if ($soc->outstanding_limit)
+		{
 			// Outstanding Bill
 			print '<tr><td>';
 			print $langs->trans('OutstandingBill');

htdocs/core/boxes/box_contacts.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
  *
@@ -62,7 +62,7 @@ class box_contacts extends ModeleBoxes
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc";
+			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
 			$sql.= ", s.nom as socname";
             $sql.= ", s.code_client";
 			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
@@ -91,6 +91,7 @@ class box_contacts extends ModeleBoxes
 					$contactstatic->lastname=$objp->lastname;
                     $contactstatic->firstname=$objp->firstname;
                     $contactstatic->civility_id=$objp->civility_id;
+					$contactstatic->statut=$objp->status;
 					
                     $societestatic->id = $objp->fk_soc;
                     $societestatic->code_client = $objp->code_client;
@@ -113,6 +114,12 @@ class box_contacts extends ModeleBoxes
                         'text' => dol_print_date($datem, "day"),
                     );
 
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'align="right" class="nowrap" width="18"',
+                        'text' => $contactstatic->getLibStatut(3),
+                        'asis'=>1,
+                    );
+                    
                     $line++;
                 }
 

htdocs/core/class/html.form.class.php

@@ -3217,11 +3217,11 @@ class Form
             {
                 foreach ($formquestion as $key => $input)
                 {
-                    if (isset($input['name'])) array_push($inputok,$input['name']);
+                	//print "xx ".$key." rr ".is_array($input)."<br>\n";
+                    if (is_array($input) && isset($input['name'])) array_push($inputok,$input['name']);
                     if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko,$input['name']);
                 }
             }
-
 			// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
             $formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
             if (! empty($more)) {

htdocs/core/class/html.formadmin.class.php

@@ -54,9 +54,10 @@ class FormAdmin
 	 * 		@param		int			$showempty		Add empty value
 	 *      @param      int			$showwarning    Show a warning if language is not complete
 	 *      @param		int			$disabled		Disable edit of select
+	 *      @param		string		$morecss		Add more css styles
 	 *      @return		string						Return HTML select string with list of languages
 	 */
-	function select_language($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0,$showwarning=0,$disabled=0)
+	function select_language($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0,$showwarning=0,$disabled=0,$morecss='')
 	{
 		global $langs;
 
@@ -64,7 +65,7 @@ class FormAdmin
 
 		$out='';
 
-		$out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').'>';
+		$out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').'>';
 		if ($showempty)
 		{
 			$out.= '<option value=""';

htdocs/core/lib/functions.lib.php

@@ -1725,11 +1725,12 @@ function dol_substr($string,$start,$length,$stringencoding='')
  *  @param		string	$type			Type of graph ('pie', 'barline')
  *  @param		int		$showpercent	Show percent (with type='pie' only)
  *  @param		string	$url			Param to add an url to click values
+ *  @param		int		$combineother	0=No combine, 0.05=Combine if lower than 5%
  *  @return		void
  *  @deprecated
  *  @see DolGraph
  */
-function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',$showpercent=0,$url='')
+function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',$showpercent=0,$url='',$combineother=0.05)
 {
 	dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
 
@@ -1777,10 +1778,15 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 						series: {
 							pie: {
 								show: true,
-								radius: 0.8,
+								radius: 0.8,';
+			if ($combineother)
+			{
+				print '
 								combine: {
-								 	threshold: 0.05
+								 	threshold: '.$combineother.'
-								},
+								},';
+			}
+			print '
 								label: {
 									show: true,
 									radius: 0.9,

htdocs/core/lib/pdf.lib.php

@@ -353,9 +353,9 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
 		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
 		{
 			// Phone
-			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
 			// Fax
-			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
 			// EMail
 			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
 			// Web

htdocs/core/lib/security.lib.php

@@ -351,7 +351,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
  *
  * @return	bool		True if user has access, False otherwise
  */
-function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='', $dbt_select='')
+function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='', $dbt_select='rowid')
 {
 	global $db, $conf;
 
@@ -416,32 +416,32 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checkother))
+		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->societe_id > 0)
 			{
-				$sql = "SELECT dbt.rowid";
+				$sql = "SELECT dbt.".$dbt_select;
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.rowid = ".$objectid;
+				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
 				$sql.= " AND dbt.fk_soc = ".$user->societe_id;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
 			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
 			{
-				$sql = "SELECT dbt.rowid";
+				$sql = "SELECT dbt.".$dbt_select;
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
-				$sql.= " WHERE dbt.rowid = ".$objectid;
+				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
 				$sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
 			else if (! empty($conf->multicompany->enabled))
 			{
-				$sql = "SELECT dbt.rowid";
+				$sql = "SELECT dbt.".$dbt_select;
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.rowid = ".$objectid;
+				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}

htdocs/core/menus/standard/eldy.lib.php

@@ -584,6 +584,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 			}
 
+			$newmenu->add("/societe/list.php?leftmenu=thirdparties", $langs->trans("List"),1);
+
 			// Prospects
 			if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 			{

htdocs/core/modules/expedition/doc/pdf_merou.modules.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2015      Marcos García       <marcosgdf@gmail.com>

htdocs/expedition/card.php

@@ -507,6 +507,8 @@ if ($action == 'create')
                 print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id','int').'">';
             }
 
+            dol_fiche_head('');
+
             print '<table class="border" width="100%">';
 
             // Ref
@@ -618,6 +620,8 @@ if ($action == 'create')
 
             print "</table>";
 
+            dol_fiche_end();
+
             /*
              * Lignes de commandes
              */
@@ -838,7 +842,7 @@ if ($action == 'create')
 				}
 				else
 				{
-					print '<td></td><td></td></tr>';
+					print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
 					$subj=0;
 					print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 					foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
@@ -855,6 +859,7 @@ if ($action == 'create')
 						$staticwarehouse->fetch($warehouse_id);
 						print $staticwarehouse->getNomUrl(0).' / ';
 
+						print '<!-- Show details of lot -->';
 						print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 						print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
 						if ($defaultqty<=0) {
@@ -1073,8 +1078,8 @@ else if ($id || $ref)
 		// Weight
 		print '<tr><td>'.$form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
 
-		if($action=='edittrueWeight') {
+		if ($action=='edittrueWeight')
-
+		{
 			print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input name="action" value="settrueWeight" type="hidden">';
 			print '<input name="id" value="'.$object->id.'" type="hidden">';
@@ -1086,7 +1091,8 @@ else if ($id || $ref)
 			print '</form>';
 
 		}
-		else {
+		else
+		{
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
 		}
@@ -1107,8 +1113,8 @@ else if ($id || $ref)
 
 		// Height
 		print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		if($action=='edittrueHeight') {
+		if($action=='edittrueHeight')
-
+		{
 			print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input name="action" value="settrueHeight" type="hidden">';
 			print '<input name="id" value="'.$object->id.'" type="hidden">';
@@ -1120,7 +1126,8 @@ else if ($id || $ref)
 			print '</form>';
 
 		}
-		else {
+		else
+		{
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
 
@@ -1370,8 +1377,10 @@ else if ($id || $ref)
 				else if (count($lines[$i]->details_entrepot) > 1)
 				{
 					$detail = '';
-					foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+					foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-						if ($detail_entrepot->entrepot_id > 0) {
+					{
+						if ($detail_entrepot->entrepot_id > 0)
+						{
 							$entrepot = new Entrepot($db);
 							$entrepot->fetch($detail_entrepot->entrepot_id);
 							$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
@@ -1389,7 +1398,8 @@ else if ($id || $ref)
 				{
 					print '<td>';
 					$detail = '';
-					foreach ($lines[$i]->detail_batch as $dbatch) {
+					foreach ($lines[$i]->detail_batch as $dbatch)
+					{
 						$detail.= $langs->trans("DetailBatchFormat",$dbatch->batch,dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->dluo_qty).'<br/>';
 					}
 					print $form->textwithtooltip($langs->trans("DetailBatchNumber"),$detail);

htdocs/expedition/class/expedition.class.php

@@ -1234,23 +1234,34 @@ class Expedition extends CommonObject
 				$this->total_localtax1+= $tabprice[9];
 				$this->total_localtax2+= $tabprice[10];
 
+                $line->detail_batch = array();
+
 				// Eat-by date
-				if (! empty($conf->productbatch->enabled)) {
+				if (! empty($conf->productbatch->enabled) && $obj->line_id > 0)
-                    /* test on conf at begining of file sometimes doesn't include expeditionbatch
+				{
-                     * May be conf is not well initialized for dark reason
-                     */
                     require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+
+                    $newdetailbatch = ExpeditionLineBatch::fetchAll($this->db,$obj->line_id);
+                    if (is_array($newdetailbatch))
+                    {
 	                    if ($originline != $obj->fk_origin_line)
 	                    {
-                        $line->detail_batch = ExpeditionLineBatch::fetchAll($this->db,$obj->line_id);
+	                        $line->detail_batch = $newdetailbatch;
-                    } else {
+	                    }
-                        $line->detail_batch = array_merge($line->detail_batch,ExpeditionLineBatch::fetchAll($this->db,$obj->line_id));
+	                    else
+						{
+	                        $line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
 	                    }
                     }
-				if ($originline != $obj->fk_origin_line) {
+				}
+
+				if ($originline != $obj->fk_origin_line)
+				{
 				    $this->lines[$lineindex] = $line;
 				    $lineindex++;
-				} else {
+				}
+				else
+				{
 				    $line->total_ht			+= $tabprice[0];
 				    $line->total_localtax1 	+= $tabprice[9];
 				    $line->total_localtax2 	+= $tabprice[10];

htdocs/expedition/shipment.php

@@ -238,7 +238,6 @@ if ($id > 0 || ! empty($ref))
 		// Date
 		print '<tr><td>'.$langs->trans('Date').'</td>';
 		print '<td colspan="2">'.dol_print_date($commande->date,'daytext').'</td>';
-		print '<td width="50%">'.$langs->trans('Source').' : '.$commande->getLabelSource().'</td>';
 		print '</tr>';
 
 		// Delivery date planned
@@ -265,9 +264,9 @@ if ($id > 0 || ! empty($ref))
 		}
 		print '</td>';
 		// Note on several rows
-		print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';
+		//print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';
-		print nl2br($commande->note_public);
+		//print nl2br($commande->note_public);
-		print '</td>';
+		//print '</td>';
 		print '</tr>';
 
         // Shipping Method
@@ -307,7 +306,7 @@ if ($id > 0 || ! empty($ref))
 		print '</td></tr>';
 
 		// Mode of payment
-		print '<tr><td height="10">';
+		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('PaymentMode');
 		print '</td>';
@@ -324,11 +323,42 @@ if ($id > 0 || ! empty($ref))
 		}
 		print '</td></tr>';
 
+		// Availability
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('AvailabilityPeriod');
+		print '</td>';
+		if ($action != 'editavailability')
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editavailability') {
+			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $commande->id, $commande->availability_id, 'availability_id', 1);
+		} else {
+			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $commande->id, $commande->availability_id, 'none', 1);
+		}
+		print '</td></tr>';
+
+		// Source
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Source');
+		print '</td>';
+		if ($action != 'editdemandreason')
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editdemandreason') {
+			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $commande->id, $commande->demand_reason_id, 'demand_reason_id', 1);
+		} else {
+			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $commande->id, $commande->demand_reason_id, 'none');
+		}
+
 		// Project
 		if (! empty($conf->projet->enabled))
 		{
 			$langs->load('projects');
-			print '<tr><td height="10">';
+			print '<tr><td>';
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
 			print $langs->trans('Project');
 			print '</td>';
@@ -373,15 +403,14 @@ if ($id > 0 || ! empty($ref))
 		 *  Lignes de commandes avec quantite livrees et reste a livrer
 		 *  Les quantites livrees sont stockees dans $commande->expeditions[fk_product]
 		 */
-		print '<table class="liste" width="100%">';
+		print '<table class="noborder noshadow" width="100%">';
 
-		$sql = "SELECT cd.rowid, cd.fk_product, cd.product_type, cd.label, cd.description,";
+		$sql = "SELECT cd.rowid, cd.fk_product, cd.product_type as type, cd.label, cd.description,";
 		$sql.= " cd.price, cd.tva_tx, cd.subprice,";
 		$sql.= " cd.qty,";
 		$sql.= ' cd.date_start,';
 		$sql.= ' cd.date_end,';
-		$sql.= ' p.label as product_label, p.entity, p.ref, p.fk_product_type, p.rowid as prodid,';
+		$sql.= ' p.rowid as prodid, p.label as product_label, p.entity, p.ref, p.fk_product_type as product_type, p.description as product_desc';
-		$sql.= ' p.description as product_desc, p.fk_product_type as product_type';
 		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
 		$sql.= " WHERE cd.fk_commande = ".$commande->id;
@@ -419,7 +448,8 @@ if ($id > 0 || ! empty($ref))
 				$var=!$var;
 
 				// Show product and description
-				$type=$objp->product_type?$objp->product_type:$objp->fk_product_type;
+				$type=isset($objp->type)?$objp->type:$objp->product_type;
+
 				// Try to enhance type detection using date_start and date_end for free lines where type
 				// was not saved.
 				if (! empty($objp->date_start)) $type=1;
@@ -459,7 +489,7 @@ if ($id > 0 || ! empty($ref))
 					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
 
 					// Show product and description
-					$product_static->type=$objp->fk_product_type;
+					$product_static->type=$type;
 					$product_static->id=$objp->fk_product;
 					$product_static->ref=$objp->ref;
                     $product_static->entity = $objp->entity;

htdocs/expensereport/card.php

@@ -576,7 +576,7 @@ if ($action == "confirm_refuse" && GETPOST('confirm')=="yes" && $id > 0 && $user
 	}
 	else
 	{
-		setEventMessage($object->error, $object->errors);
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
@@ -1115,7 +1115,10 @@ if ($action == 'create')
 	print '<td>';
 	$object = new ExpenseReport($db);
 	$include_users = $object->fetch_users_approver_expensereport();
-	$s=$form->select_dolusers((GETPOST('fk_user_validator')?GETPOST('fk_user_validator'):$conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR), "fk_user_validator", 1, "", 0, $include_users);
+	$defaultselectuser=$user->fk_user;	// Will work only if supervisor has permission to approve so is inside include_users
+	if (! empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) $defaultselectuser=$conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR;
+	if (GETPOST('fk_user_validator') > 0) $defaultselectuser=GETPOST('fk_user_validator');
+	$s=$form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", 0, $include_users);
 	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 	print '</td>';
 	print '</tr>';
@@ -1404,7 +1407,14 @@ else
 				print '<tr>';
 				print '<td>'.$langs->trans("AmountHT").'</td>';
 				print '<td>'.price($object->total_ht).'</td>';
-				print '<td rowspan="7" valign="top">';
+				$rowspan = 5;
+				if ($object->fk_statut < 3) $rowspan++;
+				elseif($object->fk_statut == 4) $rowspan+=2;
+				else $rowspan+=2;
+				if ($object->fk_statut==99 || !empty($object->detail_refuse)) $rowspan+=2;
+				if($object->fk_statut==6) $rowspan+=2;
+
+				print '<td rowspan="'.$rowspan.'" valign="top">';
 				/*
 				 * Payments
 				 */

htdocs/expensereport/class/expensereport.class.php

@@ -986,8 +986,8 @@ class ExpenseReport extends CommonObject
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
             $sql.= " SET ref = '".$this->ref."', fk_statut = 99, fk_user_refuse = ".$fuser->id.",";
             $sql.= " date_refuse='".$this->db->idate($now)."',";
-            $sql.= " detail_refuse='".$this->db->escape($details)."'";
+            $sql.= " detail_refuse='".$this->db->escape($details)."',";
-            $sql.= " fk_user_approve=NULL,";
+            $sql.= " fk_user_approve = NULL";
             $sql.= ' WHERE rowid = '.$this->id;
             if ($this->db->query($sql))
             {
@@ -1715,7 +1715,7 @@ class ExpenseReportLine
  */
 function select_expensereport_statut($selected='',$htmlname='fk_statut',$useempty=1)
 {
-    global $db;
+    global $db, $langs;
 
     $tmpep=new ExpenseReport($db);
 
@@ -1731,7 +1731,7 @@ function select_expensereport_statut($selected='',$htmlname='fk_statut',$useempt
         {
             print '<option value="'.$key.'">';
         }
-        print $val;
+        print $langs->trans($val);
         print '</option>';
     }
     print '</select>';

htdocs/expensereport/index.php

@@ -120,7 +120,7 @@ if ($conf->use_javascript_ajax)
 {
     print '<tr '.$bc[0].'><td align="center" colspan="4">';
     $data=array('series'=>$dataseries);
-    dol_print_graph('stats',320,180,$data,1,'pie',0);
+    dol_print_graph('stats',320,180,$data,1,'pie',0,'',0);
     print '</td></tr>';
 }
 

htdocs/fourn/card.php

@@ -139,7 +139,7 @@ if ($object->id > 0)
 	print '</td></tr>';
 
 	// Alias names (commercial, trademark or alias names)
-	print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans('AliasNameShort').'</td><td colspan="3">';
 	print $object->name_alias;
 	print "</td></tr>";
 

htdocs/install/mysql/migration/repair.sql

@@ -54,6 +54,7 @@ delete from llx_adherent_extrafields where fk_object not in (select rowid from l
 delete from llx_product_extrafields where fk_object not in (select rowid from llx_product);
 --delete from llx_societe_commerciaux where fk_soc not in (select rowid from llx_societe);
 
+update llx_product_batch set batch = '' where batch = 'Non défini';
 
 -- Fix: delete category child with no category parent.
 drop table tmp_categorie;

htdocs/langs/ar_SA/admin.lang

@@ -821,6 +821,7 @@ DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Type of leaves
+DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=الإعداد المحفوظة
 BackToModuleList=العودة إلى قائمة الوحدات
 BackToDictionaryList=Back to dictionaries list
@@ -1650,3 +1651,24 @@ LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
+OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+MailToSendProposal=To send customer proposal
+MailToSendOrder=To send customer order
+MailToSendInvoice=To send customer invoice
+MailToSendShipment=To send shipment
+MailToSendIntervention=To send intervention
+MailToSendSupplierRequestForQuotation=To send quotation request to supplier
+MailToSendSupplierOrder=To send supplier order
+MailToSendSupplierInvoice=To send supplier invoice
+MailToThirdparty=To send email from thirdparty page

htdocs/langs/ar_SA/agenda.lang

@@ -97,3 +97,9 @@ ActionType=Event type
 DateActionBegin=Start event date
 CloneAction=Clone event
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour

htdocs/langs/ar_SA/banks.lang

@@ -165,3 +165,8 @@ DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
 StartDate=Start date
 EndDate=End date
+RejectCheck=Check rejection
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+RejectCheckDate=Check rejection date
+CheckRejected=Check rejected
+CheckRejectedAndInvoicesReopened=Check rejected and invoices reopened

htdocs/langs/ar_SA/categories.lang

@@ -108,3 +108,4 @@ CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
+ByDefaultInList=By default in list

htdocs/langs/ar_SA/compta.lang

@@ -199,9 +199,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product,
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT
+ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code

htdocs/langs/ar_SA/errors.lang

@@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=يتم تعيين ثلث آخر إلى %s
 ErrorFailedToSendPassword=لم ترسل كلمة السر
 ErrorFailedToLoadRSSFile=فشل في الحصول على آر إس إس. محاولة إضافة MAIN_SIMPLEXMLLOAD_DEBUG ثابت إذا رسائل الخطأ لا توفر ما يكفي من المعلومات.
 ErrorPasswordDiffers=كلمات السر يختلف، الرجاء كتابتها مرة أخرى.
-ErrorForbidden=رفض الوصول. <br> حاولت الوصول إلى المنطقة، وصفحة أو ميزة دون أن يكون في جلسة المصادقة أو لا يجوز أن المستخدم الخاص بك.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
 ErrorForbidden2=ويمكن تعريف إذن لهذا الدخول من قبل المسؤول Dolibarr الخاص بك من القائمة %s-> %s.
 ErrorForbidden3=يبدو أن لا يتم استخدام Dolibarr خلال جلسة المصادقة. نلقي نظرة على وثائق الإعداد Dolibarr لمعرفة كيفية إدارة المصادقة (تاكيس، mod_auth أو غيرها ...).
 ErrorNoImagickReadimage=لم يتم العثور على فئة Imagick في هذا PHP. لا يمكن لمعاينة تكون متاحة. يمكن للمسؤولين تعطيل هذا التبويب من إعداد القائمة - عرض.

htdocs/langs/ar_SA/exports.lang

@@ -132,3 +132,4 @@ SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Champs Filtrables
 FilteredFields=Filtered fields
 FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule

htdocs/langs/ar_SA/languages.lang

@@ -23,6 +23,7 @@ Language_en_US=الإنكليزية (الولايات المتحدة)
 Language_en_ZA=English (South Africa)
 Language_es_ES=الأسبانية
 Language_es_AR=الأسبانية (الأرجنتين)
+Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)

htdocs/langs/ar_SA/projects.lang

@@ -26,6 +26,8 @@ ConfirmDeleteATask=هل أنت متأكد من أنك تريد حذف هذه ا
 OfficerProject=ضابط المشروع
 LastProjects=آخر مشاريع ق ٪
 AllProjects=جميع المشاريع
+OpenedProjects=Opened projects
+OpportunitiesStatusForOpenedProjects=Opportunities status for opened projects
 ProjectsList=قائمة المشاريع
 ShowProject=وتبين للمشروع
 SetProject=وضع المشروع
@@ -78,6 +80,8 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=قائمة الإجراءات المرتبطة بالمشروع
 ListTaskTimeUserProject=List of time consumed on tasks of project
 TaskTimeUserProject=Time consumed on tasks of project
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=نشاط المشروع هذا الاسبوع
 ActivityOnProjectThisMonth=نشاط المشروع هذا الشهر
 ActivityOnProjectThisYear=نشاط المشروع هذا العام
@@ -93,6 +97,7 @@ ReOpenAProject=فتح مشروع
 ConfirmReOpenAProject=هل أنت متأكد أنك تريد إعادة فتح هذا المشروع؟
 ProjectContact=مشروع اتصالات
 ActionsOnProject=الإجراءات على المشروع
+OpenedProjects=Opened projects
 YouAreNotContactOfProject=كنت لا اتصال لهذا المشروع الخاص
 DeleteATimeSpent=قضى الوقت حذف
 ConfirmDeleteATimeSpent=هل أنت متأكد أنك تريد حذف هذا الوقت الذي يقضيه؟
@@ -121,6 +126,8 @@ ProjectCreatedInDolibarr=Project %s created
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Opportunity status
+OpportunityAmount=Opportunity amount
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=مشروع زعيم
 TypeContact_project_external_PROJECTLEADER=مشروع زعيم
@@ -140,6 +147,7 @@ PlannedWorkloadShort=Workload
 WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
+SearchATask=Search a task
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a resource to allocate time
@@ -154,3 +162,10 @@ ResourceNotAssignedToTask=Not assigned to task
 AssignTaskToMe=Assign task to me
 AssignTask=Assign
 ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and time
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=Nb of created projects by month
+ProjectsStatistics=Statistics on projects/leads
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpportunityPonderatedAmount=Opportunities ponderated amount

htdocs/langs/ar_SA/trips.lang

@@ -9,6 +9,7 @@ TripCard=Expense report card
 AddTrip=Create expense report
 ListOfTrips=List of expense reports
 ListOfFees=قائمة الرسوم
+ShowTrip=Show expense report
 NewTrip=New expense report
 CompanyVisited=الشركة / المؤسسة زارت
 Kilometers=كم

htdocs/langs/bg_BG/admin.lang

@@ -318,9 +318,9 @@ GenericMaskCodes4b=<u>Пример за трета страна е създад
 GenericMaskCodes4c=<u>Пример за продукт, създаден на 2007-03-01:</u> <br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ще даде <b>ABC0701-000099</b> <br> <b>{0000+100@1}-ZZZ/{dd} / XXX</b> ще даде <b>0199-ZZZ/31/XXX</b>
 GenericNumRefModelDesc=Върнете адаптивни номер според определен маска.
-ServerAvailableOnIPOrPort=Сървър е достъпна на адрес <b>%s</b> на порт <b>%s</b>
+ServerAvailableOnIPOrPort=Сървъра е достъпен на адрес <b>%s</b> , порт <b>%s</b>
-ServerNotAvailableOnIPOrPort=Сървърът не е достъпен на адрес <b>%s</b> на порт <b>%s</b>
+ServerNotAvailableOnIPOrPort=Сървъра не е достъпен на адрес <b>%s</b> , порт <b>%s</b>
-DoTestServerAvailability=Свързаност тестовия сървър
+DoTestServerAvailability=Тестване на сързаността със сървъра
 DoTestSend=Тестване изпращането
 DoTestSendHTML=Тестване изпращането на HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
@@ -821,6 +821,7 @@ DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Type of leaves
+DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup спаси
 BackToModuleList=Обратно към списъка с модули
 BackToDictionaryList=Back to dictionaries list
@@ -1650,3 +1651,24 @@ LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
+OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+MailToSendProposal=To send customer proposal
+MailToSendOrder=To send customer order
+MailToSendInvoice=To send customer invoice
+MailToSendShipment=To send shipment
+MailToSendIntervention=To send intervention
+MailToSendSupplierRequestForQuotation=To send quotation request to supplier
+MailToSendSupplierOrder=To send supplier order
+MailToSendSupplierInvoice=To send supplier invoice
+MailToThirdparty=To send email from thirdparty page

htdocs/langs/bg_BG/agenda.lang

@@ -97,3 +97,9 @@ ActionType=Event type
 DateActionBegin=Start event date
 CloneAction=Clone event
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour

htdocs/langs/bg_BG/banks.lang

@@ -165,3 +165,8 @@ DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
 StartDate=Start date
 EndDate=End date
+RejectCheck=Check rejection
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+RejectCheckDate=Check rejection date
+CheckRejected=Check rejected
+CheckRejectedAndInvoicesReopened=Check rejected and invoices reopened

htdocs/langs/bg_BG/categories.lang

@@ -108,3 +108,4 @@ CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ако е активирано, продукта ще бъде свързан също и с родителската категория при добавяне в под-категория
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
+ByDefaultInList=By default in list

htdocs/langs/bg_BG/compta.lang

@@ -199,9 +199,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product,
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT
+ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Клониране за следващ месец
+SimpleReport=Simple report
+AddExtraReport=Extra reports
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code

htdocs/langs/bg_BG/contracts.lang

@@ -4,7 +4,7 @@ ListOfContracts=Списък на договорите
 LastModifiedContracts=Last %s modified contracts
 AllContracts=Всички договори
 ContractCard=Карта на договор
-ContractStatus=Договор статус
+ContractStatus=Статус на договор
 ContractStatusNotRunning=Не работи
 ContractStatusRunning=Бягане
 ContractStatusDraft=Проект
@@ -54,7 +54,7 @@ ListOfRunningContractsLines=Списък на линиите на движени
 ListOfRunningServices=Списък на стартираните услуги
 NotActivatedServices=Неактивни услуги (сред валидирани договори)
 BoardNotActivatedServices=Услуги за да активирате сред утвърдени договори
-LastContracts=Last %s contracts
+LastContracts=Последните %s договори
 LastActivatedServices=Последните %s активирани услуги
 LastModifiedServices=Последните %s променени услуги
 EditServiceLine=Редактиране на сервизна линия

htdocs/langs/bg_BG/donations.lang

@@ -4,10 +4,10 @@ Donations=Дарения
 DonationRef=Дарение
 Donor=Дарител
 Donors=Дарители
-AddDonation=Create a donation
+AddDonation=Създаване на дарение
 NewDonation=Ново дарение
-DeleteADonation=Delete a donation
+DeleteADonation=Изтриване на дарение
-ConfirmDeleteADonation=Are you sure you want to delete this donation ?
+ConfirmDeleteADonation=Сигурни ли сте, че желаете да изтриете това дарение
 ShowDonation=Показване на дарение
 DonationPromise=Обещано дарение
 PromisesNotValid=Няма потвърдени дарения
@@ -24,7 +24,7 @@ DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Потвърдено
 DonationStatusPaidShort=Получено
 DonationTitle=Donation receipt
-DonationDatePayment=Payment date
+DonationDatePayment=Дата на плащане
 ValidPromess=Потвърждаване на дарението
 DonationReceipt=Разписка за дарение
 BuildDonationReceipt=Създаване на разписка
@@ -36,7 +36,7 @@ ThankYou=Благодарим Ви!
 IConfirmDonationReception=Получателят декларира, че е получил дарение на стойност
 MinimumAmount=Минималното количество е %s
 FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
+FrenchOptions=Опции за Франция
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned

htdocs/langs/bg_BG/errors.lang

@@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=%s се възлага на друга трета
 ErrorFailedToSendPassword=Не може да се изпрати парола
 ErrorFailedToLoadRSSFile=Не успее да получи RSS Feed. Опитайте се да добавите постоянно MAIN_SIMPLEXMLLOAD_DEBUG ако съобщения за грешки не предоставя достатъчно информация.
 ErrorPasswordDiffers=Паролите се различава, моля да ги въведете отново.
-ErrorForbidden=Достъпът е отказан. <br> Опитвате се да отворите към страница, или функция, без да е в заверено сесия или, че не е позволено да си потребител.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
 ErrorForbidden2=Разрешение за вход може да бъде определена от вашия администратор Dolibarr от менюто %s-> %s.
 ErrorForbidden3=Изглежда, че Dolibarr не се използва чрез заверено сесия. Обърнете внимание на документация за настройка Dolibarr за знаят как да управляват удостоверявания (Htaccess, mod_auth или други ...).
 ErrorNoImagickReadimage=Клас Imagick не се намира в тази PHP. Без визуализация могат да бъдат на разположение. Администраторите могат да деактивирате тази раздела от менюто Setup - Display.

htdocs/langs/bg_BG/exports.lang

@@ -132,3 +132,4 @@ SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Champs Filtrables
 FilteredFields=Filtered fields
 FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule

htdocs/langs/bg_BG/languages.lang

@@ -23,6 +23,7 @@ Language_en_US=English (United States)
 Language_en_ZA=English (Южна Африка)
 Language_es_ES=Испански
 Language_es_AR=Испански (Аржентина)
+Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)

htdocs/langs/bg_BG/projects.lang

@@ -26,6 +26,8 @@ ConfirmDeleteATask=Сигурен ли сте, че искате да изтри
 OfficerProject=Директор проект
 LastProjects=Последни проекти %s
 AllProjects=Всички проекти
+OpenedProjects=Opened projects
+OpportunitiesStatusForOpenedProjects=Opportunities status for opened projects
 ProjectsList=Списък на проектите
 ShowProject=Покажи проект
 SetProject=Задайте проект
@@ -78,6 +80,8 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Списък на събития, свързани с проекта
 ListTaskTimeUserProject=List of time consumed on tasks of project
 TaskTimeUserProject=Time consumed on tasks of project
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Дейности в проекта тази седмица
 ActivityOnProjectThisMonth=Дейност по проект, този месец
 ActivityOnProjectThisYear=Дейности в проекта тази година
@@ -93,6 +97,7 @@ ReOpenAProject=Проект с отворен
 ConfirmReOpenAProject=Сигурен ли сте, че искате да отвори отново този проект?
 ProjectContact=ПРОЕКТА Контакти
 ActionsOnProject=Събития по проекта
+OpenedProjects=Opened projects
 YouAreNotContactOfProject=Вие не сте контакт на този частен проект
 DeleteATimeSpent=Изтриване на времето, прекарано
 ConfirmDeleteATimeSpent=Сигурен ли сте, че искате да изтриете това време, прекарано?
@@ -121,6 +126,8 @@ ProjectCreatedInDolibarr=Project %s created
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Opportunity status
+OpportunityAmount=Opportunity amount
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Ръководител на проекта
 TypeContact_project_external_PROJECTLEADER=Ръководител на проекта
@@ -140,6 +147,7 @@ PlannedWorkloadShort=Workload
 WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
+SearchATask=Search a task
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a resource to allocate time
@@ -154,3 +162,10 @@ ResourceNotAssignedToTask=Not assigned to task
 AssignTaskToMe=Assign task to me
 AssignTask=Assign
 ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and time
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=Nb of created projects by month
+ProjectsStatistics=Statistics on projects/leads
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpportunityPonderatedAmount=Opportunities ponderated amount

htdocs/langs/bg_BG/trips.lang

@@ -9,6 +9,7 @@ TripCard=Expense report card
 AddTrip=Create expense report
 ListOfTrips=List of expense reports
 ListOfFees=Списък на такси
+ShowTrip=Show expense report
 NewTrip=New expense report
 CompanyVisited=Фирмата/организацията е посетена
 Kilometers=Км

htdocs/langs/bn_BD/admin.lang

@@ -821,6 +821,7 @@ DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Type of leaves
+DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -1650,3 +1651,24 @@ LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
+OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+MailToSendProposal=To send customer proposal
+MailToSendOrder=To send customer order
+MailToSendInvoice=To send customer invoice
+MailToSendShipment=To send shipment
+MailToSendIntervention=To send intervention
+MailToSendSupplierRequestForQuotation=To send quotation request to supplier
+MailToSendSupplierOrder=To send supplier order
+MailToSendSupplierInvoice=To send supplier invoice
+MailToThirdparty=To send email from thirdparty page

htdocs/langs/bn_BD/agenda.lang

@@ -97,3 +97,9 @@ ActionType=Event type
 DateActionBegin=Start event date
 CloneAction=Clone event
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour

htdocs/langs/bn_BD/banks.lang

@@ -165,3 +165,8 @@ DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
 StartDate=Start date
 EndDate=End date
+RejectCheck=Check rejection
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+RejectCheckDate=Check rejection date
+CheckRejected=Check rejected
+CheckRejectedAndInvoicesReopened=Check rejected and invoices reopened

htdocs/langs/bn_BD/categories.lang

@@ -108,3 +108,4 @@ CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
+ByDefaultInList=By default in list

htdocs/langs/bn_BD/compta.lang

@@ -199,9 +199,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product,
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT
+ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code

htdocs/langs/bn_BD/errors.lang

@@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=%s is assigned to another third
 ErrorFailedToSendPassword=Failed to send password
 ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
 ErrorPasswordDiffers=Passwords differs, please type them again.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
 ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
 ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
 ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.

htdocs/langs/bn_BD/exports.lang

@@ -132,3 +132,4 @@ SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Champs Filtrables
 FilteredFields=Filtered fields
 FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule

htdocs/langs/bn_BD/languages.lang

@@ -23,6 +23,7 @@ Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
 Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)

htdocs/langs/bn_BD/projects.lang

@@ -26,6 +26,8 @@ ConfirmDeleteATask=Are you sure you want to delete this task ?
 OfficerProject=Officer project
 LastProjects=Last %s projects
 AllProjects=All projects
+OpenedProjects=Opened projects
+OpportunitiesStatusForOpenedProjects=Opportunities status for opened projects
 ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
@@ -78,6 +80,8 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ListTaskTimeUserProject=List of time consumed on tasks of project
 TaskTimeUserProject=Time consumed on tasks of project
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
 ActivityOnProjectThisYear=Activity on project this year
@@ -93,6 +97,7 @@ ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project ?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
+OpenedProjects=Opened projects
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
@@ -121,6 +126,8 @@ ProjectCreatedInDolibarr=Project %s created
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Opportunity status
+OpportunityAmount=Opportunity amount
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Project leader
 TypeContact_project_external_PROJECTLEADER=Project leader
@@ -140,6 +147,7 @@ PlannedWorkloadShort=Workload
 WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
+SearchATask=Search a task
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a resource to allocate time
@@ -154,3 +162,10 @@ ResourceNotAssignedToTask=Not assigned to task
 AssignTaskToMe=Assign task to me
 AssignTask=Assign
 ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and time
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=Nb of created projects by month
+ProjectsStatistics=Statistics on projects/leads
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpportunityPonderatedAmount=Opportunities ponderated amount

htdocs/langs/bn_BD/trips.lang

@@ -9,6 +9,7 @@ TripCard=Expense report card
 AddTrip=Create expense report
 ListOfTrips=List of expense reports
 ListOfFees=List of fees
+ShowTrip=Show expense report
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
 Kilometers=Kilometers

htdocs/langs/bs_BA/admin.lang

@@ -821,6 +821,7 @@ DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Type of leaves
+DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Postavke snimljene
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -1650,3 +1651,24 @@ LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
+OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+MailToSendProposal=To send customer proposal
+MailToSendOrder=To send customer order
+MailToSendInvoice=To send customer invoice
+MailToSendShipment=To send shipment
+MailToSendIntervention=To send intervention
+MailToSendSupplierRequestForQuotation=To send quotation request to supplier
+MailToSendSupplierOrder=To send supplier order
+MailToSendSupplierInvoice=To send supplier invoice
+MailToThirdparty=To send email from thirdparty page

htdocs/langs/bs_BA/agenda.lang

@@ -97,3 +97,9 @@ ActionType=Event type
 DateActionBegin=Start event date
 CloneAction=Clone event
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour

htdocs/langs/bs_BA/banks.lang

@@ -165,3 +165,8 @@ DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
 StartDate=Start date
 EndDate=End date
+RejectCheck=Check rejection
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+RejectCheckDate=Check rejection date
+CheckRejected=Check rejected
+CheckRejectedAndInvoicesReopened=Check rejected and invoices reopened

htdocs/langs/bs_BA/categories.lang

@@ -108,3 +108,4 @@ CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
+ByDefaultInList=By default in list

htdocs/langs/bs_BA/compta.lang

@@ -199,9 +199,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product,
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT
+ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code

htdocs/langs/bs_BA/errors.lang

@@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=%s is assigned to another third
 ErrorFailedToSendPassword=Failed to send password
 ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
 ErrorPasswordDiffers=Passwords differs, please type them again.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
 ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
 ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
 ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.

htdocs/langs/bs_BA/exports.lang

@@ -132,3 +132,4 @@ SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Champs Filtrables
 FilteredFields=Filtered fields
 FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule

htdocs/langs/bs_BA/languages.lang

@@ -23,6 +23,7 @@ Language_en_US=Engleski (United States)
 Language_en_ZA=Engleski (Južna Afrika)
 Language_es_ES=Španski
 Language_es_AR=Španjolski (Argentina)
+Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)

htdocs/langs/bs_BA/projects.lang

@@ -26,6 +26,8 @@ ConfirmDeleteATask=Jeste li sigurni da želite obrisati ovaj zadatak?
 OfficerProject=Službenik projekta
 LastProjects=Zadnjih %s projekata
 AllProjects=Svi projekti
+OpenedProjects=Opened projects
+OpportunitiesStatusForOpenedProjects=Opportunities status for opened projects
 ProjectsList=Lista projekata
 ShowProject=Prikaži projekt
 SetProject=Postavi projekat
@@ -78,6 +80,8 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista događaja u vezi s projektom
 ListTaskTimeUserProject=List of time consumed on tasks of project
 TaskTimeUserProject=Time consumed on tasks of project
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Aktivnost na projektu ove sedmice
 ActivityOnProjectThisMonth=Aktivnost na projektu ovog mjeseca
 ActivityOnProjectThisYear=Aktivnost na projektu ove godine
@@ -93,6 +97,7 @@ ReOpenAProject=Otvori projekat
 ConfirmReOpenAProject=Jeste li sigurni da želite ponovo otvariti ovaj projekat?
 ProjectContact=Kontakti projekta
 ActionsOnProject=Događaji na projektu
+OpenedProjects=Opened projects
 YouAreNotContactOfProject=Vi niste kontakt ovog privatnog projekta
 DeleteATimeSpent=Brisanje provedenog vremena
 ConfirmDeleteATimeSpent=Jeste li sigurni da želite obrisati ovo provedeno vrijeme?
@@ -121,6 +126,8 @@ ProjectCreatedInDolibarr=Project %s created
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Opportunity status
+OpportunityAmount=Opportunity amount
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Project leader
 TypeContact_project_external_PROJECTLEADER=Project leader
@@ -140,6 +147,7 @@ PlannedWorkloadShort=Workload
 WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
+SearchATask=Search a task
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a resource to allocate time
@@ -154,3 +162,10 @@ ResourceNotAssignedToTask=Not assigned to task
 AssignTaskToMe=Assign task to me
 AssignTask=Assign
 ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and time
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=Nb of created projects by month
+ProjectsStatistics=Statistics on projects/leads
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpportunityPonderatedAmount=Opportunities ponderated amount

htdocs/langs/bs_BA/trips.lang

@@ -9,6 +9,7 @@ TripCard=Expense report card
 AddTrip=Create expense report
 ListOfTrips=List of expense reports
 ListOfFees=Lista naknada
+ShowTrip=Show expense report
 NewTrip=New expense report
 CompanyVisited=Posjeta kompaniji/fondaciji
 Kilometers=Kilometri

htdocs/langs/ca_ES/admin.lang

@@ -821,6 +821,7 @@ DictionaryEMailTemplates=Models d'emails
 DictionaryUnits=Unitats
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Type of leaves
+DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Configuració desada
 BackToModuleList=Retornar llista de mòduls
 BackToDictionaryList=Tornar a la llista de diccionaris
@@ -1650,3 +1651,24 @@ LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
+OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+MailToSendProposal=To send customer proposal
+MailToSendOrder=To send customer order
+MailToSendInvoice=To send customer invoice
+MailToSendShipment=To send shipment
+MailToSendIntervention=To send intervention
+MailToSendSupplierRequestForQuotation=To send quotation request to supplier
+MailToSendSupplierOrder=To send supplier order
+MailToSendSupplierInvoice=To send supplier invoice
+MailToThirdparty=To send email from thirdparty page

htdocs/langs/ca_ES/agenda.lang

@@ -97,3 +97,9 @@ ActionType=Tipus d'esdeveniment
 DateActionBegin=Data d'inici de l'esdeveniment
 CloneAction=Clone event
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour

htdocs/langs/ca_ES/banks.lang

@@ -165,3 +165,8 @@ DeleteARib=Codi BAN eliminat
 ConfirmDeleteRib=Segur que vols eliminar aquest registre BAN?
 StartDate=Data d'inici
 EndDate=Data final
+RejectCheck=Check rejection
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+RejectCheckDate=Check rejection date
+CheckRejected=Check rejected
+CheckRejectedAndInvoicesReopened=Check rejected and invoices reopened

htdocs/langs/ca_ES/categories.lang

@@ -108,3 +108,4 @@ CategorieRecursiv=Enllaçar amb l'etiqueta/categoria automàticament
 CategorieRecursivHelp=Si esta activat, el producte s'enllaçara a la categoria pare si l'afegim a una subcategoria
 AddProductServiceIntoCategory=Afegir el següent producte/servei
 ShowCategory=Mostrar etiqueta/categoria
+ByDefaultInList=By default in list

htdocs/langs/ca_ES/compta.lang

@@ -199,9 +199,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per pr
 CalculationMode=Mode de càlcul
 AccountancyJournal=Codi comptable diari
 ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Codi comptable per defecte per l'IVA soportat
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT
+ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable per defecte per a clients
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable per defecte per a proveïdors
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clonar-la pel pròxim mes
+SimpleReport=Simple report
+AddExtraReport=Extra reports
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code

htdocs/langs/ca_ES/errors.lang

@@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=%s es troba assignat a altre tercer
 ErrorFailedToSendPassword=Error en l'enviament de la contrasenya
 ErrorFailedToLoadRSSFile=Error en la recuperació del flux RSS. Afegiu la constant MAIN_SIMPLEXMLLOAD_DEBUG si el missatge d'error no és molt explícit.
 ErrorPasswordDiffers=Les contrasenyes no són identiques, torni a introduir-les
-ErrorForbidden=Accés no autoritzat.<br>Intenta accedir a una pàgina, zona o funció sense estar en una sessió autentificada o que no s'autoritza per al seu compte d'usuari.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
 ErrorForbidden2=Els permisos per a aquest usuari poden ser assignats per l'administrador Dolibarr mitjançant el menú  %s-> %s.
 ErrorForbidden3=Dolibarr no sembla funcionar en una sessió autentificada. Consulteu la documentació d'instal lació de Dolibarr per saber com administrar les autenticacions (htacces, mod_auth o altre ...).
 ErrorNoImagickReadimage=La classe imagick_readimage no està present en aquesta instal lació de PHP. La ressenya no està doncs disponible. Els administradors poden desactivar aquesta pestanya en el menú Configuració->Visualització.

htdocs/langs/ca_ES/exports.lang

@@ -8,7 +8,7 @@ ImportableDatas=Conjunt de dades importables
 SelectExportDataSet=Trieu un conjunt predefinit de dades que voleu exportar ...
 SelectImportDataSet=Seleccioneu un lot de dades predefinides que desitgi importar ...
 SelectExportFields=Escolliu els camps que han d'exportar, o elija un perfil d'exportació predefinit
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectImportFields=Trieu els camps de l'arxiu d'origen que voleu importar i el seu camp de destinació a la base de dades movent cap amunt i cap avall amb l'àncora %s, o seleccionar un perfil d'importació per omissió:
 NotImportedFields=Camps de l'arxiu origen no importats
 SaveExportModel=Desar aquest perfil d'exportació si voleu reutilitzar posteriorment ...
 SaveImportModel=Deseu aquest perfil d'importació si el voleu reutilitzar de nou posteriorment ...
@@ -81,7 +81,7 @@ DoNotImportFirstLine=No importar la primera línia del fitxer font
 NbOfSourceLines=Nombre de línies de l'arxiu font
 NowClickToTestTheImport=Comproveu els paràmetres d'importació establerts. Si està d'acord, feu clic al botó "<b>%s</b>" per executar una simulació d'importació (cap dada serà modificat, iinicialmente només serà una simulació)...
 RunSimulateImportFile=Executar la simulació d'importació
-FieldNeedSource=This field requires data from the source file
+FieldNeedSource=Aquest camp requereix les dades de l'arxiu d'origen
 SomeMandatoryFieldHaveNoSource=Alguns camps obligatoris no tenen camp font a l'arxiu d'origen
 InformationOnSourceFile=Informació de l'arxiu origen
 InformationOnTargetTables=Informació sobre els camps de destinació
@@ -102,14 +102,14 @@ NbOfLinesImported=Nombre de línies correctament importades: <b>%s</b>.
 DataComeFromNoWhere=El valor a inserir no correspon a cap camp de l'arxiu origen.
 DataComeFromFileFieldNb=El valor a inserir es correspon al camp nombre <<b>%s</b> de l'arxiu origen.
 DataComeFromIdFoundFromRef=El valor donat per el camp <b>%s</b> de l'arxiu origen serà utilitzat per trobar el ID de l'objecte pare a fer servir (l'objecte <b>%s</b> amb la referència de l'arxiu origen ha d'existir a Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=El codi del camp número <b>%s</b> de l'arxiu d'origen s'utilitzarà per trobar l'id de l'objecte pare a utilitzar (el codi de l'arxiu d'origen ha d'existir en el diccionari <b>%s</b>). Tingueu en compte que si coneix l'id, pot usar-lo en lloc del codi a l'arxiu d'origen. La importació funcionarà en els 2 casos.
 DataIsInsertedInto=Les dades de l'arxiu d'origen s'inseriran en el següent camp:
 DataIDSourceIsInsertedInto=L'ID de l'objecte pare trobat a partir de la dada origen, s'inserirà en el següent camp:
 DataCodeIDSourceIsInsertedInto=L'id de la línia pare trobada a partir del codi, s'ha d'inserir en el següent camp:
 SourceRequired=Dades d'origen obligatòries
 SourceExample=Exemple de dades d'origen possibles
 ExampleAnyRefFoundIntoElement=Totes les referències trobades per als elements <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Tots els codis (o id) trobats en el diccionari <b>%s</b>
 CSVFormatDesc=Arxiu amb format <b>Valors separats per coma</b> (.csv).<br>És un fitxer amb format de text en què els camps són separats pel caràcter [ %s ]. Si el separador es troba en el contingut d'un camp, el camp ha d'estar tancat per el caràcter [ %s ]. El caràcter d'escapament per a incloure un caràcter d'entorn en una dada és [ %s ].
 Excel95FormatDesc=Arxiu amb format <b>Excel</b> (.xls)<br>Aquest és el format natiu d'Excel 95 (BIFF5).
 Excel2007FormatDesc=Arxiu amb format <b>Excel</b> (.xlsx)<br>Aquest és el format natiu d'Excel 2007 (SpreadsheetML).
@@ -123,12 +123,13 @@ BankCode=Codi banc
 DeskCode=Codi oficina
 BankAccountNumber=Número compte
 BankAccountNumberKey=Dígit Control
-SpecialCode=Special code
+SpecialCode=Codi especial
-ExportStringFilter=%% allows replacing one or more characters in the text
+ExportStringFilter=%% Permet la substitució d'un o mes caràcters en el text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
+ExportDateFilter=AAAA, AAAAMM, AAAAMMDD: filtres per any/mes/dia<br>AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMDD+AAAAMMDD: filtres sobre una gamma d'anys/mes/dia<br> > AAAA, > AAAAMM, > AAAAMMDD: filtres en tots els següents anys/mesos/dia<br> < AAAA, < AAAAMM, < AAAAMMDD: filtres en tots els anys/mes/dia anteriors
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ExportNumericFilter=Filtres 'NNNNN' per un valor<br>Filtres 'NNNNN+NNNN' més d'un rang de valors<br> '&gt; NNNNN' filtres per valors més baixos <br> '&gt; NNNNN' filtres pels valors més alts
 ## filters
 SelectFilterFields=Si vol aplicar un filtre sobre alguns valors, introduïu-los aquí.
 FilterableFields=Camps filtrables
 FilteredFields=Campos filtrats
 FilteredFieldsValues=Valors de filtres
+FormatControlRule=Format control rule

htdocs/langs/ca_ES/languages.lang

@@ -23,6 +23,7 @@ Language_en_US=Anglès (Estats Units)
 Language_en_ZA=Anglès (Àfrica del Sud)
 Language_es_ES=Espanyol
 Language_es_AR=Espanyol (Argentina)
+Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Espanyol (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Espenyol (Republica Dominicana)

htdocs/langs/ca_ES/projects.lang

@@ -26,6 +26,8 @@ ConfirmDeleteATask=Esteu segur de voler eliminar aquesta tasca?
 OfficerProject=Responsable del projecte
 LastProjects=Els %s ultims projectes
 AllProjects=Tots els projectes
+OpenedProjects=Opened projects
+OpportunitiesStatusForOpenedProjects=Opportunities status for opened projects
 ProjectsList=Llistat de projectes
 ShowProject=Veure projecte
 SetProject=Definir projecte
@@ -78,6 +80,8 @@ ListDonationsAssociatedProject=Llistat de donacions associades al projecte
 ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte
 ListTaskTimeUserProject=List of time consumed on tasks of project
 TaskTimeUserProject=Time consumed on tasks of project
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana
 ActivityOnProjectThisMonth=Activitat en el projecte aquest mes
 ActivityOnProjectThisYear=Activitat en el projecte aquest any
@@ -93,6 +97,7 @@ ReOpenAProject=Reobrir projecte
 ConfirmReOpenAProject=Esteu segur de voler reobrir aquest projecte?
 ProjectContact=Contactes projecte
 ActionsOnProject=Esdeveniments del projecte
+OpenedProjects=Opened projects
 YouAreNotContactOfProject=Vostè no és contacte d'aquest projecte privat
 DeleteATimeSpent=Eliminació de temps dedicat
 ConfirmDeleteATimeSpent=Esteu segur de voler eliminar aquest temps dedicat?
@@ -121,6 +126,8 @@ ProjectCreatedInDolibarr=Projecte %s creat
 TaskCreatedInDolibarr=La tasca %s a sigut creada
 TaskModifiedInDolibarr=La tasca %s a sigut modificada
 TaskDeletedInDolibarr=La tasca %s a sigut eliminada
+OpportunityStatus=Opportunity status
+OpportunityAmount=Opportunity amount
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Cap de projecte
 TypeContact_project_external_PROJECTLEADER=Cap de projecte
@@ -140,6 +147,7 @@ PlannedWorkloadShort=Carrega de treball
 WorkloadOccupation=Assignació de carrega de treball
 ProjectReferers=Objectes vinculats
 SearchAProject=Cercar un projecte
+SearchATask=Search a task
 ProjectMustBeValidatedFirst=El projecte primer ha de ser validat
 ProjectDraft=Projectes esborrany
 FirstAddRessourceToAllocateTime=Associate a resource to allocate time
@@ -154,3 +162,10 @@ ResourceNotAssignedToTask=Not assigned to task
 AssignTaskToMe=Assign task to me
 AssignTask=Assign
 ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and time
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=Nb of created projects by month
+ProjectsStatistics=Statistics on projects/leads
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpportunityPonderatedAmount=Opportunities ponderated amount

htdocs/langs/ca_ES/trips.lang

@@ -9,6 +9,7 @@ TripCard=Expense report card
 AddTrip=Create expense report
 ListOfTrips=List of expense reports
 ListOfFees=Llistat notes de honoraris
+ShowTrip=Show expense report
 NewTrip=New expense report
 CompanyVisited=Empresa/institució visitada
 Kilometers=Quilòmetres

htdocs/langs/cs_CZ/admin.lang

@@ -821,6 +821,7 @@ DictionaryEMailTemplates=E-maily šablony
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Type of leaves
+DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Nastavení uloženo
 BackToModuleList=Zpět na seznam modulů
 BackToDictionaryList=Zpět k seznamu slovníků
@@ -1650,3 +1651,24 @@ LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
+OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+MailToSendProposal=To send customer proposal
+MailToSendOrder=To send customer order
+MailToSendInvoice=To send customer invoice
+MailToSendShipment=To send shipment
+MailToSendIntervention=To send intervention
+MailToSendSupplierRequestForQuotation=To send quotation request to supplier
+MailToSendSupplierOrder=To send supplier order
+MailToSendSupplierInvoice=To send supplier invoice
+MailToThirdparty=To send email from thirdparty page

htdocs/langs/cs_CZ/agenda.lang

@@ -97,3 +97,9 @@ ActionType=Typ události
 DateActionBegin=Datum zahájení události
 CloneAction=Clone event
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour

htdocs/langs/cs_CZ/banks.lang

@@ -165,3 +165,8 @@ DeleteARib=Smazat BAN záznam
 ConfirmDeleteRib=Jste si jisti, že chcete smazat tento BAN záznam?
 StartDate=Datum zahájení
 EndDate=Datum ukončení
+RejectCheck=Check rejection
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+RejectCheckDate=Check rejection date
+CheckRejected=Check rejected
+CheckRejectedAndInvoicesReopened=Check rejected and invoices reopened

htdocs/langs/cs_CZ/categories.lang

@@ -43,18 +43,18 @@ ImpossibleAssociateCategory=Nelze spojit tag/kategorii s
 WasAddedSuccessfully=<b>%s</b> bylo úspěšně přidáno.
 ObjectAlreadyLinkedToCategory=Element je již propojen s tímto tagem/kategorií.
 CategorySuccessfullyCreated=Tag/kategorie %s byla úspěšně přidána.
-ProductIsInCategories=Produkt/služba vlastní následjící tagy/kategorie
+ProductIsInCategories=Produkt/služba je spojena s následujícími tagy/kategoriemi
-SupplierIsInCategories=Třetí strany vlastní následující dodavatelské tagy/kategorie
+SupplierIsInCategories=Třetí strany jsou spojeny s následujícími dodavatelskými tagy/kategoriemi
-CompanyIsInCustomersCategories=Tato třetí strana vlastní následující zákazníci/cíle tagy/kategorie
+CompanyIsInCustomersCategories=Tato třetí strana je propojena s následujícími zákazníky/cíle tagy/kategorie
-CompanyIsInSuppliersCategories=Tato třetí strana vlastní dodavatelské tagy/kategorie
+CompanyIsInSuppliersCategories=Tato třetí strana je propojena na následující dodavatelské tagy/kategorie
-MemberIsInCategories=Tento uživatel vlastní následující uživatelské tagy/kategorie
+MemberIsInCategories=Tento uživatel je propojen na následující uživatelské tagy/kategorie
-ContactIsInCategories=Tento kontakt je vlastníkem z následujících kontaktů tagy/kategorií
+ContactIsInCategories=Tento kontakt je propojen na následujícíí kontakty tagy/kategorie
 ProductHasNoCategory=Tento produkt/služba není v žádném tagu/kategoriích
 SupplierHasNoCategory=Tento dodavatel není v žádném tagu/kategoriích
-CompanyHasNoCategory=Tato společnost není v žádném tagu/kategoriích
+CompanyHasNoCategory=Tato třetí strana není v žádném tagu/kategoriích
 MemberHasNoCategory=Tento uživatel není v žádném tagu/kategoriích
 ContactHasNoCategory=Tento kontakt není v žádném tagu/kategorii
-ClassifyInCategory=Zařadit do tagu/kategorie
+ClassifyInCategory=Přidat do tagu/kategorie
 NoneCategory=Nikdo
 NotCategorized=Bez tagu/kategorie
 CategoryExistsAtSameLevel=Tato kategorie již existuje s tímto čj
@@ -68,12 +68,12 @@ CategoriesTree=Strom tagů/kategorií
 DeleteCategory=Smazat tag/kategorii
 ConfirmDeleteCategory=Jste si opravdu jistý, že chcete odstranit tento tag/kategorii?
 RemoveFromCategory=Odstranit spojení s tagem/kategorií
-RemoveFromCategoryConfirm=Jste si opravdu jistý, že chcete odstranit toto spojení mezi transakcí a tagem/kategorií?
+RemoveFromCategoryConfirm=Jste si opravdu jistý, že chcete odstranit tuto vazbu mezi transakcí a tagem/kategorií?
 NoCategoriesDefined=Není definován žádný tag/kategorie
-SuppliersCategoryShort=Tagy/kategorie dodavatelé
+SuppliersCategoryShort=Tag/kategorie dodavatelé
-CustomersCategoryShort=Tagy/kategorie zákazníci
+CustomersCategoryShort=Tag/kategorie zákazníci
-ProductsCategoryShort=Tagy/kategorie produkty
+ProductsCategoryShort=Tag/kategorie Produkty
-MembersCategoryShort=Tagy/kategorie uživatelé
+MembersCategoryShort=Tag/kategorie uživatelé
 SuppliersCategoriesShort=Dodavatelé tagy/kategorie
 CustomersCategoriesShort=Zákazníci tagy/kategorie
 CustomersProspectsCategoriesShort=Zák./Cíl. kategorie
@@ -94,7 +94,7 @@ CatSupList=Seznam tagů/kategorií dodavatelů
 CatCusList=Seznam tagů/kategorií zákazníků/cílů
 CatProdList=Seznam tagů/kategorií produktů 
 CatMemberList=Seznam tagů/kategorií uživatelů
-CatContactList=Seznam kontaktních tagů/kategorií a kontaktů
+CatContactList=Seznam kontaktů tagů/kategorií
 CatSupLinks=Spojení mezi dodavateli a tagy/kategoriemi
 CatCusLinks=Spojení mezi zákazníky/cíly a tagy/kategoriemi
 CatProdLinks=Spojení mezi produkty/službami a tagy/kategoriemi
@@ -108,3 +108,4 @@ CategorieRecursiv=Odkaz na nadřazený tag/kategorii automaticky
 CategorieRecursivHelp=Je-li aktivován, bude produkt spojen s nadřazenou kategorií při přidávání do podkategorie
 AddProductServiceIntoCategory=Přidejte následující produkt/službu
 ShowCategory=Zobrazit tag/kategorii
+ByDefaultInList=By default in list

htdocs/langs/cs_CZ/compta.lang

@@ -199,9 +199,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Obratová zpráva za zboží
 CalculationMode=Výpočetní režim
 AccountancyJournal=Deník účetnických kódů
 ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Výchozí účetnické kódy pro placení DPH
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT
+ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Účetnické kódy ve výchozím nastavení pro zákazníka třetích stran
 ACCOUNTING_ACCOUNT_SUPPLIER=Výchozí účetnické kódy pro dodavatele třetích stran
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Kopírovat pro příští měsíc
+SimpleReport=Simple report
+AddExtraReport=Extra reports
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code

htdocs/langs/cs_CZ/errors.lang

@@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=%s je přiřazen do jiné třetí
 ErrorFailedToSendPassword=Nepodařilo se odeslat heslo
 ErrorFailedToLoadRSSFile=Nedokáže dostat RSS feed. Zkuste přidat konstantní MAIN_SIMPLEXMLLOAD_DEBUG případě chybových hlášení neposkytuje dostatek informací.
 ErrorPasswordDiffers=Hesla se liší, zadejte prosím znovu.
-ErrorForbidden=Přístup byl odepřen. <br> Pokusu o přístup na stránku, oblasti nebo funkce, aniž by v ověřeném sezení nebo že není dovoleno, aby své uživatele.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
 ErrorForbidden2=Povolení pro toto přihlášení může být definována správcem Dolibarr z nabídky %s-&gt; %s.
 ErrorForbidden3=Zdá se, že Dolibarr není využita prostřednictvím ověřené relace. Podívejte se na dokumentaci k nastavení Dolibarr vědět, jak řídit autentizace (htaccess, mod_auth nebo jiné ...).
 ErrorNoImagickReadimage=Třída Imagick není nalezen v této PHP. Náhled není mohou být k dispozici. Správci mohou zakázat tuto kartu z menu Nastavení - Zobrazení.

htdocs/langs/cs_CZ/exports.lang

@@ -132,3 +132,4 @@ SelectFilterFields=Chcete-li filtrovat některé hodnoty, stačí zadat hodnoty
 FilterableFields=Champs Filtrables
 FilteredFields=Filtrované pole
 FilteredFieldsValues=Hodnota za filtrem
+FormatControlRule=Format control rule

htdocs/langs/cs_CZ/languages.lang

@@ -23,6 +23,7 @@ Language_en_US=Angličtina (Spojené státy)
 Language_en_ZA=Angličtina (Jižní Afrika)
 Language_es_ES=Španělština
 Language_es_AR=Španělština (Argentina)
+Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Španělština (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Španělština (Dominikánská republika)

htdocs/langs/cs_CZ/projects.lang

@@ -26,6 +26,8 @@ ConfirmDeleteATask=Jste si jisti, že chcete smazat tento úkol?
 OfficerProject=Ředitel projektu
 LastProjects=Posledních %s projektů
 AllProjects=Všechny projekty
+OpenedProjects=Opened projects
+OpportunitiesStatusForOpenedProjects=Opportunities status for opened projects
 ProjectsList=Seznam projektů
 ShowProject=Zobrazit projekt
 SetProject=Nastavit projekt
@@ -78,6 +80,8 @@ ListDonationsAssociatedProject=Seznam darů spojených s projektem
 ListActionsAssociatedProject=Seznam událostí spojených s projektem
 ListTaskTimeUserProject=List of time consumed on tasks of project
 TaskTimeUserProject=Time consumed on tasks of project
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Týdenní projektová aktivita
 ActivityOnProjectThisMonth=Měsíční projektová aktivita
 ActivityOnProjectThisYear=Roční projektová aktivita
@@ -93,6 +97,7 @@ ReOpenAProject=Otevřít projekt
 ConfirmReOpenAProject=Jste si jisti, že chcete znovu otevřít tento projekt?
 ProjectContact=Kontakty projektu
 ActionsOnProject=Události na projektu
+OpenedProjects=Opened projects
 YouAreNotContactOfProject=Nejste kontakt tohoto privátního projektu
 DeleteATimeSpent=Odstranit strávený čas
 ConfirmDeleteATimeSpent=Jste si jisti, že chcete smazat tento strávený čas?
@@ -121,6 +126,8 @@ ProjectCreatedInDolibarr=Projekt %s vytvořen
 TaskCreatedInDolibarr=Úkol %s vytvořen
 TaskModifiedInDolibarr=Úkol %s upraven
 TaskDeletedInDolibarr=Úkol %s smazán
+OpportunityStatus=Opportunity status
+OpportunityAmount=Opportunity amount
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Vedoucí projektu
 TypeContact_project_external_PROJECTLEADER=Vedoucí projektu
@@ -140,6 +147,7 @@ PlannedWorkloadShort=Pracovní zátěž
 WorkloadOccupation=Pracovní zátěž
 ProjectReferers=Odkazující objekty
 SearchAProject=Hledat projekt
+SearchATask=Search a task
 ProjectMustBeValidatedFirst=Projekt musí být nejdříve ověřen
 ProjectDraft=Návrhy projektů
 FirstAddRessourceToAllocateTime=Přiřadit zdroj k vyčlenění času
@@ -154,3 +162,10 @@ ResourceNotAssignedToTask=Not assigned to task
 AssignTaskToMe=Assign task to me
 AssignTask=Assign
 ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and time
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=Nb of created projects by month
+ProjectsStatistics=Statistics on projects/leads
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpportunityPonderatedAmount=Opportunities ponderated amount

htdocs/langs/cs_CZ/trips.lang

@@ -9,6 +9,7 @@ TripCard=Karta zpráv výdajů
 AddTrip=Vytvoření zprávy o výdajích
 ListOfTrips=Seznam vyúčtování výdajů
 ListOfFees=Sazebník poplatků
+ShowTrip=Show expense report
 NewTrip=Nová zpráva výdaje
 CompanyVisited=Firma/nadace navštívena
 Kilometers=Kilometry

htdocs/langs/da_DK/admin.lang

@@ -821,6 +821,7 @@ DictionaryEMailTemplates=E-mail skabeloner
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Type of leaves
+DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup gemt
 BackToModuleList=Tilbage til moduler liste
 BackToDictionaryList=Back to dictionaries list
@@ -1650,3 +1651,24 @@ LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
+OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+MailToSendProposal=To send customer proposal
+MailToSendOrder=To send customer order
+MailToSendInvoice=To send customer invoice
+MailToSendShipment=To send shipment
+MailToSendIntervention=To send intervention
+MailToSendSupplierRequestForQuotation=To send quotation request to supplier
+MailToSendSupplierOrder=To send supplier order
+MailToSendSupplierInvoice=To send supplier invoice
+MailToThirdparty=To send email from thirdparty page

htdocs/langs/da_DK/agenda.lang

@@ -97,3 +97,9 @@ ActionType=Event type
 DateActionBegin=Start event date
 CloneAction=Clone event
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
+RepeatEvent=Repeat event
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour

htdocs/langs/da_DK/banks.lang

@@ -165,3 +165,8 @@ DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
 StartDate=Start date
 EndDate=End date
+RejectCheck=Check rejection
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+RejectCheckDate=Check rejection date
+CheckRejected=Check rejected
+CheckRejectedAndInvoicesReopened=Check rejected and invoices reopened

htdocs/langs/da_DK/categories.lang

@@ -108,3 +108,4 @@ CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
+ByDefaultInList=By default in list

htdocs/langs/da_DK/compta.lang

@@ -199,9 +199,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product,
 CalculationMode=Kalkulations mode
 AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT
+ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code

htdocs/langs/da_DK/errors.lang

@@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=%s er tildelt til et andet tredjeland
 ErrorFailedToSendPassword=Det lykkedes ikke at sende password
 ErrorFailedToLoadRSSFile=Ikke formår at få RSS-feed. Prøv at tilføje konstant MAIN_SIMPLEXMLLOAD_DEBUG hvis fejlmeddelelser ikke giver nok information.
 ErrorPasswordDiffers=Passwords er forskellig, skal du skrive dem igen.
-ErrorForbidden=Adgang forbudt. <br> Du forsøger at få adgang til en side, et område eller funktion uden at være i en authenticated samling, eller som ikke er tilladt til din brugerkonto.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
 ErrorForbidden2=Tilladelse til dette login kan defineres af din Dolibarr administrator fra menuen %s-> %s.
 ErrorForbidden3=Det lader til, at Dolibarr ikke anvendes gennem en authenticated session. Tag et kig på Dolibarr setup dokumentation for at vide, hvordan man forvalter authentications (htaccess, mod_auth eller andre ...).
 ErrorNoImagickReadimage=Funktion imagick_readimage er ikke fundet i denne PHP. Intet eksempel kan være til rådighed. Administratorer kan deaktivere denne fane fra menuen Setup - Display.

htdocs/langs/da_DK/exports.lang

@@ -132,3 +132,4 @@ SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Champs Filtrables
 FilteredFields=Filtered fields
 FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule

htdocs/langs/da_DK/languages.lang

@@ -23,6 +23,7 @@ Language_en_US=Engelsk (USA)
 Language_en_ZA=Engelsk (Sydafrika)
 Language_es_ES=Spansk
 Language_es_AR=Spansk (Argentina)
+Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)

htdocs/langs/da_DK/projects.lang

@@ -26,6 +26,8 @@ ConfirmDeleteATask=Er du sikker på du vil slette denne opgave?
 OfficerProject=Officer projekt
 LastProjects=Seneste %s projekter
 AllProjects=Alle projekter
+OpenedProjects=Opened projects
+OpportunitiesStatusForOpenedProjects=Opportunities status for opened projects
 ProjectsList=Liste over projekter
 ShowProject=Vis projekt
 SetProject=Indstil projekt
@@ -78,6 +80,8 @@ ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Liste over aktioner i forbindelse med projektet
 ListTaskTimeUserProject=List of time consumed on tasks of project
 TaskTimeUserProject=Time consumed on tasks of project
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
 ActivityOnProjectThisWeek=Aktivitet på projektet i denne uge
 ActivityOnProjectThisMonth=Aktivitet på projektet i denne måned
 ActivityOnProjectThisYear=Aktivitet på projektet i år
@@ -93,6 +97,7 @@ ReOpenAProject=Åbn projekt
 ConfirmReOpenAProject=Er du sikker på du vil genåbne dette projekt?
 ProjectContact=Projekt kontakter
 ActionsOnProject=Initiativer på projektet
+OpenedProjects=Opened projects
 YouAreNotContactOfProject=Du er ikke en kontakt af denne private projekt
 DeleteATimeSpent=Slet tid
 ConfirmDeleteATimeSpent=Er du sikker på du vil slette denne tid?
@@ -121,6 +126,8 @@ ProjectCreatedInDolibarr=Project %s created
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Opportunity status
+OpportunityAmount=Opportunity amount
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Projektleder
 TypeContact_project_external_PROJECTLEADER=Projektleder
@@ -140,6 +147,7 @@ PlannedWorkloadShort=Workload
 WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
+SearchATask=Search a task
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a resource to allocate time
@@ -154,3 +162,10 @@ ResourceNotAssignedToTask=Not assigned to task
 AssignTaskToMe=Assign task to me
 AssignTask=Assign
 ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and time
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=Nb of created projects by month
+ProjectsStatistics=Statistics on projects/leads
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpportunityPonderatedAmount=Opportunities ponderated amount

htdocs/langs/da_DK/trips.lang

@@ -9,6 +9,7 @@ TripCard=Expense report card
 AddTrip=Create expense report
 ListOfTrips=List of expense reports
 ListOfFees=Liste over gebyrer
+ShowTrip=Show expense report
 NewTrip=New expense report
 CompanyVisited=Company / fundament besøgte
 Kilometers=Kilometer

htdocs/langs/de_AT/admin.lang

@@ -2,13 +2,10 @@
 VersionRecommanded=Empfohlen
 UseSearchToSelectCompany=Suchfeld statt Listenansicht für Partnerauswahl verwenden
 NextValue=Nächste Wert
-AntiVirusCommandExample=Beispiel für ClamWin: c:\Program Files (x86)\ClamWin\bin\clamscan.exe <br>Beispiel für ClamAV: /usr/bin/clamscan
-AntiVirusParamExample=Beispiel für ClamWin: --database="C:\Program Files (x86)\ClamWin\lib"
 ImportMySqlDesc=Zum Wiederherstellen einer Sicherungsdatei müssen Sie folgenden Befehl über die Kommandozeile ausführen:
 GenericMaskCodes2=<b>(cccc)</b> den Client-Code <br> <b>() cccc000</b> den Client-Code auf n Zeichen ist, gefolgt von einer Client-ref Zähler ohne Offset-und zeroized mit der globalen Zähler. <br>
 GenericMaskCodes5=<b>ABC (yy) (mm) - (000000)</b> wird <b>ABC0701-000099</b> <br> <b>(0000 +100)-ZZZ / tt () / XXX</b> wird <b>0199-ZZZ/31/XXX</b>
 NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt-Dokumentvorlagen
-ExampleOfDirectoriesForModelGen=Beispiele für Syntax:<br>c:\mydir<br>/Home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module53Desc=Services-Verwaltung
 Module70Name=Eingriffe
 Module70Desc=Eingriffsverwaltung
@@ -106,4 +103,7 @@ InterventionsSetup=Eingriffsmoduleinstellungen
 FreeLegalTextOnInterventions=Freier Rechtstext für Eingriffe
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Intervention Karte Dokumente (alle, wenn leer)
 UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl verwenden
+UseUnits=Support units
+SendingsAbility=Support shipment sheets for customer deliveries
 PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP to Country Übersetzung. <br> Beispiel: / usr / local / share / GeoIP / GeoIP.dat
+UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.

htdocs/langs/de_AT/agenda.lang

@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - agenda
-ViewList=Liste anzeigen
 ViewCal=Kalender anzeigen
 OrderValidatedInDolibarr=Bestellung freigegeben