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

ChangeLog

@@ -209,6 +209,12 @@ Dolibarr better:
 - Fix: Bad SEPA xml file creation
 - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
 - Fix: Showing system error if not enough stock of product into orders creation with lines
+- Fix: [ bug #2543 ] Untranslated "Contract" origin string when creating an invoice from a contract
+- Fix: [ bug #2534 ] SQL error when editing a supplier invoice line
+- Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project
+- Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme
+- Fix: [ bug #2542 ] Contracts store localtax preferences
+- Fix: Bad permission assignments for stock movements actions
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.

build/README

@@ -28,9 +28,6 @@ Note: Prerequisites to build autoexe DoliWamp package:
   recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
   The .exe file will be build into directory build.
 
-- To build a translaction package, launch the script
-> perl makepack-dolibarrlang.pl
-
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl
 

build/makepack-dolibarr.pl

@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \author       (c)2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
 #
 # This is list of constant you can set to have generated packages moved into a specific dir: 
 #DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
@@ -15,8 +15,12 @@
 
 use Cwd;
 
+
+# Change this to defined target for option 98 and 99
 $PROJECT="dolibarr";
-$RPMSUBVERSION="auto";	# auto use value found into BUILD
+$PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
+$PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
+
 
 @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
 %REQUIREMENTPUBLISH=(
@@ -41,6 +45,7 @@ $RPMSUBVERSION="auto";	# auto use value found into BUILD
 "makensis.exe"=>"NSIS"
 );
 
+$RPMSUBVERSION="auto";	# auto use value found into BUILD
 if (-d "/usr/src/redhat")   { $RPMDIR="/usr/src/redhat"; } # redhat
 if (-d "/usr/src/packages") { $RPMDIR="/usr/src/packages"; } # opensuse
 if (-d "/usr/src/RPM")      { $RPMDIR="/usr/src/RPM"; } # mandrake
@@ -59,8 +64,6 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 
 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
-$PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
-$PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/files";
 if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
 	print "Error: Missing environment variables.\n";
@@ -210,9 +213,9 @@ else {
 			printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
 		}
 		$cpt=98;
-		printf(" %2d - %-14s  (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+		printf(" %2d - %-14s  (%s)\n",$cpt,"ASSO (publish)","Need ".$REQUIREMENTPUBLISH{"ASSO"});
 		$cpt=99;
-		printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+		printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".$REQUIREMENTPUBLISH{"SF"});
 	
 		# Ask which target to build
 		print "Choose one package number or several separated with space (0 - ".$cpt."): ";
@@ -1030,9 +1033,16 @@ if ($nboftargetok) {
 				if (! $filesize) { next; }
 
 				print "\n";
-				print "Publish file ".$file." to ".$filestoscan{$file}."\n";
-				
-				$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
+	    		
+	    		if ($target eq 'SF') { 
+	    			$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
+		    		print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."\n";
+	    		}
+	    		else
+	    		{
+	    			$destFolder="$NEWPUBLISH";
+		    		print "Publish file ".$file." to $NEWPUBLISH\n";
+	    		}
 
 				# mkdir	   
 				#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");

build/makepack-howto.txt

@@ -8,7 +8,7 @@ This files describe steps made by Dolibarr packaging team to make a
 beta version of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in /ChangeLog
+- Update version/info in ChangeLog. To generate a changelog, you can do "git log x.y.z..HEAD --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIXED\|NEW'"
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
 - Update version number with x.y.z-w in build/debian/changelog
 - Update version number with x.y.z-w in build/rpm/*.spec
@@ -17,10 +17,11 @@ beta version of Dolibarr, step by step.
 - Create a branch (x.y).
 
 - Run makepack-dolibarr.pl to generate all packages.
+
 - Move build files into www.dolibarr.org web site
   (/home/dolibarr/wwwroot/files/lastbuild).
 
-- Post a news on dolibarr.org/dolibarr.fr
+- Post a news on dolibarr.org/dolibarr.fr + social networks
 - Send mail on mailings-list
 
 
@@ -35,14 +36,16 @@ complete release of Dolibarr, step by step.
 - Update version number with x.y.z in build/rpm/*.spec
 - Commit all changes.
 
-- Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl
+- Run makepack-dolibarr.pl to generate all packages.
+
 - Check content of built packages.
 - Move build files into www.dolibarr.org web site
   (/home/dolibarr/wwwroot/files/stable).
+
 - Run makepack-dolibarr.pl again with option to publish files on 
   sourceforge. This will also add official tag.
 - Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"
   on server to point to new files (used by some web sites).
 
+- Post a news on dolibarr.org/dolibarr.fr + social networks
 - Send mail on mailings-list
-- Send news on OpenSource web sites (if major beta or release)

dev/codesniffer/ruleset.xml

@@ -164,8 +164,6 @@
         <severity>0</severity>
 	</rule>
     
-    <rule ref="Generic.VersionControl.SubversionProperties" />
-
 	<!-- Disallow usage of tab -->
 	<!--  <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->
 

dev/translation/txpull.sh

@@ -26,7 +26,6 @@ fi
 
 if [ "x$1" = "xall" ]
 then
-    cd htdocs/lang
 	for dir in `find htdocs/langs/* -type d`
 	do
 	    fic=`basename $dir`

htdocs/comm/action/class/actioncomm.class.php

@@ -413,7 +413,8 @@ class ActionComm extends CommonObject
         $resql=$this->db->query($sql);
         if ($resql)
         {
-            if ($this->db->num_rows($resql))
+        	$num=$this->db->num_rows($resql);
+            if ($num)
             {
                 $obj = $this->db->fetch_object($resql);
 
@@ -469,13 +470,15 @@ class ActionComm extends CommonObject
                 $this->elementtype			= $obj->elementtype;
             }
             $this->db->free($resql);
-            return 1;
         }
         else
         {
             $this->error=$this->db->lasterror();
             return -1;
         }
+
+        return $num;
+
     }
 
 

htdocs/commande/card.php

@@ -138,8 +138,10 @@ if (empty($reshook))
 	}
 
 	// Reopen a closed order
-	else if ($action == 'reopen' && $user->rights->commande->creer) {
-		if ($object->statut == 3) {
+	else if ($action == 'reopen' && $user->rights->commande->creer)
+	{
+		if ($object->statut == -1 || $object->statut == 3)
+		{
 			$result = $object->set_reopen($user);
 			if ($result > 0)
 			{
@@ -1279,7 +1281,7 @@ if ($action == 'create' && $user->rights->commande->creer) {
 			$demand_reason_id	= (!empty($objectsrc->demand_reason_id)?$objectsrc->demand_reason_id:(!empty($soc->demand_reason_id)?$soc->demand_reason_id:0));
 			$remise_percent		= (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0));
 			$remise_absolue		= (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0));
-			$dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
+			$dateorder		    = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER)?-1:'';
 
 			$datedelivery = (! empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
 
@@ -1300,7 +1302,7 @@ if ($action == 'create' && $user->rights->commande->creer) {
 		$demand_reason_id   = $soc->demand_reason_id;
 		$remise_percent     = $soc->remise_percent;
 		$remise_absolue     = 0;
-		$dateinvoice        = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
+		$dateorder          = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER)?-1:'';
 		$projectid          = 0;
 	}
 	$absolute_discount=$soc->getAvailableDiscounts();
@@ -1368,7 +1370,8 @@ if ($action == 'create' && $user->rights->commande->creer) {
 	}
 	// Date
 	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
-	$form->select_date('', 're', '', '', '', "crea_commande", 1, 1);
+	//$form->select_date($dateorder, 're', '', '', '', "crea_commande", 1, 1);
+	$form->select_date('', 're', '', '', '', "crea_commande", 1, 1);			// Always autofill date with current date
 	print '</td></tr>';
 
 	// Date de livraison
@@ -1376,7 +1379,7 @@ if ($action == 'create' && $user->rights->commande->creer) {
 	if (empty($datedelivery))
 	{
 		if (! empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7*$conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
-		else $datedelivery=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
+		else $datedelivery=empty($conf->global->MAIN_AUTOFILL_DATE_DELIVERY)?-1:'';
 	}
 	$form->select_date($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1);
 	print "</td></tr>";
@@ -2180,7 +2183,7 @@ if ($action == 'create' && $user->rights->commande->creer) {
 				}
 
 				// Reopen a closed order
-				if ($object->statut == 3 && $user->rights->commande->creer) {
+				if (($object->statut == 3 || $object->statut == -1) && $user->rights->commande->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=reopen">' . $langs->trans('ReOpen') . '</a></div>';
 				}
 

htdocs/commande/class/commande.class.php

@@ -60,7 +60,7 @@ class Commande extends CommonOrder
     var $ref_int;
     var $contactid;
     var $fk_project;
-    var $statut;		// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
+    var $statut;		// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Delivered=Sent/Received, billed or not)
     var $facturee;		// deprecated
     var $billed;		// billed or not
 
@@ -109,7 +109,7 @@ class Commande extends CommonOrder
     // Pour board
     var $nbtodo;
     var $nbtodolate;
-    
+
      /**
      * ERR Not engouch stock
      */
@@ -299,7 +299,7 @@ class Commande extends CommonOrder
             // Rename directory if dir was a temporary ref
             if (preg_match('/^[\(]?PROV/i', $this->ref))
             {
-            	// On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref)
+            	// On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref)
                 // in order not to lose the attachments
                 $oldref = dol_sanitizeFileName($this->ref);
                 $newref = dol_sanitizeFileName($num);
@@ -437,7 +437,7 @@ class Commande extends CommonOrder
         global $conf,$langs;
         $error=0;
 
-        if ($this->statut != 3)
+        if ($this->statut != -1 && $this->statut != 3)
         {
         	dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING);
             return 0;
@@ -461,7 +461,7 @@ class Commande extends CommonOrder
         else
         {
             $error++;
-            $this->error=$this->db->error();
+            $this->error=$this->db->lasterror();
             dol_print_error($this->db);
         }
 

htdocs/commande/list.php

@@ -6,6 +6,7 @@
  * Copyright (C) 2012      Juanjo Menent          <jmenent@2byte.es>
  * Copyright (C) 2013      Christophe Battarel    <christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Cédric Salvador        <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015      Marcos García          <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +44,7 @@ $orderyear=GETPOST("orderyear","int");
 $ordermonth=GETPOST("ordermonth","int");
 $deliveryyear=GETPOST("deliveryyear","int");
 $deliverymonth=GETPOST("deliverymonth","int");
-$search_ref=GETPOST('search_ref','alpha');
+$search_ref=GETPOST('search_ref','alpha')!=''?GETPOST('search_ref','alpha'):GETPOST('sref','alpha');
 $search_ref_customer=GETPOST('search_ref_customer','alpha');
 $search_company=GETPOST('search_company','alpha');
 $sall=GETPOST('sall');
@@ -110,7 +111,7 @@ $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Ped
 llxHeader('',$langs->trans("Orders"),$help_url);
 
 $sql = 'SELECT s.nom as name, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
-$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison, c.fk_statut, c.facture as facturee';
+$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as facturee';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= ', '.MAIN_DB_PREFIX.'commande as c';
 // We'll need this table joined to the select in order to filter by sale
@@ -415,7 +416,7 @@ if ($resql)
 
         // warning late icon
 		print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-		if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay))
+		if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_delivery)) < ($now - $conf->commande->client->warning_delay))
 			print img_picto($langs->trans("Late"),"warning");
 		if(!empty($objp->note_private))
 		{
@@ -466,7 +467,7 @@ if ($resql)
 
 		// Delivery date
 		print '<td align="center">';
-		print dol_print_date($db->jdate($objp->date_livraison), 'day');
+		print dol_print_date($db->jdate($objp->date_delivery), 'day');
 		print '</td>';
 
 		// Amount HT

htdocs/compta/facture.php

@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
- * Copyright (C) 2010-2013 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2010-2015 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2012-2013 Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Jean-Francois FERRY   <jfefe@aternatik.fr>
  * Copyright (C) 2013-2014 Florian Henry         <florian.henry@open-concept.pro>
@@ -1045,8 +1045,12 @@ if (empty($reshook))
 											$lines[$i]->fetch_optionals($lines[$i]->rowid);
 											$array_option = $lines[$i]->array_options;
 										}
+										
+										// View third's localtaxes for now
+										$localtax1_tx = get_localtax($lines[$i]->tva_tx, 1, $object->client);
+										$localtax2_tx = get_localtax($lines[$i]->tva_tx, 2, $object->client);
 
-										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option);
+										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option);
 
 										if ($result > 0) {
 											$lineid = $result;

htdocs/core/actions_sendmails.inc.php

@@ -132,9 +132,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
 			$message = $_POST['message'];
 			$sendtobcc= GETPOST('sendtoccc');
-			if ($mode == 'emailfromproposal') $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO);
-			if ($mode == 'emailfromorder')    $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO);
-			if ($mode == 'emailfrominvoice')  $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO);
+			if ($mode == 'emailfromproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
+			if ($mode == 'emailfromorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
+			if ($mode == 'emailfrominvoice')  $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
 
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 

htdocs/core/class/extrafields.class.php

@@ -766,7 +766,7 @@ class ExtraFields
 					$sqlwhere.= ' WHERE 1';
 				}
 				if (in_array($InfoFieldList[0],array('tablewithentity'))) $sqlwhere.= ' AND entity = '.$conf->entity;	// Some tables may have field, some other not. For the moment we disable it.
-				//$sql.=preg_replace('/^ AND /','',$sqlwhere);
+				$sql.=$sqlwhere;
 				//print $sql;
 
 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

htdocs/core/class/html.formactions.class.php

@@ -210,7 +210,10 @@ class FormActions
         		{
 	        		$tmpa=dol_getdate($action->datep);
 	        		$tmpb=dol_getdate($action->datef);
-	        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) print '-'.dol_print_date($action->datef,'hour');
+	        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
+	        		{
+	        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef,'hour');
+	        		}
 	        		else print '-'.dol_print_date($action->datef,'dayhour');
         		}
         		print '</td>';

htdocs/core/class/notify.class.php

@@ -171,6 +171,8 @@ class Notify
 			return 0;
 		}
 
+		$oldref=(empty($object->oldref)?$object->ref:$object->oldref);
+		$newref=(empty($object->newref)?$object->ref:$object->newref);
 
 		// Check notification per third party
 		$sql = "SELECT s.nom, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
@@ -215,32 +217,32 @@ class Notify
 								$link='/compta/facture.php?facid='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
 								break;
 							case 'ORDER_VALIDATE':
 								$link='/commande/card.php?id='.$object->id;
 								$dir_output = $conf->commande->dir_output;
 								$object_type = 'order';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$newref);
 								break;
 							case 'PROPAL_VALIDATE':
 								$link='/comm/propal.php?id='.$object->id;
 								$dir_output = $conf->propal->dir_output;
 								$object_type = 'propal';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
 								break;
 							case 'FICHINTER_VALIDATE':
 								$link='/fichinter/card.php?id='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'ficheinter';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$newref);
 								break;
 							case 'ORDER_SUPPLIER_APPROVE':
 								$link='/fourn/commande/card.php?id='.$object->id;
 								$dir_output = $conf->fournisseur->dir_output.'/commande/';
 								$object_type = 'order_supplier';
 								$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs));
+								$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs));
 								$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_REFUSE':
@@ -248,16 +250,16 @@ class Notify
 								$dir_output = $conf->fournisseur->dir_output.'/commande/';
 								$object_type = 'order_supplier';
 								$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs));
+								$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$newref,$user->getFullName($langs));
 								$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'SHIPPING_VALIDATE':
 								$dir_output = $conf->expedition->dir_output.'/sending/';
 								$object_type = 'order_supplier';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
 								break;
 						}
-                    	$ref = dol_sanitizeFileName($object->ref);
+                    	$ref = dol_sanitizeFileName($newref);
 						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
 						if (! dol_is_file($pdf_path))
 						{
@@ -344,32 +346,32 @@ class Notify
 						$link='/compta/facture.php?facid='.$object->id;
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'facture';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
 						break;
 					case 'ORDER_VALIDATE':
 						$link='/commande/card.php?id='.$object->id;
 						$dir_output = $conf->commande->dir_output;
 						$object_type = 'order';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$newref);
 						break;
 					case 'PROPAL_VALIDATE':
 						$link='/comm/propal.php?id='.$object->id;
 						$dir_output = $conf->propal->dir_output;
 						$object_type = 'propal';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
 						break;
 					case 'FICHINTER_VALIDATE':
 						$link='/fichinter/card.php?id='.$object->id;
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'ficheinter';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$newref);
 						break;
 					case 'ORDER_SUPPLIER_APPROVE':
 						$link='/fourn/commande/card.php?id='.$object->id;
 						$dir_output = $conf->fournisseur->dir_output.'/commande/';
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs));
+						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs));
 						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'ORDER_SUPPLIER_REFUSE':
@@ -377,16 +379,16 @@ class Notify
 						$dir_output = $conf->fournisseur->dir_output.'/commande/';
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs));
+						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$newref,$user->getFullName($langs));
 						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'SHIPPING_VALIDATE':
 						$dir_output = $conf->expedition->dir_output.'/sending/';
 						$object_type = 'order_supplier';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
 						break;
 				}
-				$ref = dol_sanitizeFileName($object->ref);
+				$ref = dol_sanitizeFileName($newref);
 				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
 				if (! dol_is_file($pdf_path))
 				{

htdocs/core/class/stats.class.php

@@ -31,7 +31,7 @@ abstract class Stats
 {
 	protected $db;
 	var $_lastfetchdate=array();	// Dates of cache file read by methods
-	var $cachefilesuffix='';		// Suffix to add to name of cache file (to avoid file name conflicts) 
+	var $cachefilesuffix='';		// Suffix to add to name of cache file (to avoid file name conflicts)
 
 	/**
 	 * Return nb of elements by month for several years
@@ -76,7 +76,7 @@ abstract class Stats
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
-		
+
 		// Load file into $data
 		if ($foundintocache)    // Cache file found and is not too old
 		{
@@ -203,11 +203,14 @@ abstract class Stats
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
 			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
-			fwrite($fp, json_encode($data));
-			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-			@chmod($newpathofdestfile, octdec($newmask));
-
+			if ($fp)
+			{
+				fwrite($fp, json_encode($data));
+				fclose($fp);
+				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				@chmod($newpathofdestfile, octdec($newmask));
+			}
+			else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
 		}
 
@@ -309,21 +312,23 @@ abstract class Stats
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
 			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
-			fwrite($fp, json_encode($data));
-			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-			@chmod($newpathofdestfile, octdec($newmask));
-
+			if ($fp)
+			{
+				fwrite($fp, json_encode($data));
+				fclose($fp);
+				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				@chmod($newpathofdestfile, octdec($newmask));
+			}
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
 		}
 
 		return $data;
-	}	
-	
-	
+	}
+
+
 	// Here we have low level of shared code called by XxxStats.class.php
 
-	
+
 	/**
 	 * 	Return nb of elements by year
 	 *
@@ -532,8 +537,8 @@ abstract class Stats
 
 		return $data;
 	}
-	
-	
+
+
 	/**
 	 *	   Return number or total of product refs
 	 *
@@ -544,7 +549,7 @@ abstract class Stats
 	function _getAllByProduct($sql, $limit=10)
 	{
 		global $langs;
-		
+
 		$result=array();
 		$res=array();
 
@@ -567,6 +572,6 @@ abstract class Stats
         else dol_print_error($this->db);
 
 		return $result;
-	}	
+	}
 }
 

htdocs/core/login/functions_dolibarr.php

@@ -111,15 +111,20 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 					$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
 				}
 
+				// We must check entity
 				if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
 				{
 					global $mc;
 
-					$ret=$mc->checkRight($obj->rowid, $entitytotest);
-					if ($ret < 0)
+					if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
+					else
 					{
-						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '".$entitytotest."' not allowed for user '".$obj->rowid."'");
-						$login=''; // force authentication failure
+						$ret = $mc->checkRight($obj->rowid, $entitytotest);
+						if ($ret < 0)
+						{
+							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'");
+							$login = ''; // force authentication failure
+						}
 					}
 				}
 			}

htdocs/core/menus/init_menu_auguria.sql

@@ -103,8 +103,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/card.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/list.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->creer', '', 2, 5, __ENTITY__);
 
 -- Product - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);

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

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2012-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1061,8 +1061,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);
 				$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
 				$newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
-                if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire);
-                if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire);
+                if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+                $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->creer);
 			}
 
 			// Expeditions

htdocs/core/modules/modFournisseur.class.php

@@ -67,194 +67,194 @@ class modFournisseur extends DolibarrModules
 		                    "/fournisseur/facture/temp"
 		                    );
 
-            // Dependances
-            $this->depends = array("modSociete");
-            $this->requiredby = array();
-            $this->langfiles = array('bills', 'companies', 'suppliers', 'orders');
+		// Dependances
+		$this->depends = array("modSociete");
+		$this->requiredby = array();
+		$this->langfiles = array('bills', 'companies', 'suppliers', 'orders');
 
-            // Config pages
-            $this->config_page_url = array("supplier_order.php");
+		// Config pages
+		$this->config_page_url = array("supplier_order.php");
 
-            // Constantes
-            $this->const = array();
-			$r=0;
+		// Constantes
+		$this->const = array();
+		$r=0;
 
-            $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_PDF";
-            $this->const[$r][1] = "chaine";
-            $this->const[$r][2] = "muscadet";
-			$this->const[$r][3] = 'Nom du gestionnaire de generation des bons de commande en PDF';
-			$this->const[$r][4] = 0;
-			$r++;
+		$this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "muscadet";
+		$this->const[$r][3] = 'Nom du gestionnaire de generation des bons de commande en PDF';
+		$this->const[$r][4] = 0;
+		$r++;
 
-            $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_NUMBER";
-            $this->const[$r][1] = "chaine";
-            $this->const[$r][2] = "mod_commande_fournisseur_muguet";
-			$this->const[$r][3] = 'Nom du gestionnaire de numerotation des commandes fournisseur';
-			$this->const[$r][4] = 0;
-			$r++;
+		$this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_NUMBER";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "mod_commande_fournisseur_muguet";
+		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des commandes fournisseur';
+		$this->const[$r][4] = 0;
+		$r++;
 
-			$this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_PDF";
-            $this->const[$r][1] = "chaine";
-            $this->const[$r][2] = "canelle";
-			$this->const[$r][3] = 'Nom du gestionnaire de generation des factures fournisseur en PDF';
-			$this->const[$r][4] = 0;
-			$r++;
+		$this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "canelle";
+		$this->const[$r][3] = 'Nom du gestionnaire de generation des factures fournisseur en PDF';
+		$this->const[$r][4] = 0;
+		$r++;
 
-			$this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_NUMBER";
-            $this->const[$r][1] = "chaine";
-            $this->const[$r][2] = "mod_facture_fournisseur_cactus";
-			$this->const[$r][3] = 'Nom du gestionnaire de numerotation des factures fournisseur';
-			$this->const[$r][4] = 0;
-			$r++;
+		$this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_NUMBER";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "mod_facture_fournisseur_cactus";
+		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des factures fournisseur';
+		$this->const[$r][4] = 0;
+		$r++;
 
-            // Boxes
-            $this->boxes = array(
-            	0=>array('file'=>'box_graph_invoices_supplier_permonth.php','enabledbydefaulton'=>'Home'),
-            	1=>array('file'=>'box_graph_orders_supplier_permonth.php','enabledbydefaulton'=>'Home'),
-            	2=>array('file'=>'box_fournisseurs.php','enabledbydefaulton'=>'Home'),
-            	3=>array('file'=>'box_factures_fourn_imp.php','enabledbydefaulton'=>'Home'),
-            	4=>array('file'=>'box_factures_fourn.php','enabledbydefaulton'=>'Home'),
-            	5=>array('file'=>'box_supplier_orders.php','enabledbydefaulton'=>'Home'),
-            );
+		// Boxes
+		$this->boxes = array(
+		0=>array('file'=>'box_graph_invoices_supplier_permonth.php','enabledbydefaulton'=>'Home'),
+		1=>array('file'=>'box_graph_orders_supplier_permonth.php','enabledbydefaulton'=>'Home'),
+		2=>array('file'=>'box_fournisseurs.php','enabledbydefaulton'=>'Home'),
+		3=>array('file'=>'box_factures_fourn_imp.php','enabledbydefaulton'=>'Home'),
+		4=>array('file'=>'box_factures_fourn.php','enabledbydefaulton'=>'Home'),
+		5=>array('file'=>'box_supplier_orders.php','enabledbydefaulton'=>'Home'),
+		);
 
-            // Permissions
-            $this->rights = array();
-            $this->rights_class = 'fournisseur';
-            $r=0;
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'fournisseur';
+		$r=0;
 
-            $r++;
-            $this->rights[$r][0] = 1181;
-            $this->rights[$r][1] = 'Consulter les fournisseurs';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 1;
-            $this->rights[$r][4] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 1181;
+		$this->rights[$r][1] = 'Consulter les fournisseurs';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'lire';
 
-            $r++;
-            $this->rights[$r][0] = 1182;
-            $this->rights[$r][1] = 'Consulter les commandes fournisseur';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 1;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 1182;
+		$this->rights[$r][1] = 'Consulter les commandes fournisseur';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'lire';
 
-            $r++;
-            $this->rights[$r][0] = 1183;
-            $this->rights[$r][1] = 'Creer une commande fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 1183;
+		$this->rights[$r][1] = 'Creer une commande fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'creer';
 
-            $r++;
-            $this->rights[$r][0] = 1184;
-            $this->rights[$r][1] = 'Valider une commande fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'valider';
+		$r++;
+		$this->rights[$r][0] = 1184;
+		$this->rights[$r][1] = 'Valider une commande fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'valider';
 
-            $r++;
-            $this->rights[$r][0] = 1185;
-            $this->rights[$r][1] = 'Approuver une commande fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'approuver';
+		$r++;
+		$this->rights[$r][0] = 1185;
+		$this->rights[$r][1] = 'Approuver une commande fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'approuver';
 
-            $r++;
-            $this->rights[$r][0] = 1186;
-            $this->rights[$r][1] = 'Commander une commande fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'commander';
+		$r++;
+		$this->rights[$r][0] = 1186;
+		$this->rights[$r][1] = 'Commander une commande fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'commander';
 
-            $r++;
-            $this->rights[$r][0] = 1187;
-            $this->rights[$r][1] = 'Receptionner une commande fournisseur';
-            $this->rights[$r][2] = 'd';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'receptionner';
+		$r++;
+		$this->rights[$r][0] = 1187;
+		$this->rights[$r][1] = 'Receptionner une commande fournisseur';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'receptionner';
 
-            $r++;
-            $this->rights[$r][0] = 1188;
-            $this->rights[$r][1] = 'Supprimer une commande fournisseur';
-            $this->rights[$r][2] = 'd';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'supprimer';
+		$r++;
+		$this->rights[$r][0] = 1188;
+		$this->rights[$r][1] = 'Supprimer une commande fournisseur';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'supprimer';
 
-            $r++;
-            $this->rights[$r][0] = 1231;
-            $this->rights[$r][1] = 'Consulter les factures fournisseur';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 1;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 1231;
+		$this->rights[$r][1] = 'Consulter les factures fournisseur';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'lire';
 
-            $r++;
-            $this->rights[$r][0] = 1232;
-            $this->rights[$r][1] = 'Creer une facture fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 1232;
+		$this->rights[$r][1] = 'Creer une facture fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'creer';
 
-            $r++;
-            $this->rights[$r][0] = 1233;
-            $this->rights[$r][1] = 'Valider une facture fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'valider';
+		$r++;
+		$this->rights[$r][0] = 1233;
+		$this->rights[$r][1] = 'Valider une facture fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'valider';
 
-            $r++;
-            $this->rights[$r][0] = 1234;
-            $this->rights[$r][1] = 'Supprimer une facture fournisseur';
-            $this->rights[$r][2] = 'd';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'supprimer';
+		$r++;
+		$this->rights[$r][0] = 1234;
+		$this->rights[$r][1] = 'Supprimer une facture fournisseur';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'supprimer';
 
-            $r++;
-            $this->rights[$r][0] = 1235;
-			$this->rights[$r][1] = 'Envoyer les factures par mail';
-			$this->rights[$r][2] = 'a';
-			$this->rights[$r][3] = 0;
-			$this->rights[$r][4] = 'supplier_invoice_advance';
-			$this->rights[$r][5] = 'send';
+		$r++;
+		$this->rights[$r][0] = 1235;
+		$this->rights[$r][1] = 'Envoyer les factures par mail';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'supplier_invoice_advance';
+		$this->rights[$r][5] = 'send';
 
-            $r++;
-            $this->rights[$r][0] = 1236;
-            $this->rights[$r][1] = 'Exporter les factures fournisseurs, attributs et reglements';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'export';
+		$r++;
+		$this->rights[$r][0] = 1236;
+		$this->rights[$r][1] = 'Exporter les factures fournisseurs, attributs et reglements';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'export';
 
-            $r++;
-            $this->rights[$r][0] = 1237;
-            $this->rights[$r][1] = 'Exporter les commande fournisseurs, attributs';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'export';
+		$r++;
+		$this->rights[$r][0] = 1237;
+		$this->rights[$r][1] = 'Exporter les commande fournisseurs, attributs';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'export';
 
-            // Exports
-            //--------
-            $r=0;
+		// Exports
+		//--------
+		$r=0;
 
-            $r++;
-            $this->export_code[$r]=$this->rights_class.'_'.$r;
-            $this->export_label[$r]='Factures fournisseurs et lignes de facture';
-            $this->export_icon[$r]='bill';
-            $this->export_permission[$r]=array(array("fournisseur","facture","export"));
-            $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_buy'=>'ProductAccountancyBuyCode');
-            //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
-            $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
-            $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.remise_percent'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva'=>"invoice_line",'fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_buy'=>'product');
-            $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='Factures fournisseurs et lignes de facture';
+		$this->export_icon[$r]='bill';
+		$this->export_permission[$r]=array(array("fournisseur","facture","export"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_buy'=>'ProductAccountancyBuyCode');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.remise_percent'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva'=>"invoice_line",'fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_buy'=>'product');
+		$this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields
 		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
 		$resql=$this->db->query($sql);
@@ -289,26 +289,26 @@ class modFournisseur extends DolibarrModules
 			}
 		}
 		// End add axtra fields
-            $this->export_sql_start[$r]='SELECT DISTINCT ';
-            $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
-            $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
-            $this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'facture_fourn_det as fd';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-            $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
-            $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'facture_fourn_det as fd';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
+		$this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
 
-            $r++;
-            $this->export_code[$r]=$this->rights_class.'_'.$r;
-            $this->export_label[$r]='Factures fournisseurs et reglements';
-            $this->export_icon[$r]='bill';
-            $this->export_permission[$r]=array(array("fournisseur","facture","export"));
-            $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber');
-            //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
-            $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
-            $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
-            $this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='Factures fournisseurs et reglements';
+		$this->export_icon[$r]='bill';
+		$this->export_permission[$r]=array(array("fournisseur","facture","export"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
+		$this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields
 		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
 		$resql=$this->db->query($sql);
@@ -343,33 +343,33 @@ class modFournisseur extends DolibarrModules
 			}
 		}
 		// End add axtra fields
-            $this->export_sql_start[$r]='SELECT DISTINCT ';
-            $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
-            $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
-            $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-            $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
+		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
 
-            $r++;
-            $this->export_code[$r]=$this->rights_class.'_'.$r;
-            $this->export_label[$r]='Commandes fournisseurs et lignes de commandes';
-            $this->export_icon[$r]='order';
-            $this->export_permission[$r]=array(array("fournisseur","commande","export"));
-            $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"OrderId",'f.ref'=>"Ref",'f.ref_supplier'=>"RefSupplier",'f.date_creation'=>"DateCreation",'f.date_commande'=>"OrderDate",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.fk_statut'=>'Status','f.note_private'=>"NotePrivate",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.total_tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
-            $this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.fk_statut'=>'Status','f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Number",'fd.qty'=>"Number",'fd.remise_percent'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.total_tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
-            $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"order",'f.ref'=>"order",'f.ref_supplier'=>"order",'f.date_creation'=>"order",'f.date_commande'=>"order",'f.total_ht'=>"order",'f.total_ttc'=>"order",'f.tva'=>"order",'f.fk_statut'=>'order','f.note_private'=>"order",'fd.rowid'=>'order_line','fd.description'=>"order_line",'fd.tva_tx'=>"order_line",'fd.qty'=>"order_line",'fd.remise_percent'=>"order_line",'fd.total_ht'=>"order_line",'fd.total_ttc'=>"order_line",'fd.total_tva'=>"order_line",'fd.product_type'=>'order_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product');
-            $this->export_dependencies_array[$r]=array('order_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='Commandes fournisseurs et lignes de commandes';
+		$this->export_icon[$r]='order';
+		$this->export_permission[$r]=array(array("fournisseur","commande","export"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"OrderId",'f.ref'=>"Ref",'f.ref_supplier'=>"RefSupplier",'f.date_creation'=>"DateCreation",'f.date_commande'=>"OrderDate",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.fk_statut'=>'Status','f.note_private'=>"NotePrivate",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.total_tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		$this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.fk_statut'=>'Status','f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Number",'fd.qty'=>"Number",'fd.remise_percent'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.total_tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"order",'f.ref'=>"order",'f.ref_supplier'=>"order",'f.date_creation'=>"order",'f.date_commande'=>"order",'f.total_ht'=>"order",'f.total_ttc'=>"order",'f.tva'=>"order",'f.fk_statut'=>'order','f.note_private'=>"order",'fd.rowid'=>'order_line','fd.description'=>"order_line",'fd.tva_tx'=>"order_line",'fd.qty'=>"order_line",'fd.remise_percent'=>"order_line",'fd.total_ht'=>"order_line",'fd.total_ttc'=>"order_line",'fd.total_tva'=>"order_line",'fd.product_type'=>'order_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product');
+		$this->export_dependencies_array[$r]=array('order_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
-            $this->export_sql_start[$r]='SELECT DISTINCT ';
-            $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
-            $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseur as f, '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-            $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
-            $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseur as f, '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
+		$this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
 
 	}
 

htdocs/core/tpl/extrafields_view.tpl.php

@@ -48,7 +48,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td';
 			//var_dump($action);exit;
-			if ((! empty($action) && $action != 'view') && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
 			print '>' . $label . '</td>';
 
 			//TODO Improve element and rights detection

htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php

@@ -182,7 +182,40 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid=0;
 		}
-        elseif ($action == 'ORDER_SENTBYMAIL')
+		elseif ($action == 'ORDER_CLOSE')
+        {
+            $langs->load("orders");
+
+			$object->actiontypecode='AC_OTH_AUTO';
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+			$object->sendtoid=0;
+		}
+		elseif ($action == 'ORDER_CLASSIFY_BILLED')
+        {
+            $langs->load("orders");
+
+			$object->actiontypecode='AC_OTH_AUTO';
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+			$object->sendtoid=0;
+		}
+		elseif ($action == 'ORDER_CANCEL')
+        {
+            $langs->load("orders");
+
+			$object->actiontypecode='AC_OTH_AUTO';
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+			$object->sendtoid=0;
+		}
+		elseif ($action == 'ORDER_SENTBYMAIL')
         {
             $langs->load("orders");
 

htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN

@@ -134,6 +134,7 @@ class InterfaceDemo extends DolibarrTriggers
 		    case 'ORDER_SUPPLIER_REFUSE':
 		    case 'ORDER_SUPPLIER_CANCEL':
 		    case 'ORDER_SUPPLIER_SENTBYMAIL':
+            case 'ORDER_SUPPLIER_DISPATCH':
 		    case 'LINEORDER_SUPPLIER_DISPATCH':
 		    case 'LINEORDER_SUPPLIER_CREATE':
 		    case 'LINEORDER_SUPPLIER_UPDATE':

htdocs/expedition/class/expedition.class.php

@@ -1037,7 +1037,7 @@ class Expedition extends CommonObject
 								}
 								if (file_exists($dir))
 								{
-									if (!dol_delete_dir($dir))
+									if (!dol_delete_dir_recursive($dir))
 									{
 										$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
 										return 0;

htdocs/fourn/class/fournisseur.commande.class.php

@@ -1275,9 +1275,10 @@ class CommandeFournisseur extends CommonOrder
 	 * @param	date		$sellby					sell-by date
 	 * @param	string		$batch					Lot number
 	 * @param	int			$fk_commandefourndet	Id of supplier order line
+     * @param	int			$notrigger          	1 = notrigger
      * @return 	int						<0 if KO, >0 if OK
      */
-    function DispatchProduct($user, $product, $qty, $entrepot, $price=0, $comment='', $eatby='', $sellby='', $batch='', $fk_commandefourndet='')
+    function DispatchProduct($user, $product, $qty, $entrepot, $price=0, $comment='', $eatby='', $sellby='', $batch='', $fk_commandefourndet=0, $notrigger=0)
     {
         global $conf;
         $error = 0;

htdocs/fourn/commande/dispatch.php

@@ -81,7 +81,7 @@ if ($_POST["action"] ==	'dispatch' && $user->rights->fournisseur->commande->rece
 			$fk_commandefourndet = "fk_commandefourndet_".$reg[1];
 			if (GETPOST($ent,'int') > 0)
 			{
-				$result = $commande->DispatchProduct($user, GETPOST($prod,'int'),GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), '', '', '', GETPOST($fk_commandefourndet, 'int'));
+				$result = $commande->DispatchProduct($user, GETPOST($prod,'int'),GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), '', '', '', GETPOST($fk_commandefourndet, 'int'), $notrigger);
 			}
 			else
 			{
@@ -98,35 +98,37 @@ if ($_POST["action"] ==	'dispatch' && $user->rights->fournisseur->commande->rece
 			$lot = "lot_number_".$reg[1]."_".$reg[2];
 			$dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$reg[1]."_".$reg[2].'month'], $_POST['dluo_'.$reg[1]."_".$reg[2].'day'], $_POST['dluo_'.$reg[1]."_".$reg[2].'year']);
 			$dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$reg[1]."_".$reg[2].'month'], $_POST['dlc_'.$reg[1]."_".$reg[2].'day'], $_POST['dlc_'.$reg[1]."_".$reg[2].'year']);
-
+            $fk_commandefourndet = "fk_commandefourndet_".$reg[1]."_".$reg[2];
 			if (! (GETPOST($ent,'int') > 0))
 			{
 				dol_syslog('No dispatch for line '.$key.' as no warehouse choosed');
 				$text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').'' .($reg[1]-1);
 				setEventMessage($langs->trans('ErrorFieldRequired',$text), 'errors');
-		}
+    		}
 			if (!((GETPOST($qty) > 0 ) && ( $_POST[$lot]  or $dDLUO or $dDLC) ))
 			{
 				dol_syslog('No dispatch for line '.$key.' as qty is not set or eat-by date are not set');
 				$text = $langs->transnoentities('atleast1batchfield').', '.$langs->transnoentities('Line').'' .($reg[1]-1);
 				setEventMessage($langs->trans('ErrorFieldRequired',$text), 'errors');
-			} else {
-				$result = $commande->DispatchProduct($user, GETPOST($prod,'int'),GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), $dDLC, $dDLUO, GETPOST($lot));
-		}
+			} 
+			else 
+			{
+				$result = $commande->DispatchProduct($user, GETPOST($prod,'int'),GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), $dDLC, $dDLUO, GETPOST($lot), GETPOST($fk_commandefourndet, 'int'), $notrigger);
+    		}
 
 		}
 
 	}
 
-	if (! $notrigger)
+	if (! $notrigger && ($result >= 0))
 	{
 		global $conf, $langs, $user;
-        // Call trigger
-        $result=$commande->call_trigger('ORDER_SUPPLIER_DISPATCH',$user);
+        // Call trigger		
+        $result = $commande->call_trigger('ORDER_SUPPLIER_DISPATCH', $user);
         // End call triggers
 	}
 
-	if ($result > 0)
+	if ($result >= 0)
 	{
 		$db->commit();
 
@@ -138,6 +140,7 @@ if ($_POST["action"] ==	'dispatch' && $user->rights->fournisseur->commande->rece
 		$db->rollback();
 
 		$mesg='<div class="error">'.$langs->trans($commande->error).'</div>';
+		setEventMessage($mesg);
 	}
 }
 

htdocs/install/mysql/data/llx_c_action_trigger.sql

@@ -32,25 +32,29 @@
 -- List of all managed triggered events (used for trigger agenda and for notification)
 --
 delete from llx_c_action_trigger;
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22);
@@ -58,7 +62,6 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);

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

@@ -27,6 +27,9 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5);
 
 -- VPGSQL8.2 ALTER TABLE llx_contrat ALTER COLUMN fk_commercial_signature DROP NOT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_contrat ALTER COLUMN fk_commercial_suivi DROP NOT NULL;

htdocs/install/mysql/tables/llx_cronjob.sql

@@ -33,11 +33,11 @@ CREATE TABLE llx_cronjob
 	md5params 		varchar(32),
   	module_name 		varchar(255),
   	priority 		integer DEFAULT 0,
-  	datelastrun 		datetime,
-  	datenextrun 		datetime,
-  	datestart		datetime,
-  	dateend			datetime,
-  	datelastresult      	datetime,
+  	datelastrun 		datetime,					-- date last run and when should be next
+  	datenextrun 		datetime,					-- job will be run if current date higher that this date
+  	datestart		datetime,						-- before this date no jobs will be run
+  	dateend			datetime,						-- after this date, no more jobs will be run
+  	datelastresult      	datetime,				
   	lastresult      	text,
   	lastoutput      	text,
   	unitfrequency	 	integer NOT NULL DEFAULT 0,

htdocs/langs/ar_SA/admin.lang

@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 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 :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code: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>...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=الإخطارات
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=التبرعات
@@ -508,14 +511,14 @@ Module1400Name=المحاسبة
 Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=الفئات
-Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=سوغ محرر
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=جدول الأعمال
 Module2400Desc=الأعمال / الإدارة المهام وجدول الأعمال
 Module2500Name=إدارة المحتوى الإلكتروني
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=قراءة الخدمات
 Permission532=إنشاء / تعديل الخدمات
 Permission534=حذف خدمات
@@ -746,6 +754,7 @@ Permission1185=الموافقة على أوامر المورد
 Permission1186=من أجل المورد أوامر
 Permission1187=باستلام المورد أوامر
 Permission1188=وثيقة أوامر المورد
+Permission1190=Approve (second approval) supplier orders
 Permission1201=ونتيجة للحصول على التصدير
 Permission1202=إنشاء / تعديل للتصدير
 Permission1231=قراءة فواتير الموردين
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=ادارة الدمار الواردات الخارجية البيانات في قاعدة البيانات (بيانات تحميل)
 Permission1321=تصدير العملاء والفواتير والمدفوعات والصفات
 Permission1421=التصدير طلبات الزبائن وصفاته
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=قراءة الأعمال (أو أحداث المهام) مرتبطة حسابه
 Permission2402=إنشاء / تعديل أو حذف الإجراءات (الأحداث أو المهام) مرتبطة حسابه
 Permission2403=قراءة الأعمال (أو أحداث المهام) آخرين
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=عودة رمز المحاسبة التي بناها:
 ModuleCompanyCodePanicum=العودة فارغة مدونة المحاسبة.
 ModuleCompanyCodeDigitaria=قانون المحاسبة طرف ثالث يعتمد على الرمز. الشفرة تتكون من طابع "جيم" في المركز الأول يليه 5 الحروف الأولى من طرف ثالث المدونة.
 UseNotifications=استخدام الإخطارات
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
 ModelModules=وثائق قوالب
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=علامة مائية على مشروع الوثيقة
@@ -1557,6 +1566,7 @@ SuppliersSetup=المورد الإعداد وحدة
 SuppliersCommandModel=قالب كاملة من أجل المورد (logo...)
 SuppliersInvoiceModel=كاملة قالب من فاتورة المورد (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind الإعداد وحدة
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold

htdocs/langs/ar_SA/agenda.lang

@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=تم توثيق %s من الفاتورة
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=الفاتورة %s للذهاب بها إلى حالة المسودة
 InvoiceDeleteDolibarr=تم حذف %s من الفاتورة
-OrderValidatedInDolibarr= تم توثيق %s من الطلب
+OrderValidatedInDolibarr=تم توثيق %s من الطلب
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=تم إلغاء %s من الطلب
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=تم الموافقة على %s من الطلب
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=الطلب %s للذهاب بها إلى حالة المسودة
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date

htdocs/langs/ar_SA/bills.lang

@@ -74,8 +74,9 @@ PaymentsAlreadyDone=المدفوعات قد فعلت
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=دفع الحكم
 PaymentMode=نوع الدفع
-PaymentConditions=مدة السداد
-PaymentConditionsShort=مدة السداد
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=دفع مبلغ
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=دفع أعلى من دفع تذكرة
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=مجموعه جديدتين الخصم يج
 ConfirmRemoveDiscount=هل أنت متأكد من أنك تريد إزالة هذا الخصم؟
 RelatedBill=الفاتورة ذات الصلة
 RelatedBills=الفواتير ذات الصلة
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 

htdocs/langs/ar_SA/categories.lang

@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=الفئة
-Categories=الفئات
-Rubrique=الفئة
-Rubriques=الفئات
-categories=الفئات
-TheCategorie=فئة
-NoCategoryYet=أي فئة من هذا النوع التي أنشئت
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=في
 AddIn=أضيف في
 modify=تعديل
 Classify=تصنيف
-CategoriesArea=منطقة الفئات
-ProductsCategoriesArea=منتجات / خدمات الفئات المنطقة
-SuppliersCategoriesArea=الموردين منطقة الفئات
-CustomersCategoriesArea=العملاء منطقة الفئات
-ThirdPartyCategoriesArea=أطراف ثالثة 'منطقة الفئات
-MembersCategoriesArea=منطقة فئات الأعضاء
-ContactsCategoriesArea=Contacts categories area
-MainCats=الفئات الرئيسية
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=الفئات الفرعية
 CatStatistics=إحصائيات
-CatList=قائمة الفئات
-AllCats=جميع الفئات
-ViewCat=عرض الفئة
-NewCat=إضافة فئة
-NewCategory=فئة جديدة
-ModifCat=تعديل الفئة
-CatCreated=تم إنشاء الفئة
-CreateCat=إنشاء فئة
-CreateThisCat=إنشاء هذه الفئة
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=صحة المجالات
 NoSubCat=لا فرعية.
 SubCatOf=فرعية
-FoundCats=العثور على الفئات
-FoundCatsForName=فئات إيجاد اسم :
-FoundSubCatsIn=فرعية موجودة في الفئة
-ErrSameCatSelected=كنت قد اخترت نفس الفئة عدة مرات
-ErrForgotCat=نسيت اختيار الفئة
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=نسيت أن أبلغ المجالات
 ErrCatAlreadyExists=هذا الاسم مستخدم بالفعل
-AddProductToCat=إضافة هذا المنتج إلى الفئة؟
-ImpossibleAddCat=من المستحيل أن تضيف فئة
-ImpossibleAssociateCategory=من المستحيل المنتسبين لهذه الفئة
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>ق ٪</b> أضيفت بنجاح.
-ObjectAlreadyLinkedToCategory=العنصر المرتبط بالفعل في هذه الفئة.
-CategorySuccessfullyCreated=ق ٪ من هذه الفئة تم اضافة بالنجاح.
-ProductIsInCategories=المنتجات / الخدمات وتملك على الفئات التالية
-SupplierIsInCategories=لطرف ثالث يملك الموردين الفئات التالية
-CompanyIsInCustomersCategories=هذا الطرف الثالث وتملك ليلي العملاء / آفاق الفئات
-CompanyIsInSuppliersCategories=ويملك هذا الطرف الثالث على الفئات التالية الموردين
-MemberIsInCategories=يملك هذا العضو إلى الفئات التالية الأعضاء
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=هذا المنتج / الخدمة وليس في أي فئات
-SupplierHasNoCategory=هذا المورد ليست في أي فئات
-CompanyHasNoCategory=هذه الشركة ليست في أي فئات
-MemberHasNoCategory=هذا العضو غير موجود في أي فئات
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=تصنف في الفئة
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=بلا
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=هذه الفئة موجودة بالفعل في نفس المكان
 ReturnInProduct=عودة إلى المنتجات / الخدمات بطاقة
 ReturnInSupplier=عودة الى مورد بطاقة
@@ -66,22 +64,22 @@ ReturnInCompany=عودة الى الزبون / احتمال بطاقة
 ContentsVisibleByAll=محتويات سوف تكون واضحة من جانب جميع
 ContentsVisibleByAllShort=محتويات مرئية من قبل جميع
 ContentsNotVisibleByAllShort=محتويات غير مرئي من قبل جميع
-CategoriesTree=Categories tree
-DeleteCategory=حذف فئة
-ConfirmDeleteCategory=هل أنت متأكد من أنك تريد حذف هذه الفئة؟
-RemoveFromCategory=إزالة الارتباط مع catégorie
-RemoveFromCategoryConfirm=هل أنت متأكد من أنك تريد إزالة الربط بين الصفقة والفئة؟
-NoCategoriesDefined=أي فئة محددة
-SuppliersCategoryShort=فئة الموردين
-CustomersCategoryShort=فئة الزبائن
-ProductsCategoryShort=فئة المنتجات
-MembersCategoryShort=أعضاء الفئة
-SuppliersCategoriesShort=فئات الموردين
-CustomersCategoriesShort=فئات العملاء
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp. الفئات
-ProductsCategoriesShort=فئات المنتجات
-MembersCategoriesShort=أعضاء الفئات
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=هذه الفئة لا تحتوي على أي منتج.
 ThisCategoryHasNoSupplier=هذه الفئة لا تحتوي على أي مورد.
 ThisCategoryHasNoCustomer=هذه الفئة لا تحتوي على أي عميل.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=المخصصة للعميل
 AssignedToTheCustomer=يكلف العميل
 InternalCategory=فئة Inernal
-CategoryContents=محتويات هذه الفئة
-CategId=معرف الفئة
-CatSupList=قائمة الموردين الفئات
-CatCusList=قائمة العملاء / احتمال الفئات
-CatProdList=قائمة المنتجات فئات
-CatMemberList=قائمة بأسماء أعضاء الفئات
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category

htdocs/langs/ar_SA/cron.lang

@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= بلا
+CronNone=بلا
 CronDtStart=تاريخ البدء
 CronDtEnd=نهاية التاريخ
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Doli
 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>
 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>
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common

htdocs/langs/ar_SA/donations.lang

@@ -6,6 +6,8 @@ Donor=الجهات المانحة
 Donors=الجهات المانحة
 AddDonation=Create a donation
 NewDonation=منحة جديدة
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=هدية الوعد
 PromisesNotValid=وعود لم يصادق
@@ -21,6 +23,8 @@ DonationStatusPaid=تلقى تبرع
 DonationStatusPromiseNotValidatedShort=مسودة
 DonationStatusPromiseValidatedShort=صادق
 DonationStatusPaidShort=وردت
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=التحقق من صحة الوعد
 DonationReceipt=Donation receipt
 BuildDonationReceipt=بناء استلام
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment

htdocs/langs/ar_SA/errors.lang

@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined

htdocs/langs/ar_SA/mails.lang

@@ -139,3 +139,5 @@ ListOfNotificationsDone=أرسلت قائمة جميع اشعارات بالبر
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails

htdocs/langs/ar_SA/main.lang

@@ -352,6 +352,7 @@ Status=حالة
 Favorite=Favorite
 ShortInfo=Info.
 Ref=المرجع.
+ExternalRef=Ref. extern
 RefSupplier=المرجع. المورد
 RefPayment=المرجع. الدفع
 CommercialProposalsShort=مقترحات تجارية
@@ -394,8 +395,8 @@ Available=متاح
 NotYetAvailable=لم تتوفر بعد
 NotAvailable=غير متاحة
 Popularity=شعبية
-Categories=الفئات
-Category=الفئة
+Categories=Tags/categories
+Category=Tag/category
 By=بواسطة
 From=من
 to=إلى
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء

htdocs/langs/ar_SA/orders.lang

@@ -64,7 +64,8 @@ ShipProduct=سفينة المنتج
 Discount=الخصم
 CreateOrder=خلق أمر
 RefuseOrder=رفض النظام
-ApproveOrder=قبول النظام
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=من أجل التحقق من صحة
 UnvalidateOrder=Unvalidate النظام
 DeleteOrder=من أجل حذف
@@ -102,6 +103,8 @@ ClassifyBilled=تصنيف "فواتير"
 ComptaCard=بطاقة المحاسبة
 DraftOrders=مشروع أوامر
 RelatedOrders=الأوامر ذات الصلة
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=على عملية أوامر
 RefOrder=المرجع. ترتيب
 RefCustomerOrder=المرجع. عملاء النظام
@@ -118,6 +121,7 @@ PaymentOrderRef=من أجل دفع ق ٪
 CloneOrder=استنساخ النظام
 ConfirmCloneOrder=هل أنت متأكد من أن هذا الأمر استنساخ <b>٪ ق؟</b>
 DispatchSupplierOrder=%s استقبال النظام مورد
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=ممثل العميل متابعة النظام
 TypeContact_commande_internal_SHIPPING=ممثل الشحن متابعة

htdocs/langs/ar_SA/other.lang

@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=تدخل المصادق
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=فاتورة مصادق
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=من أجل الموافقة على المورد
 Notify_ORDER_SUPPLIER_REFUSE=من أجل رفض الموردين
 Notify_ORDER_VALIDATE=التحقق من صحة النظام العميل
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=اقتراح التجارية المرسلة عن طر
 Notify_BILL_PAYED=دفعت فاتورة العميل
 Notify_BILL_CANCEL=فاتورة الزبون إلغاء
 Notify_BILL_SENTBYMAIL=فاتورة الزبون إرسالها عن طريق البريد
-Notify_ORDER_SUPPLIER_VALIDATE=أجل التحقق من صحة المورد
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=النظام مزود ترسل عن طريق البريد
 Notify_BILL_SUPPLIER_VALIDATE=فاتورة المورد المصادق
 Notify_BILL_SUPPLIER_PAYED=دفعت فاتورة المورد
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=عدد الملفات المرفقة / وثائق
 TotalSizeOfAttachedFiles=اجمالى حجم الملفات المرفقة / وثائق
 MaxSize=الحجم الأقصى
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=فاتورة ٪ ق المصادق
 EMailTextProposalValidated=وقد تم اقتراح %s التحقق من صحة.
 EMailTextOrderValidated=وقد تم التحقق من صحة %s النظام.
 EMailTextOrderApproved=من أجل الموافقة على ق ٪
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=من أجل ٪ ق ق ٪ وافقت عليها
 EMailTextOrderRefused=من أجل رفض ق ٪
 EMailTextOrderRefusedBy=من أجل أن ترفض ٪ ق ق ٪

htdocs/langs/ar_SA/products.lang

@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#options_myextrafieldkey#</b>
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated

htdocs/langs/ar_SA/projects.lang

@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=قائمة الموردين المرتبط
 ListContractAssociatedProject=قائمة العقود المرتبطة بالمشروع.
 ListFichinterAssociatedProject=قائمة التدخلات المرتبطة بالمشروع
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=قائمة الإجراءات المرتبطة بالمشروع
 ActivityOnProjectThisWeek=نشاط المشروع هذا الاسبوع
 ActivityOnProjectThisMonth=نشاط المشروع هذا الشهر
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=وهناك مشروع كامل لنموذج التقرير (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per 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

htdocs/langs/ar_SA/sendings.lang

@@ -2,6 +2,7 @@
 RefSending=المرجع. إرسال
 Sending=إرسال
 Sendings=الإرسال
+AllSendings=All Shipments
 Shipment=إرسال
 Shipments=شحنات
 ShowSending=Show Sending

htdocs/langs/ar_SA/suppliers.lang

@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)

htdocs/langs/bg_BG/admin.lang

@@ -389,6 +389,7 @@ ExtrafieldSeparator=Разделител
 ExtrafieldCheckBox=Отметка
 ExtrafieldRadio=Радио бутон
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 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 :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code: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>...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Известия
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Дарения
@@ -508,14 +511,14 @@ Module1400Name=Счетоводство
 Module1400Desc=Управление на счетоводство (двойни страни)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Категории
-Module1780Desc=Управление на категории (продукти, доставчици и клиенти)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG редактор
 Module2000Desc=Оставя се да редактирате някакъв текст, чрез използване на усъвършенствана редактор
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Дневен ред
 Module2400Desc=Събития/задачи и управление на дневен ред
 Module2500Name=Електронно Управление на Съдържанието
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Прочети услуги
 Permission532=Създаване / промяна услуги
 Permission534=Изтриване на услуги
@@ -746,6 +754,7 @@ Permission1185=Одобряване на доставчика поръчки
 Permission1186=Поръчка доставчика поръчки
 Permission1187=Потвърдя получаването на доставчика поръчки
 Permission1188=Изтриване на доставчика поръчки
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Резултат от износ
 Permission1202=Създаване / Промяна на износ
 Permission1231=Доставчика фактури
@@ -758,10 +767,10 @@ Permission1237=EXPORT доставчик поръчки и техните дет
 Permission1251=Пусни масов внос на външни данни в базата данни (данни товара)
 Permission1321=Износ на клиентите фактури, атрибути и плащания
 Permission1421=Износ на клиентски поръчки и атрибути
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Прочетете действия (събития или задачи), свързани с неговата сметка
 Permission2402=Създаване/промяна действия (събития или задачи), свързани с неговата сметка
 Permission2403=Изтрий действия (събития или задачи), свързани с неговата сметка
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Връщане счетоводна код, постр
 ModuleCompanyCodePanicum=Връща празна код счетоводство.
 ModuleCompanyCodeDigitaria=Счетоводството код зависи от код на трето лице. Код се състои от буквата &quot;C&quot; на първа позиция, следван от първите 5 символа на код на трета страна.
 UseNotifications=Използвайте уведомления
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
 ModelModules=Документи шаблони
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Воден знак върху проект на документ
@@ -1557,6 +1566,7 @@ SuppliersSetup=Настройка доставчик модул
 SuppliersCommandModel=Пълна шаблон на доставчика за (logo. ..)
 SuppliersInvoiceModel=Пълна образец на фактура на доставчика (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind модул за настройка
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold

htdocs/langs/bg_BG/agenda.lang

@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Фактура %s валидирани
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Фактура %s се върнете в състояние на чернова
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Поръчка %s валидирани
+OrderValidatedInDolibarr=Поръчка %s валидирани
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Поръчка %s отменен
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Поръчка %s одобрен
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Поръчка %s се върне в състояние на чернова
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date

htdocs/langs/bg_BG/bills.lang

@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Плащания направили
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Плащане правило
 PaymentMode=Начин на плащане
-PaymentConditions=Начин на плащане
-PaymentConditionsShort=Начин на плащане
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Сума за плащане
 ValidatePayment=Проверка на плащане
 PaymentHigherThanReminderToPay=Плащането по-висока от напомняне за плащане
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Общо на две нови отстъп
 ConfirmRemoveDiscount=Сигурен ли сте, че искате да премахнете тази отстъпка?
 RelatedBill=Свързани фактура
 RelatedBills=Свързани фактури
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 

htdocs/langs/bg_BG/categories.lang

@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Категория
-Categories=Категории
-Rubrique=Категория
-Rubriques=Категории
-categories=категории
-TheCategorie=Категорията
-NoCategoryYet=Няма създадена категория от този тип
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=В
 AddIn=Добавяне в
 modify=промяна
 Classify=Добавяне
-CategoriesArea=Категории
-ProductsCategoriesArea=Категории Продукти / Услуги
-SuppliersCategoriesArea=Категории доставчици
-CustomersCategoriesArea=Категории клиенти
-ThirdPartyCategoriesArea=Категории трети страни
-MembersCategoriesArea=Категории членове
-ContactsCategoriesArea=Категории контакти
-MainCats=Основни категории
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Подкатегории
 CatStatistics=Статистика
-CatList=Списък на категории
-AllCats=Всички категории
-ViewCat=Преглед на категория
-NewCat=Добавяне на категория
-NewCategory=Нова категория
-ModifCat=Промяна на категория
-CatCreated=Категорията е създадена
-CreateCat=Създаване на категория
-CreateThisCat=Създаване
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Проверка на полетата
 NoSubCat=Няма подкатегория.
 SubCatOf=Подкатегория
-FoundCats=Открити са категории
-FoundCatsForName=Открити са категории за името:
-FoundSubCatsIn=Открити са подкатегории в категорията
-ErrSameCatSelected=Избрали сте една и съща категория няколко пъти
-ErrForgotCat=Забравили сте да изберете категория
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Забравили сте да информира полета
 ErrCatAlreadyExists=Това име вече се използва
-AddProductToCat=Добавете този продукт към категория?
-ImpossibleAddCat=Невъзможно е да добавите категория
-ImpossibleAssociateCategory=Невъзможно е да се асоциира категорията към
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> е добавен успешно.
-ObjectAlreadyLinkedToCategory=Елемента вече е свързан с тази категория.
-CategorySuccessfullyCreated=Категорията %s е добавена успешно.
-ProductIsInCategories=Продукта/услугата е в следните категории
-SupplierIsInCategories=Третото лице е в следните категории доставчици
-CompanyIsInCustomersCategories=Това трето лице е в следните категории клиенти/prospects
-CompanyIsInSuppliersCategories=Това трето лице е в следните категории доставчици
-MemberIsInCategories=Този член е в следните категории членове
-ContactIsInCategories=Този контакт принадлежи на следните категории контакти
-ProductHasNoCategory=Този продукт/услуга не е в никакви категории
-SupplierHasNoCategory=Този доставчик не е в никакви категории
-CompanyHasNoCategory=Тази фирма не е в никакви категории
-MemberHasNoCategory=Този член не е в никакви категории
-ContactHasNoCategory=Този контакт не е в категория
-ClassifyInCategory=Добавяне в категория
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Няма
-NotCategorized=Без категория
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Тази категория вече съществува с този код
 ReturnInProduct=Обратно към картата на продукта/услугата
 ReturnInSupplier=Обратно към картата на доставчика
@@ -66,22 +64,22 @@ ReturnInCompany=Обратно към картата на  клиента/prospe
 ContentsVisibleByAll=Съдържанието ще се вижда от всички
 ContentsVisibleByAllShort=Съдържанието е видимо от всички
 ContentsNotVisibleByAllShort=Съдържанието не е видимо от всички
-CategoriesTree=Категории дърво
-DeleteCategory=Изтриване на категория
-ConfirmDeleteCategory=Сигурни ли сте, че желаете да изтриете тази категория?
-RemoveFromCategory=Премахване на връзката с категория
-RemoveFromCategoryConfirm=Сигурни ли сте, че желаете да премахнете връзката между операцията и категорията?
-NoCategoriesDefined=Не е определена категория
-SuppliersCategoryShort=Категория доставчици
-CustomersCategoryShort=Категория клиенти
-ProductsCategoryShort=Категория продукти
-MembersCategoryShort=Категория членове
-SuppliersCategoriesShort=Категории доставчици
-CustomersCategoriesShort=Категории клиенти
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo / Prosp. категории
-ProductsCategoriesShort=Категории продукти
-MembersCategoriesShort=Категории членове
-ContactCategoriesShort=Категории контакти
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Тази категория не съдържа никакъв продукт.
 ThisCategoryHasNoSupplier=Тази категория не съдържа никакъв доставчик.
 ThisCategoryHasNoCustomer=Тази категория не съдържа никакъв клиент.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Тази категория не съдържа ник
 AssignedToCustomer=Възложено на клиент
 AssignedToTheCustomer=Възложено на клиента
 InternalCategory=Вътрешна категория
-CategoryContents=Съдържание на категория
-CategId=ID на категория
-CatSupList=Списък на доставчика категории
-CatCusList=Списък на потребителите / перспективата категории
-CatProdList=Списък на продуктите категории
-CatMemberList=Списък на членовете категории
-CatContactList=Лист на контактни категории и контакти
-CatSupLinks=Връзки между доставчици и категории
-CatCusLinks=Връзки между потребител/перспектива и категории
-CatProdLinks=Връзки между продукти/услуги и категории
-CatMemberLinks=Връзки между членове и категории
-DeleteFromCat=Премахване от категорията
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Изтрий снимка
 ConfirmDeletePicture=Потвърди изтриване на снимка?
 ExtraFieldsCategories=Допълнителни атрибути
-CategoriesSetup=Категории настройка
-CategorieRecursiv=Автоматично свързване с родителска категория
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ако е активирано, продукта ще бъде свързан също и с родителската категория при добавяне в под-категория
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category

htdocs/langs/bg_BG/cron.lang

@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Няма
+CronNone=Няма
 CronDtStart=Начална дата
 CronDtEnd=Крайна дата
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Doli
 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>
 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>
 CronCommandHelp=Системния команден ред за стартиране.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Информация
 # Common

htdocs/langs/bg_BG/donations.lang

@@ -6,6 +6,8 @@ Donor=Дарител
 Donors=Дарители
 AddDonation=Create a donation
 NewDonation=Ново дарение
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Показване на дарение
 DonationPromise=Обещано дарение
 PromisesNotValid=Няма потвърдени дарения
@@ -21,6 +23,8 @@ DonationStatusPaid=Получено дарение
 DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Потвърдено
 DonationStatusPaidShort=Получено
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Потвърждаване на дарението
 DonationReceipt=Разписка за дарение
 BuildDonationReceipt=Създаване на разписка
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment

htdocs/langs/bg_BG/errors.lang

@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени

htdocs/langs/bg_BG/mails.lang

@@ -139,3 +139,5 @@ ListOfNotificationsDone=Списък на всички имейли, изпра
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails

htdocs/langs/bg_BG/main.lang

@@ -352,6 +352,7 @@ Status=Състояние
 Favorite=Favorite
 ShortInfo=Инфо.
 Ref=Реф.
+ExternalRef=Ref. extern
 RefSupplier=Реф. снабдител
 RefPayment=Реф. плащане
 CommercialProposalsShort=Търговски предложения
@@ -394,8 +395,8 @@ Available=На разположение
 NotYetAvailable=Все още няма данни
 NotAvailable=Не е налично
 Popularity=Популярност
-Categories=Категории
-Category=Категория
+Categories=Tags/categories
+Category=Tag/category
 By=От
 From=От
 to=за
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Изберете елемент и натиснете Презареждане
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Понеделник
 Tuesday=Вторник

htdocs/langs/bg_BG/orders.lang

@@ -64,7 +64,8 @@ ShipProduct=Кораб продукт
 Discount=Отстъпка
 CreateOrder=Създаване на поръчка
 RefuseOrder=Спецконтейнери за
-ApproveOrder=Приемам за
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Валидиране за
 UnvalidateOrder=Unvalidate за
 DeleteOrder=Изтрий заявка
@@ -102,6 +103,8 @@ ClassifyBilled=Класифицирайте таксувани
 ComptaCard=Счетоводството карта
 DraftOrders=Проект за поръчки
 RelatedOrders=Подобни поръчки
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=В процес поръчки
 RefOrder=Реф. ред
 RefCustomerOrder=Реф. поръчка на клиента
@@ -118,6 +121,7 @@ PaymentOrderRef=Плащане на поръчката %s
 CloneOrder=Clone за
 ConfirmCloneOrder=Сигурен ли сте, че искате да клонирате за този <b>%s?</b>
 DispatchSupplierOrder=Получаване %s доставчика ред
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Представител проследяване поръчка на клиента
 TypeContact_commande_internal_SHIPPING=Представител проследяване доставка

htdocs/langs/bg_BG/other.lang

@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Интервенция валидирани
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Клиентът фактура се заверява
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Доставчик утвърдения
 Notify_ORDER_SUPPLIER_REFUSE=Доставчик за отказа
 Notify_ORDER_VALIDATE=Клиента заявка се заверява
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Търговско предложение, изпрат
 Notify_BILL_PAYED=Фактурата на клиента е платена
 Notify_BILL_CANCEL=Фактурата на клиента е отменена
 Notify_BILL_SENTBYMAIL=Фактурата на клиента е  изпратена по пощата
-Notify_ORDER_SUPPLIER_VALIDATE=Доставчик влязлата в сила заповед
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Доставчик реда, изпратени по пощата
 Notify_BILL_SUPPLIER_VALIDATE=Доставчик фактура валидирани
 Notify_BILL_SUPPLIER_PAYED=Доставчик фактура плаща
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Брой на прикачените файлове/документи
 TotalSizeOfAttachedFiles=Общ размер на прикачените файлове/документи
 MaxSize=Максимален размер
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Фактура %s е била потвърдена.
 EMailTextProposalValidated=Предложението %s е била потвърдена.
 EMailTextOrderValidated=За %s е била потвърдена.
 EMailTextOrderApproved=За %s е одобрен.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Е бил одобрен за %s от %s.
 EMailTextOrderRefused=За %s е била отказана.
 EMailTextOrderRefusedBy=За %s е отказано от %s.

htdocs/langs/bg_BG/products.lang

@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#options_myextrafieldkey#</b>
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated

htdocs/langs/bg_BG/projects.lang

@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Списък на фактурите на
 ListContractAssociatedProject=Списък на договори, свързани с проекта
 ListFichinterAssociatedProject=Списък на интервенциите, свързани с проекта
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Списък на събития, свързани с проекта
 ActivityOnProjectThisWeek=Дейности в проекта тази седмица
 ActivityOnProjectThisMonth=Дейност по проект, този месец
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Прекъсни връзката към елемента
 # Documents models
 DocumentModelBaleine=Доклад за цялостния проект модел (logo. ..)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето
-InputPerTime=Input per 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

htdocs/langs/bg_BG/sendings.lang

@@ -2,6 +2,7 @@
 RefSending=Реф. пратка
 Sending=Пратка
 Sendings=Превозите
+AllSendings=All Shipments
 Shipment=Пратка
 Shipments=Превозите
 ShowSending=Show Sending

htdocs/langs/bg_BG/suppliers.lang

@@ -43,3 +43,4 @@ ListOfSupplierOrders=Списък на нарежданията за доста
 MenuOrdersSupplierToBill=Поръчки на доставчика за фактуриране
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)

htdocs/langs/bs_BA/admin.lang

@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 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 :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code: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>...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Putanja do datoteke koja sadrži Maxmind ip do prevoda za zemlju. <br> Primjeri: <br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold

htdocs/langs/bs_BA/agenda.lang

@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura %s potvrđena
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktura %s vraćena u status izrade
 InvoiceDeleteDolibarr=Faktura %s obrisana
-OrderValidatedInDolibarr= Narudžba %s potvrđena
+OrderValidatedInDolibarr=Narudžba %s potvrđena
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Narudžba %s otkazana
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date

htdocs/langs/bs_BA/bills.lang

@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Izvršene uplate
 PaymentsBackAlreadyDone=Izvršeni povrati uplata
 PaymentRule=Pravilo plaćanja
 PaymentMode=Način plaćanja
-PaymentConditions=Rok plaćanja
-PaymentConditionsShort=Rok plaćanja
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Iznos plaćanja
 ValidatePayment=Potvrditi uplatu
 PaymentHigherThanReminderToPay=Uplata viša od zaostalog duga
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Ukupno za dva nova popusta mora biti jednak
 ConfirmRemoveDiscount=Jeste li sigurni da želite ukloniti ovaj popust?
 RelatedBill=Povezana faktura
 RelatedBills=Povezane fakture
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 

htdocs/langs/bs_BA/categories.lang

@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorija
-Categories=Kategorije
-Rubrique=Kategorija
-Rubriques=Kategorije
-categories=kategorije
-TheCategorie=Kategorija
-NoCategoryYet=Nema kreirane kategorije ovog tipa
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=U
 AddIn=Dodaj u
 modify=izmijeniti
 Classify=Svrstati
-CategoriesArea=Područje za kategorije
-ProductsCategoriesArea=Područje za kategorije proizvoda/usluga
-SuppliersCategoriesArea=Područje za kategorije dobavljača
-CustomersCategoriesArea=Područje za kategorije kupaca
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Područje za kategorije članova
-ContactsCategoriesArea=Područje za kategorije kontakata
-MainCats=Glavne kategorije
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Podkategorije
 CatStatistics=Statistika
-CatList=Lista kategorija
-AllCats=Sve kategorije
-ViewCat=Pogledaj kategoriju
-NewCat=Dodaj kategoriju
-NewCategory=Nova kategorija
-ModifCat=Izmijeni kategoriju
-CatCreated=Kategorija kreirana
-CreateCat=Kreiraj kategoriju
-CreateThisCat=Kreiraj ovu kategoriju
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Potvrdi polja
 NoSubCat=Nema podkategorije
 SubCatOf=Podkategorija
-FoundCats=Kategorije pronađene
-FoundCatsForName=Kategorije pronađene za ime :
-FoundSubCatsIn=Podkategorije pronađene u kategoriji
-ErrSameCatSelected=Izbrali ste istu kategoriju nekoliko puta
-ErrForgotCat=Zaboravili ste izabrati kategoriju
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Zaboravili ste prijaviti polja
 ErrCatAlreadyExists=Ime se već koristi
-AddProductToCat=Dodaj ovaj proizvod u kategoriju?
-ImpossibleAddCat=Nemoguće dodati kategoriju
-ImpossibleAssociateCategory=Nemoguće povezati kategoriju sa
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> je uspješno dodan/a.
-ObjectAlreadyLinkedToCategory=Element je već povezan sa ovom kategorijom.
-CategorySuccessfullyCreated=Ova kategorija %s je uspješno dodana.
-ProductIsInCategories=Proizvod/usluga pripada slijedećim kategorijama
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=Ovaj član pripada sljedećim kategorijama članova
-ContactIsInCategories=Ovaj kontakt pripada slijedećim kategorijama kontakata
-ProductHasNoCategory=Ovaj prozvod/usluga nije dodan u neku od kategorija
-SupplierHasNoCategory=Ovaj dobavljač nije dodan u neku od kategorija
-CompanyHasNoCategory=Ova kopmanija nije dodana u neku od kategorija
-MemberHasNoCategory=Ovaj član nije dodan u neku od kategorija
-ContactHasNoCategory=Ovaj kontakt nije u nekoj od kategorija
-ClassifyInCategory=Svrstaj u kategoriju
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Ništa
-NotCategorized=Bez kategorije
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Već postoji kategorija sa ovom referencom
 ReturnInProduct=Nazad na karticu proizvoda/usluge
 ReturnInSupplier=Nazad na karticu dobavljača
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=Sadržaj će biti vidljiv svima
 ContentsVisibleByAllShort=Sadržaj vidljiv svima
 ContentsNotVisibleByAllShort=Sadržaj nije vidljiv svima
-CategoriesTree=Categories tree
-DeleteCategory=Obriši kategoriju
-ConfirmDeleteCategory=Jeste li sigurni da želite obrisati ovu kategoriju?
-RemoveFromCategory=Uklonite vezu sa kategorijom
-RemoveFromCategoryConfirm=Jeste li sigurni da želite ukloniti vezu između transakcije i kategorije?
-NoCategoriesDefined=Nema definisane kategorije
-SuppliersCategoryShort=Kategorija dobavljača
-CustomersCategoryShort=Kategorija kupaca
-ProductsCategoryShort=Kategorija prozvoda
-MembersCategoryShort=Kategorija članova
-SuppliersCategoriesShort=Kategorije dobavljača
-CustomersCategoriesShort=Kategorije kupaca
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Kategorije proizvoda
-MembersCategoriesShort=Kategorije članova
-ContactCategoriesShort=Kategorije kontakata
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ova kategorija ne sadrži nijedan proizvod.
 ThisCategoryHasNoSupplier=Ova kategorija ne sadrži nijednog dobavljača.
 ThisCategoryHasNoCustomer=Ova kategorija ne sadrži nijednog kupca.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Ova kategorija ne sadrži nijednog kontakta.
 AssignedToCustomer=Dodijeljeno nekom kupcu
 AssignedToTheCustomer=Dodijeljeno ovom kupcu
 InternalCategory=Interna kategorija
-CategoryContents=Sadržaj kategorije
-CategId=ID kategorije
-CatSupList=Lista kategorija za dobavljače
-CatCusList=List of customer/prospect categories
-CatProdList=Lista kategorija za proizvode
-CatMemberList=Lista kategorija za članove
-CatContactList=Lista kategorija kontakata i kontakata
-CatSupLinks=Veze između dobavljača i kategorija
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Veze između proizvoda/usluga i kategorija
-CatMemberLinks=Veze između članova i kategorija
-DeleteFromCat=Ukloni iz kategorije
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category

htdocs/langs/bs_BA/cron.lang

@@ -26,15 +26,15 @@ CronLastOutput=Izvještaj o zadnjem pokretanju
 CronLastResult=Šifra rezultat zadnjeg pokretanja
 CronListOfCronJobs=Lista redovnih poslova
 CronCommand=Komanda
-CronList=Jobs list
-CronDelete= Obriši kron posao
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Jeste li sigurni sada da izvrši ovaj posao sada
-CronInfo= Poslovi omogućavaju da se izvrše zadatci koji su planirani
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Ništa
+CronNone=Ništa
 CronDtStart=Datum početka
 CronDtEnd=End date
 CronDtNextLaunch=Sljedeće izvršenje
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Doli
 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>
 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>
 CronCommandHelp=Sistemska komanda za izvršenje
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Inromacije
 # Common

htdocs/langs/bs_BA/donations.lang

@@ -6,6 +6,8 @@ Donor=Donator
 Donors=Donatori
 AddDonation=Create a donation
 NewDonation=Nova donacija
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Prikaži donaciju
 DonationPromise=Obećanje za poklon
 PromisesNotValid=Nepotvrđena obećanja
@@ -21,6 +23,8 @@ DonationStatusPaid=Primljena donacija
 DonationStatusPromiseNotValidatedShort=Nacrt
 DonationStatusPromiseValidatedShort=Potvrđena donacija
 DonationStatusPaidShort=Primljena donacija
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Potvrdi obećanje
 DonationReceipt=Priznanica za donaciju
 BuildDonationReceipt=Napravi priznanicu
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment

htdocs/langs/bs_BA/errors.lang

@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined

htdocs/langs/bs_BA/mails.lang

@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista svih notifikacija o slanju emaila
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails

htdocs/langs/bs_BA/main.lang

@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Poslovni prijedlozi
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday

htdocs/langs/bs_BA/orders.lang

@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping

htdocs/langs/bs_BA/other.lang

@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.

htdocs/langs/bs_BA/products.lang

@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#options_myextrafieldkey#</b>
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated

htdocs/langs/bs_BA/projects.lang

@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Lista faktura dobavljača u vezi s projekt
 ListContractAssociatedProject=Lista ugovora u vezi s projektom
 ListFichinterAssociatedProject=Lista intervencija u vezi s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista događaja u vezi s projektom
 ActivityOnProjectThisWeek=Aktivnost na projektu ove sedmice
 ActivityOnProjectThisMonth=Aktivnost na projektu ovog mjeseca
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per 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

htdocs/langs/bs_BA/sendings.lang

@@ -2,6 +2,7 @@
 RefSending=Referenca pošiljke
 Sending=Pošiljka
 Sendings=Pošiljke
+AllSendings=All Shipments
 Shipment=Pošiljka
 Shipments=Pošiljke
 ShowSending=Show Sending

htdocs/langs/bs_BA/suppliers.lang

@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)

htdocs/langs/ca_ES/admin.lang

@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separador
 ExtrafieldCheckBox=Casella de verificació
 ExtrafieldRadio=Botó de selecció excloent
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 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 :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code: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>...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notificacions
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donacions
@@ -508,14 +511,14 @@ Module1400Name=Comptabilitat experta
 Module1400Desc=Gestió experta de la comptabilitat (doble partida)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Gestió de categories (productes, proveïdors i clients)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Gestor de tasques programades
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Gestió de l'agenda i de les accions
 Module2500Name=Gestió Electrònica de Documents
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Consultar serveis
 Permission532=Crear/modificar serveis
 Permission534=Eliminar serveis
@@ -746,6 +754,7 @@ Permission1185=Aprovar comandes a proveïdors
 Permission1186=Enviar comandes a proveïdors
 Permission1187=Rebre comandes a proveïdors
 Permission1188=Tancar comandes a proveïdors
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Obtenir resultat d'una exportació
 Permission1202=Crear/modificar exportacions
 Permission1231=Consultar factures de proveïdors
@@ -758,10 +767,10 @@ Permission1237=Exporta comandes de proveïdors juntament amb els seus detalls
 Permission1251=Llançar les importacions en massa a la base de dades (càrrega de dades)
 Permission1321=Exporta factures a clients, atributs i cobraments
 Permission1421=Exporta comandes de clients i atributs
-Permission23001 = Veure les tasques programades
-Permission23002 = Crear/Modificar les tasques programades
-Permission23003 = Eliminar les tasques programades
-Permission23004 = Executar les tasques programades
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Llegir accions (esdeveniments o tasques) vinculades al seu compte
 Permission2402=Crear/modificar accions (esdeveniments o tasques) vinculades al seu compte
 Permission2403=Modificar accions (esdeveniments o tasques) vinculades al seu compte
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Retorna un codi comptable compost de<br>%s seguit del
 ModuleCompanyCodePanicum=Retorna un codi comptable buit.
 ModuleCompanyCodeDigitaria=Retorna un codi comptable compost seguint el codi de tercer. El codi està format per caràcter 'C' en primera posició seguit dels 5 primers caràcters del codi tercer.
 UseNotifications=Utilitza notificacions
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
 ModelModules=Models de documents
 DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .ODT OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Marca d'aigua en els documents esborrany
@@ -1557,6 +1566,7 @@ SuppliersSetup=Configuració del mòdul Proveïdors
 SuppliersCommandModel=Model de comandes a proveïdors complet (logo...)
 SuppliersInvoiceModel=Model de factures de proveïdors complet (logo...)
 SuppliersInvoiceNumberingModel=Models de numeració de factures de proveïdor
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuració del mòdul GeoIP  Maxmind
 PathToGeoIPMaxmindCountryDataFile=Ruta de l'arxiu Maxmind que conté les conversions IP-> País.<br>Exemple: /usr/local/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold

htdocs/langs/ca_ES/agenda.lang

@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factura %s validada
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Factura %s tornada a borrador
 InvoiceDeleteDolibarr=Factura %s eliminada
-OrderValidatedInDolibarr= Comanda %s validada
+OrderValidatedInDolibarr=Comanda %s validada
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Commanda %s anul·lada
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Comanda %s aprovada
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Comanda %s tordada a borrador
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date

htdocs/langs/ca_ES/bills.lang

@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pagaments efectuats
 PaymentsBackAlreadyDone=Reemborsaments ja efectuats
 PaymentRule=Forma de pagament
 PaymentMode=Forma de pagament
-PaymentConditions=Condicions de pagament
-PaymentConditionsShort=Condicions pagament
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Import pagament
 ValidatePayment=Validar aquest pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La suma de l'import dels 2 nous descomptes
 ConfirmRemoveDiscount=Esteu segur de voler eliminar aquest descompte?
 RelatedBill=Factura associada
 RelatedBills=Factures associades
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 

htdocs/langs/ca_ES/categories.lang

@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categoria
-Categories=categories
-Rubrique=Categoria
-Rubriques=Categories
-categories=Categoria(es)
-TheCategorie=La categoria
-NoCategoryYet=Cap categoria d'aquest tipus creada
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=En
 AddIn=Afegir en
 modify=Modificar
 Classify=Classificar
-CategoriesArea=Àrea categories
-ProductsCategoriesArea=Àrea categories de productes i serveis
-SuppliersCategoriesArea=Àrea categories de proveïdors
-CustomersCategoriesArea=Àrea categories de clients
-ThirdPartyCategoriesArea=Àrea categories de tercers
-MembersCategoriesArea=Àrea categories de membres
-ContactsCategoriesArea=Àrea categories de contactes
-MainCats=Categories principals
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Estadístiques
-CatList=Llista de categories
-AllCats=Totes les categories
-ViewCat=Veure la categoria
-NewCat=Nova categoria
-NewCategory=Nova categoria
-ModifCat=Modificar una categoria
-CatCreated=Categoria creada
-CreateCat=Afegir una categoria
-CreateThisCat=Afegir aquesta categoria
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validar els camps
 NoSubCat=Aquesta categoria no  conté cap subcategoria
 SubCatOf=Subcategories
-FoundCats=Categories trobades
-FoundCatsForName=Categories trobades amb el nom:
-FoundSubCatsIn=Subcategories trobades en  la categoria
-ErrSameCatSelected=Heu seleccionat la mateixa categoria diverses vegades
-ErrForgotCat=Ha oblidat escollir la categoria
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Ha oblidat reassignar un camp
 ErrCatAlreadyExists=Aquest nom està sent utilitzat
-AddProductToCat=Afegir aquest producte a una categoria?
-ImpossibleAddCat=Impossible afegir la categoria
-ImpossibleAssociateCategory=Impossible associar la categoria
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=s'ha afegit amb èxit.
-ObjectAlreadyLinkedToCategory=L'element ja està enllaçat a aquesta categoria
-CategorySuccessfullyCreated=La categoria %s s'ha inserit correctament.
-ProductIsInCategories=Aquest producte/servei es troba en les següents categories
-SupplierIsInCategories=Aquest proveïdor es troba en les següents categories
-CompanyIsInCustomersCategories=Aquesta empresa es troba en les següents categories
-CompanyIsInSuppliersCategories=Aquesta empresa es troba en les següents categories de proveïdors
-MemberIsInCategories=Aquest membre es troba en les següents categories de membres
-ContactIsInCategories=Aquest contacte es troba en les següents categories de contactes
-ProductHasNoCategory=Aquest producte/servei no es troba en cap categoria en particular
-SupplierHasNoCategory=Aquest proveïdor no es troba en cap categoria en particular
-CompanyHasNoCategory=Aquesta empresa no es troba en cap categoria en particular
-MemberHasNoCategory=Aquest membre no es troba en cap categoria en particular
-ContactHasNoCategory=Aquest contacte no es troba en cap categoria
-ClassifyInCategory=Classificar en la categoria
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Cap
-NotCategorized=Sense categoria
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Aquesta categoria ja existeix per aquesta referència
 ReturnInProduct=Tornar a la fitxa producte/servei
 ReturnInSupplier=Tornar a la fitxa proveïdor
@@ -66,22 +64,22 @@ ReturnInCompany=Tornar a la fitxa client/client potencial
 ContentsVisibleByAll=El contingut serà visible per tots
 ContentsVisibleByAllShort=Contingut visible per tots
 ContentsNotVisibleByAllShort=Contingut no visible per tots
-CategoriesTree=Categories tree
-DeleteCategory=Eliminar categoria
-ConfirmDeleteCategory=Esteu segur de voler eliminar aquesta categoria?
-RemoveFromCategory=Suprimir l'enllaç amb categoria
-RemoveFromCategoryConfirm=Esteu segur de voler eliminar el vincle entre la transacció i la categoria?
-NoCategoriesDefined=Cap categoria definida
-SuppliersCategoryShort=Categoria proveïdors
-CustomersCategoryShort=Categoria clients
-ProductsCategoryShort=Categoria productes
-MembersCategoryShort=Categoria membre
-SuppliersCategoriesShort=Categories proveïdors
-CustomersCategoriesShort=Categories clients
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Categories clients
-ProductsCategoriesShort=Categories productes
-MembersCategoriesShort=Categories membres
-ContactCategoriesShort=Categories contactes
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Aquesta categoria no conté cap producte.
 ThisCategoryHasNoSupplier=Aquesta categoria no conté cap proveïdor.
 ThisCategoryHasNoCustomer=Aquesta categoria no conté cap client.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Aquesta categoria no conté contactes
 AssignedToCustomer=Assignar a un client
 AssignedToTheCustomer=Assignat a un client
 InternalCategory=Categoria interna
-CategoryContents=Contingut de la categoria
-CategId=Id categoria
-CatSupList=Llista de categories de proveïdors
-CatCusList=Llista de categories de clients/potencials
-CatProdList=Llista de categories de productes
-CatMemberList=Llista de categories de membres
-CatContactList=Llistat de categories de contactes i contactes
-CatSupLinks=Proveïdors
-CatCusLinks=Clients/Clients potencials
-CatProdLinks=Productes
-CatMemberLinks=Membres
-DeleteFromCat=Eliminar de la categoria
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category

htdocs/langs/ca_ES/cron.lang

@@ -26,15 +26,15 @@ CronLastOutput=Última sortida
 CronLastResult=Últim codi tornat
 CronListOfCronJobs=Llista de tasques programades
 CronCommand=Comando
-CronList=Llistat de tasques planificades
-CronDelete= Eliminar la tasca planificada
-CronConfirmDelete= Està segur que voleu eliminar aquesta tasca planificada?
-CronExecute=Executar aquesta tasca
-CronConfirmExecute= Està segur que voleu executar ara aquesta tasca?
-CronInfo= Els treballs permeten executar les tasques a intervals regulars
-CronWaitingJobs=Els seus treballs en espera:
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Tasca
-CronNone= Ningún
+CronNone=Ningún
 CronDtStart=Data inici
 CronDtEnd=Data fi
 CronDtNextLaunch=Propera execució
@@ -75,6 +75,7 @@ CronObjectHelp=El nombre del objeto a crear. <BR> Por ejemplo para llamar el mé
 CronMethodHelp=El método a lanzar. <BR> Por ejemplo para llamar el método fetch del objeto Product de Dolibarr  /htdocs/product/class/product.class.php, el valor del método es <i>fecth</i>
 CronArgsHelp=Los argumentos del método. <BR> Por ejemplo para usar el método fetch del objeto Product deDolibarr /htdocs/product/class/product.class.php, el valor del parámetro podría ser <i>0, RefProduit</i>
 CronCommandHelp=El comando del sistema a executar
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informació
 # Common

htdocs/langs/ca_ES/donations.lang

@@ -6,6 +6,8 @@ Donor=Donant
 Donors=Donants
 AddDonation=Create a donation
 NewDonation=Nova donació
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Mostrar donació
 DonationPromise=Promesa de donació
 PromisesNotValid=Promeses no validades
@@ -21,6 +23,8 @@ DonationStatusPaid=Donació pagada
 DonationStatusPromiseNotValidatedShort=No validada
 DonationStatusPromiseValidatedShort=Validada
 DonationStatusPaidShort=Pagada
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validar promesa
 DonationReceipt=Rebut de donació
 BuildDonationReceipt=Crear rebut
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment

htdocs/langs/ca_ES/errors.lang

@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits

htdocs/langs/ca_ES/mails.lang

@@ -139,3 +139,5 @@ ListOfNotificationsDone=Llista de notificacions d'e-mails enviades
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails

htdocs/langs/ca_ES/main.lang

@@ -352,6 +352,7 @@ Status=Estat
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. proveïdor
 RefPayment=Ref. pagament
 CommercialProposalsShort=Pressupostos
@@ -394,8 +395,8 @@ Available=Disponible
 NotYetAvailable=Encara no disponible
 NotAvailable=No disponible
 Popularity=Popularitat
-Categories=Categories
-Category=Categoria
+Categories=Tags/categories
+Category=Tag/category
 By=Per
 From=De
 to=a
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts

htdocs/langs/ca_ES/orders.lang

@@ -64,7 +64,8 @@ ShipProduct=Enviar producte
 Discount=Descompte
 CreateOrder=Crear comanda
 RefuseOrder=Rebutjar la comanda
-ApproveOrder=Acceptar la comanda
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validar la comanda
 UnvalidateOrder=Desvalidar la comanda
 DeleteOrder=Eliminar la comanda
@@ -102,6 +103,8 @@ ClassifyBilled=Classificar facturat
 ComptaCard=Fitxa comptable
 DraftOrders=Comandes esborrany
 RelatedOrders=Comandes adjuntes
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Comandes en procés
 RefOrder=Ref. comanda
 RefCustomerOrder=Ref. comanda client
@@ -118,6 +121,7 @@ PaymentOrderRef=Pagament comanda %s
 CloneOrder=Clonar comanda
 ConfirmCloneOrder=Esteu segur de voler clonar aquesta comanda <b>%s</b>?
 DispatchSupplierOrder=Recepció de la comanda a proveïdor %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable seguiment comanda client
 TypeContact_commande_internal_SHIPPING=Responsable enviament comanda client

htdocs/langs/ca_ES/other.lang

@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validació fitxa intervenció
 Notify_FICHINTER_SENTBYMAIL=Enviament fitxa intervenció per e-mail
 Notify_BILL_VALIDATE=Validació factura
 Notify_BILL_UNVALIDATE=Devalidació factura a client
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Aprovació comanda a proveïdor
 Notify_ORDER_SUPPLIER_REFUSE=Rebuig comanda a proveïdor
 Notify_ORDER_VALIDATE=Validació comanda client
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Enviament pressupost per e-mail
 Notify_BILL_PAYED=Cobrament factura a client
 Notify_BILL_CANCEL=Cancel·lació factura a client
 Notify_BILL_SENTBYMAIL=Enviament factura a client per e-mail
-Notify_ORDER_SUPPLIER_VALIDATE=Validació comanda a proveïdor
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Enviament comanda a proveïdor per e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Validació factura de proveïdor
 Notify_BILL_SUPPLIER_PAYED=Pagament factura de proveïdor
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Número arxius/documents adjunts
 TotalSizeOfAttachedFiles=Mida total dels arxius/documents adjunts
 MaxSize=Tamany màxim
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Factura %s validada
 EMailTextProposalValidated=El pressupost %s que el concerneix ha estat validat.
 EMailTextOrderValidated=La comanda %s que el concerneix ha estat validada.
 EMailTextOrderApproved=Comanda %s aprovada
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Comanda %s aprovada per %s
 EMailTextOrderRefused=Comanda %s rebutjada
 EMailTextOrderRefusedBy=Comanda %s rebutjada per %s

htdocs/langs/ca_ES/products.lang

@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#options_myextrafieldkey#</b>
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated

htdocs/langs/ca_ES/projects.lang

@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Llistat de factures de proveïdor associad
 ListContractAssociatedProject=Llistatde contractes associats al projecte
 ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte
 ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana
 ActivityOnProjectThisMonth=Activitat en el projecte aquest mes
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Model d'informe de projecte complet (logo...)
-PlannedWorkload = Càrrega de treball prevista
-WorkloadOccupation= Percentatge afectat
+PlannedWorkload=Càrrega de treball prevista
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Objectes vinculats
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per 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

htdocs/langs/ca_ES/sendings.lang

@@ -2,6 +2,7 @@
 RefSending=Ref enviament
 Sending=Enviament
 Sendings=Enviaments
+AllSendings=All Shipments
 Shipment=Enviament
 Shipments=Enviaments
 ShowSending=Show Sending

htdocs/langs/ca_ES/suppliers.lang

@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)

htdocs/langs/cs_CZ/admin.lang

@@ -389,6 +389,7 @@ ExtrafieldSeparator=Oddělovač
 ExtrafieldCheckBox=Zaškrtávací políčko
 ExtrafieldRadio=Přepínač
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 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 :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code: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>...
@@ -494,6 +495,8 @@ Module500Name=Zvláštní náklady (daně, sociální příspěvky a dividendy)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Upozornění
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Dary
@@ -508,14 +511,14 @@ Module1400Name=Účetnictví
 Module1400Desc=Vedení účetnictví (dvojité strany)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorie
-Module1780Desc=Category management (produkty, dodavatelé a odběratelé)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Nechte upravit některé textové pole pomocí pokročilého editoru
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Plánované správu úloh
+Module2300Desc=Scheduled job management
 Module2400Name=Pořad jednání
 Module2400Desc=Události / úkoly a agendy vedení
 Module2500Name=Elektronický Redakční
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Přečtěte služby
 Permission532=Vytvořit / upravit služby
 Permission534=Odstranit služby
@@ -746,6 +754,7 @@ Permission1185=Schválit dodavatelských objednávek
 Permission1186=Objednávky Objednat dodavatel
 Permission1187=Potvrzení přijetí dodavatelských objednávek
 Permission1188=Odstranit dodavatelských objednávek
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Získejte výsledek exportu
 Permission1202=Vytvořit / Upravit vývoz
 Permission1231=Přečtěte si dodavatelské faktury
@@ -758,10 +767,10 @@ Permission1237=Export dodavatelské objednávky a informace o nich
 Permission1251=Spustit Hmotné dovozy externích dat do databáze (načítání dat)
 Permission1321=Export zákazníků faktury, atributy a platby
 Permission1421=Export objednávek zákazníků a atributy
-Permission23001 = Přečtěte si naplánovaná úloha
-Permission23002 = Vytvořit / aktualizovat naplánovanou úlohu
-Permission23003 = Odstranit naplánovaná úloha
-Permission23004 = Provést naplánované úlohy,
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Přečtěte akce (události nebo úkoly) které souvisí s jeho účet
 Permission2402=Vytvořit / upravit akce (události nebo úkoly) které souvisí s jeho účet
 Permission2403=Odstranit akce (události nebo úkoly) které souvisí s jeho účet
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Vrátit evidence kód postavený podle: <br> %s násle
 ModuleCompanyCodePanicum=Zpět prázdný evidence kód.
 ModuleCompanyCodeDigitaria=Účetnictví kód závisí na kódu třetích stran. Kód se skládá ze znaku &quot;C&quot; na prvním místě následuje prvních 5 znaků kódu třetích stran.
 UseNotifications=Použití oznámení
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
 ModelModules=Dokumenty šablony
 DocumentModelOdt=Generování dokumentů z OpenDocuments šablon (. ODT nebo ODS. Soubory OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vodoznak na návrhu dokumentu
@@ -1557,6 +1566,7 @@ SuppliersSetup=Dodavatel modul nastavení
 SuppliersCommandModel=Kompletní šablona se s dodavately řádu (logo. ..)
 SuppliersInvoiceModel=Kompletní šablona dodavatelské faktury (logo. ..)
 SuppliersInvoiceNumberingModel=Dodavatelských faktur číslování modelů
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul nastavení
 PathToGeoIPMaxmindCountryDataFile=Cesta k souboru obsahující Maxmind IP pro země překladu. <br> Příklady: <br> / Usr / local / share / GeoIP / GeoIP.dat <br> / Usr / share / GeoIP / GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold

htdocs/langs/cs_CZ/agenda.lang

@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura %s ověřena
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktura %s vrátit do stavu návrhu
 InvoiceDeleteDolibarr=Faktura %s smazána
-OrderValidatedInDolibarr= Objednat %s ověřena
+OrderValidatedInDolibarr=Objednat %s ověřena
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Objednat %s zrušen
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Objednat %s schválen
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Objednat %s vrátit do stavu návrhu
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date

htdocs/langs/cs_CZ/bills.lang

@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Platby neučinily
 PaymentsBackAlreadyDone=Platby zpět neučinily
 PaymentRule=Platba pravidlo
 PaymentMode=Typ platby
-PaymentConditions=Termín vyplacení
-PaymentConditionsShort=Termín vyplacení
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Částka platby
 ValidatePayment=Ověření platby
 PaymentHigherThanReminderToPay=Platební vyšší než upomínce k zaplacení
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Celkem dva nové slevy musí být roven pů
 ConfirmRemoveDiscount=Jste si jisti, že chcete odstranit tuto slevu?
 RelatedBill=Související faktura
 RelatedBills=Související faktury
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 

htdocs/langs/cs_CZ/categories.lang

@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorie
-Categories=Kategorie
-Rubrique=Kategorie
-Rubriques=Kategorie
-categories=kategorie
-TheCategorie=Kategorie
-NoCategoryYet=Žádné kategorii tohoto typu vytvořeného
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=V
 AddIn=Přidejte
 modify=upravit
 Classify=Klasifikovat
-CategoriesArea=Kategorie plocha
-ProductsCategoriesArea=Produkty / služby kategorie oblasti
-SuppliersCategoriesArea=Dodavatelé kategorie oblastí
-CustomersCategoriesArea=Zákazníci kategorie oblastí
-ThirdPartyCategoriesArea=Třetí strany Kategorie plocha
-MembersCategoriesArea=Členové kategorie oblastí
-ContactsCategoriesArea=Kontakty Kategorie plocha
-MainCats=Hlavní kategorie
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Podkategorie
 CatStatistics=Statistika
-CatList=Seznam kategorií
-AllCats=Všechny kategorie
-ViewCat=Zobrazit kategorii
-NewCat=Přidat kategorii
-NewCategory=Nová kategorie
-ModifCat=Změnit kategorii
-CatCreated=Kategorie vytvořil
-CreateCat=Vytvoření kategorie
-CreateThisCat=Vytvoření této kategorie
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Ověření pole
 NoSubCat=Podkategorie.
 SubCatOf=Podkategorie
-FoundCats=Nalezené kategorie
-FoundCatsForName=Kategorie nalezených pro výraz názvu:
-FoundSubCatsIn=Podkategorie nalezené v kategorii
-ErrSameCatSelected=Vybrali jste stejné kategorie několikrát
-ErrForgotCat=Zapomněli jste si vybrat kategorii
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Zapomněli jste informovat pole
 ErrCatAlreadyExists=Tento název je již používán
-AddProductToCat=Přidat tento produkt do kategorie?
-ImpossibleAddCat=Nelze přidat kategorii
-ImpossibleAssociateCategory=Nelze přiřadit kategorii
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> bylo úspěšně přidáno.
-ObjectAlreadyLinkedToCategory=Element je již připojen do této kategorie.
-CategorySuccessfullyCreated=Tato kategorie %s byla přidána s úspěchem.
-ProductIsInCategories=Produktu / služby je vlastníkem následujících kategoriích
-SupplierIsInCategories=Třetí strana vlastní následování dodavatelů kategorií
-CompanyIsInCustomersCategories=Tato třetí strana vlastní pro následující zákazníků / vyhlídky kategorií
-CompanyIsInSuppliersCategories=Tato třetí strana vlastní následování dodavatelů kategorií
-MemberIsInCategories=Tento člen je vlastníkem, aby tito členové kategorií
-ContactIsInCategories=Tento kontakt je vlastníkem do následujících kategorií kontakty
-ProductHasNoCategory=Tento produkt / služba není v žádné kategorii
-SupplierHasNoCategory=Tento dodavatel není v žádném kategoriích
-CompanyHasNoCategory=Tato společnost není v žádném kategoriích
-MemberHasNoCategory=Tento člen není v žádném kategoriích
-ContactHasNoCategory=Tento kontakt není v žádném kategoriích
-ClassifyInCategory=Zařazení do kategorie
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Nikdo
-NotCategorized=Bez kategorii
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Tato kategorie již existuje s tímto čj
 ReturnInProduct=Zpět na produkt / službu kartu
 ReturnInSupplier=Zpět na dodavatele karty
@@ -66,22 +64,22 @@ ReturnInCompany=Zpět na zákazníka / Vyhlídka karty
 ContentsVisibleByAll=Obsah bude vidět všichni
 ContentsVisibleByAllShort=Obsah viditelné všemi
 ContentsNotVisibleByAllShort=Obsah není vidět všichni
-CategoriesTree=Categories tree
-DeleteCategory=Odstranit kategorii
-ConfirmDeleteCategory=Jste si jisti, že chcete smazat tuto kategorii?
-RemoveFromCategory=Odstraňte spojení s kategoriích
-RemoveFromCategoryConfirm=Jste si jisti, že chcete odstranit vazbu mezi transakce a kategorie?
-NoCategoriesDefined=Žádné definované kategorie
-SuppliersCategoryShort=Dodavatelé kategorie
-CustomersCategoryShort=Zákazníci kategorie
-ProductsCategoryShort=Kategorie produktů
-MembersCategoryShort=Členové kategorie
-SuppliersCategoriesShort=Dodavatelé kategorie
-CustomersCategoriesShort=Zákazníci kategorie
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp. kategorie
-ProductsCategoriesShort=Kategorie produktů
-MembersCategoriesShort=Členové kategorie
-ContactCategoriesShort=Kontakty kategorie
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Tato kategorie neobsahuje žádný produkt.
 ThisCategoryHasNoSupplier=Tato kategorie neobsahuje žádné dodavatele.
 ThisCategoryHasNoCustomer=Tato kategorie neobsahuje žádné zákazníka.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Tato kategorie neobsahuje žádný kontakt.
 AssignedToCustomer=Účelově vázané k zákazníkovi
 AssignedToTheCustomer=Přiřazené zákazníkovi
 InternalCategory=Vnitřní kategorie
-CategoryContents=Kategorie obsah
-CategId=Kategorie id
-CatSupList=Seznam dodavatelských kategorií
-CatCusList=Seznam zákazníků / vyhlídky kategorií
-CatProdList=Seznam kategorií produktů
-CatMemberList=Seznam členů kategorií
-CatContactList=Seznam kontaktních kategorií a kontakt
-CatSupLinks=Vazby mezi dodavateli a kategorií
-CatCusLinks=Vazby mezi zákazníky / vyhlídky a kategorií
-CatProdLinks=Vazby mezi produktů / služeb a kategorií
-CatMemberLinks=Vazby mezi členy a kategorií
-DeleteFromCat=Odebrat z kategorie
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Nastavení kategorií
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category

htdocs/langs/cs_CZ/cron.lang

@@ -26,15 +26,15 @@ CronLastOutput=Poslední běh výstup
 CronLastResult=Poslední kód výsledku
 CronListOfCronJobs=Seznam naplánovaných úloh
 CronCommand=Příkaz
-CronList=Jobs list
-CronDelete= Odstranit cron
-CronConfirmDelete= Jste si jisti, že chcete smazat tento cron?
-CronExecute=Zahájení práce
-CronConfirmExecute= Opravdu chcete provést tuto práci nyní
-CronInfo= Práce umožňují provádět úlohy, které byly plánované
-CronWaitingJobs=Wainting pracovních míst
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Práce
-CronNone= Nikdo
+CronNone=Nikdo
 CronDtStart=Datum zahájení
 CronDtEnd=Datum ukončení
 CronDtNextLaunch=Další provedení
@@ -75,6 +75,7 @@ CronObjectHelp=Název objektu načíst. <BR> Např načíst metody objektu výro
 CronMethodHelp=Objekt způsob startu. <BR> Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, hodnota metody je <i>fecth</i>
 CronArgsHelp=Metoda argumenty. <BR> Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, může být hodnota paramters být <i>0, ProductRef</i>
 CronCommandHelp=Systém příkazového řádku spustit.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informace
 # Common

htdocs/langs/cs_CZ/donations.lang

@@ -6,6 +6,8 @@ Donor=Dárce
 Donors=Dárci
 AddDonation=Create a donation
 NewDonation=Nový dárcovství
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Zobrazit dar
 DonationPromise=Dárkové slib
 PromisesNotValid=Nevaliduje sliby
@@ -21,6 +23,8 @@ DonationStatusPaid=Dotace přijaté
 DonationStatusPromiseNotValidatedShort=Návrh
 DonationStatusPromiseValidatedShort=Ověřené
 DonationStatusPaidShort=Přijaté
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Ověřit slib
 DonationReceipt=Darování příjem
 BuildDonationReceipt=Build přijetí
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment

htdocs/langs/cs_CZ/errors.lang

@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny

htdocs/langs/cs_CZ/mails.lang

@@ -139,3 +139,5 @@ ListOfNotificationsDone=Vypsat všechny e-maily odesílané oznámení
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails

htdocs/langs/cs_CZ/main.lang

@@ -352,6 +352,7 @@ Status=Postavení
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. dodavatel
 RefPayment=Ref. platba
 CommercialProposalsShort=Komerční návrhy
@@ -394,8 +395,8 @@ Available=Dostupný
 NotYetAvailable=Zatím není k dispozici
 NotAvailable=Není k dispozici
 Popularity=Popularita
-Categories=Kategorie
-Category=Kategorie
+Categories=Tags/categories
+Category=Tag/category
 By=Podle
 From=Z
 to=na
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Pondělí
 Tuesday=Úterý

htdocs/langs/cs_CZ/orders.lang

@@ -64,7 +64,8 @@ ShipProduct=Loď produkt
 Discount=Sleva
 CreateOrder=Vytvořit objednávku
 RefuseOrder=Odmítnout objednávku
-ApproveOrder=Přijmout objednávku
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Potvrzení objednávky
 UnvalidateOrder=Unvalidate objednávku
 DeleteOrder=Smazat objednávku
@@ -102,6 +103,8 @@ ClassifyBilled=Klasifikovat účtovány
 ComptaCard=Účetnictví karty
 DraftOrders=Návrh usnesení
 RelatedOrders=Související objednávky
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=V procesu objednávky
 RefOrder=Ref. objednávka
 RefCustomerOrder=Ref. objednávka zákazníka
@@ -118,6 +121,7 @@ PaymentOrderRef=Platba objednávky %s
 CloneOrder=Clone, aby
 ConfirmCloneOrder=Jste si jisti, že chcete kopírovat tuto objednávku <b>%s?</b>
 DispatchSupplierOrder=Příjem %s dodavatelských objednávek
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Zástupce následující-up, aby zákazník
 TypeContact_commande_internal_SHIPPING=Zástupce následující-up doprava

htdocs/langs/cs_CZ/other.lang

@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervence ověřena
 Notify_FICHINTER_SENTBYMAIL=Intervence poštou
 Notify_BILL_VALIDATE=Zákazník faktura ověřena
 Notify_BILL_UNVALIDATE=Zákazník faktura unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Dodavatel aby schválila
 Notify_ORDER_SUPPLIER_REFUSE=Dodavatel aby odmítl
 Notify_ORDER_VALIDATE=Zákazníka ověřena
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Komerční návrh zaslat poštou
 Notify_BILL_PAYED=Zákazník platí faktury
 Notify_BILL_CANCEL=Zákazník faktura zrušena
 Notify_BILL_SENTBYMAIL=Zákazník faktura zaslána poštou
-Notify_ORDER_SUPPLIER_VALIDATE=Dodavatel validovány, aby
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Dodavatel odeslaná poštou
 Notify_BILL_SUPPLIER_VALIDATE=Dodavatel fakturu ověřena
 Notify_BILL_SUPPLIER_PAYED=Dodavatel fakturu platí
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Počet připojených souborů / dokumentů
 TotalSizeOfAttachedFiles=Celková velikost připojených souborů / dokumentů
 MaxSize=Maximální rozměr
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Faktura %s byl ověřen.
 EMailTextProposalValidated=Návrh %s byl ověřen.
 EMailTextOrderValidated=Aby %s byl ověřen.
 EMailTextOrderApproved=Aby %s byl schválen.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Aby %s byl schválen %s.
 EMailTextOrderRefused=Aby %s byla zamítnuta.
 EMailTextOrderRefusedBy=Aby %s bylo odmítnuto podle %s.