Merge remote-tracking branch 'uptream/develop' into 6.0-fec3

# Conflicts:
#	htdocs/accountancy/customer/index.php

.travis.yml

@@ -2,6 +2,7 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
+dist: precise
 sudo: required
 
 language: php
@@ -10,7 +11,7 @@ php:
 - '5.3'
 - '5.4'
 - '5.5'
-- '5.6'
+- '5.6.29'
 - '7.0'
 - '7.1'
 - nightly
@@ -58,7 +59,7 @@ matrix:
   allow_failures:
   - php: 7.1
   - php: nightly
-  - env: DB=postgresql
+  #- env: DB=postgresql
   # TODO
   #- env: DB=sqlite
 
@@ -261,18 +262,16 @@ script:
   echo "Checking PHP syntax errors"
   # Ensure we catch errors
   set -e
-  #parallel-lint --exclude htdocs/includes --blame .
+  parallel-lint --exclude htdocs/includes --blame .
   set +e
   echo
 
-# TODO: dev/* checks
-
 - |
   echo "Checking coding style"
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
   set +e
   echo
 
@@ -280,8 +279,6 @@ script:
 
 # TODO: Check CSS (csslint?)
 
-# TODO: check SQL syntax (pgsanity?)
-
 - |
   echo "Upgrading Dolibarr"
   # Ensure we catch errors

htdocs/accountancy/customer/index.php

@@ -73,7 +73,7 @@ if ($action == 'validatehistory') {
 
 	// First clean corrupted data
 	$sqlclean = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sqlclean .= " SET fd.fk_code_ventilation = 0";
+	$sqlclean .= " SET fk_code_ventilation = 0";
 	$sqlclean .= ' WHERE fd.fk_code_ventilation NOT IN ';
 	$sqlclean .= '	(SELECT accnt.rowid ';
 	$sqlclean .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
@@ -91,7 +91,7 @@ if ($action == 'validatehistory') {
 		$sql1 .= " AND " . MAIN_DB_PREFIX . "facturedet.fk_code_ventilation = 0";
 	} else {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " SET fd.fk_code_ventilation = accnt.rowid";
+		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
 		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
@@ -113,7 +113,7 @@ if ($action == 'validatehistory') {
 	$db->begin();
 
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sql1 .= " SET fd.fk_code_ventilation = 0";
+	$sql1 .= " SET fk_code_ventilation = 0";
 	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
 	$sql1 .= '	(SELECT accnt.rowid ';
 	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
@@ -134,16 +134,16 @@ if ($action == 'validatehistory') {
 } elseif ($action == 'cleanaccountancycode') {
 	$error = 0;
 	$db->begin();
-	
+
 	// Now clean
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sql1.= " SET fd.fk_code_ventilation = 0";
+	$sql1.= " SET fk_code_ventilation = 0";
 	$sql1.= " WHERE fd.fk_facture IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture as f";
 	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
 	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.=")";
-	
+
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
 
 	$resql1 = $db->query($sql1);
@@ -327,7 +327,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 		print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 	}
 	print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
-	
+
 	$sql = "SELECT '" . $langs->trans("TotalVente") . "' AS total,";
 	for($i = 1; $i <= 12; $i ++) {
 		$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";

htdocs/accountancy/journal/expensereportsjournal.php

@@ -134,7 +134,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $account_vat);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
 		{
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}

htdocs/accountancy/journal/purchasesjournal.php

@@ -145,7 +145,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
 		{
             $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}

htdocs/accountancy/journal/sellsjournal.php

@@ -150,7 +150,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+        if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
 		{
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
@@ -674,7 +674,8 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . "</td>"; // ' '.join(', ',$def_tva[$key][$k]).
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
+				print "</td>";
 				// print "<td>" . $langs->trans("VAT") . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";

htdocs/accountancy/supplier/index.php

@@ -69,14 +69,14 @@ if ($action == 'validatehistory') {
 
 	// First clean corrupted data
 	$sqlclean = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sqlclean .= " SET fd.fk_code_ventilation = 0";
+	$sqlclean .= " SET fk_code_ventilation = 0";
 	$sqlclean .= ' WHERE fd.fk_code_ventilation NOT IN ';
 	$sqlclean .= '	(SELECT accnt.rowid ';
 	$sqlclean .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
 	$sqlclean .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
 	$sqlclean .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
 	$resql = $db->query($sqlclean);
-	
+
 	// Now make the binding. Bind automatically only for product with a dedicated account that exists into chart of account, others need a manual bind
 	if ($db->type == 'pgsql') {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
@@ -87,7 +87,7 @@ if ($action == 'validatehistory') {
 		$sql1 .= " AND " . MAIN_DB_PREFIX . "facture_fourn_det.fk_code_ventilation = 0";
 	} else {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " SET fd.fk_code_ventilation = accnt.rowid";
+		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
 		$sql1 .= " WHERE fd.fk_product = p.rowid AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_buy=accnt.account_number";
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
@@ -107,7 +107,7 @@ if ($action == 'validatehistory') {
 	$db->begin();
 
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
-	$sql1 .= " SET fd.fk_code_ventilation = 0";
+	$sql1 .= " SET fk_code_ventilation = 0";
 	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
 	$sql1 .= '	(SELECT accnt.rowid ';
 	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
@@ -130,13 +130,13 @@ if ($action == 'validatehistory') {
 	$db->begin();
 
 	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
-	$sql1.= " SET fd.fk_code_ventilation = 0";
+	$sql1.= " SET fk_code_ventilation = 0";
 	$sql1.= " WHERE fd.fk_facture_fourn IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
 	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
 	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.= ")";
-	
+
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
 
 	$resql1 = $db->query($sql1);
@@ -291,9 +291,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 {
     print '<br>';
     print '<br>';
-    
+
     print_fiche_titre($langs->trans("OtherInfo"), '', '');
-    
+
     print "<br>\n";
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("Total") . '</td>';
@@ -301,7 +301,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
     }
     print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
-    
+
     $sql = "SELECT '" . $langs->trans("CAHTF") . "' AS label,";
     for($i = 1; $i <= 12; $i ++) {
     	$sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $i, 'ffd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
@@ -313,15 +313,15 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= "  AND ff.fk_statut > 0 ";
     $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
-    
+
     dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
     if ($resql) {
     	$num = $db->num_rows($resql);
-    
+
     	while ( $row = $db->fetch_row($resql)) {
-    
+
-    
+
     		print '<tr><td>' . $row[0] . '</td>';
     			for($i = 1; $i <= 12; $i ++) {
     			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -329,7 +329,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     		print '<td align="right"><b>' . price($row[13]) . '</b></td>';
     		print '</tr>';
     	}
-    
+
     	$db->free($resql);
     } else {
     	print $db->lasterror(); // Show last sql error

htdocs/admin/mails_templates.php

@@ -50,6 +50,7 @@ $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
 $confirm=GETPOST('confirm','alpha');
 $id=GETPOST('id','int');
 $rowid=GETPOST('rowid','alpha');
+$search_label=GETPOST('search_label','alpha');
 
 $allowed=$user->admin;
 if (! $allowed) accessforbidden();
@@ -78,10 +79,6 @@ $hookmanager->initHooks(array('emailtemplates'));
 $tabname=array();
 $tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 
-// Requests to extract data
-$tabsql=array();
-$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template').")";
-
 // Criteria to sort dictionaries
 $tabsqlsort=array();
 $tabsqlsort[25]="label ASC";
@@ -173,211 +170,223 @@ $id = 25;
  * Actions
  */
 
-if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-{
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
-    //$search_country_id = '';
-}
 
-// Actions add or modify an entry into a dictionary
+$parameters=array();
-if (GETPOST('actionadd') || GETPOST('actionmodify'))
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-{
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
-    $listfieldinsert=explode(',',$tabfieldinsert[$id]);
-    $listfieldmodify=explode(',',$tabfieldinsert[$id]);
-    $listfieldvalue=explode(',',$tabfieldvalue[$id]);
 
-    // Check that all fields are filled
+if (empty($reshook))
-    $ok=1;
+{
-    foreach ($listfield as $f => $value)
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
-        if ($value == 'content') continue;
+        $search_label='';
-        if ($value == 'content_lines') continue;
+        $toselect='';
-        if ($value == 'content') $value='content-'.$rowid;
+        $search_array_options=array();
-        if ($value == 'content_lines') $value='content_lines-'.$rowid;
-
-        if (! isset($_POST[$value]) || $_POST[$value]=='')
-        {
-            $ok=0;
-            $fieldnamekey=$listfield[$f];
-            // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
-            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
-
-            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-        }
     }
 
-    // Si verif ok et action add, on ajoute la ligne
+    // Actions add or modify an entry into a dictionary
-    if ($ok && GETPOST('actionadd'))
+    if (GETPOST('actionadd') || GETPOST('actionmodify'))
     {
-        if ($tabrowid[$id])
+        $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
+        $listfieldinsert=explode(',',$tabfieldinsert[$id]);
+        $listfieldmodify=explode(',',$tabfieldinsert[$id]);
+        $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+
+        // Check that all fields are filled
+        $ok=1;
+        foreach ($listfield as $f => $value)
         {
-            // Recupere id libre pour insertion
+            if ($value == 'content') continue;
-            $newid=0;
+            if ($value == 'content_lines') continue;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+            if ($value == 'content') $value='content-'.$rowid;
-            $result = $db->query($sql);
+            if ($value == 'content_lines') $value='content_lines-'.$rowid;
-            if ($result)
+
+            if (! isset($_POST[$value]) || $_POST[$value]=='')
             {
-                $obj = $db->fetch_object($result);
+                $ok=0;
-                $newid=($obj->newid + 1);
+                $fieldnamekey=$listfield[$f];
+                // We take translate key of field
+                if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+                if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+                if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+                if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+                if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
 
-            } else {
+                setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-                dol_print_error($db);
             }
         }
 
-        // Add new entry
+        // Si verif ok et action add, on ajoute la ligne
-        $sql = "INSERT INTO ".$tabname[$id]." (";
+        if ($ok && GETPOST('actionadd'))
-        // List of fields
+        {
-        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+            if ($tabrowid[$id])
-        	$sql.= $tabrowid[$id].",";
+            {
-        $sql.= $tabfieldinsert[$id];
+                // Recupere id libre pour insertion
-        $sql.=",active)";
+                $newid=0;
-        $sql.= " VALUES(";
+                $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+                $result = $db->query($sql);
+                if ($result)
+                {
+                    $obj = $db->fetch_object($result);
+                    $newid=($obj->newid + 1);
 
-        // List of values
+                } else {
-        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+                    dol_print_error($db);
-        	$sql.= $newid.",";
+                }
-        $i=0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-            //var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
-            if ($value == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
             }
-            if ($i) $sql.=",";
-            if ($value == 'private' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='0';
-            if ($value == 'position' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='1';
-            if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
-            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql.=",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
+            // Add new entry
-        $result = $db->query($sql);
+            $sql = "INSERT INTO ".$tabname[$id]." (";
-        if ($result)	// Add is ok
+            // List of fields
-        {
+            if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+            	$sql.= $tabrowid[$id].",";
-        	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+            $sql.= $tabfieldinsert[$id];
-        }
+            $sql.=",active)";
-        else
+            $sql.= " VALUES(";
-        {
+
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+            // List of values
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+            if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+            	$sql.= $newid.",";
+            $i=0;
+            foreach ($listfieldinsert as $f => $value)
+            {
+                //var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
+                if ($value == 'entity') {
+                	$_POST[$listfieldvalue[$i]] = $conf->entity;
+                }
+                if ($i) $sql.=",";
+                if ($value == 'private' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='0';
+                if ($value == 'position' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='1';
+                if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
+                else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+                $i++;
             }
-            else {
+            $sql.=",1)";
-                dol_print_error($db);
+
+            dol_syslog("actionadd", LOG_DEBUG);
+            $result = $db->query($sql);
+            if ($result)	// Add is ok
+            {
+                setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+            	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+            }
+            else
+            {
+                if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+                    setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+                }
+                else {
+                    dol_print_error($db);
+                }
+            }
+        }
+
+        // Si verif ok et action modify, on modifie la ligne
+        if ($ok && GETPOST('actionmodify'))
+        {
+            if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+            else { $rowidcol="rowid"; }
+
+            // Modify entry
+            $sql = "UPDATE ".$tabname[$id]." SET ";
+            // Modifie valeur des champs
+            if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
+            {
+                $sql.= $tabrowid[$id]."=";
+                $sql.= "'".$db->escape($rowid)."', ";
+            }
+            $i = 0;
+            foreach ($listfieldmodify as $field)
+            {
+                if ($field == 'content') $_POST['content']=$_POST['content-'.$rowid];
+                if ($field == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
+                if ($field == 'entity') {
+                	$_POST[$listfieldvalue[$i]] = $conf->entity;
+                }
+                if ($i) $sql.=",";
+                $sql.= $field."=";
+                if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
+                else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+                $i++;
+            }
+            $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+
+            dol_syslog("actionmodify", LOG_DEBUG);
+            //print $sql;
+            $resql = $db->query($sql);
+            if (! $resql)
+            {
+                setEventMessages($db->error(), null, 'errors');
             }
         }
     }
 
-    // Si verif ok et action modify, on modifie la ligne
+    if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
-    if ($ok && GETPOST('actionmodify'))
     {
         if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
         else { $rowidcol="rowid"; }
 
-        // Modify entry
+        $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
-        {
-            $sql.= $tabrowid[$id]."=";
-            $sql.= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-            if ($field == 'content') $_POST['content']=$_POST['content-'.$rowid];
-            if ($field == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
-            if ($field == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($i) $sql.=",";
-            $sql.= $field."=";
-            if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
-            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
 
-        dol_syslog("actionmodify", LOG_DEBUG);
+        dol_syslog("delete", LOG_DEBUG);
-        //print $sql;
+        $result = $db->query($sql);
-        $resql = $db->query($sql);
+        if (! $result)
-        if (! $resql)
         {
-            setEventMessages($db->error(), null, 'errors');
+            if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+            {
+                setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+            }
+            else
+            {
+                dol_print_error($db);
+            }
         }
     }
-}
 
-if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+    // activate
-{
+    if ($action == $acts[0])
-    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-    else { $rowidcol="rowid"; }
-
-    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
-
-    dol_syslog("delete", LOG_DEBUG);
-    $result = $db->query($sql);
-    if (! $result)
     {
-        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-        {
+        else { $rowidcol="rowid"; }
-            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+
+        if ($rowid) {
+            $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
         }
-        else
+        elseif ($code) {
+            $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
+        }
+
+        $result = $db->query($sql);
+        if (!$result)
+        {
+            dol_print_error($db);
+        }
+    }
+
+    // disable
+    if ($action == $acts[1])
+    {
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+        else { $rowidcol="rowid"; }
+
+        if ($rowid) {
+            $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+        }
+        elseif ($code) {
+            $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
+        }
+
+        $result = $db->query($sql);
+        if (!$result)
         {
             dol_print_error($db);
         }
     }
 }
 
-// activate
-if ($action == $acts[0])
-{
-    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-    else { $rowidcol="rowid"; }
-
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
-    }
-    elseif ($code) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
-    }
-
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
-}
-
-// disable
-if ($action == $acts[1])
-{
-    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-    else { $rowidcol="rowid"; }
-
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
-    }
-    elseif ($code) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
-    }
-
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
-}
-
-
 
 /*
  * View
@@ -416,8 +425,11 @@ if ($action == 'delete')
 }
 //var_dump($elementList);
 
-// Complete requete recherche valeurs avec critere de tri
+
-$sql=$tabsql[$id];
+$sql="SELECT rowid as rowid, label, type_template, private, position, topic, content_lines, content, active";
+$sql.=" FROM ".MAIN_DB_PREFIX."c_email_templates";
+$sql.=" WHERE entity IN (".getEntity('email_template').")";
+if ($search_label) $sql.=natural_search('label', $search_label);
 
 if ($search_country_id > 0)
 {
@@ -572,9 +584,19 @@ if ($action != 'edit')
 
 
     $colspan=count($fieldlist)+1;
-    print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+    //print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
 }
 
+print '</table>';
+print '</form>';
+
+print '<br>';
+
+print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+
+print '<table class="noborder" width="100%">';
 
 // List of available record in database
 dol_syslog("htdocs/admin/dict", LOG_DEBUG);
@@ -599,8 +621,26 @@ if ($resql)
         print '</td></tr>';
     }
 
+
+    // Title line with search boxes
+    print '<tr class="liste_titre">';
+    $filterfound=0;
+    foreach ($fieldlist as $field => $value)
+    {
+        if ($value == 'label') print '<td class="liste_titre"><input type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
+        elseif (! in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
+    }
+    if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre"></td>';
+    // Action column
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
+    print '</td>';
+    print '</tr>';
+
     // Title of lines
-    print '<tr class="liste_titre'.($action != 'edit' ? ' liste_titre_add' : '').'">';
+    print '<tr class="liste_titre">';
     foreach ($fieldlist as $field => $value)
     {
         // Determine le nom du champ par rapport aux noms possibles
@@ -642,18 +682,6 @@ if ($resql)
     print getTitleFieldOfList('');
     print '</tr>';
 
-    // Title line with search boxes
-    print '<tr class="liste_titre">';
-    $filterfound=0;
-    foreach ($fieldlist as $field => $value)
-    {
-        if (! in_array($field, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
-    }
-    if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre"></td>';
-    print '</tr>';
-
     if ($num)
     {
         // Lines with values

htdocs/admin/multicurrency.php

@@ -61,7 +61,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
 		dol_print_error($db);
 	}
 }
-	
+
 if (preg_match('/del_(.*)/',$action,$reg))
 {
 	$code=$reg[1];
@@ -79,7 +79,7 @@ if (preg_match('/del_(.*)/',$action,$reg))
 if ($action == 'add_currency')
 {
 	$langs->loadCacheCurrencies('');
-	
+
 	$code = GETPOST('code', 'alpha');
 	$rate = GETPOST('rate', 'alpha');
 	$currency = new MultiCurrency($db);
@@ -96,23 +96,23 @@ if ($action == 'add_currency')
 elseif ($action == 'update_currency')
 {
 	$submit = GETPOST('submit', 'alpha');
-	
+
 	if ($submit == $langs->trans('Modify'))
 	{
 		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
 		$rate = GETPOST('rate', 'float');
 		$currency = new MultiCurrency($db);
-		
+
 		if ($currency->fetch($fk_multicurrency) > 0)
 		{
 			$currency->updateRate($rate);
-		}	
+		}
 	}
 	elseif ($submit == $langs->trans('Delete'))
 	{
 		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
 		$currency = new MultiCurrency($db);
-		
+
 		if ($currency->fetch($fk_multicurrency) > 0)
 		{
 			if ($currency->delete() > 0) setEventMessages($langs->trans('RecordDeleted'), array());
@@ -120,14 +120,14 @@ elseif ($action == 'update_currency')
 		}
 	}
 }
-elseif ($action == 'synchronize') 
+elseif ($action == 'synchronize')
 {
 	$response = GETPOST('response');
 	$response = json_decode($response);
-	
+
 	if ($response->success)
 	{
-		MultiCurrency::syncRates($response);	
+		MultiCurrency::syncRates($response);
 	}
 	else
 	{
@@ -159,19 +159,12 @@ $page_name = "MultiCurrencySetup";
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
-    . $langs->trans("BackToModuleList") . '</a>';
 print_fiche_titre($langs->trans($page_name), $linkback);
 
 // Configuration header
 $head = multicurrencyAdminPrepareHead();
-dol_fiche_head(
+dol_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurrency");
-    $head,
-    'settings',
-    $langs->trans("ModuleSetup"),
-    0,
-    "multicurrency"
-);
 
 // Setup page goes here
 $form=new Form($db);
@@ -225,7 +218,7 @@ print '</form>';
 print '</td></tr>';
 */
 
-/* TODO uncomment when the functionality will integrated 
+/* TODO uncomment when the functionality will integrated
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("multicurrency_modifyRateApplication").'</td>';
@@ -258,9 +251,9 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print $langs->trans("Value").'&nbsp;<input type="button" id="bt_sync" class="button" onclick="javascript:getRates();" value="'.$langs->trans('Synchronize').'" />';
 	print '</form>';
 	print '</td></tr>';
-	
+
-	
+
-	
+
 	print '<tr class="oddeven">';
 	print '<td><a target="_blank" href="https://currencylayer.com">'.$langs->transnoentitiesnoconv("multicurrency_appId").'</a></td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -272,8 +265,8 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print '</form>';
 	print '</td></tr>';
-	
+
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->transnoentitiesnoconv("multicurrency_appCurrencySource").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -285,8 +278,8 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print '</form>';
 	print '</td></tr>';
-	
+
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->transnoentitiesnoconv("multicurrency_alternateCurrencySource").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -298,7 +291,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print '</form>';
 	print '</td></tr>';
-	
+
 	print '</table>';
 	print '<br />';
 }
@@ -333,8 +326,8 @@ print '</td></form></tr>';
 foreach ($TCurrency as &$currency)
 {
 	if($currency->code == $conf->currency) continue;
-	
+
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$currency->code.' - '.$currency->name.'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
@@ -362,7 +355,7 @@ print '
 		{
 			$("#bt_sync").attr("disabled", true);
 			var url_sync = "http://apilayer.net/api/live?access_key='.$conf->global->MULTICURRENCY_APP_ID.'&format=1'.(!empty($conf->global->MULTICURRENCY_APP_SOURCE) ? '&source='.$conf->global->MULTICURRENCY_APP_SOURCE : '').'";
-			
+
 			$.ajax({
 				url: url_sync,
 				dataType: "jsonp"

htdocs/admin/syslog.php

@@ -88,7 +88,7 @@ if ($action == 'set')
 
 	$newActiveModules = array();
 	$selectedModules = (isset($_POST['SYSLOG_HANDLERS']) ? $_POST['SYSLOG_HANDLERS'] : array());
-	
+
 	// Save options of handler
 	foreach ($syslogModules as $syslogHandler)
 	{
@@ -111,7 +111,7 @@ if ($action == 'set')
 
 	$activeModules = $newActiveModules;
 
-    dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1);  // To be sure ther is not a setup into another entity	
+    dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1);  // To be sure ther is not a setup into another entity
     dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine',0,'',0);
 
 	// Check configuration
@@ -206,7 +206,7 @@ foreach ($syslogModules as $moduleName)
 	//print $moduleName." = ".$moduleactive." - ".$module->getName()." ".($moduleactive == -1)."<br>\n";
 	if (($moduleactive == -1) && empty($conf->global->MAIN_FEATURES_LEVEL)) continue;		// Some modules are hidden if not activable and not into debug mode (end user must not see them)
 
-	
+
 	print '<tr class="oddeven">';
 	print '<td width="140">';
 	print '<input class="oddeven" type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
@@ -229,6 +229,14 @@ foreach ($syslogModules as $moduleName)
 
 			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
 			if (! empty($option['example'])) print '<br>'.$langs->trans("Example").': '.$option['example'];
+
+			if ($option['constant'] == 'SYSLOG_FILE' && preg_match('/^DOL_DATA_ROOT\/[^\/]*$/',$value))
+			{
+    			$filelogparam =' (<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file='.basename($value).'">';
+    			$filelogparam.=$langs->trans('Download');
+    			$filelogparam.=$filelog.'</a>)';
+    			print $filelogparam;
+			}
 		}
 	}
 	print '</td>';

htdocs/admin/tools/listevents.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2015  Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2017  Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2015       Bahfir Abbes		<bafbes@gmail.com>
  *
@@ -45,15 +45,17 @@ $langs->load("companies");
 $langs->load("users");
 $langs->load("other");
 
-$sortfield = GETPOST("sortfield",'alpha');
+// Load variable for pagination
-$sortorder = GETPOST("sortorder",'alpha');
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$page = GETPOST("page",'int');
+$sortfield = GETPOST('sortfield','alpha');
-if ($page == -1) { $page = 0 ; }
+$sortorder = GETPOST('sortorder','alpha');
-$offset = $conf->liste_limit * $page ;
+$page = GETPOST('page','int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="dateevent";
+if (! $sortorder) $sortorder="DESC";
 
 $search_code = GETPOST("search_code");
 $search_ip   = GETPOST("search_ip");
@@ -61,9 +63,9 @@ $search_user = GETPOST("search_user");
 $search_desc = GETPOST("search_desc");
 $search_ua   = GETPOST("search_ua");
 
-if (!isset($_REQUEST["date_startmonth"]) || $_REQUEST["date_startmonth"] > 0) $date_start=dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]);
+if (GETPOST("date_startmonth") == '' || GETPOST("date_startmonth") > 0) $date_start=dol_mktime(0,0,0,GETPOST("date_startmonth"),GETPOST("date_startday"),GETPOST("date_startyear"));
 else $date_start=-1;
-if (!isset($_REQUEST["date_endmonth"]) || $_REQUEST["date_endmonth"] > 0) $date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]);
+if (GETPOST("date_endmonth") == '' || GETPOST("date_endmonth") > 0) $date_end=dol_mktime(23,59,59,GETPOST("date_endmonth"),GETPOST("date_endday"),GETPOST("date_endyear"));
 else $date_end=-1;
 
 // checks:if date_start>date_end  then date_end=date_start + 24 hours
@@ -72,14 +74,6 @@ if ($date_start > 0 && $date_end > 0 && $date_start > $date_end) $date_end=$date
 $now = dol_now();
 $nowarray = dol_getdate($now);
 
-$params = "&amp;search_code=$search_code&amp;search_ip=$search_ip&amp;search_user=$search_user&amp;search_desc=$search_desc&amp;search_ua=$search_ua";
-$params.= "&amp;date_startmonth=".$_REQUEST["date_startmonth"];
-$params.= "&amp;date_startday=".$_REQUEST["date_startday"];
-$params.= "&amp;date_startyear=".$_REQUEST["date_startyear"];
-$params.= "&amp;date_endmonth=".$_REQUEST["date_endmonth"];
-$params.= "&amp;date_endday=".$_REQUEST["date_endday"];
-$params.= "&amp;date_endyear=".$_REQUEST["date_endyear"];
-
 if (empty($date_start)) // We define date_start and date_end
 {
     $date_start=dol_get_first_day($nowarray['year'],$nowarray['mon'],false);
@@ -88,6 +82,15 @@ if (empty($date_end))
 {
     $date_end=dol_mktime(23,59,59,$nowarray['mon'],$nowarray['mday'],$nowarray['year']);
 }
+// Set $date_startmonth...
+$tmp = dol_getdate($date_start);
+$date_startday = $tmp['mday'];
+$date_startmonth = $tmp['mon'];
+$date_startyear = $tmp['year'];
+$tmp = dol_getdate($date_end);
+$date_endday = $tmp['mday'];
+$date_endmonth = $tmp['mon'];
+$date_endyear = $tmp['year'];
 
 
 /*
@@ -97,7 +100,7 @@ if (empty($date_end))
 $now=dol_now();
 
 // Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $date_start=-1;
     $date_end=-1;
@@ -192,39 +195,39 @@ if ($result)
 	$i = 0;
 
 	$param='';
-	if ($search_code) $param.='&search_code='.$search_code;
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($search_ip)   $param.='&search_ip='.$search_ip;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($search_user) $param.='&search_user='.$search_user;
+	if ($optioncss != '') $param.='&optioncss='.$optioncss;
-	if ($search_desc) $param.='&search_desc='.$search_desc;
+	if ($search_code) $param.='&search_code='.urlencode($search_code);
-	if ($search_ua)   $param.='&search_ua='.$search_ua;
+	if ($search_ip)   $param.='&search_ip='.urlencode($search_ip);
+	if ($search_user) $param.='&search_user='.urlencode($search_user);
+	if ($search_desc) $param.='&search_desc='.urlencode($search_desc);
+	if ($search_ua)   $param.='&search_ua='.urlencode($search_ua);
+	if ($date_startmonth) $param.= "&date_startmonth=".urlencode($date_startmonth);
+	if ($date_startday)   $param.= "&date_startday=".urlencode($date_startday);
+	if ($date_startyear)  $param.= "&date_startyear=".urlencode($date_startyear);
+	if ($date_endmonth)   $param.= "&date_endmonth=".urlencode($date_endmonth);
+	if ($date_endday)     $param.= "&date_endday=".urlencode($date_endday);
+	if ($date_endyear)    $param.= "&date_endyear=".urlencode($date_endyear);
 
     $langs->load('withdrawals');
     if ($num)
     {
         $center='<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
     }
-    
+
-	print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $nbtotalofrecords, 'setup');
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+
+    print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $nbtotalofrecords, 'setup', 0, '', '', $limit);
 
 	if ($action == 'purge')
 	{
 		$formquestion=array();
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('PurgeAuditEvents'), $langs->trans('ConfirmPurgeAuditEvents'),'confirm_purge',$formquestion,'no',1);
 	}
-	
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 
 	print '<div class="div-table-responsive">';
 	print '<table class="liste" width="100%">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"e.dateevent","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Code"),$_SERVER["PHP_SELF"],"e.type","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("IP"),$_SERVER["PHP_SELF"],"e.ip","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("User"),$_SERVER["PHP_SELF"],"u.login","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"e.description","","",'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print "</tr>\n";
-
 
 	// Lignes des champs de filtres
 	print '<tr class="liste_titre">';
@@ -255,14 +258,20 @@ if ($result)
 
 	print "</tr>\n";
 
-	$var=True;
 
-	while ($i < min($num, $conf->liste_limit))
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"e.dateevent","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Code"),$_SERVER["PHP_SELF"],"e.type","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("IP"),$_SERVER["PHP_SELF"],"e.ip","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("User"),$_SERVER["PHP_SELF"],"u.login","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"e.description","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+
+	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($result);
 
-		
-
 		print '<tr class="oddeven">';
 
 		// Date
@@ -316,7 +325,7 @@ if ($result)
 	}
 	print "</table>";
 	print "</div>";
-	
+
 	print "</form>";
 	$db->free($result);
 }

htdocs/admin/tools/purge.php

@@ -83,7 +83,15 @@ if (! empty($conf->syslog->enabled))
 {
 	print '<input type="radio" name="choice" value="logfile"';
 	print ($choice && $choice=='logfile') ? ' checked' : '';
-	print '> '.$langs->trans("PurgeDeleteLogFile",$filelog).'<br><br>';
+	$filelogparam=$filelog;
+	if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog)))
+	{
+	   $filelogparam ='<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file=';
+	   $filelogparam.=basename($filelog);
+	   $filelogparam.='">'.$filelog.'</a>';
+	}
+	print '> '.$langs->trans("PurgeDeleteLogFile", $filelogparam);
+	print '<br><br>';
 }
 
 print '<input type="radio" name="choice" value="tempfiles"';

htdocs/categories/card.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Matthieu Valleton	<mv@seeschloss.org>
- * Copyright (C) 2006-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2007		Patrick Raguin		<patrick.raguin@gmail.com>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
@@ -221,9 +221,7 @@ llxHeader("",$langs->trans("Categories"),$helpurl);
 
 if ($user->rights->categorie->creer)
 {
-	/*
+	// Create or add
-	 * Fiche en mode creation
-	 */
 	if ($action == 'create' || $_POST["addcat"] == 'addcat')
 	{
 		dol_set_focus('#label');
@@ -246,7 +244,7 @@ if ($user->rights->categorie->creer)
 
 		// Ref
 		print '<tr>';
-		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="flat" name="label" size="25" value="'.$label.'">';
+		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="minwidth100" name="label" value="'.$label.'">';
 		print'</td></tr>';
 
 		// Description
@@ -263,7 +261,8 @@ if ($user->rights->categorie->creer)
 
 		// Parent category
 		print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
-		print $form->select_all_categories($type, $catorigin);
+		print $form->select_all_categories($type, $catorigin, 'parent');
+		print ajax_combobox('parent');
 		print '</td></tr>';
 
 		$parameters=array();

htdocs/comm/propal/card.php

@@ -1360,7 +1360,7 @@ if ($action == 'create')
         }
 	} else {
 		print '<td>';
-		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty');
+		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
 		{

htdocs/commande/card.php

@@ -1477,7 +1477,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '</td>';
 	} else {
 		print '<td>';
-		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 'SelectThirdParty');
+		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
 		{

htdocs/commande/stats/index.php

@@ -76,7 +76,7 @@ if ($mode == 'customer')
 if ($mode == 'supplier')
 {
     $title=$langs->trans("OrdersStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
-    $dir=$conf->fournisseur->dir_output.'/commande/temp';
+    $dir=$conf->fournisseur->commande->dir_temp;
 }
 
 llxHeader('', $title);
@@ -322,7 +322,7 @@ foreach ($data as $val)
 	while (! empty($year) && $oldyear > $year+1)
 	{ // If we have empty year
 		$oldyear--;
-		
+
 		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
@@ -334,7 +334,7 @@ foreach ($data as $val)
 		print '</tr>';
 	}
 
-	
+
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';

htdocs/compta/resultat/index.php

@@ -492,14 +492,14 @@ if (! empty($conf->salaries->enabled))
     } else {
     	$column = 'p.datep';
     }
-    
+
     $subtotal_ht = 0;
     $subtotal_ttc = 0;
     $sql = "SELECT p.label as nom, date_format($column,'%Y-%m') as dm, sum(p.amount) as amount";
     $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
     $sql.= " WHERE p.entity = ".$conf->entity;
     $sql.= " GROUP BY p.label, dm";
-    
+
     dol_syslog("get social salaries payments");
     $result=$db->query($sql);
     if ($result)
@@ -512,13 +512,13 @@ if (! empty($conf->salaries->enabled))
     		while ($i < $num)
     		{
     			$obj = $db->fetch_object($result);
-    
+
     			if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
     			$decaiss[$obj->dm] += $obj->amount;
-    
+
     			if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
     			$decaiss_ttc[$obj->dm] += $obj->amount;
-    
+
     			$i++;
     		}
     	}
@@ -568,7 +568,7 @@ if (! empty($conf->expensereport->enabled))
 			{
 				if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
 				$decaiss[$obj->dm] += $obj->amount_ht;
-				
+
 				if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
 				$decaiss_ttc[$obj->dm] += $obj->amount_ttc;
 
@@ -588,7 +588,7 @@ if (! empty($conf->don->enabled))
 {
     $subtotal_ht = 0;
     $subtotal_ttc = 0;
-    
+
     if ($modecompta == 'CREANCES-DETTES') {
         $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
@@ -617,13 +617,13 @@ if (! empty($conf->don->enabled))
     		while ($i < $num)
     		{
     			$obj = $db->fetch_object($result);
-    
+
     			if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
     			$encaiss[$obj->dm] += $obj->amount;
-    
+
     			if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
     			$encaiss_ttc[$obj->dm] += $obj->amount;
-    
+
     			$i++;
     		}
     	}
@@ -671,7 +671,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 {
 	$mois_modulo = $mois;
 	if($mois>12) {$mois_modulo = $mois-12;}
-	
+
 	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,$annee),"%B")."</td>";
 	for ($annee = $year_start ; $annee <= $year_end ; $annee++)
@@ -680,7 +680,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 		if($mois>12) {$annee_decalage=$annee+1;}
 		$case = strftime("%Y-%m",dol_mktime(12,0,0,$mois_modulo,1,$annee_decalage));
 
-		print '<td class="liste_titre" align="right">&nbsp;';
+		print '<td align="right">&nbsp;';
 		if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
 		{
 			print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price(price2num($decaiss_ttc[$case],'MT')).'</a>';
@@ -689,7 +689,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 		}
 		print "</td>";
 
-		print '<td align="right" class="liste_titre borderrightlight">&nbsp;';
+		print '<td align="right" class="borderrightlight">&nbsp;';
 		//if (isset($encaiss_ttc[$case]) && $encaiss_ttc[$case] != 0)
 		if (isset($encaiss_ttc[$case]))
 		{

htdocs/core/class/fiscalyear.class.php

@@ -275,7 +275,7 @@ class Fiscalyear extends CommonObject
 		if ($mode == 5)
 		{
 			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
 		}
 	}
 

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

@@ -995,7 +995,7 @@ class Form
     			unset($societetmp);
     		}
     		// mode 1
-    		$urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter;
+    		$urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter.($showtype?'&showtype='.$showtype:'');
     		$out.=  ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			$out.='<style type="text/css">
 					.ui-autocomplete {
@@ -3461,7 +3461,7 @@ class Form
             $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
 		}
 
-        $output = '<select class="flat" name="'.$htmlname.'">';
+        $output = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
 		$outarray=array();
         if (is_array($cate_arbo))
         {

htdocs/core/db/pgsql.class.php

@@ -169,7 +169,7 @@ class DoliDBPgsql extends DoliDB
 			$line = preg_replace('/ SEPARATOR/i', ',', $line);
 			$line = preg_replace('/STRING_AGG\(([^,\)]+)\)/i', 'STRING_AGG(\\1, \',\')', $line);
 			//print $line."\n";
-					
+
 		    if ($type == 'auto')
 		    {
               if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
@@ -185,8 +185,8 @@ class DoliDBPgsql extends DoliDB
 
 		        // we are inside create table statement so lets process datatypes
     			if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
-    				$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
+    				$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
-    				$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
+    				$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
     				$line=preg_replace('/,$/','',$line);
     			}
 
@@ -210,6 +210,7 @@ class DoliDBPgsql extends DoliDB
     			// tinytext/mediumtext -> text
     			$line=preg_replace('/tinytext/i','text',$line);
     			$line=preg_replace('/mediumtext/i','text',$line);
+    			$line=preg_replace('/longtext/i','text',$line);
 
     			$line=preg_replace('/text\([0-9]+\)/i','text',$line);
 

htdocs/core/lib/ajax.lib.php

@@ -37,9 +37,9 @@
  *  @param	int		$autoselect			Automatic selection if just one value
  *  @param	array	$ajaxoptions		Multiple options array
  *                                          Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
- *                                          Ex: array('disabled'=>
+ *                                          Ex: array('disabled'=> )
- *                                          Ex: array('show'=>
+ *                                          Ex: array('show'=> )
- *                                          Ex: array('update_textarea'=>
+ *                                          Ex: array('update_textarea'=> )
  *	@return string              		Script
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
@@ -181,12 +181,12 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
     							});
     						}
     						console.log("ajax_autocompleter new value selected, we trigger change on original component so field #search_'.$htmlname.'");
-							
+
     						$("#search_'.$htmlname.'").trigger("change");	// We have changed value of the combo select, we must be sure to trigger all js hook binded on this event. This is required to trigger other javascript change method binded on original field by other code.
     					}
     					,delay: 500
 					}).data("ui-autocomplete")._renderItem = function( ul, item ) {
-						  
+
 						return $("<li>")
 						.data( "ui-autocomplete-item", item ) // jQuery UI > 1.10.0
 						.append( \'<a><span class="tag">\' + item.label + "</span></a>" )
@@ -352,8 +352,8 @@ function ajax_dialog($title,$message,$w=350,$h=150)
 
 /**
  * Make content of an input box selected when we click into input field.
- * 
+ *
- * @param string	$htmlname	Id of html object 
+ * @param string	$htmlname	Id of html object
  * @param string	$addlink	Add a 'link to' after
  */
 function ajax_autoselect($htmlname, $addlink='')
@@ -383,7 +383,7 @@ function ajax_autoselect($htmlname, $addlink='')
 function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve')
 {
 	global $conf;
-	
+
 	if (! empty($conf->browser->phone)) return '';	// select2 disabled for smartphones with standard browser (does not works, popup appears outside screen)
 	if (! empty($conf->dol_use_jmobile)) return '';	// select2 works with jmobile but it breaks the autosize feature of jmobile.
 	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
@@ -392,13 +392,13 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0;
 
     $tmpplugin='select2';
-    $msg='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+    $msg='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
           <script type="text/javascript">
         	$(document).ready(function () {
         		$(\''.(preg_match('/^\./',$htmlname)?$htmlname:'#'.$htmlname).'\').'.$tmpplugin.'({
         		    dir: \'ltr\',
         			width: \''.$widthTypeOfAutocomplete.'\',		/* off or resolve */
-					minimumInputLength: '.$minLengthToAutocomplete.'				    
+					minimumInputLength: '.$minLengthToAutocomplete.'
 				})';
 	if ($forcefocus) $msg.= '.select2(\'focus\')';
 	$msg.= ';'."\n";

htdocs/core/lib/files.lib.php

@@ -1825,8 +1825,20 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	    $lire='creer'; $read='write'; $download='upload';
 	}
 
+	// Wrapping for miscellaneous medias files
+	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
+	{
+	    $accessallowed=1;
+	    $original_file=$dolibarr_main_data_root.'/medias/'.$original_file;
+	}
+	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
+	{
+	    $accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
+	    $original_file=$dolibarr_main_data_root.'/'.$original_file;
+	}
 	// Wrapping for some images
-	if (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
+	elseif (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
 		$accessallowed=1;
 		$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
@@ -1912,7 +1924,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->dir_output.'/commande/temp/'.$original_file;
+		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
@@ -2369,13 +2381,6 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
 	}
 
-	// Wrapping for miscellaneous medias files
-	elseif ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
-	{
-	    $accessallowed=1;
-	    $original_file=$dolibarr_main_data_root.'/medias/'.$original_file;
-	}
-
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{

htdocs/core/lib/functions.lib.php

@@ -3455,7 +3455,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
  *	@param	string	    $titre				Title to show (required)
  *	@param	int   	    $page				Numero of page to show in navigation links (required)
  *	@param	string	    $file				Url of page (required)
- *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder)
+ *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder). Value must be 'urlencoded' before calling function.
  *	@param	string    	$sortfield       	Field to sort on ('' by default)
  *	@param	string	    $sortorder       	Order to sort ('' by default)
  *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction()
@@ -6088,13 +6088,13 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 /**
  * Set focus onto field with selector
  *
- * @param 	string	$selector	Selector ('#id') to use to find the HTML input field that must get the autofocus. You must use a CSS selector, so unique id preceding with the '#' char.
+ * @param 	string	$selector	Selector ('#id' or 'input[name="ref"]') to use to find the HTML input field that must get the autofocus. You must use a CSS selector, so unique id preceding with the '#' char.
  * @return	string				HTML code to set focus
  */
 function dol_set_focus($selector)
 {
 	print "\n".'<!-- Set focus onto a specific field -->'."\n";
-	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.$selector.'").focus(); });</script>'."\n";
+	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";
 }
 
 

htdocs/core/lib/json.lib.php

@@ -49,12 +49,15 @@ function dol_json_encode($elements)
 {
 	dol_syslog('dol_json_encode() is deprecated. Please update your code to use native json_encode().', LOG_WARNING);
 
-	$num=count($elements);
+	$num=0;
 	if (is_object($elements))	// Count number of properties for an object
 	{
-		$num=0;
 		foreach($elements as $key => $value) $num++;
 	}
+	else
+	{
+	    $num=count($elements);
+	}
 	//var_dump($num);
 
 	// determine type

htdocs/core/modules/modReceiptPrinter.class.php

@@ -137,8 +137,8 @@ class modReceiptPrinter extends DolibarrModules
         // Clean before activation
         $this->remove($options);
         $sql = array(
-            "CREATE TABLE IF NOT EXISTS llx_printer_receipt (rowid int(11) NOT NULL AUTO_INCREMENT, name varchar(128), fk_type int(11), fk_profile int(11), parameter varchar(128), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
+            "CREATE TABLE IF NOT EXISTS llx_printer_receipt (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), fk_type integer, fk_profile integer, parameter varchar(128), entity integer) ENGINE=innodb;",
-            "CREATE TABLE IF NOT EXISTS llx_printer_receipt_template (rowid int(11) NOT NULL AUTO_INCREMENT, name varchar(128), template text, entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
+            "CREATE TABLE IF NOT EXISTS llx_printer_receipt_template (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), template text, entity integer) ENGINE=innodb;",
             );
         return $this->_init($sql,$options);
     }

htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

@@ -72,27 +72,32 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$tooltip.=$langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</td>';
+		$texte.= '<tr><td>'.$langs->trans("Mask");
+		//$texte.= ' ('.$langs->trans("InvoiceStandard").')';
+		$texte.= ':</td>';
 		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->SUPPLIER_INVOICE_TULIP_MASK.'">',$tooltip,1,1).'</td>';
 
 		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
 		$texte.= '</tr>';
 
-		// Parametrage du prefix des replacement
+		if ($conf->global->MAIN_FEATURE_LEVEL >= 2)
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+		{
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+    		// Parametrage du prefix des replacement
-		$texte.= '</tr>';
+    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+    		$texte.= '</tr>';
 
-		// Parametrage du prefix des avoirs
+    		// Parametrage du prefix des avoirs
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
+    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-		$texte.= '</tr>';
+    		$texte.= '</tr>';
 
-		// Parametrage du prefix des acomptes
+    		// Parametrage du prefix des acomptes
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-		$texte.= '</tr>';
+    		$texte.= '</tr>';
+		}
 
 		$texte.= '</table>';
 		$texte.= '</form>';
@@ -137,7 +142,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 
 		// Get Mask value
 		$mask = '';
-		if (is_object($object) && $object->type == 1) 
+		if (is_object($object) && $object->type == 1)
 		{
 			$mask=$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK;
 			if (! $mask)

htdocs/document.php

@@ -26,6 +26,7 @@
  *  \brief      Wrapper to download data files
  *  \remarks    Call of this wrapper is made with URL:
  * 				document.php?modulepart=repfichierconcerne&file=pathrelatifdufichier
+ * 				document.php?modulepart=logs&file=dolibarr.log
  */
 
 define('NOTOKENRENEWAL',1); // Disables token renewal
@@ -106,7 +107,7 @@ $refname=basename(dirname($original_file)."/");
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
-$check_access = dol_check_secure_access_document($modulepart,$original_file,$entity,$refname);
+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $original_file              = $check_access['original_file'];               // original_file is now a full path name
@@ -183,7 +184,7 @@ header('Pragma: public');
 
 //ob_clean();
 //flush();
-    
+
 readfile($original_file_osencoded);
 
 if (is_object($db)) $db->close();

htdocs/fichinter/card.php

@@ -1045,7 +1045,7 @@ if ($action == 'create')
 		}
 		print '<table class="border" width="100%">';
 		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>';
-		print $form->select_company('','socid','','SelectThirdParty',1);
+		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
 		print '</td></tr>';
 		print '</table>';
 

htdocs/fourn/commande/card.php

@@ -1436,7 +1436,7 @@ if ($action=='create')
 	}
 	else
 	{
-		print $form->select_company((empty($socid)?'':$socid), 'socid', 's.fournisseur = 1', 'SelectThirdParty');
+		print $form->select_company((empty($socid)?'':$socid), 'socid', 's.fournisseur = 1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
         // reload page to retrieve customer informations
         if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
         {

htdocs/fourn/commande/list.php

@@ -1111,7 +1111,7 @@ if ($resql)
     	    // Other picto tool
     	    print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
 			$filename=dol_sanitizeFileName($obj->ref);
-			$filedir=$conf->fournisseur->dir_output.'/commande' . '/' . dol_sanitizeFileName($obj->ref);
+			$filedir=$conf->fournisseur->dir_output.'/commande/' . dol_sanitizeFileName($obj->ref);
 			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
 

htdocs/fourn/facture/card.php

@@ -1445,7 +1445,7 @@ if ($action == 'create')
     }
     else
     {
-        print $form->select_company($societe->id, 'socid', 's.fournisseur = 1', 'SelectThirdParty');
+        print $form->select_company($societe->id, 'socid', 's.fournisseur = 1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
         // reload page to retrieve supplier informations
         if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
         {

htdocs/install/mysql/data/llx_accounting.sql

@@ -360,7 +360,7 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (305,'PCG99-BASE','FINAN', 'XXXXXX',  '511', '304', 'Valeurs à l''encaissement', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (306,'PCG99-BASE','FINAN', 'BANK',    '512', '304', 'Banques', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (307,'PCG99-BASE','FINAN', 'XXXXXX',  '514', '304', 'Chèques postaux', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '304', '"Caisses" du Trésor et des établissements publics', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '304', 'Caisses du Trésor et des établissements publics', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (309,'PCG99-BASE','FINAN', 'XXXXXX',  '516', '304', 'Sociétés de bourse', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (310,'PCG99-BASE','FINAN', 'XXXXXX',  '517', '304', 'Autres organismes financiers', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (311,'PCG99-BASE','FINAN', 'XXXXXX',  '518', '304', 'Intérêts courus', 1);

htdocs/install/mysql/data/llx_accounting_category.sql

@@ -24,6 +24,6 @@
 -- Categories compte de résultat Français
 --
 
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE','Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE',  'Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR','Coût d achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR',  'Coût achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
 INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  3,'MARGE','Marge commerciale', '', 0, 1, '1 + 2', '30', 1, 1);

htdocs/install/mysql/data/llx_const.sql

@@ -91,7 +91,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_
 --
 -- ODT Path
 ---
-insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('PRODUCT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/products', 'chaine', 0);
+insert into llx_const (name, entity, value, type, visible) VALUES ('PRODUCT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/products', 'chaine', 0);
-insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('CONTRACT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/contracts', 'chaine', 0);
+insert into llx_const (name, entity, value, type, visible) VALUES ('CONTRACT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/contracts', 'chaine', 0);
-insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0);
+insert into llx_const (name, entity, value, type, visible) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0);
-insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0);
+insert into llx_const (name, entity, value, type, visible) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0);

htdocs/install/mysql/migration/3.2.0-3.3.0.sql

@@ -659,7 +659,7 @@ insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype,
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (305,'PCG99-BASE','FINAN', 'XXXXXX',  '511', '51', 'Valeurs à l''encaissement', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (306,'PCG99-BASE','FINAN', 'BANK',    '512', '51', 'Banques', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (307,'PCG99-BASE','FINAN', 'XXXXXX',  '514', '51', 'Chèques postaux', '1');
-insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '51', '"Caisses" du Trésor et des établissements publics', '1');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '51', 'Caisses du Trésor et des établissements publics', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (309,'PCG99-BASE','FINAN', 'XXXXXX',  '516', '51', 'Sociétés de bourse', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (310,'PCG99-BASE','FINAN', 'XXXXXX',  '517', '51', 'Autres organismes financiers', '1');
 insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (311,'PCG99-BASE','FINAN', 'XXXXXX',  '518', '51', 'Intérêts courus', '1');

htdocs/install/mysql/migration/3.5.0-3.6.0.sql

@@ -635,7 +635,7 @@ INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype,
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (305,'PCG99-BASE','FINAN', 'XXXXXX',  '511', '304', 'Valeurs à l''encaissement', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (306,'PCG99-BASE','FINAN', 'BANK',    '512', '304', 'Banques', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (307,'PCG99-BASE','FINAN', 'XXXXXX',  '514', '304', 'Chèques postaux', '1');
-INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '304', '"Caisses" du Trésor et des établissements publics', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (308,'PCG99-BASE','FINAN', 'XXXXXX',  '515', '304', 'Caisses du Trésor et des établissements publics', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (309,'PCG99-BASE','FINAN', 'XXXXXX',  '516', '304', 'Sociétés de bourse', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (310,'PCG99-BASE','FINAN', 'XXXXXX',  '517', '304', 'Autres organismes financiers', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (311,'PCG99-BASE','FINAN', 'XXXXXX',  '518', '304', 'Intérêts courus', '1');

htdocs/install/mysql/migration/3.7.0-3.8.0.sql

@@ -9,14 +9,20 @@
 -- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
 -- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
 -- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
--- To restrict request to Mysql version x.y or more: -- VMYSQLx.y
+-- To drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
--- To restrict request to Pgsql version x.y or more: -- VPGSQLx.y
+-- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
--- To make pk to be auto increment (mysql):    VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
--- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
--- To set a field as NULL:                     VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
--- To set a field as DEFAULT NULL:             VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
--- To delete orphelins:                        VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
--- To delete orphelins:                        VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
+-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
 UPDATE llx_facture_fourn set ref=rowid where ref IS NULL;
@@ -35,6 +41,7 @@ ALTER TABLE llx_societe_rib ADD COLUMN frstrecur varchar(16) DEFAULT 'FRST' AFTE
 
 ALTER TABLE llx_cronjob ADD COLUMN entity integer DEFAULT 0;
 ALTER TABLE llx_cronjob MODIFY COLUMN params text NULL;
+-- VPGSQL8.2 ALTER TABLE llx_cronjob ALTER COLUMN params DROP NOT NULL;
 
 -- Loan
 create table llx_loan

htdocs/install/mysql/migration/3.9.0-4.0.0.sql

@@ -393,8 +393,8 @@ CREATE TABLE llx_c_accounting_category (
 
 ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code);
 
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE','Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE',  'Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR','Coût d'achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR',  'Coût achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
 INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  3,'MARGE','Marge commerciale', '', 0, 1, '1 + 2', '30', 1, 1);
 
 UPDATE llx_accounting_account SET account_parent = '0' WHERE account_parent = '';

htdocs/install/mysql/migration/4.0.0-5.0.0.sql

@@ -1,7 +1,7 @@
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
--- when current version is 4.0.0 or higher.
+-- when current version is 5.0.0 or higher.
 --
 -- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
 -- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;

htdocs/install/mysql/migration/5.0.0-6.0.0.sql

@@ -1,7 +1,7 @@
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
--- when current version is 5.0.0 or higher.
+-- when current version is 6.0.0 or higher.
 --
 -- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
 -- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
@@ -493,7 +493,7 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+	tms timestamp
 ) ENGINE=innodb;
 
 ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);

htdocs/install/mysql/migration/repair.sql

@@ -18,7 +18,7 @@
 
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) CHARACTER SET utf8;
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci;
--- You can check with "show full columns from llx_accounting_account";
+-- You can check with 'show full columns from llx_accounting_account';
 
 
 

htdocs/install/mysql/tables/llx_accounting_account.sql

@@ -16,7 +16,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--- Table of "accounts" for accountancy expert module
+-- Table of 'accounts' for accountancy expert module
 -- ============================================================================
 
 create table llx_accounting_account

htdocs/install/mysql/tables/llx_actioncomm.sql

@@ -65,7 +65,7 @@ create table llx_actioncomm
   errors_to			varchar(256),					-- when event was an email, we store here the erros_to
   
   recurid           varchar(128),                   -- used to store event id to link each other all the repeating event record
-  recurrule         varchar(128),					-- contains string with ical format recurring rule like "FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19" or "FREQ=WEEKLY;BYDAY=MO"
+  recurrule         varchar(128),					-- contains string with ical format recurring rule like 'FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19' or 'FREQ=WEEKLY;BYDAY=MO'
   recurdateend      datetime,						-- no more recurring event after this date
      
   fk_element		integer DEFAULT NULL,			-- For link to an element (proposal, invoice, order, ...)

htdocs/install/mysql/tables/llx_advtargetemailing.sql

@@ -14,7 +14,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--- Table of "Plan de comptes" for accountancy expert module
+-- Table to setup advanced targeting for emailing
 -- ============================================================================
 
 CREATE TABLE llx_advtargetemailing

htdocs/install/mysql/tables/llx_blockedlog_authority.sql

@@ -3,5 +3,5 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+	tms timestamp
 ) ENGINE=innodb;

htdocs/install/mysql/tables/llx_budget_lines.sql

@@ -20,7 +20,7 @@ create table llx_budget_lines
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_budget     	integer NOT NULL,
-  fk_project_ids	varchar(255) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come". 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects.
+  fk_project_ids	varchar(255) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects.
   amount			double(24,8) NOT NULL,
   datec        		datetime,
   tms           	timestamp,

htdocs/install/mysql/tables/llx_chargesociales.sql

@@ -21,7 +21,7 @@
 create table llx_chargesociales
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  ref               varchar(16),				   -- "TX...."
+  ref               varchar(16),				   -- 'TX....'
   date_ech			datetime NOT NULL,             -- date echeance
   libelle			varchar(80) NOT NULL,
   entity			integer DEFAULT 1 NOT NULL,	  -- multi company id

htdocs/install/pgsql/functions/functions.sql

@@ -23,9 +23,13 @@ CREATE LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP(TIMESTAMP WITHOUT TIME ZONE) RETURNS BIGINT LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT EXTRACT(EPOCH FROM $1)::bigint;';
 
 CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP(TIMESTAMP WITH TIME ZONE) RETURNS BIGINT LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT EXTRACT(EPOCH FROM $1)::bigint;';
- 
+
+DROP FUNCTION date_format(timestamp without time zone,text);
 CREATE OR REPLACE FUNCTION date_format(timestamp without time zone, text) RETURNS text AS $$ DECLARE i int := 1; temp text := ''; c text; n text; res text; BEGIN WHILE i <= pg_catalog.length($2) LOOP c := SUBSTRING ($2 FROM i FOR 1); IF c = '%' AND i != pg_catalog.length($2) THEN n := SUBSTRING ($2 FROM (i + 1) FOR 1); SELECT INTO res CASE WHEN n = 'a' THEN pg_catalog.to_char($1, 'Dy') WHEN n = 'b' THEN pg_catalog.to_char($1, 'Mon') WHEN n = 'c' THEN pg_catalog.to_char($1, 'FMMM') WHEN n = 'D' THEN pg_catalog.to_char($1, 'FMDDth') WHEN n = 'd' THEN pg_catalog.to_char($1, 'DD') WHEN n = 'e' THEN pg_catalog.to_char($1, 'FMDD') WHEN n = 'f' THEN pg_catalog.to_char($1, 'US') WHEN n = 'H' THEN pg_catalog.to_char($1, 'HH24') WHEN n = 'h' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'I' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'i' THEN pg_catalog.to_char($1, 'MI') WHEN n = 'j' THEN pg_catalog.to_char($1, 'DDD') WHEN n = 'k' THEN pg_catalog.to_char($1, 'FMHH24') WHEN n = 'l' THEN pg_catalog.to_char($1, 'FMHH12') WHEN n = 'M' THEN pg_catalog.to_char($1, 'FMMonth') WHEN n = 'm' THEN pg_catalog.to_char($1, 'MM') WHEN n = 'p' THEN pg_catalog.to_char($1, 'AM') WHEN n = 'r' THEN pg_catalog.to_char($1, 'HH12:MI:SS AM') WHEN n = 'S' THEN pg_catalog.to_char($1, 'SS') WHEN n = 's' THEN pg_catalog.to_char($1, 'SS') WHEN n = 'T' THEN pg_catalog.to_char($1, 'HH24:MI:SS') WHEN n = 'U' THEN pg_catalog.to_char($1, '?') WHEN n = 'u' THEN pg_catalog.to_char($1, '?') WHEN n = 'V' THEN pg_catalog.to_char($1, '?') WHEN n = 'v' THEN pg_catalog.to_char($1, '?') WHEN n = 'W' THEN pg_catalog.to_char($1, 'FMDay') WHEN n = 'w' THEN EXTRACT(DOW FROM $1)::text WHEN n = 'X' THEN pg_catalog.to_char($1, '?') WHEN n = 'x' THEN pg_catalog.to_char($1, '?') WHEN n = 'Y' THEN pg_catalog.to_char($1, 'YYYY') WHEN n = 'y' THEN pg_catalog.to_char($1, 'YY') WHEN n = '%' THEN pg_catalog.to_char($1, '%') ELSE NULL END; temp := temp operator(pg_catalog.||) res; i := i + 2; ELSE temp = temp operator(pg_catalog.||) c; i := i + 1; END IF; END LOOP; RETURN temp; END $$ IMMUTABLE STRICT LANGUAGE plpgsql;
 
+DROP FUNCTION date_format(timestamp with time zone,text);
+CREATE OR REPLACE FUNCTION date_format(timestamp with time zone, text) RETURNS text AS $$ DECLARE i int := 1; temp text := ''; c text; n text; res text; BEGIN WHILE i <= pg_catalog.length($2) LOOP c := SUBSTRING ($2 FROM i FOR 1); IF c = '%' AND i != pg_catalog.length($2) THEN n := SUBSTRING ($2 FROM (i + 1) FOR 1); SELECT INTO res CASE WHEN n = 'a' THEN pg_catalog.to_char($1, 'Dy') WHEN n = 'b' THEN pg_catalog.to_char($1, 'Mon') WHEN n = 'c' THEN pg_catalog.to_char($1, 'FMMM') WHEN n = 'D' THEN pg_catalog.to_char($1, 'FMDDth') WHEN n = 'd' THEN pg_catalog.to_char($1, 'DD') WHEN n = 'e' THEN pg_catalog.to_char($1, 'FMDD') WHEN n = 'f' THEN pg_catalog.to_char($1, 'US') WHEN n = 'H' THEN pg_catalog.to_char($1, 'HH24') WHEN n = 'h' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'I' THEN pg_catalog.to_char($1, 'HH12') WHEN n = 'i' THEN pg_catalog.to_char($1, 'MI') WHEN n = 'j' THEN pg_catalog.to_char($1, 'DDD') WHEN n = 'k' THEN pg_catalog.to_char($1, 'FMHH24') WHEN n = 'l' THEN pg_catalog.to_char($1, 'FMHH12') WHEN n = 'M' THEN pg_catalog.to_char($1, 'FMMonth') WHEN n = 'm' THEN pg_catalog.to_char($1, 'MM') WHEN n = 'p' THEN pg_catalog.to_char($1, 'AM') WHEN n = 'r' THEN pg_catalog.to_char($1, 'HH12:MI:SS AM') WHEN n = 'S' THEN pg_catalog.to_char($1, 'SS') WHEN n = 's' THEN pg_catalog.to_char($1, 'SS') WHEN n = 'T' THEN pg_catalog.to_char($1, 'HH24:MI:SS') WHEN n = 'U' THEN pg_catalog.to_char($1, '?') WHEN n = 'u' THEN pg_catalog.to_char($1, '?') WHEN n = 'V' THEN pg_catalog.to_char($1, '?') WHEN n = 'v' THEN pg_catalog.to_char($1, '?') WHEN n = 'W' THEN pg_catalog.to_char($1, 'FMDay') WHEN n = 'w' THEN EXTRACT(DOW FROM $1)::text WHEN n = 'X' THEN pg_catalog.to_char($1, '?') WHEN n = 'x' THEN pg_catalog.to_char($1, '?') WHEN n = 'Y' THEN pg_catalog.to_char($1, 'YYYY') WHEN n = 'y' THEN pg_catalog.to_char($1, 'YY') WHEN n = '%' THEN pg_catalog.to_char($1, '%') ELSE NULL END; temp := temp operator(pg_catalog.||) res; i := i + 2; ELSE temp = temp operator(pg_catalog.||) c; i := i + 1; END IF; END LOOP; RETURN temp; END $$ IMMUTABLE STRICT LANGUAGE plpgsql;
+
 
 CREATE OR REPLACE FUNCTION YEAR(TIMESTAMP without TIME ZONE) RETURNS INTEGER AS $$ SELECT EXTRACT(YEAR FROM $1)::INTEGER; $$ LANGUAGE SQL IMMUTABLE;
 

htdocs/install/upgrade.php

@@ -185,10 +185,10 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version);
 
         // Test database version requirement
-        $versionmindb=$db::VERSIONMIN;
+        $versionmindb=explode('.',$db::VERSIONMIN);
         //print join('.',$versionarray).' - '.join('.',$versionmindb);
         if (count($versionmindb) && count($versionarray)
-        	&& versioncompare($versionarray,$versionmindb) < 0)
+        	&& versioncompare($versionarray, $versionmindb) < 0)
         {
         	// Warning: database version too low.
         	print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow",join('.',$versionarray),join('.',$versionmindb))."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";

htdocs/langs/ar_SA/accountancy.lang

@@ -3,8 +3,8 @@ ACCOUNTING_EXPORT_SEPARATORCSV=فاصل العمود لملف التصدير
 ACCOUNTING_EXPORT_DATE=تنسيق التاريخ لملف التصدير
 ACCOUNTING_EXPORT_PIECE=تصدير عدد القطعة
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=تصدير مع الحساب العام
-ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_LABEL=تصدير التسمية
-ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_AMOUNT=تصدير الكمية
 ACCOUNTING_EXPORT_DEVISE=Export currency
 Selectformat=حدد تنسيق للملف
 ACCOUNTING_EXPORT_PREFIX_SPEC=تحديد بادئة لاسم الملف
@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
 AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=إضافة حساب محاسبي
 AccountAccounting=حساب محاسبي
 AccountAccountingShort=حساب
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -66,13 +74,13 @@ MenuLoanAccounts=Loan accounts
 MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
-CustomersVentilation=Customer invoice binding
+CustomersVentilation=ربط فاتورة الزبون 
 SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
+WriteBookKeeping=Journalize transactions in Ledger
-Bookkeeping=دفتر الأستاذ العام
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=إجمالي شراء المورد قبل الضريبة
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=دفتر البيع اليومي
@@ -132,19 +140,19 @@ Sens=السيناتور
 Codejournal=دفتر اليومية
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
-DelBookKeeping=Delete record of the general ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=دفتر المالية اليومي
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=دفتر المالية اليومي المتضمن لجميع الدفعات عن طريق الحساب المصرفي
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=الدائن والمدين لا يمكن أن يكون لهم قيمة في الوقت نفسه
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=قائمة الحسابات المحاسبية
 
 Pcgtype=فئة الحساب
-Pcgsubtype=تحت فئة الحساب
+Pcgsubtype=Subclass of account
 
 TotalVente=المبيعات الإجمالية قبل الضريبة
 TotalMarge=إجمالي هامش المبيعات
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=خطأ، لا يمكنك حذف هذا الحساب المحاسبي لأنه مستخدم
 MvtNotCorrectlyBalanced=الحركة غير متوازنة\nالدائن =%s\nالمدين =%s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
+GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
-NoNewRecordSaved=No new record saved
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=رمز
+Nature=طبيعة
+AccountingJournalType1=Various operation
+AccountingJournalType2=مبيعات
+AccountingJournalType3=مشتريات
+AccountingJournalType4=بنك
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=صادرات
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.

htdocs/langs/ar_SA/admin.lang

@@ -48,6 +48,7 @@ InternalUsers=مستخدمين داخليين
 ExternalUsers=مستخدمين خارجيين
 GUISetup=العرض
 SetupArea=منطقة الإعداد
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=نموذج لاختبار تحميل ملف (وفقا لبرنامج الإعداد)
 IfModuleEnabled=ملاحظة : نعم فعالة فقط في حال كان النموذج <b>%s</b> مفعل
 RemoveLock=قم بحذف الملف <b>%s</b> إذا كان موجوداً لتمكين اداة التحديث
@@ -85,7 +86,7 @@ Mask=القناع
 NextValue=القيمة التالية
 NextValueForInvoices=القيمة التالية (الفواتير)
 NextValueForCreditNotes=القيمة التالية (ملاحظات دائن)
-NextValueForDeposit=القيمة التالية (وديعة)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=القيمة التالية (استبدال)
 MustBeLowerThanPHPLimit=ملاحظة : البي إتش بي الخاص بك يحد من حجم الملفات المرفوعة <b>%s</b> %s, مهما كان الحجم المدخل
 NoMaxSizeByPHPLimit=ملاحظة : لم يتم وضح حد في إعدادات الـ PHP الخاص بك
@@ -103,7 +104,7 @@ MenuIdParent=رمز القائمة العليا
 DetailMenuIdParent=رمز القائمة العليا (فراغ للقائمة العليا)
 DetailPosition=رتب الرقم لتعريف موقع القائمة
 AllMenus=الكل
-NotConfigured=النموذج غير مهيء
+NotConfigured=Module/Application not configured
 Active=نشطة
 SetupShort=الإعداد
 OtherOptions=الخيارات الأخرى
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=ألفاصلة الألفية
 Destination=المقصد
 IdModule=ID حدة
 IdPermissions=ضوابط ID
-Modules=النموذج
 LanguageBrowserParameter=الوحدة %s
 LocalisationDolibarrParameters=الوحدات المحلية
 ClientTZ=المنطقة الزمنية للعميل (المستخدم)
@@ -123,7 +123,8 @@ PHPTZ=المنطقة الزمنية خادم PHP
 DaylingSavingTime=التوقيت الصيفي
 CurrentHour=PHP خادم ساعة
 CurrentSessionTimeOut=إنتها مدة التصفح الحالية
-YouCanEditPHPTZ=لضبط توقيت PHP مختلفة (غير مطلوب)، يمكنك محاولة إضافة .htacces الملف مع مثل هذا الخط "ابق ضاغطا TZ أوروبا / باريس"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=الصلاحيات
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=كلمة السر في قاعدة بيانات
 InstrucToEncodePass=لديك كلمة السر المشفرة في ملف <b>conf.php،</b> استبدال الخط <br> <b>$ dolibarr_main_db_pass = "..."؛</b> <br> بواسطة <br> <b>$ dolibarr_main_db_pass = "crypted:٪ ليالي".</b>
 InstrucToClearPass=لديك كلمة مرور فك الشفرة (واضح) في ملف <b>conf.php،</b> استبدال الخط <br> <b>$ dolibarr_main_db_pass = "crypted: ...".</b> <br> بواسطة <br> <b>$ dolibarr_main_db_pass = "%s".</b>
 ProtectAndEncryptPdfFiles=حماية الملفات ولدت الشعبي (لا recommandd ، تقتحم الجماهيري الشعبي وتوليد)
-ProtectAndEncryptPdfFilesDesc=حماية وجود وثيقة من وثائق وتبقي الشعبي توفيرها لقراءة وطباعة أي متصفح الشعبي. ومع ذلك ، وتحريرها ونسخها وليس من الممكن بعد الآن. علما أن استخدام هذه الميزة تجعل بناء عالمي لا يعمل المتراكمة الشعبي (مثل الفواتير غير المدفوعة).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=ميزة
 DolibarrLicense=الترخيص
 Developpers=مطوري / المساهمين
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr الانترنت التجريبي
 OfficialMarketPlace=المسؤول عن وحدات السوق الخارجية / أدونس
 OfficialWebHostingService=المشار خدمات استضافة المواقع (سحابة استضافة)
 ReferencedPreferredPartners=الشركاء المفضلين
-OtherResources=RESSOURCES AUTRES
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=للمستخدم أو وثائق المطور (الوثيقة، أسئلة وأجوبة ...)، <br> نلقي نظرة على Dolibarr يكي: <br> <b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=عن أي أسئلة أخرى / مساعدة، يمكنك استخدام المنتدى Dolibarr: <br> <b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=هذا المجال يمكن أن تساعدك في الحصول على مساعدة لتقديم خدمات الدعم على Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=ميزة لا تتوفر على مثل أنظمة ي
 SubmitTranslation=إذا ترجمة لهذه اللغة ليست كاملة أو تجد الأخطاء، يمكنك تصحيح هذا عن طريق تحرير الملفات إلى دليل <b>LANGS /%s</b> وتقديم التغيير إلى www.transifex.com/dolibarr-association/dolibarr/~~V
 SubmitTranslationENUS=إذا ترجمة لهذه اللغة ليست كاملة أو تجد الأخطاء، يمكنك تصحيح هذا عن طريق تحرير الملفات إلى دليل <b>LANGS /%s</b> وتقديم الملفات التي تم تعديلها على dolibarr.org/forum أو للمطورين على github.com/Dolibarr/dolibarr.
 ModuleSetup=إعداد وحدة
-ModulesSetup=نمائط الإعداد
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=نظام
 ModuleFamilyCrm=إدارة علاقات العملاء (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr النسخة الحالية
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=خادم التحديث متواجد حاليا
+WithCounter=Manage a counter
 GenericMaskCodes=يمكنك إدخال أي قناع الترقيم. في هذا القناع ، وبعد ويمكن استخدام العلامات : <br> <b>(000000)</b> يطابق عدد الذي سيكون على كل يزداد ٪ s. كما تدخل العديد من أصفار على النحو المنشود طول المضادة. المضاد وسيتم الانتهاء من اصفار من اليسار من أجل الحصول على أكبر عدد اصفار كما القناع. <br> <b>000000 +000) (نفس</b> السابقة ولكن يقابل المقابلة لعدد للحق من علامة + يطبق اعتبارا من أول ٪ s. <br> <b>000000 @ (س)</b> نفس السابقة ولكن المضاد هو إعادة الصفر عندما يتم التوصل إلى الشهر خ خ ما بين 1 و 12). إذا كان هذا الخيار هو المستخدمة وس 2 أو أعلى ، ثم تسلسل (ذ ذ م م)) ((سنة أو ملم)) (مطلوب أيضا. <br> <b>(ب)</b> اليوم (01 الى 31). <br> <b>() ملم</b> في الشهر (01 الى 12). <br> <b>(كذا)</b> ، <b>(سنة))</b> أو <b>(ذ</b> السنة أكثر من 2 أو 4 أو 1 الأرقام. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=جميع الشخصيات الاخرى في قناع سوف تظل سليمة. <br> المساحات غير مسموح بها. <br>
-GenericMaskCodes4a=<u>ومثال على 99th %s من طرف ثالث TheCompany عمله 2007-01-31 :</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>ومثال على طرف ثالث على إنشاء 2007-03-01 :</u> <br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=العودة للتخصيص وفقا لعدد محدد القناع.
 ServerAvailableOnIPOrPort=الخدمة متاحة في معالجة <b>٪ ق %s</b> على الميناء
 ServerNotAvailableOnIPOrPort=الخدمة غير متاحة في التصدي <b>٪ ق %s</b> على الميناء
@@ -369,19 +375,21 @@ Int=عدد صحيح
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = هاتف
 ExtrafieldPrice = الأسعار
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=الرمز السري
-ExtrafieldCheckBox=Checkbox
+ExtrafieldRadio=Radio buttons (on choice only)
-ExtrafieldRadio=Radio button
+ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList= مربع من الجدول
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=رابط إلى كائن
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
 ClickToShowDescription=Click to show description
+DependsOn=This module need the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=حقل
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=& مجموعات المستخدمين
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=ويلاحظ اعتماد الفواتير وإدارة العمل
 Module40Name=الموردين
 Module40Desc=الموردين وإدارة وشراء (الأوامر والفواتير)
 Module42Name=Syslog
-Module42Desc=قطع الأشجار مرافق (syslog)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=المحررين
 Module49Desc=المحررين إدارة
 Module50Name=المنتجات
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=التكامل Webcalendar
 Module500Name=المصروفات الخاصة
 Module500Desc=إدارة المصروفات الخاصة (الضرائب، الضرائب الاجتماعية أو المالية وتوزيعات الأرباح)
-Module510Name=Employee contracts and salaries
+Module510Name=Payment of employee wages
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=قرض
 Module520Desc=إدارة القروض
 Module600Name=الإخطارات
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP التحويلات Maxmind القدرات
 Module3100Name=سكايب
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=إدارة الموارد البشرية
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=شركة متعددة
 Module5000Desc=يسمح لك لإدارة الشركات المتعددة
 Module6000Name=سير العمل
@@ -591,7 +615,7 @@ Permission32=إنشاء / تعديل المنتجات
 Permission34=حذف المنتجات
 Permission36=انظر / إدارة المنتجات المخفية
 Permission38=منتجات التصدير
-Permission41=مشاريع القراءة والمهام (مشروع مشترك ومشاريع انا اتصال ل). كما يمكن أن يدخل الوقت المستهلك في المهام الموكلة (الجدول الزمني)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=حذف مشاريع
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=طرق ترتيب
 DictionarySource=أصل مقترحات / أوامر
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=نماذج للتخطيط للحسابات
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=رسائل البريد الإلكتروني قوالب
 DictionaryUnits=الوحدات
 DictionaryProspectStatus=حالة التنقيب
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=الوضع فرصة للمشروع / الرصاص
 SetupSaved=الإعداد المحفوظة
+SetupNotSaved=Setup not saved
 BackToModuleList=العودة إلى قائمة الوحدات
 BackToDictionaryList=العودة إلى قائمة القواميس
 VATManagement=إدارة الضريبة على القيمة المضافة
@@ -921,7 +947,7 @@ Host=الخادم
 DriverType=سائق نوع
 SummarySystem=نظام معلومات موجزة
 SummaryConst=قائمة بجميع Dolibarr الإعداد البارامترات
-MenuCompanySetup=الشركة / المؤسسة
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= معيار مدير القائمة
 DefaultMenuSmartphoneManager=الهاتف الذكي القائمة مدير
 Skin=موضوع الجلد
@@ -931,12 +957,14 @@ DefaultMaxSizeList=افتراضي الطول الاقصى للقوائم
 DefaultMaxSizeShortList=طول الأقصى الافتراضي للقوائم قصيرة (أي في بطاقة العميل)
 MessageOfDay=رسالة اليوم
 MessageLogin=ادخل صفحة الرسالة
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليمنى
 DefaultLanguage=اللغة الافتراضية لاستخدام (شفرة اللغة)
 EnableMultilangInterface=تتيح واجهة متعددة اللغات
 EnableShowLogo=عرض الشعار على اليسار القائمة
-CompanyInfo=الشركة / المؤسسة المعلومات
+CompanyInfo=Company/organisation information
-CompanyIds=الشركة / المؤسسة الهويات
+CompanyIds=Company/organisation identities
 CompanyName=اسم
 CompanyAddress=عنوان
 CompanyZip=الرمز البريدي
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=تأخير التسامح (في يوم) في حالة
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=تأخير التسامح (في يوم) في حالة تأهب قبل لإيداع الشيكات للقيام
 Delays_MAIN_DELAY_EXPENSEREPORTS=تأخير التسامح (بالأيام) قبل حالة تأهب لتقارير النفقات الموافقة
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=القيود الأخرى القائمة في إدارة اختياري البارامترات.
 LogEvents=مراجعة الحسابات الأحداث الأمنية
 Audit=المراجعة
@@ -987,7 +1015,7 @@ BrowserOS=متصفح OS
 ListOfSecurityEvents=قائمة الأحداث الأمنية Dolibarr
 SecurityEventsPurged=تطهير الاحداث الامنية
 LogEventDesc=هنا يمكنك تمكين قطع الأشجار لDolibarr الأحداث الأمنية. يمكن للمشرفين ثم انظر مضمونه عبر <b>نظام</b> القائمة <b>أدوات -- لمراجعة الحسابات.</b> محذرا من أن هذه الميزة يمكن أن تستهلك كمية كبيرة من البيانات في قاعدة البيانات.
-AreaForAdminOnly=هذه الميزات يمكن أن تستخدم من قبل <b>مدير المستخدمين</b> فقط.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط.
 SystemAreaForAdminOnly=هذا المجال المتاح لمدير المستخدمين فقط. أيا من Dolibarr أذونات يمكن أن تقلل من هذا الحد.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=يجب على الأقل تمكين 1 وحدة
 ClassNotFoundIntoPathWarning=لم يتم العثور على  %s في مسار PHP
 YesInSummer=نعم في الصيف
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=تخزين جلسة المشفرة بواسطة Suhosin
 ConditionIsCurrently=الشرط هو حاليا %s
 YouUseBestDriver=استخدام سائق %s التي هو أفضل سائق المتاحة حاليا.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=المهنية معرف فريد
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=تصدير صلة <b>%s </b> شكل متاح على الوصلة التالية : %s
 ##### Invoices #####
 BillsSetup=وحدة إعداد الفواتير
 BillsNumberingModule=الفواتير والقروض وتلاحظ وحدة الترقيم
 BillsPDFModules=فاتورة نماذج الوثائق
+PaymentsPDFModules=Payment documents models
 CreditNote=علما الائتمان
 CreditNotes=ويلاحظ الائتمان
 ForceInvoiceDate=قوة تاريخ الفاتورة تاريخ المصادقة على
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=لا يتم التخزين المؤقت الملفات من
 FilesOfTypeCompressed=يتم ضغط الملفات من نوع %s من قبل خادم HTTP
 FilesOfTypeNotCompressed=لا يتم ضغط الملفات من نوع %s من قبل خادم HTTP
 CacheByServer=ذاكرة التخزين المؤقت من قبل خادم
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=الذاكرة المخبئية من خلال متصفح
 CompressionOfResources=ضغط الردود HTTP
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=مثل هذا الكشف التلقائي غير ممكن مع المتصفحات الحالية
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=المنتجات وحدة الإعداد
 ServiceSetup=خدمات وحدة الإعداد
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=فاتورة تاريخ المستخدمة
 Buy=يشتري
 Sell=يبيع
 InvoiceDateUsed=فاتورة تاريخ المستخدمة
-YourCompanyDoesNotUseVAT=وقد تم تسجيل شركة محددة لعدم استخدام ضريبة القيمة المضافة (الصفحة الرئيسية -- إعداد -- شركة / مؤسسة) ، لذلك لا يوجد خيارات لضريبة القيمة المضافة الإعداد.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=قانون المحاسبة
 AccountancyCodeSell=حساب بيع. رمز
 AccountancyCodeBuy=شراء الحساب. رمز
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=تلقائيا تعيين هذه الحالة مع
 AGENDA_DEFAULT_VIEW=علامة التبويب التي تريد فتح افتراضيا عند اختيار القائمة جدول الأعمال
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
-ClickToDialUrlDesc=ودعا الموقع عندما تنقر على الهاتف picto ذلك. Dans l' رابط ، vous pouvez utiliser ليه balises <br> <b>٪ ٪ 1 $ ق</b> qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé <br> <b>٪ ٪</b> 2 $ <b>ق</b> qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre) <br> <b>٪ ٪ ل 3</b> دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur) <br> <b>٪ ٪</b> 4 <b>$</b> ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur).
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=هذه الوحدة تسمح لجعل أرقام هواتف يمكن النقر عليها. وهناك انقر على هذه الأيقونة دعوة تجعل هاتفك إلى الاتصال برقم الهاتف. وهذا يمكن أن تستخدم لاستدعاء نظام مركز الاتصال من Dolibarr يمكن أن نسميه ورقم الهاتف على نظام SIP على سبيل المثال.
 ClickToDialUseTelLink=مجرد استخدام الرابط "الهاتف:" على أرقام الهواتف
 ClickToDialUseTelLinkDesc=استخدام هذا الأسلوب إذا كان المستخدمون يكون الهاتف الرقمي أو واجهة البرامج المثبتة على الكمبيوتر نفسه من المتصفح، ويسمى عند النقر على رابط في المتصفح التي تبدأ ب "الهاتف". إذا كنت في حاجة الى حل خادم الكامل (لا حاجة لتثبيت البرامج المحلية)، يجب عليك تعيين هذا إلى "لا" وملء الحقل التالي.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API وحدة الإعداد
 ApiDesc=من خلال تمكين هذه الوحدة، Dolibarr يصبح الخادم REST لتوفير خدمات الإنترنت المتنوعة.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=ويتعرض عناصر فقط من وحدات تمكين
 ApiKey=مفتاح API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=عرض عام النظام
 BankOrderES=الأسبانية
 BankOrderESDesc=الأسبانية عرض النظام
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=نموذج متعدد شركة الإعداد
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=المعالج لبناء قاعدة بيانات النسخ ا
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
 SomethingMakeInstallFromWebNotPossible2=لهذا السبب، عملية لترقية وصفت هنا هو دليل على بعد خطوات قليلة يمكن للمستخدم متميز القيام به.
 InstallModuleFromWebHasBeenDisabledByFile=تثبيت وحدة خارجية من التطبيق قد تم تعطيلها من قبل المسؤول. يجب أن يطلب منه إزالة <strong>الملف٪ s</strong> للسماح هذه الميزة.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=تسليط الضوء على خطوط الجدول عندما يمر تحرك الماوس فوق
 HighlightLinesColor=تسليط الضوء على لون الخط عند تمرير الماوس فوق (الحفاظ فارغة دون تمييز)
 TextTitleColor=Color of page title
 LinkColor=لون الروابط
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=لون الخلفية
 TopMenuBackgroundColor=لون الخلفية لقائمة الأعلى
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=الحد الأدنى لمدة إشعار (يجب أن يت
 NbAddedAutomatically=عدد الأيام تضاف إلى العدادات من المستخدمين (تلقائيا) كل شهر
 EnterAnyCode=يحتوي هذا الحقل على إشارة لتحديد الخط. أدخل أي قيمة من اختيارك، ولكن من دون أحرف خاصة.
 UnicodeCurrency=أدخل هنا بين الأقواس، وقائمة من عدد البايت التي تمثل رمز العملة. لexemple: ل$، أدخل [36] - للبرازيل R الحقيقي $ [82،36] - ل€، أدخل [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=موقف خط في قوائم السرد
 SellTaxRate=بيع معدل الضريبة
 RecuperableOnly=نعم لضريبة القيمة المضافة "غير مستردة Perçue" مخصصة لبعض الدول في فرنسا. إبقاء القيمة إلى "لا" في جميع الحالات الأخرى.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
 UserHasNoPermissions=This user has no permission defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).

htdocs/langs/ar_SA/compta.lang

@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=وتحسب المبالغ المبينة
 Param=الإعداد
 RemainingAmountPayment=دفع المبلغ المتبقي :
 Account=حساب
-Accountparent=الوالد حساب
+Accountparent=Parent account
-Accountsparent=حسابات الأم
+Accountsparent=Parent accounts
 Income=الدخل
 Outcome=نتائج
 ReportInOut=دخل / نتائج
@@ -56,6 +56,7 @@ MenuTaxAndDividends=الضرائب وعوائد
 MenuSocialContributions=الضرائب الاجتماعية / المالية
 MenuNewSocialContribution=الضريبة الاجتماعية / مالية جديدة
 NewSocialContribution=الضريبة الاجتماعية / مالية جديدة
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=الضرائب الاجتماعية / المالية لدفع
 AccountancyTreasuryArea=المحاسبة / الخزانة المنطقة
 NewPayment=دفع جديدة
@@ -134,8 +135,8 @@ RulesResultDue=- وتتضمن الفواتير غير المسددة، والن
 RulesResultInOut=- ويشمل المدفوعات الحقيقية المحرز في الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. <br> - لأنه يقوم على مواعيد دفع الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. تاريخ التبرع للتبرع.
 RulesCADue=- ويشمل الفواتير المستحقة على العميل سواء كانت بأجر أو لا. <br> - وهو يستند إلى تاريخ التحقق من هذه الفواتير. <br>
 RulesCAIn=-- ويشمل جميع الفعال دفع الفواتير الواردة من العملاء. <br> -- يقوم على دفع هذه الفواتير تاريخ <br>
-DepositsAreNotIncluded=- يتم ولا تشمل ودائع الفواتير
+DepositsAreNotIncluded=- Down payment invoices are nor included
-DepositsAreIncluded=- وترد الفواتير ودائع
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=تقرير من قبل طرف ثالث IRPF
 LT1ReportByCustomersInInputOutputModeES=تقرير RE طرف ثالث
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=مبيعات المجلة
 DescPurchasesJournal=شراء مجلة
 InvoiceRef=فاتورة المرجع.
 CodeNotDef=لم يتم تعريف
-WarningDepositsNotIncluded=لا يتم تضمين فواتير الودائع في هذا الإصدار مع هذه الوحدة المحاسبة.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=تاريخ الدفع الأجل لا يمكن أن يكون أقل من تاريخ الكائن.
 Pcg_version=Chart of accounts models
 Pcg_type=نوع PCG
@@ -189,8 +190,10 @@ AccountancyJournal=كود المحاسبة مجلة
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=استنساخ ضريبة اجتماعية / مالية
 ConfirmCloneTax=تأكيد استنساخ ل/ دفع الضرائب المالية الاجتماعي
 CloneTaxForNextMonth=استنساخ لشهر المقبل
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=الضرائب الاجتماعية / المالية
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project

htdocs/langs/ar_SA/cron.lang

@@ -25,7 +25,7 @@ CronDelete=حذف المهام المجدولة
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=وحدة مهمة مجدولة تسمح لتنفيذ المهمة التي تم التخطيط لها
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=وظيفة
 CronNone=بلا
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=تمكين
 CronStatusInactiveBtn=يعطل
 CronTaskInactive=تم تعطيل هذه الوظائف
 CronId=هوية شخصية
-CronClassFile=فصول (filename.class.php)
+CronClassFile=Filename with class
-CronModuleHelp=اسم Dolibarr وحدة الدليل (يعمل أيضا مع وحدة Dolibarr الخارجية). <BR> لexemple لجلب طريقة الكائن المنتج Dolibarr / htdocs / <u>المنتج</u> /class/product.class.php، وقيمة الوحدة هي <i>المنتج</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
-CronClassFileHelp=اسم الملف لتحميل. <BR> لexemple لجلب طريقة الكائن المنتج Dolibarr / htdocs / المنتج / فئة / <u>product.class.php،</u> وقيمة اسم ملف فئة هي <i>product.class.php</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
-CronObjectHelp=اسم الكائن لتحميل. <BR> لexemple لجلب طريقة Dolibarr /htdocs/product/class/product.class.php الكائن المنتج، وقيمة اسم ملف فئة هي <i>المنتج</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
-CronMethodHelp=طريقة كائن لإطلاق. <BR> لexemple لجلب طريقة Dolibarr /htdocs/product/class/product.class.php الكائن المنتج، وقيمة الأسلوب هو <i>fecth</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
-CronArgsHelp=الحجج الأسلوب. <BR> لexemple لجلب طريقة Dolibarr /htdocs/product/class/product.class.php الكائن المنتج، وقيمة paramters يمكن أن يكون <i>0، ProductRef</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=سطر الأوامر لتنفيذ النظام.
 CronCreateJob=إنشاء مهمة مجدولة جديدة
 CronFrom=من عند
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=تعطيل وظيفة
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.

htdocs/langs/ar_SA/errors.lang

@@ -18,6 +18,8 @@ ErrorFailToCreateFile=فشل إنشاء الملف <b>'٪ ق.</b>
 ErrorFailToRenameDir=فشل إعادة تسمية الدليل <b>'٪ ق'</b> الى <b>'٪ ق.</b>
 ErrorFailToCreateDir=فشل إنشاء الدليل <b>'٪ ق.</b>
 ErrorFailToDeleteDir=فشل حذف الدليل <b>'٪ ق.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=هذا الاتصال هو اتصال بالفعل تعريف لهذا النوع.
 ErrorCashAccountAcceptsOnlyCashMoney=هذا الحساب المصرفي هو الحساب النقدي ، وذلك ما وافق على نوع من المدفوعات النقدية فقط.
 ErrorFromToAccountsMustDiffers=المصدر والأهداف يجب أن تكون الحسابات المصرفية المختلفة.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=لم يكتب في دليل ٪ ق
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=العثور على بريد إلكتروني صحيح لتركيب خطوط ق ٪ في ملف (على سبيل المثال خط ٪ ق= ٪ مع البريد الإلكتروني)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=تتطلب بعض المجالات لم تملأ.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=فشل إنشاء دليل. تأكد من أن خادم الويب المستخدم أذونات لكتابة وثائق Dolibarr في الدليل. إذا تم تمكين المعلم <b>safe_mode</b> على هذا PHP ، تحقق من أن ملفات Dolibarr php تملك لخدمة الويب المستخدم (أو مجموعة).
 ErrorNoMailDefinedForThisUser=البريد لا يعرف لهذا المستخدم
 ErrorFeatureNeedJavascript=هذه الميزة تحتاج إلى تفعيل جافا سكريبت في العمل. هذا التغيير في البنية -- عرض.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=كمية لخط في فواتير ال
 ErrorWebServerUserHasNotPermission=<b>%s</b> تستخدم حساب مستخدم لتنفيذ خادم الويب لا يوجد لديه إذن لذلك
 ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها
 ErrUnzipFails=فشل بفك٪ الصورة مع ZipArchive
-ErrNoZipEngine=لا المحرك لبفك الصورة ملف٪ في هذا PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=يجب أن يكون الملف٪ s حزمة البريدي Dolibarr
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=وPHP الضفيرة لم يتم تثبيت، وهذا أمر ضروري لاجراء محادثات مع باي بال
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=لا متغير عمومي مختارة
 ErrorFieldMustBeANumeric=يجب أن يكون <b>حقل٪ الصورة</b> قيمة رقمية
 ErrorMandatoryParametersNotProvided=معيار إلزامي (ق) لم تقدم
 ErrorOppStatusRequiredIfAmount=قمت بتعيين المبلغ المقدر لهذه الفرصة / الرصاص. لذلك يجب عليك أيضا إدخال مكانتها
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=سيئة تعريف القائمة صفيف في الوحدة واصف (القيمة سيئة لfk_menu مفتاح)
 ErrorSavingChanges=وقد ocurred لخطأ عند حفظ التغييرات
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=تاريخ الدفع (٪ ق) هو أقد
 WarningTooManyDataPleaseUseMoreFilters=عدد كبير جدا من البيانات (أكثر من خطوط%s). يرجى استخدام المزيد من المرشحات أو تعيين ثابت٪ الصورة إلى حد أعلى.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language

htdocs/langs/ar_SA/main.lang

@@ -43,7 +43,7 @@ ErrorConstantNotDefined=المعلمة٪ S غير معرف
 ErrorUnknown=خطأ غير معروف
 ErrorSQL=خطأ SQL
 ErrorLogoFileNotFound=لم يتم العثور على ملف شعار '٪ ق'
-ErrorGoToGlobalSetup=اذهب إلى 'شركة / مؤسسة' الإعداد لإصلاح هذه
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=الذهاب إلى الوحدة الإعداد لإصلاح هذه
 ErrorFailedToSendMail=فشل في إرسال البريد (المرسل =٪ ق، استقبال =٪ ق)
 ErrorFileNotUploaded=ويتم تحميل الملف. تحقق لا يتجاوز هذا الحجم الأقصى المسموح به، أن المساحة الحرة المتوفرة على القرص والتي لا يوجد بالفعل ملف بنفس الاسم في هذا الدليل.
@@ -153,6 +153,7 @@ Edit=تحرير
 Validate=التحقق من صحة
 ValidateAndApprove=التحقق من صحة والموافقة
 ToValidate=للتحقق من صحة
+NotValidated=Not validated
 Save=حفظ
 SaveAs=حفظ باسم
 TestConnection=اختبار الاتصال
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=أي ميزة قطع تطبيقية مع وضع <b>
 Connection=الاتصال
 Setup=التثبيت
 Alert=إنذار
+MenuWarnings=تنبيهات
 Previous=سابق
 Next=التالى
 Cards=بطاقات
@@ -308,6 +310,7 @@ Copy=نسخ
 Paste=لصق
 Default=افتراضي
 DefaultValue=القيمة الافتراضية
+DefaultValues=Default values
 Price=السعر
 UnitPrice=سعر الوحدة
 UnitPriceHT=سعر الوحدة (صافي)
@@ -363,7 +366,8 @@ VATRate=معدل الضريبة
 Average=متوسط
 Sum=مجموع
 Delta=دلتا
-Module=وحدة
+Module=Module/Application
+Modules=Modules/Applications
 Option=خيار
 List=قائمة
 FullList=القائمة الكاملة
@@ -387,7 +391,7 @@ ActionRunningNotStarted=لبدء
 ActionRunningShort=In progress
 ActionDoneShort=تم الانتهاء من
 ActionUncomplete=Uncomplete
-CompanyFoundation=شركة / مؤسسة
+CompanyFoundation=Company/Organisation
 ContactsForCompany=اتصالات لهذا الطرف الثالث
 ContactsAddressesForCompany=اتصالات / عناوين لهذا الطرف الثالث
 AddressesForCompany=عناوين لهذا الطرف الثالث
@@ -405,8 +409,9 @@ Generate=توليد
 Duration=المدة الزمنية
 TotalDuration=المدة الإجمالية
 Summary=ملخص
-DolibarrStateBoard=إحصائيات
+DolibarrStateBoard=Database statistics
-DolibarrWorkBoard=مهام العمل متنها
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=متاح
 NotYetAvailable=لم تتوفر بعد
 NotAvailable=غير متوفر
@@ -434,7 +439,7 @@ Reportings=التقارير
 Draft=مسودة
 Drafts=الداما
 Validated=التحقق من صحة
-Opened=Opened
+Opened=فتح
 New=جديد
 Discount=تخفيض السعر
 Unknown=غير معروف
@@ -453,6 +458,7 @@ NextStep=الخطوة التالية
 Datas=البيانات
 None=لا شيء
 NoneF=لا شيء
+NoneOrSeveral=None or several
 Late=متأخر
 LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=صورة
@@ -606,7 +612,8 @@ PartialWoman=جزئي
 TotalWoman=المجموع
 NeverReceived=لم يتلق
 Canceled=ألغى
-YouCanChangeValuesForThisListFromDictionarySetup=يمكنك تغيير قيم هذه القائمة من إعداد القائمة - القاموس
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
 Color=لون
 Documents=ربط الملفات
@@ -642,6 +649,7 @@ FreeLineOfType=دخول مجاني من نوع
 CloneMainAttributes=استنساخ وجوه مع السمات الرئيسية
 PDFMerge=دمج الشعبي
 Merge=دمج
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=وتظهر الصفحة الرئيسية لطباعة ناحية المحتوى
 MenuManager=مدير القائمة
 WarningYouAreInMaintenanceMode=انذار ، كنت في وضع الصيانة ، <b>%s</b> الدخول فقط بحيث يتم السماح لاستخدام التطبيق في الوقت الراهن.
@@ -708,6 +716,7 @@ from=من عند
 toward=نحو
 Access=وصول
 SelectAction=حدد العمل
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=استخدم Ctrl + C لنسخ إلى الحافظة
 SaveUploadedFileWithMask=حفظ الملف على الخادم مع اسم <strong>"%s"</strong> (otherwise "%s")
 OriginFileName=اسم الملف الأصلي
@@ -718,7 +727,7 @@ ViewPrivateNote=عرض الملاحظات
 XMoreLines=٪ ق خط (ق) مخبأة
 PublicUrl=URL العام
 AddBox=إضافة مربع
-SelectElementAndClickRefresh=حدد عنصر وانقر فوق تحديث
+SelectElementAndClick=Select an element and click %s
 PrintFile=طباعة ملف٪ الصورة
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=اذهب إلى الصفحة الرئيسية - إعداد - شركة لتغيير شعار أو الذهاب إلى الصفحة الرئيسية - إعداد - عرض للاختباء.
@@ -734,8 +743,8 @@ Hello=أهلا
 Sincerely=بإخلاص
 DeleteLine=حذف الخط
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=التقويم
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=السنة المالية
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
@@ -817,5 +835,3 @@ SearchIntoContracts=عقود
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=تقارير المصاريف
 SearchIntoLeaves=أوراق
-
-BulkActions=Bulk actions

htdocs/langs/ar_SA/other.lang

@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=تاريخ الميلاد
 BirthdayAlertOn=عيد ميلاد النشطة في حالة تأهب
 BirthdayAlertOff=عيد الميلاد فى حالة تأهب الخاملة
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=تدخل المصادق
 Notify_FICHINTER_SENTBYMAIL=تدخل ترسل عن طريق البريد
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=هذا هو البريد <b>الاختبار</b> (الا
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ سوف تجد هنا الفاتورة __REF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ نود أن نحذر لكم أن __REF__ فاتورة يبدو أن لا يتم سيولي. لذلك هذا هو الفاتورة في المرفق مرة أخرى، بمثابة تذكير. __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__ سوف تجد هنا اقتراح التجاري __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ سوف تجد هنا طلب السعر __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ سوف تجد هنا ترتيب __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ سوف تجد هنا نظامنا __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ سوف تجد هنا الفاتورة __REF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ سوف تجد هنا الشحن __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ سوف تجد هنا تدخل __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>الأستاذ عيد ٪ ق</b> هي المعلومات التي تعتمد على طرف ثالث. <br> على سبيل المثال ، لبلد <b>ق ٪</b> انها رمز <b>٪ ق.</b>
 DolibarrDemo=Dolibarr تخطيط موارد المؤسسات وإدارة علاقات العملاء التجريبي
-StatsByNumberOfUnits=إحصاءات في عدد من المنتجات / الخدمات وحدات
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=إحصاءات في عدد من الكيانات في اشارة
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
-NumberOfProposals=Number of proposals in past 12 months
+NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of customer orders in past 12 months
+NumberOfCustomerOrders=Number of customer orders
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
+NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
+NumberOfSupplierProposals=Number of supplier proposals
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
+NumberOfSupplierOrders=Number of supplier orders
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
+NumberOfSupplierInvoices=Number of supplier invoices
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
+NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
+NumberOfUnitsCustomerOrders=Number of units on customer orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=التدخل ٪ ق المصادق
 EMailTextInvoiceValidated=فاتورة ٪ ق المصادق

htdocs/langs/ar_SA/projects.lang

@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=حالة المشروع
 SharedProject=مشاريع مشتركة
 PrivateProject=مشروع اتصالات
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=جميع المشاريع
 MyProjectsDesc=ويقتصر هذا الرأي على المشاريع التي تقوم على الاتصال (كل ما هو نوع).
 ProjectsPublicDesc=هذا الرأي يعرض جميع المشاريع ويسمح لك قراءة.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=مشروع جديد
 AddProject=إنشاء مشروع
 DeleteAProject=حذف مشروع
 DeleteATask=حذف مهمة
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=مشاريع فتح
+OpenedProjects=Open projects
-OpenedTasks=Opened tasks
+OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=فرص كمية من المشاريع فتحت حسب الحالة
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=وتبين للمشروع
 SetProject=وضع المشروع
 NoProject=لا يعرف أو المملوكة للمشروع
 NbOfProjects=ملاحظة : للمشاريع
+NbOfTasks=Nb of tasks
 TimeSpent=الوقت الذي تستغرقه
 TimeSpentByYou=الوقت الذي يقضيه من قبلك
 TimeSpentByUser=الوقت الذي يقضيه المستخدم
@@ -47,9 +52,9 @@ TaskTimeSpent=الوقت المستغرق في المهام
 TaskTimeUser=المستعمل
 TaskTimeNote=ملاحظة
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=المهام على المشاريع المفتوحة
 WorkloadNotDefined=عبء العمل غير محددة
-NewTimeSpent=جديد الوقت الذي يقضيه
+NewTimeSpent=قضى وقتا
 MyTimeSpent=وقتي قضى
 Tasks=المهام
 Task=مهمة
@@ -59,6 +64,7 @@ TaskDescription=وصف المهمة
 NewTask=مهمة جديدة
 AddTask=إنشاء مهمة
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=النشاط
 Activities=المهام والأنشطة
 MyActivities=بلدي المهام والأنشطة
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=قائمة العقود المرتبطة بالمشروع.
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=قائمة التدخلات المرتبطة بالمشروع
 ListExpenseReportsAssociatedProject=قائمة تقارير المصاريف المرتبطة بالمشروع
 ListDonationsAssociatedProject=قائمة التبرعات المرتبطة بالمشروع
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=مشروع اتصالات
 ActionsOnProject=الإجراءات على المشروع
 YouAreNotContactOfProject=كنت لا اتصال لهذا المشروع الخاص
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=قضى الوقت حذف
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=انظر أيضا المهام  الغير موكلة الي
@@ -110,7 +118,7 @@ TaskRessourceLinks=مصادر
 ProjectsDedicatedToThisThirdParty=مشاريع مخصصة لهذا الطرف الثالث
 NoTasks=أية مهام لهذا المشروع
 LinkedToAnotherCompany=ربط طرف ثالث آخر
-TaskIsNotAffectedToYou=مهمة غيرموكلة اليك
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=الوقت الذي يقضيه فارغة
 ThisWillAlsoRemoveTasks=وهذا العمل أيضا حذف كافة مهام المشروع <b>(%s</b> المهام في الوقت الحاضر) وجميع المدخلات من الوقت الذي تستغرقه.
 IfNeedToUseOhterObjectKeepEmpty=إذا كانت بعض الكائنات (فاتورة، والنظام، ...)، الذين ينتمون إلى طرف ثالث آخر، يجب أن تكون مرتبطة بمشروع لإنشاء، والحفاظ على هذا فارغة لديها مشروع كونها متعددة الأطراف الثالثة.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=إدخال يوميا
 InputPerWeek=مساهمة في الأسبوع
 InputPerAction=مساهمة في عمل
-TimeAlreadyRecorded=الوقت الذي يقضيه سجلت بالفعل لهذه المهمة / يوم والمستخدم٪ الصورة
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=مشاريع مع هذا العضو عن الاتصال
 TasksWithThisUserAsContact=المهام الموكلة إلى هذا المستخدم
 ResourceNotAssignedToProject=لم يتم تعيين إلى المشروع
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=تعيين مهمة بالنسبة لي
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=عين
 ProjectOverview=نظرة عامة
 ManageTasks=استخدام المشاريع لمتابعة المهام والوقت
 ManageOpportunitiesStatus=استخدام مشاريع متابعة القرائن / opportinuties
 ProjectNbProjectByMonth=ملحوظة من المشاريع التي تم إنشاؤها من قبل شهر
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=كمية الفرص الشهر
 ProjectWeightedOppAmountOfProjectsByMonth=كمية المرجح الفرص من قبل شهر
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=إحصاءات عن المشاريع / يؤدي
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=المهمة الموكلة. يجب دخول الوقت على هذه المهمة يكون ممكنا.
 IdTaskTime=الوقت مهمة معرف
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=مشاريع افتتحه thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=فرص المبلغ الإجمالي
 OpportunityPonderatedAmount=كمية الفرص المرجحة

htdocs/langs/bg_BG/accountancy.lang

@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
 AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Сметка
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
+WriteBookKeeping=Journalize transactions in Ledger
-Bookkeeping=General ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Дневник
 NumPiece=Номер на част
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
-DelBookKeeping=Delete record of the general ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва.
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
+GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
-NoNewRecordSaved=No new record saved
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Код
+Nature=Същност
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Банка
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.

htdocs/langs/bg_BG/admin.lang

@@ -48,6 +48,7 @@ InternalUsers=Вътрешни потребители
 ExternalUsers=Външни потребители
 GUISetup=Екран
 SetupArea=Настройки
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Форма за тестване качване на файлове (за настройка)
 IfModuleEnabled=Забележка: Ефективно е само ако модула <b>%s</b> е активиран
 RemoveLock=Премахнете файла <b>%s</b> ако съществува, за да се позволи използването на инструмента за актуализация.
@@ -85,7 +86,7 @@ Mask=Маска
 NextValue=Следваща стойност
 NextValueForInvoices=Следваща стойност (фактури)
 NextValueForCreditNotes=Следваща стойност (кредитни известия)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на <b>%s</b> %s, независимо от стойността на този параметър е
 NoMaxSizeByPHPLimit=Забележка: Не срокът се определя в конфигурацията на вашия PHP
@@ -103,7 +104,7 @@ MenuIdParent=ID майка меню
 DetailMenuIdParent=ID на основното меню (0 за горното меню)
 DetailPosition=Брой Сортиране, за да определи позицията на менюто
 AllMenus=Всички
-NotConfigured=Модула не е конфигуриран
+NotConfigured=Module/Application not configured
 Active=Активен
 SetupShort=Настройки
 OtherOptions=Други опции
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand сепаратор
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Модули
 LanguageBrowserParameter=Параметър %s
 LocalisationDolibarrParameters=Локализация параметри
 ClientTZ=Часова зона на клиента (потребител)
@@ -123,7 +123,8 @@ PHPTZ=Часова зона на PHP Сървъра
 DaylingSavingTime=Лятното часово време
 CurrentHour=Час на PHP (сървър)
 CurrentSessionTimeOut=Продължителност на текущата сесия
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Права
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Показани са само елементи от <a href="%s">активирани модули</a>.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Парола за базата данни, ко
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Защита на генерираните PDF файлове (активиран не се препоръчва, почивки поколение на маса PDF)
-ProtectAndEncryptPdfFilesDesc=Защита на PDF документ продължава да прочетете и отпечатате с всеки PDF браузър. Въпреки това, редактиране и копиране не е възможно повече. Имайте предвид, че използването на тази функция изграждането на глобална сборен PDF не работи (като неплатени фактури).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Особеност
 DolibarrLicense=Лиценз
 Developpers=Разработчици/сътрудници
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr онлайн демо
 OfficialMarketPlace=Официален магазин за външни модули/добавки
 OfficialWebHostingService=Препоръчителен уеб хостинг услуги (хостинг в интернет облак)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=Документация за потребител или разработчик (Doc, често задавани въпроси ...), <br> можете да намерите в Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=За всякакви други въпроси / Помощ, можете да използвате форума Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Тази област може да ви помогне да получите помощ и поддръжка за Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Функцията не е на разположен
 SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
 ModuleSetup=Настройки на модул
-ModulesSetup=Настройки на модули
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Система
 ModuleFamilyCrm=Управление на Връзки с клиенти (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Текуща версия на Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска. <br> <b>{000000 000}</b> същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s. <br> <b>{000000 @}</b> същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително. <br> <b>{DD}</b> ден (01 до 31). <br> <b>{Mm}</b> месец (01 до 12). <br> <b>{Гг} {гггг}</b> или <b>{Y}</b> година над 2, 4 или 1 брой. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Всички други символи на маската ще останат непокътнати. <br> Интервалите не са разрешени. <br>
-GenericMaskCodes4a=<u>Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:</u> <br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Пример за контрагент е създаден на 2007-03-01:</u> <br>
 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>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Върнете адаптивни номер според определен маска.
 ServerAvailableOnIPOrPort=Сървъра е достъпен на адрес <b>%s</b> , порт <b>%s</b>
 ServerNotAvailableOnIPOrPort=Сървъра не е достъпен на адрес <b>%s</b> , порт <b>%s</b>
@@ -369,19 +375,21 @@ Int=Цяло число
 Float=Десетично число
 DateAndTime=Дата и час
 Unique=Уникално
-Boolean=Логическо (Отметка)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Телефон
 ExtrafieldPrice = Цена
 ExtrafieldMail = Имейл
 ExtrafieldUrl = Url
 ExtrafieldSelect = Избор лист
 ExtrafieldSelectList = Избор от таблица
-ExtrafieldSeparator=Разделител
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Парола
-ExtrafieldCheckBox=Отметка
+ExtrafieldRadio=Radio buttons (on choice only)
-ExtrafieldRadio=Радио бутон
+ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
 ClickToShowDescription=Click to show description
+DependsOn=This module need the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Област
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Потребители и групи
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Фактура и управление на кредитно изв
 Module40Name=Доставчици
 Module40Desc=Управление и изкупуване на доставчика (нареждания и фактури)
 Module42Name=Дневник
-Module42Desc=Влизане съоръжения (файл, Syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Редактори
 Module49Desc=Управление на редактор
 Module50Name=Продукти
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
+Module510Name=Payment of employee wages
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Известия
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind реализации възможности
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=ЧР
-Module4000Desc=Управление на човешки ресурси
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Няколко фирми
 Module5000Desc=Позволява ви да управлявате няколко фирми
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Създаване / промяна на продукти
 Permission34=Изтриване на продукти
 Permission36=Преглед / управление на скрити продукти
 Permission38=Износ на продукти
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Изтриване на проекти (общи проекти и проекти съм се с нас за)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup спаси
+SetupNotSaved=Setup not saved
 BackToModuleList=Обратно към списъка с модули
 BackToDictionaryList=Back to dictionaries list
 VATManagement=Управление на ДДС
@@ -921,7 +947,7 @@ Host=Сървър
 DriverType=Шофьор тип
 SummarySystem=Резюме на информационна система
 SummaryConst=Списък на всички параметри за настройка Dolibarr
-MenuCompanySetup=Фирма/Организация
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Стандартно меню мениджър
 DefaultMenuSmartphoneManager=Smartphone Menu Manager
 Skin=Кожата тема
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Макс. дължина за списъци по подра
 DefaultMaxSizeShortList=Макс. дължина по подразбиране за кратки списъци (т.е. в клиентската карта)  
 MessageOfDay=Послание на деня
 MessageLogin=Съобщение на страницата за вход
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Постоянна форма за търсене в лявото меню
 DefaultLanguage=Език по подразбиране (код на езика)
 EnableMultilangInterface=Разрешаване на многоезичен интерфейс
 EnableShowLogo=Показване на логото в лявото меню
-CompanyInfo=Информация за фирмата/организацията
+CompanyInfo=Company/organisation information
-CompanyIds=Идентичност на фирмата/организацията
+CompanyIds=Company/organisation identities
 CompanyName=Име
 CompanyAddress=Адрес
 CompanyZip=П. код
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Толерантност закъснение (в дн
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Толерантност закъснение (в дни), преди сигнал за проверки депозит
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Другите записи от менюто управляват допълнителни параметри.
 LogEvents=Събития одит на сигурността
 Audit=Проверка
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=Списък на събитията Dolibarr сигурност
 SecurityEventsPurged=Събития по сигурността прочиства
 LogEventDesc=Можете да разрешите тук сеч за събития Dolibarr сигурност. Администраторите могат да видите неговото съдържание чрез меню <b>&quot;Системни инструменти - Одит.</b> Внимание, тази функция може да се консумира голямо количество данни в база данни.
-AreaForAdminOnly=Тези функции могат да се използват само от <b>администратори</b>.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Информационна система Разни техническа информация можете да получите в режим само за четене и видими само за администратори.
 SystemAreaForAdminOnly=Тази област е достъпна само за администратори. Никой не може да промени това ограничение.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Общ брой на активираните модули: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Трябва да даде възможност на най-малко 1 модул
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Професионална Id уникален
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=За износ на линк към <b>%s</b> формат е на разположение на следния линк: %s
 ##### Invoices #####
 BillsSetup=Фактури модул за настройка
 BillsNumberingModule=Фактури и кредитни известия, номериране модул
 BillsPDFModules=Фактура модели документи
+PaymentsPDFModules=Payment documents models
 CreditNote=Кредитно известие
 CreditNotes=Кредитни известия
 ForceInvoiceDate=Принудително датата на фактурата датата на валидиране
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Настройка на модул Продукти
 ServiceSetup=Услуги модул за настройка
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Дата на фактура използва
 Buy=Купувам
 Sell=Продажба
 InvoiceDateUsed=Дата на фактура използва
-YourCompanyDoesNotUseVAT=Вашата фирма е настроена да не се използва ДДС (Начало - Настройки - Фирма/Организация), така че е без опции за настройка на ДДС.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Счетоводен код
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Кликнете, за да наберете настройка модул
-ClickToDialUrlDesc=Адреса нарича, когато се извършва едно кликване на телефона пиктограма. URL, можете да използвате маркери <br> <b>__PHONETO__,</b> Които ще бъдат заменени с телефонния номер на лицето, да се обадите <br> <b>__PHONEFROM__,</b> Че ще бъде заменен с телефонния номер на повикващата лице (твое) <br> <b>__LOGIN__,</b> Които ще бъдат заменени с clicktodial вход (определено на вашето потребителско карта) <br> <b>__PASS__,</b> Които ще бъдат заменени с clicktodial вашата парола (определено на вашето потребителско карта).
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=Този модул позволява телефонните номера да могат да се кликват. Кликване върху тази икона ще предизвика вашият телефон да набере телефонния номер. Това може да бъде използвано за обаждане към кол център система, която може да набере телефония номер на SIP система например.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Използвайте този метод ако вашите потребители имат софт-телефон или софтуерен интерфейс на същия компютър, на който е браузера, и повиквани с клик на линк във вашия браузер, който започва с "tel:". Ако се нуждаете от пълно сървърно решение (без нужда за локална софтуерна инсталация), трябва да зададете на това "Не" или да попълните следващото поле.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=Обща дисплей за
 BankOrderES=Испански
 BankOrderESDesc=Испански дисплей за
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-модул за настройка компания
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Цвят за подчертаване на линията, когато мишката мине отгоре (оставете празно за без подчертаване)
 TextTitleColor=Цвят на заглавието на страницата
 LinkColor=Цвят на връзките
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 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]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
 UserHasNoPermissions=This user has no permission defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).

htdocs/langs/bg_BG/compta.lang

@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Сумите показани тук са
 Param=Структура
 RemainingAmountPayment=Остатъчна сума за плащане:
 Account=Сметка
-Accountparent=Сметка родител
+Accountparent=Parent account
-Accountsparent=Сметки родител
+Accountsparent=Parent accounts
 Income=Доход
 Outcome=Разход
 ReportInOut=Приходи/разходи
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Данъци и дивиденти
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Секция Счетоводство/ценности
 NewPayment=Ново плащане
@@ -134,8 +135,8 @@ RulesResultDue=- Показани Сумите са с включени всич
 RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
 RulesCADue=- Тя включва дължимите на клиента фактури, независимо дали са платени или не. <br> - Тя се основава на датата на валидиране тези фактури. <br>
 RulesCAIn=- То включва всички ефективни плащания на фактурите, получени от клиенти. <br> - Тя се основава на датата на плащане на тези фактури <br>
-DepositsAreNotIncluded=- Депозит фактури не са включени
+DepositsAreNotIncluded=- Down payment invoices are nor included
-DepositsAreIncluded=- Депозит фактури са включени
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Доклад от контрагент IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Продажби вестник
 DescPurchasesJournal=Покупките вестник
 InvoiceRef=Фактура с реф.
 CodeNotDef=Не е определена
-WarningDepositsNotIncluded=Депозити фактури не са включени в тази версия с този модул за счетоводството.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=PCG тип
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Клониране за следващ месец
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project

htdocs/langs/bg_BG/cron.lang

@@ -25,7 +25,7 @@ CronDelete=Изтриване на планирани задачи
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Модул Планирана задача позволява да се изпълни задача, която е била планирана
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Задача
 CronNone=Няма
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Активирайте
 CronStatusInactiveBtn=Деактивирай
 CronTaskInactive=Тази задача е неактивирана
 CronId=Id
-CronClassFile=Класове (filename.class.php)
+CronClassFile=Filename with class
-CronModuleHelp=Име на Dolibarr модулна директория (работи също така с външен Dolibarr модул).<BR> Например, за да издърпате метод на обект Dolibarr Product /htdocs/<u>product</u>/class/product.class.php, стойността на модула е <i>product</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
-CronClassFileHelp=Име на файл да се зареди.<BR> Например, за да издърпате метод на обект Dolibarrr Product /htdocs/product/class/<u>product.class.php</u>, стойността на името на файла за класа е <i>product.class.php</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
-CronObjectHelp=Името на обекът, който да се зареди.<BR> Например, за да издърпате метод на обект Dolibarr Product /htdocs/product/class/product.class.php, стойността на името на файла за класа е <i>Product</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
-CronMethodHelp=Методът на обекта да се зареди.<BR> Например, за да издърпате метод на обект Dolibarr Product /htdocs/product/class/product.class.php, стойността на метода е <i>fecth</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
-CronArgsHelp=Аргументите за метода.<BR> Например, за да издърпате метод на обект Dolibarr Product /htdocs/product/class/product.class.php, стойността на параметрите може да бъде <i>0, ProductRef</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Системният команден ред за стартиране.
 CronCreateJob=Създаване на нова Планирана задача
 CronFrom=От
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Неактивирани задачи
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.

htdocs/langs/bg_BG/errors.lang

@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Грешка при създаване на файл <b>&q
 ErrorFailToRenameDir=Неуспешно да преименувате директория <b>&quot;%s&quot;</b> в <b>&quot;%s&quot;.</b>
 ErrorFailToCreateDir=Неуспешно създаване на директория <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteDir=Грешка при изтриване на директория <b>&quot;%s&quot;.</b>
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Този контакт е вече определен контакт за този тип.
 ErrorCashAccountAcceptsOnlyCashMoney=Тази банкова сметка е разплащателна сметка, така че приема плащания пари само от тип.
 ErrorFromToAccountsMustDiffers=Източника и целите на банкови сметки трябва да бъде различен.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Неуспех при запис в директория
 ErrorFoundBadEmailInFile=Намерени неправилен синтаксис имейл за %s линии във файла (%s например съответствие с имейл = %s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Някои задължителни полета не са запълнени.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Неуспешно създаване на директория. Уверете се, че уеб сървър потребител има разрешение да пишат в Dolibarr документи. Ако параметър <b>safe_mode</b> е разрешен в тази PHP, проверете дали Dolibarr PHP файлове притежава за потребителя на уеб сървъра (или група).
 ErrorNoMailDefinedForThisUser=Не поща, определена за този потребител
 ErrorFeatureNeedJavascript=Тази функция трябва ДжаваСкрипт да се активира, за да работят. Променете тази настройка - дисплей.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Количество за ред в к
 ErrorWebServerUserHasNotPermission=Потребителски акаунт <b>%s</b> използват за извършване на уеб сървър не разполага с разрешение за това
 ErrorNoActivatedBarcode=Не е тип баркод активира
 ErrUnzipFails=Неуспех да разархивирате %s с ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Файла %s трябва да бъде Dolibarr zip архив
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP навийте не е инсталиран, това е от съществено значение, за да разговаря с Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=Няма избрана глобална проме
 ErrorFieldMustBeANumeric=Поле <b>%s</b> трябва да бъде числена стойност
 ErrorMandatoryParametersNotProvided=Задължителен параметър(и) не е даден
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Парола е зададено за този член. Обаче, няма създаден потребителски акаунт. Следователно тази парола е записана, но не може да бъде използвана за влизане в Dolibarr. Може да бъде използвана от външен модул/интерфейс, но ако нямате нужда да определите нито потребителско име нито парола за член, можете да деактивирате тази опция. Ако имате нужда да управлявате потребителско име, но нямата нужда от парола, можете да оставите това поле празно, за да избегнете това предупреждение. Забележка: Имейл също може да бъде използван като потребителско име ако члена с свързан към потребител.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Датата на плащане (%s) е
 WarningTooManyDataPleaseUseMoreFilters=Прекалено много информация (повече от %s линии). Моля използвайте повече филтри или задайте за константата %s по-висок лимит.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language

htdocs/langs/bg_BG/main.lang

@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Параметър %s не е дефиниран
 ErrorUnknown=Неизвестна грешка
 ErrorSQL=Грешка в SQL
 ErrorLogoFileNotFound=Файлът с лого '%s' не е открит
-ErrorGoToGlobalSetup=Отидете в настройки на 'Фирма/Организация', за да коригирате това
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Отидете в настройки на Модули, за да коригирате това
 ErrorFailedToSendMail=Неуспешно изпращане на имейл (подател = %s, получател = %s)
 ErrorFileNotUploaded=Файлът не беше качен. Уверете се, че размерът му не надвишава максимално допустимия, че е на разположение свободно пространство на диска и че няма файл със същото име в тази директория.
@@ -153,6 +153,7 @@ Edit=Редактиране
 Validate=Валидирай
 ValidateAndApprove=Валидирай и одобри
 ToValidate=За валидиране
+NotValidated=Not validated
 Save=Запис
 SaveAs=Запис като
 TestConnection=Проверка на връзката
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=Не се прилага функция за изк
 Connection=Вход
 Setup=Настройки
 Alert=Предупреждение
+MenuWarnings=Сигнали
 Previous=Предишен
 Next=Следващ
 Cards=Карти
@@ -308,6 +310,7 @@ Copy=Копиране
 Paste=Поставяне
 Default=По подразбиране
 DefaultValue=Стойност по подразбиране
+DefaultValues=Default values
 Price=Цена
 UnitPrice=Единична цена
 UnitPriceHT=Единична цена (нето)
@@ -363,7 +366,8 @@ VATRate=Данъчна ставка
 Average=Средно
 Sum=Сума
 Delta=Делта
-Module=Модул
+Module=Module/Application
+Modules=Modules/Applications
 Option=Опция
 List=Списък
 FullList=Пълен списък
@@ -387,7 +391,7 @@ ActionRunningNotStarted=За започване
 ActionRunningShort=In progress
 ActionDoneShort=Завършено
 ActionUncomplete=Незавършено
-CompanyFoundation=Фирма/Организация
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Контакти за този контрагент
 ContactsAddressesForCompany=Контакти/адреси за този контрагент
 AddressesForCompany=Адреси за този контрагент
@@ -405,8 +409,9 @@ Generate=Генерирай
 Duration=Продължителност
 TotalDuration=Обща продължителност
 Summary=Резюме
-DolibarrStateBoard=Статистика
+DolibarrStateBoard=Database statistics
-DolibarrWorkBoard=Табло с текущи задачи
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Налично
 NotYetAvailable=Все още не е налично
 NotAvailable=Не е налично
@@ -434,7 +439,7 @@ Reportings=Справки
 Draft=Чернова
 Drafts=Чернови
 Validated=Валидиран
-Opened=Отворен
+Opened=Отворено
 New=Нов
 Discount=Отстъпка
 Unknown=Неизвестно
@@ -453,6 +458,7 @@ NextStep=Следваща стъпка
 Datas=Данни
 None=Няма
 NoneF=Няма
+NoneOrSeveral=None or several
 Late=Закъснели
 LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Снимка
@@ -606,7 +612,8 @@ PartialWoman=Частична
 TotalWoman=Обща
 NeverReceived=Никога не получено
 Canceled=Отменен
-YouCanChangeValuesForThisListFromDictionarySetup=Можете да промените стойностите за този списък от меню Настройки - речник
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
 Color=Цвят
 Documents=Свързани файлове
@@ -642,6 +649,7 @@ FreeLineOfType=Свободен вход с тип
 CloneMainAttributes=Клонира обекта с неговите основни атрибути
 PDFMerge=PDF обединяване
 Merge=Обединяване
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Показване на страница за печат само с основното съдържание
 MenuManager=Меню менажер
 WarningYouAreInMaintenanceMode=Внимание, вие сте в режим на поддръжка, така че само вход <b>%s</b> се разрешава за използване приложение в момента.
@@ -708,6 +716,7 @@ from=от
 toward=към
 Access=Достъп
 SelectAction=Избиране на действие
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Използвайте Ctrl+C за да копирате в клипборда
 SaveUploadedFileWithMask=Запишете файла на сървъра с име "<strong>%s</strong>" (иначе "%s")
 OriginFileName=Оригинално име на файла
@@ -718,7 +727,7 @@ ViewPrivateNote=Биж бележки
 XMoreLines=%s ред(а) скрити
 PublicUrl=Публичен URL
 AddBox=Добави поле
-SelectElementAndClickRefresh=Изберете елемент и натиснете Обнови
+SelectElementAndClick=Select an element and click %s
 PrintFile=Печат на файл %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Отидете на Начало - Настройки - Фирма/Организация, за да промените логото или отидете на Начало - Настройки- Екран, за да го скриете.
@@ -734,8 +743,8 @@ Hello=Здравейте
 Sincerely=Искрено
 DeleteLine=Изтриване на линия
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Календар
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
@@ -817,5 +835,3 @@ SearchIntoContracts=Договори
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Опис разходи
 SearchIntoLeaves=Отпуски
-
-BulkActions=Bulk actions

htdocs/langs/bg_BG/other.lang

@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Дата на раждане
 BirthdayAlertOn=Известяването за рожден ден е активно
 BirthdayAlertOff=Известяването за рожден ден е неактивно
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Интервенцията е валидирана
 Notify_FICHINTER_SENTBYMAIL=Интервенцията е изпратена по пощата
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=Това е <b>тестов</b> имейл (думата
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nТук ще намерите фактура __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nБихме искали да ви предопредим, че фактура __REF__  изглежда не е платена. Затова това фактурата е в прикачения файл, за напомняне.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nЩе намерите запитването за цена тук __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nТук ще намерите фактура __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Проф. Id %s</b> е информация, в зависимост от трета държава, която е страна. <br> Например, за страната <b>%s,</b> това е код <b>%s.</b>
 DolibarrDemo=Dolibarr ERP/CRM демо
-StatsByNumberOfUnits=Статистика в брой на единици продукти/услуги
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Статистиката в брой на референции
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
-NumberOfProposals=Number of proposals in past 12 months
+NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of customer orders in past 12 months
+NumberOfCustomerOrders=Number of customer orders
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
+NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
+NumberOfSupplierProposals=Number of supplier proposals
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
+NumberOfSupplierOrders=Number of supplier orders
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
+NumberOfSupplierInvoices=Number of supplier invoices
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
+NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
+NumberOfUnitsCustomerOrders=Number of units on customer orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=Намесата %s е потвърдена.
 EMailTextInvoiceValidated=Фактура %s е потвърдена.

htdocs/langs/bg_BG/projects.lang

@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Статус на проект
 SharedProject=Всички
 PrivateProject=ПРОЕКТА Контакти
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Всички проекти
 MyProjectsDesc=Тази гледна точка е ограничена до проекти, които са за контакт (какъвто и да е тип).
 ProjectsPublicDesc=Този възглед представя всички проекти, по които могат да се четат.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Този възглед представя всички проекти
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Нов проект
 AddProject=Създаване на проект
 DeleteAProject=Изтриване на проект
 DeleteATask=Изтриване на задача
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Отворени проекти
+OpenedProjects=Open projects
-OpenedTasks=Opened tasks
+OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Покажи проект
 SetProject=Задайте проект
 NoProject=Нито един проект няма определени или собственост
 NbOfProjects=Nb на проекти
+NbOfTasks=Nb of tasks
 TimeSpent=Времето, прекарано
 TimeSpentByYou=Време отделено от вас
 TimeSpentByUser=Време отделено от потребител
@@ -47,9 +52,9 @@ TaskTimeSpent=Време отдадено на задачи
 TaskTimeUser=Потребител
 TaskTimeNote=Бележка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Задачи на отворени проекти
 WorkloadNotDefined=Работна натовареност не е определена
-NewTimeSpent=Времето, прекарано на
+NewTimeSpent=Времето, прекарано
 MyTimeSpent=Времето, прекарано
 Tasks=Задачи
 Task=Задача
@@ -59,6 +64,7 @@ TaskDescription=Описание на задача
 NewTask=Нова задача
 AddTask=Създаване на задача
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Дейност
 Activities=Задачите / дейностите
 MyActivities=Моите задачи / дейности
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Списък на договори, свързани с проекта
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Списък на интервенциите, свързани с проекта
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=Списък на даренията асоциирани със този проект
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=ПРОЕКТА Контакти
 ActionsOnProject=Събития по проекта
 YouAreNotContactOfProject=Вие не сте контакт на този частен проект
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Изтриване на времето, прекарано
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Показване също на задачи, които не са възложени на мен
@@ -110,7 +118,7 @@ TaskRessourceLinks=Ресурси
 ProjectsDedicatedToThisThirdParty=Проекти, насочени към този контрагент
 NoTasks=Няма задачи за този проект
 LinkedToAnotherCompany=Свързано с друг контрагент
-TaskIsNotAffectedToYou=Задача, която не е възложена на вас
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Изразходваното време е празна
 ThisWillAlsoRemoveTasks=Това действие ще изтрие всички задачи на проекта <b>(%s</b> задачи в момента) и всички входове на времето, прекарано.
 IfNeedToUseOhterObjectKeepEmpty=Ако някои обекти (фактура, поръчка, ...), принадлежащи към друга трета страна, трябва да бъдат свързани с проекта за създаване, запазете тази празна да има проект е мулти трети страни.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Вече записано отделено време за тази задача/ден и потребител %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Проекти с този потребител като контакт
 TasksWithThisUserAsContact=Задачи възложени на този потребител
 ResourceNotAssignedToProject=Не е зададено към проект
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Възлагане на задача към мен
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Възлагане
 ProjectOverview=Общ преглед
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Бр. на създадените проекти по месец
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Статистики за проекти/инициативи
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Задачата е възложена. Въвеждането на време на тази задача би трябвало да е възможно
 IdTaskTime=Ид. време на задача
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Отворени проекти от трети лица
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount

htdocs/langs/bn_BD/accountancy.lang

@@ -26,27 +26,31 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
 AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -57,6 +61,10 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
@@ -71,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
+WriteBookKeeping=Journalize transactions in Ledger
-Bookkeeping=General ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
-DelBookKeeping=Delete record of the general ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
+GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
-NoNewRecordSaved=No new record saved
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,6 +204,18 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports
@@ -211,6 +231,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.

htdocs/langs/bn_BD/admin.lang

@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -85,7 +86,7 @@ Mask=Mask
 NextValue=Next value
 NextValueForInvoices=Next value (invoices)
 NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Next value (replacements)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -103,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -113,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
@@ -189,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -267,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
 ModuleSetup=Module setup
-ModulesSetup=Modules setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -369,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
+ExtrafieldRadio=Radio buttons (on choice only)
-ExtrafieldRadio=Radio button
+ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
 ClickToShowDescription=Click to show description
+DependsOn=This module need the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -499,8 +521,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
+Module510Name=Payment of employee wages
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
+MenuCompanySetup=Company/Organisation
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
+CompanyInfo=Company/organisation information
-CompanyIds=Company/foundation identities
+CompanyIds=Company/organisation identities
 CompanyName=Name
 CompanyAddress=Address
 CompanyZip=Zip
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1129,12 +1158,14 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1523,7 +1562,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 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]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
 UserHasNoPermissions=This user has no permission defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).

htdocs/langs/bn_BD/compta.lang

@@ -13,8 +13,8 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 Account=Account
-Accountparent=Account parent
+Accountparent=Parent account
-Accountsparent=Accounts parent
+Accountsparent=Parent accounts
 Income=Income
 Outcome=Expense
 ReportInOut=Income / Expense
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
+DepositsAreNotIncluded=- Down payment invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -169,7 +170,7 @@ DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project

htdocs/langs/bn_BD/cron.lang

@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
+CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.

htdocs/langs/bn_BD/errors.lang

@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language

htdocs/langs/bn_BD/main.lang

@@ -43,7 +43,7 @@ ErrorConstantNotDefined=Parameter %s not defined
 ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
+ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
@@ -222,6 +223,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards
@@ -308,6 +310,7 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
@@ -363,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
@@ -387,7 +391,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
+CompanyFoundation=Company/Organisation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
@@ -405,8 +409,9 @@ Generate=Generate
 Duration=Duration
 TotalDuration=Total duration
 Summary=Summary
-DolibarrStateBoard=Statistics
+DolibarrStateBoard=Database statistics
-DolibarrWorkBoard=Work tasks board
+DolibarrWorkBoard=Open items dashboard
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
@@ -434,7 +439,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -453,6 +458,7 @@ NextStep=Next step
 Datas=Data
 None=None
 NoneF=None
+NoneOrSeveral=None or several
 Late=Late
 LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
@@ -606,7 +612,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
 Color=Color
 Documents=Linked files
@@ -642,6 +649,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
@@ -708,6 +716,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
@@ -718,7 +727,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
@@ -734,8 +743,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
@@ -755,11 +764,20 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -817,5 +835,3 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
-BulkActions=Bulk actions

htdocs/langs/bn_BD/other.lang

@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
-NumberOfProposals=Number of proposals in past 12 months
+NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of customer orders in past 12 months
+NumberOfCustomerOrders=Number of customer orders
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
+NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
+NumberOfSupplierProposals=Number of supplier proposals
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
+NumberOfSupplierOrders=Number of supplier orders
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
+NumberOfSupplierInvoices=Number of supplier invoices
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
+NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
+NumberOfUnitsCustomerOrders=Number of units on customer orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.

htdocs/langs/bn_BD/projects.lang

@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
 MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
+OpenedProjects=Open projects
-OpenedTasks=Opened tasks
+OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -47,9 +52,9 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,6 +109,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -110,7 +118,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -161,27 +169,32 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount

htdocs/langs/bs_BA/accountancy.lang

@@ -1,24 +1,24 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_SEPARATORCSV=Odvajanje kolona za izvoznu datoteku
-ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_DATE=Format datuma za izvoznu datoteku
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_PIECE=Izvoz broja komada
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Izvoz sa globalnim računom
-ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_LABEL=Izvoz naziva
-ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_AMOUNT=Izvoz iznosa
-ACCOUNTING_EXPORT_DEVISE=Export currency
+ACCOUNTING_EXPORT_DEVISE=Izvoz valute
-Selectformat=Select the format for the file
+Selectformat=Odaberi format za datoteku
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ACCOUNTING_EXPORT_PREFIX_SPEC=Odredi prefiks za naziv datoteke
 ThisService=This service
 ThisProduct=This product
 DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Podešavanje modula eksperta računovodstva
-Journalization=Journalization
+Journalization=Prenos u dnevnik
-Journaux=Journals
+Journaux=Dnevnici
-JournalFinancial=Financial journals
+JournalFinancial=Finansijski dnevnici
-BackToChartofaccounts=Return chart of accounts
+BackToChartofaccounts=Vraćanje na pregled računa
 Chartofaccounts=Chart of accounts
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
@@ -26,38 +26,46 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
 AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger".
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
 MenuAccountancy=Računovodstvo
-Selectchartofaccounts=Select active chart of accounts
+Selectchartofaccounts=Odaberi aktivnog pregleda računa
 ChangeAndLoad=Change and load
-Addanaccount=Add an accounting account
+Addanaccount=Dodaj računovodstveni račun
-AccountAccounting=Accounting account
+AccountAccounting=Računovodstveni račun
 AccountAccountingShort=Account
-AccountAccountingSuggest=Accounting account suggested
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+AccountAccountingSuggest=Predloženi računovodstveni račun
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
 MenuTaxAccounts=Tax accounts
@@ -70,12 +78,12 @@ CustomersVentilation=Customer invoice binding
 SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
+UpdateMvts=Modifikacija transakcije
-WriteBookKeeping=Journalize transactions in General Ledger
+WriteBookKeeping=Journalize transactions in Ledger
-Bookkeeping=General ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
-CAHTF=Total purchase supplier before tax
+CAHTF=Ukupno nabavke od dobavljača prije poreza
 TotalExpenseReport=Total expense report
 InvoiceLines=Lines of invoices to bind
 InvoiceLinesDone=Bound lines of invoices
@@ -103,9 +111,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
@@ -132,19 +140,19 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
-DelBookKeeping=Delete record of the general ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -156,13 +164,13 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -186,9 +194,9 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
+GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
-NoNewRecordSaved=No new record saved
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
@@ -196,21 +204,34 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+Code=Kod
+Nature=Nature
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Banka
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
-Exports=Exports
+Exports=Izvozi
-Export=Export
+Export=Izvoz
-Modelcsv=Model of export
+Modelcsv=Model izvoza
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
+OptionsDeactivatedForThisExportModel=Za ovaj model izvoza, opcije su onemogućene
-Selectmodelcsv=Select a model of export
+Selectmodelcsv=Odaberi model izvoza
-Modelcsv_normal=Classic export
+Modelcsv_normal=Klasični izvoz
-Modelcsv_CEGID=Export towards CEGID Expert Comptabilité
+Modelcsv_CEGID=Izvoz prema CEGID Expert Comptabilité
 Modelcsv_COALA=Export towards Sage Coala
 Modelcsv_bob50=Export towards Sage BOB 50
 Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
@@ -235,11 +256,12 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.

htdocs/langs/bs_BA/admin.lang

@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
+Foundation=Fondacija
 Version=Verzija
 VersionProgram=Verzija programa
-VersionLastInstall=Initial install version
+VersionLastInstall=Prvobitno instalirana verzija
-VersionLastUpgrade=Latest version upgrade
+VersionLastUpgrade=Verzija zadnje nadogradnje
 VersionExperimental=Eksperimentalno
 VersionDevelopment=Razvoj
 VersionUnknown=Nepoznato
@@ -28,26 +28,27 @@ SessionId=ID sesije
 SessionSaveHandler=Rukovatelj snimanje sesija
 SessionSavePath=Lokalizacija snimanja sesije
 PurgeSessions=Očistiti sesije
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Da li zaista želite očistiti sve sesije? Ovo će uzrokovati odjavu svih korisnika (osim Vas).
 NoSessionListWithThisHandler=Rukovatelj snimanja sesija konfigurisan u PHP-u ne dopušta da se prikažu sve pokrenute sesije.
 LockNewSessions=Zaključaj nove konekcije
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
+ConfirmLockNewSessions=Da li ste sigurni da želite onemogućiti bilo koju novu Dolibarr konekciju sebi. Nakon toga samo će korisnik <b>%s</b> moći se prijaviti.
-UnlockNewSessions=Remove connection lock
+UnlockNewSessions=Ukloni zaključavanje veze
-YourSession=Your session
+YourSession=Vaša sesija
-Sessions=Users session
+Sessions=Korisničke sesije
 WebUserGroup=Web server user/group
 NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningModuleNotActive=Modul <b>%s</b> mora biti omogućen
 WarningOnlyPermissionOfActivatedModules=Samo dozvole koje se odnose na aktivirane module su prikazane ovdje. Možete aktivirati druge module u Početna>Postavke>Stranice modula.
-DolibarrSetup=Dolibarr install or upgrade
+DolibarrSetup=Dolibarr instalacija ili unapređenje
 InternalUser=Interni korisnik
-ExternalUser=External user
+ExternalUser=Vanjski korisnik
-InternalUsers=Internal users
+InternalUsers=Interni korisnici
-ExternalUsers=External users
+ExternalUsers=Vanjski korisnici
-GUISetup=Display
+GUISetup=Prikaz
 SetupArea=Podrčje za postavke
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Forma za testiranje uploada fajlova (prema postavkama)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -60,32 +61,32 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Postavke rječnika
 Dictionary=Dictionaries
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
+ErrorCodeCantContainZero=Kod ne može sadržavati vrijednost 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Onemogući JavaScript i Ajax funkcije (preporučeno za slijepe osobe ili tekstualne preglednike)
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient)
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
+NumberOfKeyToSearch=Broj znakova za početak pretrage: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+NotAvailableWhenAjaxDisabled=Nije moguće kada je Ajax isključen
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
+JavascriptDisabled=Onemogućena JavaScript
-UsePreviewTabs=Use preview tabs
+UsePreviewTabs=Koristi kartice pretpregleda
-ShowPreview=Show preview
+ShowPreview=Prikaži pretpregled
-PreviewNotAvailable=Preview not available
+PreviewNotAvailable=Pretpregled nije moguć
-ThemeCurrentlyActive=Theme currently active
+ThemeCurrentlyActive=Trenutno aktivna tema
-CurrentTimeZone=TimeZone PHP (server)
+CurrentTimeZone=Vremenska zona PHP (servera)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
+Space=Razmak
-Table=Table
+Table=Tabela
-Fields=Fields
+Fields=Polja
-Index=Index
+Index=Indeks
-Mask=Mask
+Mask=Maska
-NextValue=Next value
+NextValue=Sljedeća vrijednost
-NextValueForInvoices=Next value (invoices)
+NextValueForInvoices=Sljedeća vrijednost (fakture)
-NextValueForCreditNotes=Next value (credit notes)
+NextValueForCreditNotes=Sljedeća vrijednost (KO)
-NextValueForDeposit=Slijedeća vrijednost (depozita)
+NextValueForDeposit=Next value (down payment)
 NextValueForReplacements=Slijedeća vrijednost (zamjene)
 MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
@@ -93,28 +94,27 @@ MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any uploa
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
 AntiVirusCommand= Full path to antivirus command
 AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
-AntiVirusParam= More parameters on command line
+AntiVirusParam= Više parametara preko komandne linije
 AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Postavke modula za računovodstvo
 UserSetup=Postavke upravljanja korisnika
 MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
+MenuLimits=Ograničenja i preciznost
 MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
-AllMenus=All
+AllMenus=Sve
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
-Active=Active
+Active=Aktivan
 SetupShort=Postavke
-OtherOptions=Other options
+OtherOptions=Druge opcije
 OtherSetup=Ostale postavke
-CurrentValueSeparatorDecimal=Decimal separator
+CurrentValueSeparatorDecimal=Odvajanje decimala
-CurrentValueSeparatorThousand=Thousand separator
+CurrentValueSeparatorThousand=Odvajanje hiljada
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
+LanguageBrowserParameter=Parametar %s
-LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
 ClientHour=Client time (user)
@@ -123,19 +123,20 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=Da biste postavili različite PHP vremenske zonu (nije potrebno), možete pokušati dodati fajl .htacces sa linijom kao što je ova "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
+PositionByDefault=Pretpostavljeni red
 Position=Pozicija
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
 MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
+MenuForUsers=Meni za korisnike
 LangFile=.lang file
-System=System
+System=Sistem
-SystemInfo=System information
+SystemInfo=Sistemske informacije
-SystemToolsArea=System tools area
+SystemToolsArea=Područje sistemskih alata
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
@@ -183,13 +184,13 @@ NoLockBeforeInsert=No lock commands around INSERT
 DelayedInsert=Delayed insert
 EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Automatsko otkrivanje (browser jezik)
+AutoDetectLang=Automatsko otkrivanje (jezik preglednika)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Dozvole
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -213,7 +214,7 @@ MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activat
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
-ProtectAndEncryptPdfFilesDesc=Zaštita PDF dokument drži ga na raspolaganju za čitanje i printanje za bilo kojiPDF preglednikom. Međutim, uređivanje i kopiranje nije moguće. Imajte na umu da koristite ovu funkciju čine izgradnju globalne kumulirane pdf fajlove ne radi (kao što su neplaćeni računi).
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
 Developpers=Developers/contributors
@@ -224,7 +225,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -243,7 +246,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=E-mails
 EMailsSetup=Postavke e-mailova
-EMailsDesc=Ova stranica vam omogućava da prebriše PHP parametre za slanje e-mailova. U većini slučajeva na Unix / Linux OS, PHP postavke si ispravne i ovi parametri su beskorisni.
+EMailsDesc=Ova stranica vam omogućava da prebriše PHP parametre za slanje e-mailova. U većini slučajeva na Unix / Linux OS, PHP postavke su ispravne i ovi parametri su beskorisni.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
@@ -267,8 +270,8 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
 ModuleSetup=Postavke modula
-ModulesSetup=Postavke modula
+ModulesSetup=Modules/Application setup
-ModuleFamilyBase=System
+ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
@@ -300,14 +303,17 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -367,21 +373,23 @@ String=String
 TextLong=Long text
 Int=Integer
 Float=Float
-DateAndTime=Date and hour
+DateAndTime=Datum i vrijeme
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Telefon
-ExtrafieldPrice = Price
+ExtrafieldPrice = Cijena
-ExtrafieldMail = Email
+ExtrafieldMail = email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
-ExtrafieldPassword=Password
+ExtrafieldPassword=Šifra
-ExtrafieldCheckBox=Checkbox
+ExtrafieldRadio=Radio buttons (on choice only)
-ExtrafieldRadio=Radio button
+ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -398,7 +406,7 @@ LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone nu
 KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Upozorenje, ova vrijednost se može prebrisati posebnim postabkama korisnika (svaki korisnik može postaviti svoj clicktodial URL)
+ValueOverwrittenByUserSetup=Upozorenje, ova vrijednost se može prebrisati posebnim postavkama korisnika (svaki korisnik može postaviti svoj clicktodial URL)
 ExternalModule=Eksterni moduli - Instalirani u direktorij %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
@@ -422,6 +430,20 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
 ClickToShowDescription=Click to show description
+DependsOn=This module need the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -444,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Dobavljači
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Proizvodi
@@ -487,7 +509,7 @@ Module240Name=Data exports
 Module240Desc=Tool to export Dolibarr data (with assistants)
 Module250Name=Data imports
 Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
+Module310Name=Članovi
 Module310Desc=Foundation members management
 Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
@@ -499,15 +521,15 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
+Module510Name=Payment of employee wages
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifikacije
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donacije
 Module700Desc=Donation management
-Module770Name=Expense reports
+Module770Name=Izvještaj o troškovima
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -542,8 +564,10 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=Kadrovska služba
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow - Tok rada
@@ -570,7 +594,7 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
-Module63000Name=Resources
+Module63000Name=Resursi
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
@@ -591,7 +615,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
@@ -830,7 +854,7 @@ DictionaryActions=Types of agenda events
 DictionarySocialContributions=Social or fiscal taxes types
 DictionaryVAT=VAT Rates or Sales Tax Rates
 DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
+DictionaryPaymentConditions=Uslovi plaćanja
 DictionaryPaymentModes=Payment modes
 DictionaryTypeContact=Contact/Address types
 DictionaryEcotaxe=Ecotax (WEEE)
@@ -844,12 +868,14 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Jedinice
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Postavke snimljene
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
@@ -858,7 +884,7 @@ VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases li
 VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
-LTRate=Rate
+LTRate=Stopa
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
 LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
@@ -921,7 +947,7 @@ Host=Server
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=Lista svih parametara postavki za Dolibarr
-MenuCompanySetup=Kompanija/Fondacija
+MenuCompanySetup=Kompanija/organizacija
 DefaultMenuManager= Standard menu manager
 DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Skin theme
@@ -931,12 +957,14 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
+CompanyInfo=Company/organisation information
-CompanyIds=Company/foundation identities
+CompanyIds=Company/organisation identities
 CompanyName=Naziv
 CompanyAddress=Adresa
 CompanyZip=Zip
@@ -950,7 +978,7 @@ NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
 ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
+Alerts=Upozorenja
 DelaysOfToleranceBeforeWarning=Tolerance delays before warning
 DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
 Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
@@ -969,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -987,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
@@ -1079,11 +1107,12 @@ CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=Možete koristiti driver %s koji je trenutno najbolji.
@@ -1129,14 +1158,16 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
-CreditNote=Dobropis
+PaymentsPDFModules=Payment documents models
-CreditNotes=Dobropisi
+CreditNote=Knjižna obavijest
+CreditNotes=Knjižne obavijesti
 ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
@@ -1191,11 +1222,11 @@ AdherentMailRequired=EMail required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
+LDAPGlobalParameters=Globalni parametri
-LDAPUsersSynchro=Users
+LDAPUsersSynchro=Korisnici
 LDAPGroupsSynchro=Grupe
-LDAPContactsSynchro=Contacts
+LDAPContactsSynchro=Kontakti
-LDAPMembersSynchro=Members
+LDAPMembersSynchro=Članovi
 LDAPSynchronization=LDAP synchronisation
 LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
 LDAPToDolibarr=LDAP -> Dolibarr
@@ -1302,7 +1333,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
+LDAPFieldTitle=Pozicija
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1327,9 +1358,16 @@ FilesOfTypeNotCached=Fajlovi tipa %s nisu keširani na HTTP serveru
 FilesOfTypeCompressed=Fajlovi tipa %s su kompresovani od strane HTTP servera
 FilesOfTypeNotCompressed=Fajlovi tipa %s nisu kompresovani od strane HTTP servera
 CacheByServer=Keširanje na serveru
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Keširanje u browser-u
 CompressionOfResources=Kompresija HTTP odgovora
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1464,7 +1502,7 @@ SupposedToBeInvoiceDate=Invoice date used
 Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
@@ -1479,9 +1517,10 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
@@ -1510,7 +1549,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
@@ -1518,12 +1557,11 @@ WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is n
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
 BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
+BankOrderGlobal=Opće
 BankOrderGlobalDesc=General display order
 BankOrderES=Španski
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
@@ -1582,12 +1620,12 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
@@ -1600,6 +1638,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 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]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1658,6 +1697,10 @@ SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choic
 ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
 UserHasNoPermissions=This user has no permission defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).

htdocs/langs/bs_BA/banks.lang

@@ -5,14 +5,14 @@ BankName=Naziv banke
 FinancialAccount=Račun
 BankAccount=Žiro račun
 BankAccounts=Žiro računi
-ShowAccount=Show Account
+ShowAccount=Prikaži račun
-AccountRef=Financijski računa ref
+AccountRef=Finansijski račun ref
-AccountLabel=Naziv za financijski račun
+AccountLabel=Naziv za finansijski račun
 CashAccount=Gotovinski račun
 CashAccounts=Gotovinski računi
 CurrentAccounts=Tekući računi
 SavingAccounts=Štedni računi
-ErrorBankLabelAlreadyExists=Naziv za financijski račun već postoji
+ErrorBankLabelAlreadyExists=Naziv za finansijski račun već postoji
 BankBalance=Stanje
 BankBalanceBefore=Stanje prije
 BankBalanceAfter=Stanje poslije
@@ -28,12 +28,12 @@ Reconciliation=Izmirenje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
 BIC=BIC / SWIFT broj
-SwiftValid=BIC/SWIFT valid
+SwiftValid=BIC/SWIFT valjan
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftVNotalid=BIC/SWIFT nije valjan
-IbanValid=BAN valid
+IbanValid=BAN valjan
-IbanNotValid=BAN not valid
+IbanNotValid=BAN nije valjan
-StandingOrders=Direct Debit orders
+StandingOrders=Nalozi za plaćanje
-StandingOrder=Direct debit order
+StandingOrder=Nalog za plaćanje
 AccountStatement=Izvod računa
 AccountStatementShort=Izvod
 AccountStatements=Izvodi računa
@@ -43,7 +43,7 @@ BankAccountDomiciliation=Adresa računa
 BankAccountCountry=Zemlja računa
 BankAccountOwner=Ime vlasnika računa
 BankAccountOwnerAddress=Adresa vlasnika računa
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Provjera integriteta vrijednosti neuspješna. To znači da podaci za ovaj broj računa nisu tačni ili nepotpuni (provjerite državu, brojeve i IBAN).
 CreateAccount=Kreiraj račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi finansijski račun
@@ -57,96 +57,101 @@ BankType2=Gotovinski račun
 AccountsArea=Područje za račune
 AccountCard=Kartica računa
 DeleteAccount=Obriši račun
-ConfirmDeleteAccount=Are you sure you want to delete this account?
+ConfirmDeleteAccount=Da li ste sigurni da želite obrisati ovaj račun?
 Account=Račun
-BankTransactionByCategories=Bank entries by categories
+BankTransactionByCategories=Bankovne transakcije po kategorijama
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionForCategory=Bankovne transakcije za kategoriju <b>%s</b>
 RemoveFromRubrique=Uklonite vezu sa kategorijom
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+RemoveFromRubriqueConfirm=Da li ste sigurni da želite ukloniti vezu između transakcije i kategorije?
-ListBankTransactions=List of bank entries
+ListBankTransactions=Spisak bankovnih transakcija
 IdTransaction=ID transakcije
-BankTransactions=Bank entries
+BankTransactions=Bankovne transakcije
-ListTransactions=List entries
+BankTransaction=Bankovna transakcija
-ListTransactionsByCategory=List entries/category
+ListTransactions=Spisak transakcija
-TransactionsToConciliate=Entries to reconcile
+ListTransactionsByCategory=Spisak transakcija/kategorija
+TransactionsToConciliate=Transakcije za izmirivanje
 Conciliable=Može se izmiriti
 Conciliate=Izmiriti
 Conciliation=Podmirivanje
-ReconciliationLate=Reconciliation late
+ReconciliationLate=Kašnjenje s izmirivanjem
 IncludeClosedAccount=Uključiti zatvorene račune
 OnlyOpenedAccount=Samo otvoreni računi
 AccountToCredit=Račun za potraživanja
 AccountToDebit=Račun za zaduživanje
 DisableConciliation=Isključi opciju podmirenja za ovaj račun
 ConciliationDisabled=Opcija podmirivanja isključena
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+LinkedToAConciliatedTransaction=Spojeno na izmirenu transakciju
-StatusAccountOpened=Otvoreno
+StatusAccountOpened=Otvoren
-StatusAccountClosed=Zatvoreno
+StatusAccountClosed=Zatvoren
 AccountIdShort=Broj
 LineRecord=Transakcija
-AddBankRecord=Add entry
+AddBankRecord=Dodaj unos
-AddBankRecordLong=Add entry manually
+AddBankRecordLong=Dodaj unos ručno
 ConciliatedBy=Izmireno od strane
 DateConciliating=Datum izmirivanja
-BankLineConciliated=Entry reconciled
+BankLineConciliated=Transakcija izmirena
-Reconciled=Reconciled
+Reconciled=Izmireno
-NotReconciled=Not reconciled
+NotReconciled=Nije izmireno
-CustomerInvoicePayment=Uplata mušterije
+CustomerInvoicePayment=Uplata kupca
-SupplierInvoicePayment=Plaćanje dobavljača
+SupplierInvoicePayment=Plaćanje dobavljaču
-SubscriptionPayment=Subscription payment
+SubscriptionPayment=Plaćanje preplate
 WithdrawalPayment=Povlačenje uplate
-SocialContributionPayment=Social/fiscal tax payment
+SocialContributionPayment=Plaćanje socijalnog/fiskalnog poreza
-BankTransfer=Bankovna transakcija
+BankTransfer=Prenos između banaka
-BankTransfers=Bankovne transakcije
+BankTransfers=Prenosi između banaka
-MenuBankInternalTransfer=Internal transfer
+MenuBankInternalTransfer=Interni transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Prebacivanje s jednog računa na drugi, Dolibarr zapisuje dva unosa (potražuje račun sa kojeg se prenosi i duguje ciljni račun. Isti iznos (osim predznaka), oznaka i datum će se koristiti za ovu transakciju)
 TransferFrom=Od strane
 TransferTo=Prema
 TransferFromToDone=Transfer sa <b>%s</b> na <b>%s</b> u iznosu od <b>%s</b> %s je zapisan.
 CheckTransmitter=Otpremnik
-ValidateCheckReceipt=Validate this check receipt?
+ValidateCheckReceipt=Odobrite ovaj ispis čeka?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
+ConfirmValidateCheckReceipt=Da li ste sigurni da želite odobriti ovaj prijem čeka, kada to uradite nećete moći više vršiti promjene?
-DeleteCheckReceipt=Delete this check receipt?
+DeleteCheckReceipt=Obrišite ovaj izvod čeka?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+ConfirmDeleteCheckReceipt=Da li ste sigurni da želite obrisati ovaj izvod od čeka?
 BankChecks=Bankovni ček
-BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceipt=Čekovi koji čekaju na depozit
 ShowCheckReceipt=Prikaži priznanicu depozita čeka
 NumberOfCheques=Broj čeka
-DeleteTransaction=Delete entry
+DeleteTransaction=Obriši unos
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ConfirmDeleteTransaction=Da li ste sigurni da želite obrisati ovaj unos?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+ThisWillAlsoDeleteBankRecord=Ovim će se također obrisati i generisana bankovna transakcija
 BankMovements=Promet
-PlannedTransactions=Planned entries
+PlannedTransactions=Planirane transakcije
 Graph=Grafika
-ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_1=Bankovne transakcije i izvod s računa
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Priznanica depozita
 TransactionOnTheOtherAccount=Transakcija na drugom računu
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateSucceeded=Broj uplate uspješno ažuriran
 PaymentNumberUpdateFailed=Broj uplate nije ažuriran
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=Datum uplate uspješno ažuriran
 PaymentDateUpdateFailed=Datum uplate nije ažuriran
 Transactions=Transakcije
-BankTransactionLine=Bank entry
+BankTransactionLine=Bankovna transakcija
 AllAccounts=Svi bankovni/novčani računi
 BackToAccount=Nazad na račun
 ShowAllAccounts=Pokaži za sve račune
-FutureTransaction=Transakcije u budućnosti. Nema šanse da se izmiri.
+FutureTransaction=Transakcija u budućnosti. Ne može se izmiriti.
 SelectChequeTransactionAndGenerate=Izaberite/filtrirajte čekove za uključivanje u priznanicu za depozit i kliknite na "Kreiraj".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Izaberite izvod iz banke za izmirivanje. Koristite brojevne vrijednosti koje se mogu sortirati: YYYYMM ili YYYYMMDD
 EventualyAddCategory=Na kraju, navesti kategoriju u koju će se svrstati zapisi
-ToConciliate=To reconcile?
+ToConciliate=Za izmirenje?
 ThenCheckLinesAndConciliate=Zatim, provjerite tekst prisutan u izvodu banke i kliknite
 DefaultRIB=Uobičajeni BAN
-AllRIB=All BAN
+AllRIB=Svi BAN
-LabelRIB=BAN Label
+LabelRIB=Oznaka BAN
-NoBANRecord=No BAN record
+NoBANRecord=Nema BAN zapisa
-DeleteARib=Delete BAN record
+DeleteARib=Brisanje BAN zapisa
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+ConfirmDeleteRib=Da li ste sigurni da želite obrisati ovaj BAN zapis?
-RejectCheck=Check returned
+RejectCheck=Ček vraćen
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+ConfirmRejectCheck=Da li ste sigurni da želite označiti ovaj ček kao odbijen?
-RejectCheckDate=Date the check was returned
+RejectCheckDate=Datum vraćanja čeka
-CheckRejected=Check returned
+CheckRejected=Ček vraćen
-CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+CheckRejectedAndInvoicesReopened=Ček vraćen i fakture ponovno otvorene
-BankAccountModelModule=Document templates for bank accounts
+BankAccountModelModule=Šabloni dokumenata za bankovne račune
-DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelSepaMandate=Šablon za SEPA mandat. Koristan je samo za evropske zemlje članice EU.
-DocumentModelBan=Template to print a page with BAN information.
+DocumentModelBan=Šablon za štampanje stranice sa BAN podacima.
+NewVariousPayment=Novo ostalo plaćanje
+VariousPayment=Razno plaćanje
+VariousPayments=Razna plaćanja
+ShowVariousPayment=Pokaži ostala plaćanja

htdocs/langs/bs_BA/bills.lang

@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktura
 Bills=Fakture
-BillsCustomers=Customer invoices
+BillsCustomers=Fakture kupaca
 BillsCustomer=Faktura kupca
-BillsSuppliers=Supplier invoices
+BillsSuppliers=Fakture dobavljača
-BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaid=Nenaplaćene fakture od kupca
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomersUnpaidForCompany=Neplaćene fakture kupca za %s
-BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaid=Neplaćene fakture dobavljača
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=Neplaćene fakture dobavljača za %s
 BillsLate=Zakašnjela plaćanja
-BillsStatistics=Customers invoices statistics
+BillsStatistics=Statistika faktura kupaca
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatisticsSuppliers=Statistika faktura dobavljača
-DisabledBecauseNotErasable=Disabled because cannot be erased
+DisabledBecauseNotErasable=Onemogućeno jer se ne može brisati
 InvoiceStandard=Standardna faktura
 InvoiceStandardAsk=Standardna faktura
 InvoiceStandardDesc=Ova vrsta fakture je uobičajena faktura.
-InvoiceDeposit=Faktura za avans
+InvoiceDeposit=Račun za akontaciju
-InvoiceDepositAsk=Faktura za avans
+InvoiceDepositAsk=Račun za akontaciju
-InvoiceDepositDesc=Ova vrsta fakture se izdaje kada se primi avans
+InvoiceDepositDesc=Ova vrsta fakture se pravi kada je uplaćena akontacija.
 InvoiceProForma=Predračun
 InvoiceProFormaAsk=Predračun
-InvoiceProFormaDesc=<b>Predračun</b> izgleda isto kao račun, vendar nima računaodske vrednosti.
+InvoiceProFormaDesc=<b>Predračun</b> izgleda isto kao račun, ali nema računovodstvene vrijednosti.
 InvoiceReplacement=Zamjenska faktura
 InvoiceReplacementAsk=Zamjenska faktura za fakturu
 InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
-InvoiceAvoir=Dobropis
+InvoiceAvoir=Knjižna obavijest
-InvoiceAvoirAsk=Dobropis za korekcijo računa
+InvoiceAvoirAsk=Knjižna obavijest za korekciju računa
-InvoiceAvoirDesc=<b>Dobropis</b> je negativni račun, ki se uporabi za rešitev problema, ko je iznos na računu drugačen od dejansko plačanega zneska (ker je kupec pomotoma plačal preveč, ali ne bo plačal v celoti, ker je na primer vrnil nekatere proizvode).
+InvoiceAvoirDesc=<b>Knjižna obavijest</b> je negativni račun, koji se koristi za rješavanje činjenice da računa ima iznos različit od iznosa koji je zaista plaćen (jer je kupac platio greškom više, ili neće da plati ostatak jer je vratio neke robe naprimjer).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
@@ -39,9 +39,9 @@ CorrectionInvoice=Ispravak fakture
 UsedByInvoice=Upotrebljeno za plaćanje fakture %s
 ConsumedBy=Utrošeno od strane
 NotConsumed=Nije utrošeno
-NoReplacableInvoice=Ni nadomestnega računa
+NoReplacableInvoice=Nema zamjenskih računa
 NoInvoiceToCorrect=Nema fakture za ispravljanje
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=je bila izvor jedne ili više knjižnih obavijesti
 CardBill=Kartica fakture
 PredefinedInvoices=Predefinisane fakture
 Invoice=Faktura
@@ -59,11 +59,11 @@ PaymentBack=Povrat uplate
 CustomerInvoicePaymentBack=Povrat uplate
 Payments=Uplate
 PaymentsBack=Povrat uplata
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=u valuti faktura
 PaidBack=Uplaćeno nazad
 DeletePayment=Obriši uplatu
-ConfirmDeletePayment=Jeste li sigurni da želite obrisati ovu uplatu?
+ConfirmDeletePayment=Da li ste sigurni da želite obrisati ovu uplatu?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReduc=Da li želite ovo %s pretvoriti u apsolutni popust ?<br>Iznos će biti spremljen među sve popuste i može se koristiti kao poput za trenutnu ili neke buduće fakture za ovog kupca.
 SupplierPayments=Uplate dobavljača
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
@@ -75,76 +75,76 @@ PaymentsAlreadyDone=Izvršene uplate
 PaymentsBackAlreadyDone=Izvršeni povrati uplata
 PaymentRule=Pravilo plaćanja
 PaymentMode=Način plaćanja
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeDC=Debitna/kreditna kartica
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
-CodePaymentMode=Payment type (code)
+CodePaymentMode=Vrsta plaćanja (šifra)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Način plaćanja
 PaymentTerm=Rok plaćanja
-PaymentConditions=Payment terms
+PaymentConditions=Uslovi plaćanja
-PaymentConditionsShort=Payment terms
+PaymentConditionsShort=Uslovi plaćanja
 PaymentAmount=Iznos plaćanja
 ValidatePayment=Potvrditi uplatu
 PaymentHigherThanReminderToPay=Uplata viša od zaostalog duga
-HelpPaymentHigherThanReminderToPay=Pozor, plačilo zneska enega ali več računa  je višje od preostanka za plačilo. <br> Popravite vaš vnos, ali potrdite iznos in pripravite dobropise za prekoračene zneske za vsak preveč plačan račun.
+HelpPaymentHigherThanReminderToPay=Upozorenje, plaćanje iznosa jedne ili više faktura je veće od ostatka duga. <br> Izmijenite vaš unos, u suprotnom potvrdite i napravite knjižnu obavijest za višak primljen za svaku više plaćenu fakturu.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
 ClassifyPaid=Označi kao 'Plaćeno'
 ClassifyPaidPartially=Označi kao 'Djelimično plaćeno'
 ClassifyCanceled=Označi kao 'Otkazano'
 ClassifyClosed=Označi kao 'Zaključeno'
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Klasificiraj 'nefakturisano'
 CreateBill=Kreiraj predračun
 CreateCreditNote=Ustvari dobropis
-AddBill=Create invoice or credit note
+AddBill=Napravi račun ili knjižnu obavijest
 AddToDraftInvoices=Dodaj na uzorak fakture
 DeleteBill=Obriši fakturu
 SearchACustomerInvoice=Traži fakturu kupca
 SearchASupplierInvoice=Traži fakturu dobavljača
 CancelBill=Otkaži fakturu
 SendRemindByMail=Pošalji opomenu na E-Mail
-DoPayment=Enter payment
+DoPayment=Unesi uplatu
-DoPaymentBack=Enter refund
+DoPaymentBack=Unesi refundaciju
 ConvertToReduc=Pretvori u budući popust
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca
-EnterPaymentDueToCustomer=Vnesi Rok plaćanja za kupca
+EnterPaymentDueToCustomer=Unesi rok plaćanja za kupca
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Onemogućeno jer je ostatak duga nula
 PriceBase=Osnova cijene
 BillStatus=Status fakture
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Uzorak (Potrebna je potvrda)
 BillStatusPaid=Plaćeno
-BillStatusPaidBackOrConverted=Refund or converted into discount
+BillStatusPaidBackOrConverted=Refundacija knjiž.obavijesti ili pretvoreno u popust
-BillStatusConverted=Spremenjeno v popust
+BillStatusConverted=Plaćeno (spremno za konačnu fakturu)
 BillStatusCanceled=Otkazano
 BillStatusValidated=Potvrđeno (Potrebno platiti)
 BillStatusStarted=Započeto
 BillStatusNotPaid=Nije plaćeno
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Nije vraćeno
 BillStatusClosedUnpaid=Zaključeno (neplaćeno)
 BillStatusClosedPaidPartially=Plaćeno (djelimično)
 BillShortStatusDraft=Uzorak
 BillShortStatusPaid=Plaćeno
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Refundirano ili preplaćeno
-BillShortStatusConverted=Spremenjeno
+BillShortStatusConverted=Plaćeno
 BillShortStatusCanceled=Otkazano
 BillShortStatusValidated=Potvrđeno
 BillShortStatusStarted=Započeto
 BillShortStatusNotPaid=Neplaćeno
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Nije vraćeno
 BillShortStatusClosedUnpaid=Zaključeno
 BillShortStatusClosedPaidPartially=Plaćeno (djelimično)
 PaymentStatusToValidShort=Za potvrdu
 ErrorVATIntraNotConfigured=PDV broj nije definisan
-ErrorNoPaiementModeConfigured=Ni določen privzet način plačila. Pojdite na nastavitve modula za račune.
+ErrorNoPaiementModeConfigured=Nema definisanog načina plaćanja. Idite u postavke modula faktura da popravite ovo.
-ErrorCreateBankAccount=Kreirajte bančni račun, zatem pojdite na področje Nastavitve za definiranje načina plačila
+ErrorCreateBankAccount=Napravite bankovni račun, zatim idite u panel postavki modula računa za definiranje načina plaćanja
 ErrorBillNotFound=Faktura %s ne postoji
-ErrorInvoiceAlreadyReplaced=Greška, poskusili ste potrditi račun za zamenjavo račuuna %s. Vendar je ta že bil nadomeščen z računom %s.
+ErrorInvoiceAlreadyReplaced=Greška, pokušavate odobriti fakturu za zamjenu fakture %s. Ali je ona već zamijenjena fakturom %s.
 ErrorDiscountAlreadyUsed=Greška, popust se već koristi
 ErrorInvoiceAvoirMustBeNegative=Greška, na popravljenem računu mora biti negativni iznos
-ErrorInvoiceOfThisTypeMustBePositive=Greška, ovaj tup fakture mora imati pozitivnu količinu
+ErrorInvoiceOfThisTypeMustBePositive=Greška, ovaj tip fakture mora imati pozitivnu količinu
-ErrorCantCancelIfReplacementInvoiceNotValidated=Greška, ne morete preklicati računa, ki je bil zamenjan z drugim računom, ki je še v statusu osnutka
+ErrorCantCancelIfReplacementInvoiceNotValidated=Greška, ne možete poništiti fakturu koju je zamijenila druga faktura a koja je još u statusu nacrta
 BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na fakturi
@@ -153,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nova faktura
-LastBills=Latest %s invoices
+LastBills=Posljednjih %s faktura
-LastCustomersBills=Latest %s customer invoices
+LastCustomersBills=Posljednjih %s faktura kupaca
-LastSuppliersBills=Latest %s supplier invoices
+LastSuppliersBills=Posljednjih %s faktura dobavljača
 AllBills=Sve fakture
 OtherBills=Ostale fakture
 DraftBills=Uzorak faktura
-CustomersDraftInvoices=Customer draft invoices
+CustomersDraftInvoices=Nacrti faktura kupcima
-SuppliersDraftInvoices=Supplier draft invoices
+SuppliersDraftInvoices=Nacrti faktura dobavljačima
 Unpaid=Neplaćeno
 ConfirmDeleteBill=Are you sure you want to delete this invoice?
 ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
@@ -174,14 +174,14 @@ ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a dis
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
-ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelomično vraćeni
+ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelimično vraćeni
 ConfirmClassifyPaidPartiallyReasonOther=Iznos otkazan zbog drugog razloga
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ovaj izbor je moguć ako faktura sadrži odgovarajući komentar. (Primjer << Imate pravo na odbitak, samo ako je plaćen porez koji odgovara cijeni>>)
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ovaj izbor je moguć ako faktura sadrži odgovarajući komentar. (Primjer «Imate pravo na odbitak, samo ako je plaćen porez koji odgovara cijeni»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim državama je ovaj izbor moguć samo ako faktura sadrži ispavne bilješke
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim državama je ovaj izbor moguć samo ako faktura sadrži ispravne bilješke
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristiti ovaj izbor samo ako nije drugi nije zadovoljavajući
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji je odbija platiti svoj dug.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada uplata nije završena zbog povrata nekih proizvoda
-ConfirmClassifyPaidPartiallyReasonOtherDesc=To izbiro uporabite, če nobena druga ne ustreza, na primer v naslednji situaciji:<br>- plačilo ni izvršeno v celoti, ker so bili nekateri proizvodi vrnjeni<br>- iznos je bil reklamiran, ker ni bil obračunan popust<br>V vseh primerih mora biti reklamiran iznos popravljen v računaodskem sistemu s kreiranjem dobropisa.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Koristite ovaj izbor ako bilo koji drugi ne odgovara, naprimjer u sljedećoj situaciji:<br>- plaćanje nije izvršeno jer su neki proizvodi vraćeni<br>- iznos je bio reklamiran, jer nije obračunat popust<br>U svim slučajevima, iznos koji je reklamiran mora biti ispravljen u računovodstvenom sistemu kreiranjem knjižne obavijesti.
 ConfirmClassifyAbandonReasonOther=Ostalo
 ConfirmClassifyAbandonReasonOtherDesc=Ovaj izbor se koristi u svim drugih slučajevima. Naprimjer, zbog toga sto planiranje kreirati zamjensku fakturu.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -198,16 +198,16 @@ ShowBill=Prikaži fakturu
 ShowInvoice=Prikaži fakturu
 ShowInvoiceReplace=Prikaži zamjensku fakturu
 ShowInvoiceAvoir=Prikaži dobropis
-ShowInvoiceDeposit=Prikaži fakture za avans
+ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
 ShowPayment=Prikaži uplatu
 AlreadyPaid=Već plaćeno
 AlreadyPaidBack=Već izvršen povrat uplate
-AlreadyPaidNoCreditNotesNoDeposits=Že plačano (brez dobropisa in avansa)
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
 Abandoned=Otkazano
-RemainderToPay=Remaining unpaid
+RemainderToPay=Ostalo neplaćeno
-RemainderToTake=Remaining amount to take
+RemainderToTake=Ostatak iznosa za naplatu
-RemainderToPayBack=Remaining amount to refund
+RemainderToPayBack=Ostatak iznosa za povrat
 Rest=Čekanje
 AmountExpected=Iznos za potraživati
 ExcessReceived=Višak primljen
@@ -216,7 +216,7 @@ EscompteOfferedShort=Popust
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
+StandingOrder=Nalog za plaćanje
 NoDraftBills=Nema uzoraka faktura
 NoOtherDraftBills=Nema drugih uzoraka faktura
 NoDraftInvoices=Nema uzoraka faktura
@@ -233,10 +233,10 @@ DateInvoice=Datum fakture
 DatePointOfTax=Point of tax
 NoInvoice=Nema fakture
 ClassifyBill=Označi fakturu
-SupplierBillsToPay=Unpaid supplier invoices
+SupplierBillsToPay=Neplaćene fakture dobavljača
-CustomerBillsUnpaid=Unpaid customer invoices
+CustomerBillsUnpaid=Nenaplaćene fakture od kupca
 NonPercuRecuperable=Nepovratno
-SetConditions=Postaviti uslova plaćanja
+SetConditions=Postaviti uslove plaćanja
 SetMode=Postaviti način plaćanja
 SetRevenuStamp=Set revenue stamp
 Billed=Fakturisano
@@ -270,10 +270,10 @@ RelativeDiscount=Relativni popust
 GlobalDiscount=Globalni popust
 CreditNote=Dobropis
 CreditNotes=Dobropisi
-Deposit=Avans
+Deposit=Down payment
-Deposits=Avansi
+Deposits=Down payments
 DiscountFromCreditNote=Popust z dobropisa %s
-DiscountFromDeposit=Uplata sa fakture za avans %s
+DiscountFromDeposit=Down payments from invoice %s
 DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Ova vrsta kredita može se koristiti na fakturi prije potvrde
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
@@ -314,8 +314,8 @@ ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Povezana faktura
 RelatedBills=Povezane fakture
 RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related supplier invoices
+RelatedSupplierInvoices=Povezane fakture dobavljača
-LatestRelatedBill=Latest related invoice
+LatestRelatedBill=Posljednje povezane fakture
 WarningBillExist=Warning, one or more invoice already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
@@ -323,9 +323,9 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
+FrequencyPer_d=Svakih %s dana
-FrequencyPer_m=Every %s months
+FrequencyPer_m=Svakih %s mjeseci
-FrequencyPer_y=Every %s years
+FrequencyPer_y=Svakih %s godina
 toolTipFrequency=Examples:<br /><b>Set 7, Day</b>: give a new invoice every 7 days<br /><b>Set 3, Month</b>: give a new invoice every 3 month
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of latest generation
@@ -340,28 +340,28 @@ WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Rok po preuzimanju
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionRECEP=Rok po preuzimanju
 PaymentConditionShort30D=30 dana
 PaymentCondition30D=30 dana
-PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentConditionShort30DENDMONTH=30 dana do kraja mjeseca
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentCondition30DENDMONTH=Unutar 30 dana nakon isteka mjeseca
 PaymentConditionShort60D=60 dana
 PaymentCondition60D=60 dana
-PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentConditionShort60DENDMONTH=60 dana do kraja mjeseca
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentCondition60DENDMONTH=Unutar 60 dana nakon isteka mjeseca
 PaymentConditionShortPT_DELIVERY=Isporuka
 PaymentConditionPT_DELIVERY=Na isporuci
-PaymentConditionShortPT_ORDER=Order
+PaymentConditionShortPT_ORDER=Narudžba
 PaymentConditionPT_ORDER=Na narudžbi
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% unaprijed, 50%% na isporuci
-PaymentConditionShort10D=10 days
+PaymentConditionShort10D=10 dana
-PaymentCondition10D=10 days
+PaymentCondition10D=10 dana
 PaymentConditionShort10DENDMONTH=10 days of month-end
 PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
+PaymentConditionShort14D=14 dana
-PaymentCondition14D=14 days
+PaymentCondition14D=14 dana
 PaymentConditionShort14DENDMONTH=14 days of month-end
 PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fiksni iznos
@@ -369,19 +369,19 @@ VarAmount=Varijabilni iznos (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bankovna transakcija
 PaymentTypeShortVIR=Bankovna transakcija
-PaymentTypePRE=Direct debit payment order
+PaymentTypePRE=Direktni nalog za plaćanje
-PaymentTypeShortPRE=Debit payment order
+PaymentTypeShortPRE=Nalog za plaćanje
 PaymentTypeLIQ=Gotovina
 PaymentTypeShortLIQ=Gotovina
 PaymentTypeCB=Kreditna kartica
 PaymentTypeShortCB=Kreditna kartica
 PaymentTypeCHQ=Ček
 PaymentTypeShortCHQ=Ček
-PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeTIP=Akreditiv (Akreditivno pismo)
-PaymentTypeShortTIP=TIP Payment
+PaymentTypeShortTIP=Plaćanje akreditivom
 PaymentTypeVAD=Elektronska uplata
 PaymentTypeShortVAD=Elektronska uplata
-PaymentTypeTRA=Bank draft
+PaymentTypeTRA=Povlačenje banke
 PaymentTypeShortTRA=Nacrt
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
@@ -390,7 +390,7 @@ BankCode=Kod banke
 DeskCode=Kod blagajne
 BankAccountNumber=Kod računa
 BankAccountNumberKey=Ključ
-Residence=Direct debit
+Residence=Nalog za plaćanje
 IBANNumber=IBAN broj
 IBAN=IBAN
 BIC=BIC/SWIFT
@@ -439,7 +439,7 @@ ShowUnpaidAll=Prikaži sve neplaćene fakture
 ShowUnpaidLateOnly=Prikaži samo zakašnjele neplaćene fakture
 PaymentInvoiceRef=Faktura za plaćanje %s
 ValidateInvoice=Potvrdi fakturu
-ValidateInvoices=Validate invoices
+ValidateInvoices=Potvrdi račune
 Cash=Gotovina
 Reported=Odgođeno
 DisabledBecausePayments=Nije moguće jer ima nekoliko uplata
@@ -447,7 +447,7 @@ CantRemovePaymentWithOneInvoicePaid=Ne može se obrisati uplata jer ima bar jedn
 ExpectedToPay=Očekivano plaćanje
 CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Plaćeno ovom uplatom
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
 ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Sve fakture bez preostalog iznosa za uplatu će atuomatski biti zatvorene uz status "Plaćeno".
@@ -460,11 +460,11 @@ YouMustCreateInvoiceFromThird=This option is only available when creating invoic
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Predloga računa Crabe. Predloga kompletnega računa (Podpora PDV opcije, popusti, pogoji plačila, logo, itd...)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+PDFCrevetteDescription=PDF šablon Crevette za račune. Kompletan šablon za situiranje privremenih situacija
 TerreNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna broj brez presledkov in večja od 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 TerreNumRefModelError=Račun z začetkom $syymm že obstaja in ni kompatibilen s tem modelom zaporedja. Odstranite ga ali ga preimenujte za aktiviranje tega modula.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for deposit invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Predstavnik za kontrolu fakture kupca
 TypeContact_facture_external_BILLING=Kontakt za fakturu kupca
@@ -475,32 +475,32 @@ TypeContact_invoice_supplier_external_BILLING=Kontakt za fakturu dobavljača
 TypeContact_invoice_supplier_external_SHIPPING=Kontakt za otpremanje dobavljaču
 TypeContact_invoice_supplier_external_SERVICE=Kontakt službe za korisnike
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationAsk=Prva privremena situacija
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
+InvoiceSituation=Privremena situacija
-InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationAsk=Faktura nakon situacije
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
+SituationDeduction=Oduzimanje situacije
-ModifyAllLines=Modify all lines
+ModifyAllLines=Izmijeni sve redove
-CreateNextSituationInvoice=Create next situation
+CreateNextSituationInvoice=Napravi sljedeću situaciju
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseNotLastInCycle=Sljedeća situacija već postoji.
-DisabledBecauseFinal=This situation is final.
+DisabledBecauseFinal=Ova situacija je konačna.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
+NoSituations=Nema otvorenih situacija
 InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationNumber=Situacija br.%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceLineDecompte=Privremena situacija - broj
-PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceTitle=Privremena situacija
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
+PDFCrevetteSituationInvoiceLine=Situacija br%s : fakt. br°%s od %s
-TotalSituationInvoice=Total situation
+TotalSituationInvoice=Ukupna situacija
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+invoiceLineProgressError=Red prethodno fakturisanog ne može biti veće ili jednako sljedećem redu u fakturi
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
+DeleteRepeatableInvoice=Obriši šablon fakture
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
 BillCreated=%s bill(s) created

htdocs/langs/bs_BA/boxes.lang

@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login information
 BoxLastRssInfos=Rss informacije
 BoxLastProducts=Latest %s products/services
 BoxProductsAlertStock=Stock alerts for products
@@ -25,8 +26,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastCustomerBills=Posljednjih %s faktura kupaca
-BoxTitleLastSupplierBills=Latest %s supplier invoices
+BoxTitleLastSupplierBills=Posljednjih %s faktura dobavljača
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -82,3 +83,4 @@ ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
 LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard

htdocs/langs/bs_BA/companies.lang

@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Ime kompanije %s već postoji. Izaberite neko drugo.
 ErrorSetACountryFirst=Odberite prvo zemlju
 SelectThirdParty=Odaberite subjekt
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Da li ste sigurni da želite obrisati ovu kompaniju i sve podatke vezane za istu?
 DeleteContact=Obrisati kontakt/uslugu
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Da li ste sigurni da želite obrisati ovaj kontakt i sve podatke vezane za istog?
 MenuNewThirdParty=Novi subjekt
 MenuNewCustomer=Novi kupac
 MenuNewProspect=Novi mogući klijent
@@ -12,9 +12,9 @@ MenuNewSupplier=Novi dobavljač
 MenuNewPrivateIndividual=Novo fizičko lice
 NewCompany=Nova kompanija (mogući klijent, kupac, dobavljač)
 NewThirdParty=Novi subjekt (mogući klijent, kupac, dobavljač)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateDolibarrThirdPartySupplier=Napravi subjekt (dobavljač)
-CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyOnly=Napravi novi subjekt
-CreateThirdPartyAndContact=Create a third party + a child contact
+CreateThirdPartyAndContact=Napravi subjekt + podređeni kontakt
 ProspectionArea=Područje za moguće kupce
 IdThirdParty=ID subjekta
 IdCompany=ID kompanije
@@ -24,8 +24,8 @@ ThirdPartyContacts=Kontakti subjekta
 ThirdPartyContact=Kontakt/Adresa subjekta
 Company=Kompanija
 CompanyName=Ime kompanije
-AliasNames=Alias name (commercial, trademark, ...)
+AliasNames=Nadimak (komercijalni, trgovačkim, ...)
-AliasNameShort=Alias name
+AliasNameShort=Nadimak
 Companies=Kompanije
 CountryIsInEEC=Zemlja je unutar Evropske ekonomske zajednice
 ThirdPartyName=Ime subjekta
@@ -38,22 +38,21 @@ ThirdPartyCustomersStats=Kupci
 ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
 ThirdPartySuppliers=Dobavljači
 ThirdPartyType=Tip subjekta
-Company/Fundation=Kompanija/Fondacija
 Individual=Fizičko lice
-ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
+ToCreateContactWithSameName=Automatski pravi kontakt/adresu sa istim informacijama kao i subjekt ispod. U većini slučajeva, čak i kada je subjekt fizička osoba, samo pravljenje subjekta je dovoljno.
 ParentCompany=Matična kompanija
 Subsidiaries=Podružnice
 ReportByCustomers=Izvještaj po kupcima
 ReportByQuarter=Izvještaj po stopama
-CivilityCode=Civility code
+CivilityCode=Pravila ponašanja
 RegisteredOffice=Registrovan ured
 Lastname=Prezime
 Firstname=Ime
-PostOrFunction=Job position
+PostOrFunction=Pozicija
 UserTitle=Titula
 Address=Adresa
 State=Država/Provincija
-StateShort=State
+StateShort=Pokrajina
 Region=Region
 Country=Država
 CountryCode=Šifra države
@@ -66,7 +65,7 @@ Chat=Chat
 PhonePro=Službeni telefon
 PhonePerso=Privatni telefon
 PhoneMobile=Mobitel
-No_Email=Refuse mass e-mailings
+No_Email=Odbija masovno slanje emaila
 Fax=Fax
 Zip=Poštanski broj
 Town=Grad
@@ -75,51 +74,51 @@ Poste= Pozicija
 DefaultLang=Defaultni jezik
 VATIsUsed=Oporeziva osoba
 VATIsNotUsed=Neoporeziva osoba
-CopyAddressFromSoc=Fill address with third party address
+CopyAddressFromSoc=Popuni adresu sa adresom subjekta
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+ThirdpartyNotCustomerNotSupplierSoNoRef=Subjekt nije kupac niti dobavljač, nema dostupnih referentnih objekata
-PaymentBankAccount=Payment bank account
+PaymentBankAccount=Bankovni račun za plaćanje
-OverAllProposals=Total proposals
+OverAllProposals=Prijedlozi
-OverAllOrders=Total orders
+OverAllOrders=Narudžbe
-OverAllInvoices=Total invoices
+OverAllInvoices=Fakture
-OverAllSupplierProposals=Total price requests
+OverAllSupplierProposals=Zahtjevi za cijena
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
+LocalTax1IsUsed=Koristi drugu stopu poreza
-LocalTax1IsUsedES= RE is used
+LocalTax1IsUsedES= Koristi se RE
-LocalTax1IsNotUsedES= RE is not used
+LocalTax1IsNotUsedES= Ne koristi se RE
-LocalTax2IsUsed=Use third tax
+LocalTax2IsUsed=Koristi treću stopu poreza
-LocalTax2IsUsedES= IRPF is used
+LocalTax2IsUsedES= Koristi se IRPF
-LocalTax2IsNotUsedES= IRPF is not used
+LocalTax2IsNotUsedES= Ne koristi se IRPF
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
+TypeLocaltax1ES=Vrsta RE
-TypeLocaltax2ES=IRPF Type
+TypeLocaltax2ES=Vrsta IRPF
 WrongCustomerCode=Nevažeća šifra kupca
 WrongSupplierCode=Nevažeća šifra dobavljača
 CustomerCodeModel=Model šifre kupca
 SupplierCodeModel=Model šifre dobavljača
 Gencod=Barkod
 ##### Professional ID #####
-ProfId1Short=Prof. id 1
+ProfId1Short=ID broj 1
-ProfId2Short=Prof. id 2
+ProfId2Short=ID broj 2
-ProfId3Short=Prof. id 3
+ProfId3Short=ID broj 3
-ProfId4Short=Prof. id 4
+ProfId4Short=ID broj 4
-ProfId5Short=Prof. id 5
+ProfId5Short=ID broj 5
-ProfId6Short=Prof. id 6
+ProfId6Short=ID broj 6
-ProfId1=Professional ID 1
+ProfId1=Profesionalni ID 1
-ProfId2=Professional ID 2
+ProfId2=Profesionalni ID 2
-ProfId3=Professional ID 3
+ProfId3=Profesionalni ID 3
-ProfId4=Professional ID 4
+ProfId4=Profesionalni ID 4
-ProfId5=Professional ID 5
+ProfId5=Profesionalni ID 5
-ProfId6=Professional ID 6
+ProfId6=Profesionalni ID 6
 ProfId1AR=Prof Id 1 (CUIT / CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId1AT=Prof Id 1 (USt.-Id br.)
-ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId2AT=Prof Id 2 (USt.-br.)
-ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId3AT=Prof Id 3 (br. trgovačkog registra)
 ProfId4AT=-
 ProfId5AT=-
 ProfId6AT=-
@@ -143,8 +142,8 @@ ProfId4BR=CPF
 #ProfId6BR=INSS
 ProfId1CH=-
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
+ProfId3CH=Prof Id 1 (Federalni broj)
-ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId4CH=Prof Id 2 (Broj komercijalnog zapisa)
 ProfId5CH=-
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
@@ -159,21 +158,21 @@ ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId1DE=Prof Id 1 (USt.-Id br.)
-ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId2DE=Prof Id 2 (USt.-br.)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId3DE=Prof Id 3 (br. trgovačkog registra)
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
-ProfId2ES=Prof Id 2 (Social security number)
+ProfId2ES=Prof Id 2 (broj socijalnog osiguranja)
 ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId4ES=Prof Id 4 (broj udruženja)
 ProfId5ES=-
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId3FR=Prof Id 3 (NAF, stari APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
 ProfId5FR=-
 ProfId6FR=-
@@ -191,38 +190,38 @@ ProfId5HN=-
 ProfId6HN=-
 ProfId1IN=Prof Id 1 (TIN)
 ProfId2IN=Prof Id 2 (PAN)
-ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId3IN=Prof Id 3 (SRVC porez)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId2LU=Id. prof. 2 (dozvola za rad)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
-ProfId2MA=Id prof. 2 (Patente)
+ProfId2MA=Id prof. 2 (Patent)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
 ProfId5MA=Id. prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId3MX=Prof Id 3 (profesionalna povelja)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=KVK broj
 ProfId2NL=-
 ProfId3NL=-
-ProfId4NL=Burgerservicenummer (BSN)
+ProfId4NL=Broj usluga građanima (BSN)
 ProfId5NL=-
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
-ProfId2PT=Prof Id 2 (Social security number)
+ProfId2PT=Prof Id 2 (broj socijalnog osiguranja)
-ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId3PT=Prof Id 3 (broj komercijalnog zapisa)
-ProfId4PT=Prof Id 4 (Conservatory)
+ProfId4PT=Prof Id 4 (konzervator)
 ProfId5PT=-
 ProfId6PT=-
 ProfId1SN=RC
@@ -232,11 +231,17 @@ ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
 ProfId1TN=Prof Id 1 (RC)
-ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId2TN=Prof Id 2 (fiskalni broj)
-ProfId3TN=Prof Id 3 (Douane code)
+ProfId3TN=Prof Id 3 (carinski broj)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
+ProfId1US=Prof Id
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
 ProfId3RU=Prof Id 3 (KPP)
@@ -259,28 +264,28 @@ CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Fiksni popust
 CompanyHasRelativeDiscount=Ovaj kupca ima defaultni popust od <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ovaj kupac nema relativnog popusta po defaultu
-CompanyHasAbsoluteDiscount=Ovaj kupac još uvijek ima zasluga za popust ili depozit za <b>%s</b> %s
+CompanyHasAbsoluteDiscount=Ovaj kupac ima dostupno odobrenje (Knjižne obavijesti ili avansno plaćanje) za <b>%s</b> %s
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+CompanyHasCreditNote=Ovaj kupac i dalje ima knjižno odobrenje za <b>%s</b> %s
 CompanyHasNoAbsoluteDiscount=Ovaj kupac nema zasluga za popust
 CustomerAbsoluteDiscountAllUsers=Fiksni popust (odobren od strane svih korisnika)
 CustomerAbsoluteDiscountMy=Fiksni popust (odobren od strane sebe)
 DiscountNone=Ništa
 Supplier=Dobavljač
-AddContact=Create contact
+AddContact=Napravi kontakt
-AddContactAddress=Create contact/address
+AddContactAddress=Napravi kontakt/adresu
 EditContact=Uredi kontakt
 EditContactAddress=Uredi kontakt/adresu
 Contact=Kontakt
-ContactId=Contact id
+ContactId=Id kontakta
 ContactsAddresses=Kontakti/Adrese
-FromContactName=Name:
+FromContactName=Naziv:
 NoContactDefinedForThirdParty=Nema definiranih kontakata za ovaj subjekt
 NoContactDefined=Nijedan kontakt definiran
 DefaultContact=Defaultni kontakt/adresa
-AddThirdParty=Create third party
+AddThirdParty=Napravi novi subjekt
 DeleteACompany=Obrisati kompaniju
 PersonalInformations=Osobni podaci
-AccountancyCode=Accounting account
+AccountancyCode=Računovodstveni račun
 CustomerCode=Šifra kupca
 SupplierCode=Šifra dobavljača
 CustomerCodeShort=Šifra kupca
@@ -296,17 +301,17 @@ CompanyDeleted=Kompanija"%s" obrisana iz baze podataka
 ListOfContacts=Lista kontakta/adresa
 ListOfContactsAddresses=Lista kontakta/adresa
 ListOfThirdParties=Lista subjekata
-ShowCompany=Show third party
+ShowCompany=Pokaži subjekt
 ShowContact=Prikaži kontakt
 ContactsAllShort=Svi (bez filtera)
 ContactType=Tip kontakta
 ContactForOrders=Kontakt narudžbe
-ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForOrdersOrShipments=Kontakt za narudžbu ili slanje
 ContactForProposals=Kontakt prijedloga
 ContactForContracts=Kontakt ugovora
 ContactForInvoices=Kontakt fakture
 NoContactForAnyOrder=Ovaj kontakt nije kontakt za bilo koju narudžbu
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyOrderOrShipments=Ovaj kontakt nije kontakt za bilo koju narudžbu ili slanje
 NoContactForAnyProposal=Ovaj kontakt nije kontakt za bilo koji poslovni prijedlog
 NoContactForAnyContract=Ovaj kontakt nije kontakt za bilo koji ugovor
 NoContactForAnyInvoice=Ovaj kontakt nije kontakt za bilo koju fakturu
@@ -316,15 +321,15 @@ MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Kapital od %s
 EditCompany=Uredi kompaniju
-ThisUserIsNot=OVaj korisnik nije mogući klijent, kupac niti dobavljač
+ThisUserIsNot=Ovaj korisnik nije mogući klijent, kupac niti dobavljač
 VATIntraCheck=Provjeri
 VATIntraCheckDesc=Link <b>%s</b> dozvoljava upit za evopski PDV servis za provjeru. Potrebno je imati pristup internetu na serveru za ovu uslugu.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site
+VATIntraCheckableOnEUSite=Provjeri PDV broj na stranici Evropske komisije
-VATIntraManualCheck=You can also check manually from european web site <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=Također možete ručno provjeriti sa evropske web stranice <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije naveden od stran države članice (%s).
 NorProspectNorCustomer=Niti mogući klijent, niti kupac
-JuridicalStatus=Legal form
+JuridicalStatus=Pravni status
 Staff=Osoblje
 ProspectLevelShort=Potencijal
 ProspectLevel=Potencijal mogućeg klijenta
@@ -351,12 +356,12 @@ TE_PRIVATE=Fizičko lice
 TE_OTHER=Ostalo
 StatusProspect-1=Ne kontaktirati
 StatusProspect0=Nikada kontaktirano
-StatusProspect1=To be contacted
+StatusProspect1=Kontaktirat će se
 StatusProspect2=Kontaktiranje u toku
 StatusProspect3=Kontaktirano
 ChangeDoNotContact=Promijeni status u 'Ne kontaktirati'
 ChangeNeverContacted=Promjeni status na 'Nikada kontaktirano'
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Promijeni status na 'Treba kontaktirati'
 ChangeContactInProcess=Promjeni status na 'Kontaktiranje u toku'
 ChangeContactDone=Promjeni status na 'Kontaktirano'
 ProspectsByStatus=Mogući klijenti po statusu
@@ -365,47 +370,47 @@ ExportCardToFormat=Izvod podataka u formatu
 ContactNotLinkedToCompany=Kontakt nije povezan sa nekim od subjekata
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Nema Dolibarr pristupa
-ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ExportDataset_company_1=Subjekti (kompanije/fondacije/fizička lica) i svojstva
 ExportDataset_company_2=Kontakti i osobine
-ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ImportDataset_company_1=Subjekti (kompanije/fondacije/fizička lica) i svojstva
 ImportDataset_company_2=Kontakti/Adrese (od subjekata ili ne) i atributi
 ImportDataset_company_3=Detalji banke
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_4=Subjekti/predstavnici prodaje (Odnosi se na predstavnike prodaje korisnike u kompanijama)
 PriceLevel=Visina cijene
 DeliveryAddress=Adresa za dostavu
 AddAddress=Dodaj adresu
 SupplierCategory=Kategorija dobavljača
-JuridicalStatus200=Independent
+JuridicalStatus200=Nezavisni
 DeleteFile=Obriši fajl
 ConfirmDeleteFile=Jeste li sigurni da želite obrisati ovaj fajl?
-AllocateCommercial=Assigned to sales representative
+AllocateCommercial=Dodijeljen predstavniku prodaje
 Organization=Organizacija
 FiscalYearInformation=Informacije o fiskalnoj godini
 FiscalMonthStart=Početni mjesec fiskalne godine
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
+YouMustAssignUserMailFirst=Morate najprije napraviti email za ovog korisnika da biste mogli dodati email notifikacije
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustCreateContactFirst=Da bi mogli dodati e-mail obavještenja, prvo morate definirati kontakte s važećom e-poštom za subjekte
 ListSuppliersShort=Lista dobavljača
 ListProspectsShort=Lista mogućih klijenata
 ListCustomersShort=Lista kupaca
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Područje za subjekte i kontakte
-LastModifiedThirdParties=Latest %s modified third parties
+LastModifiedThirdParties=Zadnjih %s izmijenjenih subjekata
 UniqueThirdParties=Ukupno unikatnih subjekata
-InActivity=Otvoreno
+InActivity=Otvori
 ActivityCeased=Zatvoreno
-ThirdPartyIsClosed=Third party is closed
+ThirdPartyIsClosed=Subjekat je zatvoren
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=Spisak proizvoda/usluga u %s
 CurrentOutstandingBill=Trenutni neplaćeni račun
 OutstandingBill=Max. za neplaćeni račun
-OutstandingBillReached=Max. for outstanding bill reached
+OutstandingBillReached=Dostignut maksimum za neplaćene račune
 MonkeyNumRefModelDesc=Vratiti broj sa formatom %syymm-nnnn za šifru kupca i $syymm-nnnn za šifru dobavljača gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0.
 LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
+ManagingDirectors=Ime menadžer(a) (CEO, direktor, predsjednik...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeOriginThirdparty=Umnoži subjekta (subjekt kojeg želite obrisati)
-MergeThirdparties=Merge third parties
+MergeThirdparties=Spoji subjekte
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ConfirmMergeThirdparties=Da li ste sigurni da želite spojiti ovaj subjekt u trenutno prikazani? Svi povezani objekti (fakture, narudžbe, ...) će biti premještene trenutnom subjektu, a zatim će prethodni subjekt biti obrisan.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
+ThirdpartiesMergeSuccess=Subjekti su spojeni
-SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeLogin=Pristup za predstavnika prodaje
-SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeFirstname=Ime predstavnika prodaje
-SaleRepresentativeLastname=Last name of sales representative
+SaleRepresentativeLastname=Prezime predstavnika prodaje
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=Nastala greška pri brisanju subjekta. Molimo provjeriti zapisnik. Promjene su vraćene.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=Kod novog kupca ili dobavljača predložen za duplikat koda

htdocs/langs/bs_BA/compta.lang

@@ -13,37 +13,37 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Postavke
 RemainingAmountPayment=Iznos preostale uplate :
 Account=Račun
-Accountparent=Account parent
+Accountparent=Glavni račun
-Accountsparent=Accounts parent
+Accountsparent=Glavni računi
-Income=Income
+Income=Prihod
-Outcome=Expense
+Outcome=Rashod
-ReportInOut=Income / Expense
+ReportInOut=Prihodi / Rashodi
-ReportTurnover=Turnover
+ReportTurnover=Promet
-PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToInvoice=Plaćanja nisu povezana ni sa jednom fakturom, niti su povezana sa nekim subjektom
-PaymentsNotLinkedToUser=Payments not linked to any user
+PaymentsNotLinkedToUser=Plaćanja nisu povezana ni sa jednim korisnikom
-Profit=Profit
+Profit=Dobit
 AccountingResult=Accounting result
 Balance=Stanje
-Debit=Debit
+Debit=Duguje
-Credit=Credit
+Credit=Potražuje
 Piece=Accounting Doc.
-AmountHTVATRealReceived=Net collected
+AmountHTVATRealReceived=Neto prikupljeno
-AmountHTVATRealPaid=Net paid
+AmountHTVATRealPaid=Neto plaćeno
-VATToPay=VAT sells
+VATToPay=PDV izlazni
-VATReceived=VAT received
+VATReceived=PDV ulazni
-VATToCollect=VAT purchases
+VATToCollect=VAT na čekanju
-VATSummary=VAT Balance
+VATSummary=PDV stanje
-LT2SummaryES=IRPF Balance
+LT2SummaryES=IRPF stanje
 LT1SummaryES=RE Balance
-VATPaid=VAT paid
+VATPaid=PDV plaćen
-LT2PaidES=IRPF Paid
+LT2PaidES=IRPF plaćen
 LT1PaidES=RE Paid
-LT2CustomerES=IRPF sales
+LT2CustomerES=IRPF prodajni
-LT2SupplierES=IRPF purchases
+LT2SupplierES=IRPF kupovni
 LT1CustomerES=RE sales
 LT1SupplierES=RE purchases
-VATCollected=VAT collected
+VATCollected=PDV prikupljeni
-ToPay=To pay
+ToPay=Za plaćanje
 SpecialExpensesArea=Area for all special payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
@@ -56,15 +56,16 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
-NewPayment=New payment
+NewPayment=Novo plaćanje
 Payments=Uplate
-PaymentCustomerInvoice=Customer invoice payment
+PaymentCustomerInvoice=Plaćanje računa kupca
-PaymentSocialContribution=Social/fiscal tax payment
+PaymentSocialContribution=Plaćanje socijalnog/fiskalnog poreza
-PaymentVat=VAT payment
+PaymentVat=Plaćanje PDVa
-ListPayment=List of payments
+ListPayment=Spisak plaćanja
-ListOfCustomerPayments=List of customer payments
+ListOfCustomerPayments=Spisak uplata kupca
 ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
@@ -75,7 +76,7 @@ LT1Payments=Tax 2 payments
 LT2Payment=Tax 3 payment
 LT2Payments=Tax 3 payments
 newLT1PaymentES=New RE payment
-newLT2PaymentES=New IRPF payment
+newLT2PaymentES=Novo IRPF plaćanje
 LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 LT2PaymentES=IRPF Payment
@@ -97,7 +98,7 @@ NewAccountingAccount=Novi račun
 SalesTurnover=Sales turnover
 SalesTurnoverMinimum=Minimum sales turnover
 ByExpenseIncome=By expenses & incomes
-ByThirdParties=By third parties
+ByThirdParties=Po subjektu
 ByUserAuthorOfInvoice=By invoice author
 CheckReceipt=Check deposit
 CheckReceiptShort=Check deposit
@@ -134,8 +135,8 @@ RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whet
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
 RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
+DepositsAreNotIncluded=- Down payment invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
+DepositsAreIncluded=- Down payment invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReport=VAT report
@@ -168,8 +169,8 @@ PurchasesJournal=Purchases Journal
 DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Referenca fakture
-CodeNotDef=Not defined
+CodeNotDef=Nije definirano
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
 Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
@@ -178,7 +179,7 @@ InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By products and services
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Link to order
+LinkedOrder=Link ka narudžbi
 Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
@@ -189,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
@@ -205,3 +208,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project

htdocs/langs/bs_BA/contracts.lang

@@ -83,6 +83,8 @@ NoteListOfYourExpiredServices=This list contains only services of contracts for
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
 OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+CloneContract=Clone contract
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Predstavnik prodaje koji potpisuje ugovor

htdocs/langs/bs_BA/cron.lang

@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=Ništa
 CronDtStart=Not before
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Sljedeće izvršenje
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Frekvencija
 CronClass=Class
 CronMethod=Metoda
 CronModule=Modul
 CronNoJobs=Nema registrovanih poslova
 CronPriority=Prioritet
-CronLabel=Label
+CronLabel=Oznaka
 CronNbRun=Broj pokretanja
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -57,12 +57,12 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Iskljući
 CronTaskInactive=This job is disabled
 CronId=ID
-CronClassFile=Classes (filename.class.php)
+CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Sistemska komanda za izvršenje
 CronCreateJob=Create new Scheduled Job
 CronFrom=Od
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.

htdocs/langs/bs_BA/ecm.lang

@@ -30,13 +30,13 @@ ECMDocsByContracts=Dokumenti vezani za ugovore
 ECMDocsByInvoices=Dokumenti vezani za fakture klijenata
 ECMDocsByProducts=Dokumenti vezani za proizvode
 ECMDocsByProjects=Dokumenti vezani za projekte
-ECMDocsByUsers=Documents linked to users
+ECMDocsByUsers=Dokumenti povezani s korisnicima
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Documents linked to expense reports
 ECMNoDirectoryYet=Nema kreiranih direktorija
 ShowECMSection=Prikaži direktorij
 DeleteSection=Ukloni direktorij
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ConfirmDeleteSection=Možete li potvrditi da želite obrisati direktorij <b>%s</b>?
 ECMDirectoryForFiles=Relativni direktorij za fajlove
 CannotRemoveDirectoryContainsFiles=Nemoguće ukloniti jer sadrži fajlove
 ECMFileManager=Updavljanje fajlovima

htdocs/langs/bs_BA/errors.lang

@@ -18,6 +18,8 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -42,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
@@ -114,7 +117,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
@@ -165,6 +168,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
@@ -177,13 +181,19 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
 ErrorTaskAlreadyAssigned=Task already assigned to user
 ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -204,3 +214,4 @@ WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language

htdocs/langs/bs_BA/holiday.lang

@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Kadrovska služba
-Holidays=Leaves
+Holidays=Odlasci
-CPTitreMenu=Leaves
+CPTitreMenu=Odlasci
 MenuReportMonth=Mjesečni izvještaj
 MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
@@ -16,7 +16,7 @@ CancelCP=Otkazan
 RefuseCP=Odbijen
 ValidatorCP=Osoba koja odobrava
 ListeCP=List of leaves
-ReviewedByCP=Bit će pregledano od strane
+ReviewedByCP=Will be approved by
 DescCP=Opis
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.

htdocs/langs/bs_BA/install.lang

@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
+InstallEasy=Pratite instrukcije korak po korak.
-MiscellaneousChecks=Prerequisites check
+MiscellaneousChecks=Provjera preduvjeta
-ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileExists=Konfiguracijska datoteka<b>%s</b> postoji.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
+ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracijska datoteka <b>%s</b> ne postoji i ne može biti napravljena !
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileCouldBeCreated=Konfiguracijska datoteka <b>%s</b> se može napraviti.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Po konfiguracijskoj datoteci <b>%s</b> se ne može pisati. Provjerite dozvole. Za prvu instalaciju, vaš web server mora dopustiti pisanje u ovu datoteku tokom procesa konfiguracije ("chmod 666" naprimjer na OS poput Unixa).
-ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileIsWritable=Konfiguracijska datoteka <b>%s</b> je slobodna za pisanje.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=Napuni sve informacije iz konfiguracijske datoteke.
-PHPSupportSessions=This PHP supports sessions.
+PHPSupportSessions=Ovaj PHP podržava sesije.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
+PHPSupportPOSTGETKo=Moguće je da vaše PHP postavke ne podržavaju varijable POST i/ili GET. Provjerite vaš parametar <b>variables_order</b> u php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportGD=Ovaj PHP podržava GD grafičke funkcije.
 PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportUTF8=Ovaj PHP podržava UTF8 funkcije.
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>. To bi trebalo biti dovoljno.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
@@ -138,6 +138,7 @@ KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values
 KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
 KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
 KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
+UpgradeExternalModule=Run dedicated upgrade process of external modules
 
 #########
 # upgrade

htdocs/langs/bs_BA/members.lang

@@ -3,7 +3,7 @@ MembersArea=Members area
 MemberCard=Member card
 SubscriptionCard=Subscription card
 Member=Member
-Members=Members
+Members=Članovi
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
 ThirdpartyNotLinkedToMember=Third-party not linked to a member
@@ -61,7 +61,7 @@ NewSubscription=New subscription
 NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
 Subscription=Subscription
 Subscriptions=Subscriptions
-SubscriptionLate=Late
+SubscriptionLate=Kasno
 SubscriptionNotReceived=Subscription never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
@@ -90,8 +90,9 @@ PublicMemberList=Public member list
 BlankSubscriptionForm=Public auto-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
 EnablePublicSubscriptionForm=Enable the public auto-subscription form
+ForceMemberType=Force the member type
 ExportDataset_member_1=Members and subscriptions
-ImportDataset_member_1=Members
+ImportDataset_member_1=Članovi
 LastMembersModified=Latest %s modified members
 LastSubscriptionsModified=Latest %s modified subscriptions
 String=String
@@ -135,7 +136,7 @@ LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with busin
 DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
-SubscriptionPayment=Subscription payment
+SubscriptionPayment=Plaćanje preplate
 LastSubscriptionDate=Latest subscription date
 LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
@@ -150,6 +151,7 @@ MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistika
 LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval

htdocs/langs/bs_BA/orders.lang

@@ -3,8 +3,8 @@ OrdersArea=Customers orders area
 SuppliersOrdersArea=Suppliers orders area
 OrderCard=Order card
 OrderId=Order Id
-Order=Order
+Order=Narudžba
-Orders=Orders
+Orders=Narudžbe
 OrderLine=Order line
 OrderDate=Datum narudžbe
 OrderDateShort=Datum narudžbe
@@ -16,7 +16,7 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customer orders
+CustomersOrders=Narudžbe kupaca
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill

htdocs/langs/bs_BA/other.lang

@@ -9,6 +9,19 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
@@ -61,13 +74,14 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -146,20 +160,20 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
-NumberOfProposals=Number of proposals in past 12 months
+NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of customer orders in past 12 months
+NumberOfCustomerOrders=Number of customer orders
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
+NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
+NumberOfSupplierProposals=Number of supplier proposals
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
+NumberOfSupplierOrders=Number of supplier orders
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
+NumberOfSupplierInvoices=Number of supplier invoices
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
+NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
+NumberOfUnitsCustomerOrders=Number of units on customer orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.

htdocs/langs/bs_BA/printing.lang

@@ -29,8 +29,8 @@ GCP_Type=Printer Type
 PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
 PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
+PRINTIPP_USER=Ulaz
-PRINTIPP_PASSWORD=Password
+PRINTIPP_PASSWORD=Šifra
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
@@ -40,7 +40,7 @@ IPP_State=Printer State
 IPP_State_reason=State reason
 IPP_State_reason1=State reason1
 IPP_BW=BW
-IPP_Color=Color
+IPP_Color=Boja
 IPP_Device=Device
 IPP_Media=Printer media
 IPP_Supported=Type of media

htdocs/langs/bs_BA/products.lang

@@ -25,11 +25,13 @@ ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi i usluge
 ProductsOrServices=Proizvodi ili usluge
-ProductsOnSell=Product for sale or for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Product for purchase only
 ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
+ServicesOnSaleOnly=Services for sale only
-ServicesNotOnSell=Services not for sale
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 LastModifiedProductsAndServices=Latest %s modified products/services
 LastRecordedProducts=Latest %s recorded products
@@ -162,7 +164,7 @@ second=second
 s=s
 hour=hour
 h=h
-day=day
+day=dan
 d=d
 kilogram=kilogram
 kg=Kg
@@ -175,6 +177,18 @@ m2=m²
 m3=m³
 liter=liter
 l=L
+unitP=Piece
+unitSET=Set
+unitS=Sekunda
+unitH=Sat
+unitD=Dan
+unitKG=Kilogram
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 CurrentProductPrice=Current price
@@ -186,6 +200,7 @@ MultipriceRules=Price segment rules
 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
 ### composition fabrication
 Build=Produce
 ProductsMultiPrice=Products and prices for each price segment
@@ -260,6 +275,8 @@ SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
 SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
 
 #Attributes
 VariantAttributes=Variant attributes
@@ -271,15 +288,19 @@ ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s"
 ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
 ProductCombinations=Variants
+PropagateVariant=Propagate variants
 HideProductCombinations=Hide products variant in the products selector
 ProductCombination=Variant
 NewProductCombination=New variant
 EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
 WeightImpact=Weight impact
-NewProductAttribute=New attribute
+NewProductAttribute=Novi atribut
 NewProductAttributeValue=New attribute value
 ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
 ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
@@ -291,8 +312,8 @@ ErrorDeletingGeneratedProducts=There was an error while trying to delete existin
 NbOfDifferentValues=Nb of different values
 NbProducts=Nb. of products
 ParentProduct=Parent product
-HideChildProducts=Hide child products
+HideChildProducts=Hide variant products
-ConfirmCloneProductCombinations=Would you like to copy all the product variant to the product with the given reference?
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
 CloneDestinationReference=Destination product reference
 ErrorCopyProductCombinations=There was an error while copying the product variants
 ErrorDestinationProductNotFound=Destination product not found

htdocs/langs/bs_BA/projects.lang

@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Zajednički projekti
 PrivateProject=Kontakti projekta
+ProjectsImContactFor=Projects I'm explicitely a contact of
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=Svi projekti
 MyProjectsDesc=Ovaj pregled je limitiran na projekte u kojima ste stavljeni kao kontakt (bilo koji tip).
 ProjectsPublicDesc=Ovaj pregled predstavlja sve projekte koje možete čitati.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,20 +26,22 @@ TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših koris
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=Novi projekat
 AddProject=Create project
 DeleteAProject=Obisati projekat
 DeleteATask=Obrisati zadatak
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Opened projects
+OpenedProjects=Open projects
-OpenedTasks=Opened tasks
+OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
+OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Prikaži projekt
 SetProject=Postavi projekat
 NoProject=Nema definisanog ili vlastitog projekta
 NbOfProjects=Broj projekata
+NbOfTasks=Nb of tasks
 TimeSpent=Vrijeme provedeno
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -45,11 +50,11 @@ RefTask=Ref. zadatka
 LabelTask=Oznaka zadatka
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Korisnik
-TaskTimeNote=Note
+TaskTimeNote=Napomena
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=Nova provedeno vrijeme
+NewTimeSpent=Vrijeme provedeno
 MyTimeSpent=Moje provedeno vrijeme
 Tasks=Zadaci
 Task=Zadatak
@@ -59,6 +64,7 @@ TaskDescription=Task description
 NewTask=Novi zadatak
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivnost
 Activities=Zadaci/aktivnosti
 MyActivities=Moji zadaci/aktivnosti
@@ -78,6 +84,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lista ugovora u vezi s projektom
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=Lista intervencija u vezi s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
@@ -102,15 +109,16 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
 ActionsOnProject=Događaji na projektu
 YouAreNotContactOfProject=Vi niste kontakt ovog privatnog projekta
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Brisanje provedenog vremena
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Resursi
 ProjectsDedicatedToThisThirdParty=Projekti posvećeni ovom subjektu
 NoTasks=Nema zadataka za ovaj projekat
 LinkedToAnotherCompany=U vezi sa drugim subjektom
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Vrijeme provedeno je prazno
 ThisWillAlsoRemoveTasks=Ova akcija će također izbrisati sve zadatke projekta (<b>%s</b> zadataka u ovom trenutku) i sve unose provedenog vremena.
 IfNeedToUseOhterObjectKeepEmpty=Ako neki objekti (faktura, narudžbe, ...), pripadaju drugom subjektu, mora biti u vezi sa projektom za kreiranje, ostavite ovo prazno da bi imali projekat što više subjekata.
@@ -155,33 +163,38 @@ DocumentModelBeluga=Project template for linked objects overview
 DocumentModelBaleine=Project report template for tasks
 PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
-ProjectReferers=Related items
+ProjectReferers=Povezane stavke
 ProjectMustBeValidatedFirst=Project must be validated first
 FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
+OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount

htdocs/langs/bs_BA/propal.lang

@@ -3,7 +3,7 @@ Proposals=Poslovni prijedlozi
 Proposal=Poslovni prijedlog
 ProposalShort=Prijedlog
 ProposalsDraft=Nacrti poslovnih prijedloga
-ProposalsOpened=Otvoreni poslovni prijedlozi
+ProposalsOpened=Open commercial proposals
 Prop=Poslovni prijedlozi
 CommercialProposal=Poslovni prijedlog
 ProposalCard=Kartica prijedloga
@@ -25,8 +25,8 @@ NumberOfProposalsByMonth=Broj po mjesecu
 AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Broj poslovnih prijedloga
 ShowPropal=Show proposal
-PropalsDraft=Drafts
+PropalsDraft=Uzorak
-PropalsOpened=Otvoreno
+PropalsOpened=Otvori
 PropalStatusDraft=Uzorak (Potrebna je potvrda)
 PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)

htdocs/langs/bs_BA/resource.lang

@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Resources
+MenuResourceIndex=Resursi
 MenuResourceAdd=New resource
 DeleteResource=Delete resource
 ConfirmDeleteResourceElement=Confirm delete the resource for this element
@@ -29,3 +29,8 @@ RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
 SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resursi

htdocs/langs/bs_BA/stocks.lang

@@ -42,7 +42,7 @@ LabelMovement=Oznaka za kretanje
 NumberOfUnit=Broj jedinica
 UnitPurchaseValue=Kupovna cijena jedinice
 StockTooLow=Zaliha preniska
-StockLowerThanLimit=Zaliha manja od granice za upozorenje
+StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Vrijednost
 PMPValue=Ponderirana/vagana aritmetička sredina - PAS
 PMPValueShort=PAS
@@ -62,16 +62,19 @@ DeStockOnShipment=Decrease real stocks on shipping validation
 DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
 ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
 ReStockOnValidateOrder=Povećaj stvarne zalihe na odobrenju narudžbe dobavljaču
-ReStockOnDispatchOrder=Povećaj stvarne zalihe na ručnom otpremanju u skladište, nakon primanja narudžbe dobavljača
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
 OrderStatusNotReadyToDispatch=Narudžna jos uvijek nema ili nema više status koji dozvoljava otpremanje proizvoda u zalihu skladišta
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Nema predefinisanih proizvoda za ovaj objekat. Dakle, nema potrebe za otpremanje na zalihu.
 DispatchVerb=Otpremiti
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 PhysicalStock=Fizička zaliha
 RealStock=Stvarna zaliha
+RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
+RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
 VirtualStock=Viruelna zaliha
+VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
 IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
@@ -116,7 +119,7 @@ NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihi poslije odabranog perioda (> %s)
 MassMovement=Mass movement
 SelectProductInAndOutWareHouse=Odaberite proizvod, kolilinu, izvordno skladište i ciljano skladište. zatim kliknite "%s". Kada je ovo završeno za sva potrebna kretanja, kliknite "%s".
-RecordMovement=Zapiši transfer
+RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Kretanja zalihe zapisana
 RuleForStockAvailability=Rules on stock requirements
@@ -143,3 +146,50 @@ ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock cor
 ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Izmjena
+inventoryValidate=Potvrđeno
+inventoryDraft=Aktivan
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Supplier filter
+inventoryOnDate=Inventory
+INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Dodaj
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action ?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Obriši red
+RegulateStock=Regulate Stock
+ListInventory=Spisak

htdocs/langs/bs_BA/supplier_proposal.lang

@@ -3,16 +3,16 @@ SupplierProposal=Supplier commercial proposals
 supplier_proposalDESC=Manage price requests to suppliers
 SupplierProposalNew=New request
 CommRequest=Price request
-CommRequests=Price requests
+CommRequests=Zahtjev za cijenu
 SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Opened price requests
+RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
+SupplierProposals=Ponude dobavljača
-SupplierProposalsShort=Supplier proposals
+SupplierProposalsShort=Ponude dobavljača
 NewAskPrice=New price request
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Uzorak (Potrebna je potvrda)
-SupplierProposalStatusValidated=Validated (request is opened)
+SupplierProposalStatusValidated=Validated (request is open)
 SupplierProposalStatusClosed=Zatvoreno
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Odbijen
@@ -47,7 +47,7 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposal=List of supplier proposal requests
+ListOfSupplierProposals=List of supplier proposal requests
 ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process

htdocs/langs/bs_BA/suppliers.lang

@@ -14,6 +14,7 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Neki podproizvodi nemaju definisanu cijenu
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
+SupplierPrices=Supplier prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ova referentni dobavljač je već povezan sa referencom: %s
 NoRecordedSuppliers=Nijedan dobavljač snimljen
 SupplierPayment=Plaćanje dobavljača

htdocs/langs/bs_BA/trips.lang

@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - trips
 ExpenseReport=Expense report
-ExpenseReports=Expense reports
+ExpenseReports=Izvještaj o troškovima
 ShowExpenseReport=Show expense report
-Trips=Expense reports
+Trips=Izvještaj o troškovima
 TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
@@ -12,7 +12,7 @@ ListOfFees=Lista naknada
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
-CompanyVisited=Posjeta kompaniji/fondaciji
+CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Iznos ili kilometri
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
@@ -56,7 +56,7 @@ AucuneLigne=There is no expense report declared yet
 ModePaiement=Payment mode
 
 VALIDATOR=User responsible for approval
-VALIDOR=Approved by
+VALIDOR=Odobrio
 AUTHOR=Recorded by
 AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
@@ -66,10 +66,11 @@ MOTIF_REFUS=Razlog
 MOTIF_CANCEL=Razlog
 
 DATE_REFUS=Deny date
-DATE_SAVE=Validation date
+DATE_SAVE=Datum potvrde
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Datum uplate
 BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
 ValidateAndSubmit=Validate and submit for approval
 ValidatedWaitingApproval=Validated (waiting for approval)
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -87,5 +88,5 @@ NoTripsToExportCSV=No expense report to export for this period.
 ExpenseReportPayment=Expense report payment
 ExpenseReportsToApprove=Expense reports to approve
 ExpenseReportsToPay=Expense reports to pay
-CloneExpenseReport=Clone expese report
+CloneExpenseReport=Clone expense report
 ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?

htdocs/langs/bs_BA/users.lang

@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=Područje upravljanja LJR
 UserCard=Korisnička kartica
 GroupCard=Grupna kartica
 Permission=Dozvola
@@ -8,33 +8,33 @@ EditPassword=Uredi šifru
 SendNewPassword=Ponovo generiši i pošalji šifru
 ReinitPassword=Ponovo generiši šifru
 PasswordChangedTo=Šifra promijenjena na: %s
-SubjectNewPassword=Your new password for %s
+SubjectNewPassword=Vaša šifra za %s
 GroupRights=Grupne dozvole
 UserRights=Korisničke dozvole
 UserGUISetup=Postavke korisničkog prikaza
-DisableUser=Iskljući
+DisableUser=Isključi
 DisableAUser=Isključi korisnika
 DeleteUser=Obrisati
 DeleteAUser=Obrisati korisnika
-EnableAUser=Uljuči korisnika
+EnableAUser=Uključi korisnika
 DeleteGroup=Obrisati
 DeleteAGroup=Obrisati grupu
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
+ConfirmDisableUser=Da li ste sigurni da želite onemogućiti korisnika <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
+ConfirmDeleteUser=Da li ste sigurni da želite obrisati korisnika <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
+ConfirmDeleteGroup=Da li ste sigurni da želite obrisati grupu <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
+ConfirmEnableUser=Da li ste sigurni da želite omogućiti korisnika <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
+ConfirmReinitPassword=Da li ste sigurni da želite generisati novu šifru za korisnika <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+ConfirmSendNewPassword=Da li ste sigurni da želite generisati i poslati novu šifru za korisnika <b>%s</b>?
 NewUser=Novi korisnik
 CreateUser=Kreiraj korisnika
 LoginNotDefined=Prijava nije definisan.
 NameNotDefined=Ime nije definisano.
 ListOfUsers=Lista korisnika
 SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Global administrator
+SuperAdministratorDesc=Globalni administrator
 AdministratorDesc=Administrator
 DefaultRights=Defaultne dozvole
-DefaultRightsDesc=Definišite ovdje <u>defaultne</u> dozvole koje se automatski odobravaju <u>novokreiranom</u> korisniku (Otiđite na karticdu korisnika za mijenjanje dozvola postojećeg korisnika).
+DefaultRightsDesc=Definišite ovdje <u>defaultne</u> dozvole koje se automatski odobravaju <u>novokreiranom</u> korisniku (Otiđite na karticu korisnika za mijenjanje dozvola postojećeg korisnika).
 DolibarrUsers=Dolibarr korisnici
 LastName=Prezime
 FirstName=Ime
@@ -45,33 +45,33 @@ RemoveFromGroup=Ukloni iz grupe
 PasswordChangedAndSentTo=Šifra promijenjena i poslana korisniku <b>%s</b>.
 PasswordChangeRequestSent=Zahtjev za promjenu šifre za <b>%s</b> poslana na <b>%s</b>.
 MenuUsersAndGroups=Korisnici i grupe
-LastGroupsCreated=Latest %s created groups
+LastGroupsCreated=Posljednjih %s napravljenih grupa
-LastUsersCreated=Latest %s users created
+LastUsersCreated=Posljednjih %s napravljenih korisnika
 ShowGroup=Prikaži grupu
 ShowUser=Prikaži korisnika
-NonAffectedUsers=Nedodijeljen korisnici
+NonAffectedUsers=Nedodijeljeni korisnici
 UserModified=Korisnik uspješno izmijenjen
-PhotoFile=Foto fajl
+PhotoFile=Foto datoteka
 ListOfUsersInGroup=Lista korisnika u ovoj grupi
 ListOfGroupsForUser=Popis grupa za ovog korisnika
-LinkToCompanyContact=Link to third party / contact
+LinkToCompanyContact=Link na subjekat / kontakt
 LinkedToDolibarrMember=Link na člana
 LinkedToDolibarrUser=Link na Dolibarr korisnika
-LinkedToDolibarrThirdParty=Link to Dolibarr third party
+LinkedToDolibarrThirdParty=Link na Dolibarr subjekt
 CreateDolibarrLogin=Kreiraj korisnika
-CreateDolibarrThirdParty=Create a third party
+CreateDolibarrThirdParty=Napravi subjekat
-LoginAccountDisableInDolibarr=Račun isključen u Dolibarr-u.
+LoginAccountDisableInDolibarr=Račun isključen u Dolibarru.
 UsePersonalValue=Koristite lične vrijednosti
 InternalUser=Interni korisnik
 ExportDataset_user_1=Dolibarr korisnici i svojstva
 DomainUser=Korisnik domene %s
 Reactivate=Reaktivirati
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+CreateInternalUserDesc=Ovaj obrazac omogućava da se napravi interni korisnik za vašu kompaniju/organizaciju. Da biste napravili eksternog korisnika (kupca, dobavljača, ...), koristite dugme  'Napravi Dolibarr korisnika' iz kartice za kontakte subjekta.
-InternalExternalDesc=<b>Interni</b> korisnik je dio vaše kompanije/fondacije. <b>Eksterni</b> korisnik je kupac, dobavljač ili drugo. <br><br> U oba slučaja, dozvole definišu prava na Dolibarr, također, eksterni korisnik može imati drugačiji meni menadžer od internog korisnika (pogledaj Početna->postavke->Display).
+InternalExternalDesc= <b>Interni</b> korisnik je korisnik koji je dio vaše kompanije/organizacije.<br> <b>Vanjski</b> korisnik je kupac, dobavljač ili neko drugi.<br><br>U oba slučaja, dozvole definiraju prava u Dolibarru, također vanjski korisnik može imati drugačiji meni od internog korisnika (Vidi Početna - Postavke - Prikaz)
 PermissionInheritedFromAGroup=Dozvola je prenesena od jedne korisničke grupe.
 Inherited=Preneseno
-UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
+UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije povezan sa nekim subjektom)
-UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+UserWillBeExternalUser=Napravljeni korisnik će biti vanjski korisnik (jer je povezan s određenim subjektom)
 IdPhoneCaller=Id telefonskog pozivatelja
 NewUserCreated=Korisnik %s kreiran
 NewUserPassword=Promjena šifre za %s
@@ -80,26 +80,26 @@ UserDisabled=Korisnik %s isključen
 UserEnabled=Korisnik %s aktiviran
 UserDeleted=Korisnik %s uklonjen
 NewGroupCreated=Grupa %s kreirana
-GroupModified=Group %s modified
+GroupModified=Grupa %s izmijenjena
 GroupDeleted=Grupa %s uklonjena
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
+ConfirmCreateContact=Da li ste sigurni da želite napraviti Dolibarr račun za ovaj kontakt?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
+ConfirmCreateLogin=Da li ste sigurni da želite napraviti Dolibarr račun za ovog člana?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+ConfirmCreateThirdParty=Da li ste sigurni da želite napraviti subjekt za ovog člana?
 LoginToCreate=Kreirati login
-NameToCreate=Name of third party to create
+NameToCreate=Naziv subjekta za kreiranje
-YourRole=Vaše uloga
+YourRole=Vaše uloge
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je postignuta!
 NbOfUsers=Broj korisnika
 DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
-HierarchicalResponsible=Supervisor
+HierarchicalResponsible=Nadzornik
 HierarchicView=Hijerarhijski prikaz
 UseTypeFieldToChange=Koristite polja Tip za promjene
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Koristiti OpenID za login
-WeeklyHours=Weekly hours
+WeeklyHours=Sedmični sati
-ColorUser=Color of the user
+ColorUser=Boja korisnika
-DisabledInMonoUserMode=Disabled in maintenance mode
+DisabledInMonoUserMode=Onemogućeno u načinu održavanja
-UserAccountancyCode=User accountancy code
+UserAccountancyCode=Konto korisnika u kontnom planu
-UserLogoff=User logout
+UserLogoff=Odjava korisnika
-UserLogged=User logged
+UserLogged=Korisnik prijavljen
-DateEmployment=Date of Employment
+DateEmployment=Datum zaposlenja

htdocs/langs/bs_BA/withdrawals.lang

@@ -2,11 +2,11 @@
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
 StandingOrders=Direct debit payment orders
-StandingOrder=Direct debit payment order
+StandingOrder=Direktni nalog za plaćanje
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Za obradu
 WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
+WithdrawalReceipt=Nalog za plaćanje
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
@@ -17,7 +17,7 @@ NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Iznos za podizanje
 WithdrawsRefused=Direct debit refused
-NoInvoiceToWithdraw=Nijedna fakture kupca u modu plaćanje "podizanje" nema na čekanju. Idi na tab "Podizanje" na kartici fakture da napravite zahtjev.
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
 ResponsibleUser=Odgovorni korisnik
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
@@ -41,6 +41,7 @@ RefusedReason=Razlog za odbijanje
 RefusedInvoicing=Naplate odbijanja
 NoInvoiceRefused=Ne naplatiti odbijanje
 InvoiceRefused=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
 StatusWaiting=Čekanje
 StatusTrans=Poslano
 StatusCredited=Pripisano