diff --git a/.editorconfig b/.editorconfig index 143f0739505..5b3e0d6a8df 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,14 +8,10 @@ charset = utf-8 end_of_line = lf insert_final_newline = true [*.php] -indent_style = space -indent_size = 4 +indent_style = tab [*.js] -indent_style = space -indent_size = 2 +indent_style = tab [*.css] -indent_style = space -indent_size = 2 +indent_style = tab [*.xml] -indent_style = space -indent_size = 4 +indent_style = tab diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e3a97fe358e..a603fd242cc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,10 @@ How to contribute to Dolibarr Bug reports and feature requests -------------------------------- -** NEW ** + +*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum). + +**NEW** Issues are now managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues). @@ -42,28 +45,19 @@ Please don't edit the ChangeLog file. A project manager will update it from your Use clear commit messages with the following structure: 
-KEYWORD Short description (may be the bug number #456)
+FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
+or
+CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
+or
+NEW|New Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
+or
+Short description (when the commit is not introducing feature nor closing a bug)
 
 Long description (Can span accross multiple lines).
-Where KEYWORD is one of: - -- "Fixed" for bug fixes (May be followed by the bug number i.e: #456) -- "Closed" for a commit to close a feature request issue (May be followed by the bug number i.e: #456) -- void, don't put a keyword if the commit is not introducing feature or closing a bug. - ### Pull Requests -When submitting a pull request, use following syntax: - -
-KEYWORD Short description (may be the bug number #456)
-
- -Where KEYWORD is one of: - -- "FIXED" or "Fixed" for bug fixes. In upper case to appear into ChangeLog. (May be followed by the bug number i.e: #456) -- "NEW" or "New" for new features. In upper case to appear into ChangeLog. (May be followed by the task number i.e: #123) +When submitting a pull request, use same rule than Commits. With upper case keyword to appear into ChangeLog. ### Resources diff --git a/COPYRIGHT b/COPYRIGHT index e4bd78e7bbf..3c7cb5bf1cf 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -18,6 +18,7 @@ CKEditor 4.3.3 LGPL-2.1+ Yes FPDI 1.5.2 Apache Software License 2.0 Yes PDF templates management GeoIP 1.4 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package) NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package) +PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency odtPHP 1.0.1 GPL-2+ b Yes Library to build/edit ODT files PHPExcel 1.8.0 LGPL-2.1+ Yes Read/Write XLS files, read ODS files php-iban 1.4.6 LGPL-3+ Yes Parse and validate IBAN (and IIBAN) bank account information in PHP diff --git a/ChangeLog b/ChangeLog index 6ed93c77235..618231d8937 100644 --- a/ChangeLog +++ b/ChangeLog @@ -243,6 +243,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. diff --git a/build/README b/build/README index 897a59c4eef..4816be8bc3a 100644 --- a/build/README +++ b/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 diff --git a/build/debian/changelog b/build/debian/changelog index 50d2b158e29..a8d056d77ab 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -3,4 +3,4 @@ dolibarr (3.8.0-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. - -- Laurent Destailleur (eldy) Tue, 3 Mar 2015 12:00:00 +0100 + -- Laurent Destailleur (eldy) Sun, 21 March 2015 12:00:00 +0100 diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d96b84ab822..80f3283114c 100755 --- a/build/makepack-dolibarr.pl +++ b/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 +# \author (c)2004-2015 Laurent Destailleur # # 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"; @@ -213,9 +216,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 target number or several separated with space (0 - ".$cpt."): "; @@ -1049,9 +1052,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"); diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index 9e5004f4ba7..4e52c6a50eb 100644 --- a/build/makepack-howto.txt +++ b/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) diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml index 199c4a4ad73..7f16ad02a76 100755 --- a/dev/codesniffer/ruleset.xml +++ b/dev/codesniffer/ruleset.xml @@ -164,8 +164,6 @@ 0 - - diff --git a/dev/examples/create_product.php b/dev/examples/create_product.php index 8fe36260c98..cdb6cdae9e2 100755 --- a/dev/examples/create_product.php +++ b/dev/examples/create_product.php @@ -70,7 +70,7 @@ $myproduct->libelle = 'libelle'; $myproduct->price = '10'; $myproduct->price_base_type = 'HT'; $myproduct->tva_tx = '19.6'; -$myproduct->type = 0; +$myproduct->type = Product::TYPE_PRODUCT; $myproduct->status = 1; $myproduct->description = 'Description'; $myproduct->note = 'Note'; diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php index 967143ab4a5..785c0544876 100755 --- a/dev/initdata/generate-commande.php +++ b/dev/initdata/generate-commande.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/dev/generate-commande.php + * \file dev/initdata/generate-commande.php * \brief Script de generation de donnees aleatoires pour les commandes */ diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php index 5c630454ba7..97f00f7d6d6 100755 --- a/dev/initdata/generate-facture.php +++ b/dev/initdata/generate-facture.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/dev/generate-facture.php + * \file dev/intdata/generate-facture.php * \brief Script de generation de donnees aleatoires pour les factures */ diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php index d712c36e1e9..38ea93f131b 100755 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-produit.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/dev/generate-produit.php + * \file dev/initdata/generate-produit.php * \brief Script de generation de donnees aleatoires pour les produits */ diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php index a887b86b1a8..b7b76ec2c02 100755 --- a/dev/initdata/generate-propale.php +++ b/dev/initdata/generate-propale.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/dev/generate-propale.php + * \file dev/initdata/generate-propale.php * \brief Script de generation de donnees aleatoires pour les propales */ diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php index c0c512db636..72e4d9b1e84 100755 --- a/dev/initdata/generate-societe.php +++ b/dev/initdata/generate-societe.php @@ -20,8 +20,8 @@ */ /** - * \file htdocs/dev/generate-societe.php - * \brief Script de generation de donnees aleatoires pour les societes + * \file dev/initdata/generate-societe.php + * \brief Script de generation de donnees aleatoires pour les societes */ // Test si mode batch @@ -89,7 +89,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++) { print "Company $s\n"; $soc = new Societe($db); - $soc->nom = "Company num ".time()."$s"; + $soc->name = "Company num ".time()."$s"; $soc->town = $listoftown[rand(0, count($listoftown)-1)]; $soc->client = rand(1,2); // Une societe sur 2 est prospect, l'autre client $soc->fournisseur = rand(0,1); // Une societe sur 2 est fournisseur @@ -101,7 +101,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++) // Un client sur 3 a une remise de 5% $user_remise=rand(1,3); if ($user_remise==3) $soc->remise_percent=5; print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n"; - $soc->note='Company created by the script generate-societe.php'; + $soc->note_private = 'Company created by the script generate-societe.php'; $socid = $soc->create(); if ($socid >= 0) @@ -120,7 +120,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++) } } - print "Company ".$s." created nom=".$soc->nom."\n"; + print "Company ".$s." created nom=".$soc->name."\n"; } else { diff --git a/dev/initdata/mysqldump_dolibarr_3.7.0.sql b/dev/initdata/mysqldump_dolibarr_3.7.0.sql index 9e920813519..3dda5017828 100644 --- a/dev/initdata/mysqldump_dolibarr_3.7.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.7.0.sql @@ -7427,7 +7427,7 @@ CREATE TABLE `llx_user` ( LOCK TABLES `llx_user` WRITE; /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */; -INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2012-12-12 16:54:10',NULL,NULL,'admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','bidon@destailleur.fr','',1,'','','',1,1,NULL,NULL,NULL,'','2014-12-21 20:52:09','2014-12-21 13:51:38',NULL,'',1,'01.jpg',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 09:54:48',NULL,NULL,'demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 18:07:21',NULL,NULL,'adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 18:48:01',NULL,NULL,'aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 15:52:37',NULL,NULL,'bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(6,'2013-02-16 20:22:40','2013-02-16 18:22:40',NULL,NULL,'aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 18:48:15',NULL,NULL,'zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 15:10:14',NULL,NULL,'zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf
\r\nfsdfsd
\r\nfsdfs',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,NULL,'','','',NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL); +INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2012-12-12 16:54:10',NULL,NULL,'admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','bidon@destailleur.fr','',1,'','','',1,1,NULL,NULL,NULL,'','2014-12-21 20:52:09','2014-12-21 13:51:38',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 09:54:48',NULL,NULL,'demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 18:07:21',NULL,NULL,'adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 18:48:01',NULL,NULL,'aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 15:52:37',NULL,NULL,'bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(6,'2013-02-16 20:22:40','2013-02-16 18:22:40',NULL,NULL,'aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 18:48:15',NULL,NULL,'zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 15:10:14',NULL,NULL,'zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf
\r\nfsdfsd
\r\nfsdfs',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,NULL,'','','',NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */; UNLOCK TABLES; diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index ff0c2f61200..1f5b56e661b 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -270,28 +270,20 @@ class Skeleton_Class extends CommonObject $resql = $this->db->query($sql); if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } - if (! $error) + if (! $error && ! $notrigger) { - if (! $notrigger) - { - // Uncomment this and change MYOBJECT to your own tag if you - // want this action calls a trigger. + // Uncomment this and change MYOBJECT to your own tag if you + // want this action calls a trigger. - //// Call triggers - //$result=$this->call_trigger('MYOBJECT_MODIFY',$user); - //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} - //// End call triggers - } + //// Call triggers + //$result=$this->call_trigger('MYOBJECT_MODIFY',$user); + //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} + //// End call triggers } // Commit or rollback if ($error) { - foreach($this->errors as $errmsg) - { - dol_syslog(__METHOD__." ".$errmsg, LOG_ERR); - $this->error.=($this->error?', '.$errmsg:$errmsg); - } $this->db->rollback(); return -1*$error; } @@ -344,11 +336,6 @@ class Skeleton_Class extends CommonObject // Commit or rollback if ($error) { - foreach($this->errors as $errmsg) - { - dol_syslog(__METHOD__." ".$errmsg, LOG_ERR); - $this->error.=($this->error?', '.$errmsg:$errmsg); - } $this->db->rollback(); return -1*$error; } diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php new file mode 100644 index 00000000000..b1ccca39dee --- /dev/null +++ b/dev/translation/sanity_check_en_langfiles.php @@ -0,0 +1,222 @@ + +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +echo ""; +echo ""; + +echo ""; + +echo ""; +echo "

If you call this file with the argument \"?unused=true\" it searches for the translation strings that exist in en_US but are never used

"; +echo "

IMPORTANT: that can take quite a lot of time (up to 10 minutes), you need to tune the max_execution_time on your php.ini accordingly

"; +echo "

Happy translating :)

"; + +// directory containing the php and lang files +$htdocs = "../../htdocs/"; +// directory containing the english lang files +$workdir = $htdocs."langs/en_US/"; + +$files = scandir($workdir); +$exludefiles = array('.','..','README'); +$files = array_diff($files,$exludefiles); +$langstrings_3d = array(); +$langstrings_full = array(); +foreach ($files AS $file) { + $path_file = pathinfo($file); + // we're only interested in .lang files + if ($path_file['extension']=='lang') { + $content = file($workdir.$file); + foreach ($content AS $line => $row) { + // don't want comment lines + if (substr($row,0,1) !== '#') { + // don't want lines without the separator (why should those even be here, anyway...) + if (strpos($row,'=')!==false) { + $row_array = explode('=',$row); + $langstrings_3d[$path_file['basename']][$line+1]=$row_array[0]; + $langstrings_full[]=$row_array[0]; + $langstrings_dist[$row_array[0]]=$row_array[0]; + } + } + } + } +} + +foreach ($langstrings_3d AS $filename => $file) { + foreach ($file AS $linenum => $value) { + $keys = array_keys($langstrings_full, $value); + if (count($keys)>1) { + foreach ($keys AS $key) { + $dups[$value][$filename][$linenum] = ''; + } + } + } +} + +echo "

Duplicate strings in lang files in $workdir - ".count($dups)." found

"; +echo "
";
+
+echo " ";
+echo "";
+echo "";
+$count = 0;
+foreach ($dups as $string => $pages) {
+	$count++;
+	echo "";
+	echo "";
+	echo "";
+	echo "";
+}
+echo "";
+echo "
#StringFile and lines
$count$string";
+	foreach ($pages AS $page => $lines ) {
+		echo "$page ";
+		foreach ($lines as $line => $nothing) {
+			echo "($line) ";
+		}
+		echo "
";
+	}
+	echo "
";
+
+
+if ($_REQUEST['unused'] == 'true') {
+
+	foreach ($langstrings_dist AS $value){
+		$search = '\'trans("'.$value.'")\'';
+		$string =  'grep -R -m 1 -F --include=*.php '.$search.' '.$htdocs.'*';
+		exec($string,$output);
+		if (empty($output)) {
+			$unused[$value] = true;
+			echo $value.'
';
+		}
+	}
+
+	echo "
Strings in en_US that are never used
";
+	echo "
";
+	print_r($unused);
+}
+echo "";
+echo "";
+?>
\ No newline at end of file
diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh
index 0154fb14c72..71e03cf522e 100755
--- a/dev/translation/txpull.sh
+++ b/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`
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 8fc5ccf0c40..c0f24821d1c 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2014	   Florian Henry		
  * Copyright (C) 2014      Marcos García        
  * Copyright (C) 2014	   Juanjo Menent		
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
@@ -94,7 +95,7 @@ llxHeader();
 $form = new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
+print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
 
 $head = admin_accounting_prepare_head();
 
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 85e49028298..0a005862054 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014      Ari Elbaz (elarifr)	
  * Copyright (C) 2014      Marcos García        
  * Copyright (C) 2014	   Juanjo Menent		
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
@@ -148,7 +149,7 @@ llxHeader();
 $form = new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
+print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
 
 $head = admin_accounting_prepare_head($accounting);
 
diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php
index bec3fee45e9..03fd8684f50 100644
--- a/htdocs/accountancy/admin/journaux.php
+++ b/htdocs/accountancy/admin/journaux.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2014 	   Florian Henry		
  * Copyright (C) 2014      Marcos García        
  * Copyright (C) 2014	   Juanjo Menent		
+ * Copyright (C) 2015		Jean-François Ferry		
  *
  * 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
@@ -82,7 +83,7 @@ llxHeader();
 $form = new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
+print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
 
 $head = admin_accounting_prepare_head(null);
 
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index 35e6c85ee4f..bae7b10e38c 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2014 Olivier Geffroy		
  * Copyright (C) 2013-2014 Alexandre Spangaro	
  * Copyright (C) 2014	   Florian Henry		
+ * Copyright (C) 2015	Jean-François Ferry		
  *
  * 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
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 0c653627be0..71afe4ca218 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -106,7 +106,7 @@ if (! empty($id)) {
 			print '';
 
 			$linkback=''.$langs->trans("Back").'';
-			print_fiche_titre($langs->trans('CustomersVentilation'),$linkback,'setup');
+			print_fiche_titre($langs->trans('CustomersVentilation'),$linkback,'title_setup');
 
 			print '';
 
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 1760f8360a9..39c9d05c833 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2013-2014 Florian Henry		
  * Copyright (C) 2013-2014 Alexandre Spangaro	
  * Copyright (C) 2014	   Juanjo Menent		
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 7605d54825c..c2c51bacd42 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -178,7 +178,7 @@ if ($result) {
 
 /*
  * Action
- * FIXME Action must be set before any view part
+ * FIXME Action must be set before any view part to respect MVC
  */
 
 // Bookkeeping Write
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 1acd5829c45..70d97b376c5 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013-2014  Olivier Geffroy       
  * Copyright (C) 2013-2014	Florian Henry	      
  * Copyright (C) 2014	    Juanjo Menent		  
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 1e445911b24..877c8d785e8 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2011-2012 Juanjo Menent		
  * Copyright (C) 2012      J. Fernando Lagrange 
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
@@ -110,7 +111,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
 
 
 $head = member_admin_prepare_head();
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index fc820100315..54667967634 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -65,12 +65,12 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
 
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'title_user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 4164be44f64..2f57ce4ed6b 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004-2012	Laurent Destailleur		
  * Copyright (C) 2012		Regis Houssin			
  * Copyright (C) 2013		Florian Henry			
+ * Copyright (C) 2015		Jean-François Ferry		
  *
  * 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
@@ -67,7 +68,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup_title');
 
 
 $head = member_admin_prepare_head();
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 0f92e017437..b7383e00010 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2011	Laurent Destailleur		
  * Copyright (C) 2006-2012	Regis Houssin			
  * Copyright (C) 2011		Juanjo Menent			
+ * Copyright (C) 2015		Jean-François Ferry		
  *
  * 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
@@ -80,7 +81,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
 
 $head = member_admin_prepare_head();
 
@@ -164,7 +165,7 @@ print '';
 print '\n";
 
 // Can edit
@@ -197,7 +198,7 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
     print '\n";
 }
 
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 6aa9e074ff6..0fe6366ae58 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -249,7 +249,7 @@ if (empty($reshook))
 		}
 		$lastname=$_POST["lastname"];
 		$firstname=$_POST["firstname"];
-		$morphy=$morphy=$_POST["morphy"];;
+		$morphy=$morphy=$_POST["morphy"];
 		if ($morphy != 'mor' && empty($lastname)) {
 			$error++;
 			$langs->load("errors");
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index c8c4f9b9ad4..941f7b300fd 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -5,8 +5,9 @@
  * Copyright (C) 2004		Sebastien Di Cintio		
  * Copyright (C) 2004		Benoit Mortier			
  * Copyright (C) 2009-2012	Regis Houssin			
- * Copyright (C) 2014		Alexandre Spangaro		
+ * Copyright (C) 2014-2015	Alexandre Spangaro		
  * Copyright (C) 2015       Marcos García           
+ * Copyright (C) 2015       Frederic France         
  *
  * 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
@@ -77,7 +78,8 @@ class Adherent extends CommonObject
 
     var $morphy;
     var $public;
-    var $note;				// Private note
+    var $note_private;		// Private note
+    var $note_public;       // Public note
     var $statut;			// -1:brouillon, 0:resilie, >=1:valide,paye
     var $photo;
 
@@ -310,7 +312,7 @@ class Adherent extends CommonObject
         $sql.= " VALUES (";
         $sql.= " '".$this->db->idate($this->datec)."'";
         $sql.= ", ".($this->login?"'".$this->db->escape($this->login)."'":"null");
-        $sql.= ", ".($user->id>0?$user->id:"null");	// Can be null because member can be createb by a guest or a script
+        $sql.= ", ".($user->id>0?$user->id:"null");	// Can be null because member can be created by a guest or a script
         $sql.= ", null, null, '".$this->morphy."'";
         $sql.= ", '".$this->typeid."'";
         $sql.= ", ".$conf->entity;
@@ -445,9 +447,10 @@ class Adherent extends CommonObject
         $sql.= ", email='".$this->email."'";
         $sql.= ", skype='".$this->skype."'";
         $sql.= ", phone="   .($this->phone?"'".$this->db->escape($this->phone)."'":"null");
-        $sql.= ", phone_perso="  .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null");
+        $sql.= ", phone_perso=" .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null");
         $sql.= ", phone_mobile=" .($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null");
-        $sql.= ", note="    .($this->note?"'".$this->db->escape($this->note)."'":"null");
+        $sql.= ", note_private=" .($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
+        $sql.= ", note_public=" .($this->note_private?"'".$this->db->escape($this->note_public)."'":"null");
         $sql.= ", photo="   .($this->photo?"'".$this->photo."'":"null");
         $sql.= ", public='".$this->public."'";
         $sql.= ", statut="  .$this->statut;
@@ -473,7 +476,7 @@ class Adherent extends CommonObject
 		    $action='update';
 
             // Actions on extra fields (by external module)
-			// FIXME le hook fait double emploi avec le trigger !!
+			// TODO le hook fait double emploi avec le trigger !!
 		    $hookmanager->initHooks(array('memberdao'));
             $parameters=array('id'=>$this->id);
             $action='';
@@ -1053,7 +1056,8 @@ class Adherent extends CommonObject
     {
         global $langs;
 
-        $sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_id, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note,";
+        $sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_id, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,";
+        $sql.= " d.note_public,";
         $sql.= " d.email, d.skype, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,";
         $sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
         $sql.= " d.datec as datec,";
@@ -1134,7 +1138,8 @@ class Adherent extends CommonObject
                 $this->datevalid		= $this->db->jdate($obj->datev);
                 $this->birth			= $this->db->jdate($obj->birthday);
 
-                $this->note				= $obj->note;
+                $this->note_private		= $obj->note_private;
+                $this->note_public      = $obj->note_public;
                 $this->morphy			= $obj->morphy;
 
                 $this->typeid			= $obj->fk_adherent_type;
@@ -1561,7 +1566,8 @@ class Adherent extends CommonObject
 
         $result='';
         $label = '' . $langs->trans("ShowMember") . '';
-        $label.= '
' . $langs->trans('Ref') . ': ' . $this->ref;
+        if (! empty($this->ref))
+            $label.= '
' . $langs->trans('Ref') . ': ' . $this->ref;
         if (! empty($this->firstname) || ! empty($this->lastname))
             $label.= '
' . $langs->trans('Name') . ': ' . $this->getFullName($langs);
         $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
@@ -1801,7 +1807,7 @@ class Adherent extends CommonObject
         $this->phone        = '0999999999';
         $this->phone_perso  = '0999999998';
         $this->phone_mobile = '0999999997';
-        $this->note='No comment';
+        $this->note_private='No comment';
         $this->birth=time();
         $this->photo='';
         $this->public=1;
@@ -1874,7 +1880,8 @@ class Adherent extends CommonObject
         if ($this->phone_perso && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
         if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) $info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
         if ($this->fax && ! empty($conf->global->LDAP_MEMBER_FIELD_FAX))	      $info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax;
-        if ($this->note && ! empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = $this->note;
+        if ($this->note_private && ! empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = $this->note_private;
+        if ($this->note_public && ! empty($conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC)) $info[$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC] = $this->note_public;
         if ($this->birth && ! empty($conf->global->LDAP_MEMBER_FIELD_BIRTHDATE))  $info[$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE] = dol_print_date($this->birth,'dayhourldap');
         if (isset($this->statut) && ! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))  $info[$conf->global->LDAP_FIELD_MEMBER_STATUS] = $this->statut;
         if ($this->datefin && ! empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION))  $info[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION] = dol_print_date($this->datefin,'dayhourldap');
@@ -1947,4 +1954,21 @@ class Adherent extends CommonObject
         }
     }
 
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty($db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'adherent'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+
 }
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index cbf5b428cc0..ee15a261820 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -73,7 +73,7 @@ class AdherentType extends CommonObject
     {
         global $conf;
 
-        $this->statut=trim($this->statut);
+        $this->statut=(int) $this->statut;
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type (";
         $sql.= "libelle";
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 41c06beebe9..a94f6750f55 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -110,7 +110,7 @@ if ($sall)
             if (is_numeric($sall)) $sql.= "d.rowid = ".$sall." OR ";
             $sql.=" d.firstname LIKE '%".$db->escape($sall)."%' OR d.lastname LIKE '%".$db->escape($sall)."%' OR d.societe LIKE '%".$db->escape($sall)."%'";
             $sql.=" OR d.email LIKE '%".$db->escape($sall)."%' OR d.login LIKE '%".$db->escape($sall)."%' OR d.address LIKE '%".$db->escape($sall)."%'";
-            $sql.=" OR d.town LIKE '%".$db->escape($sall)."%' OR d.note LIKE '%".$db->escape($sall)."%')";
+            $sql.=" OR d.town LIKE '%".$db->escape($sall)."%' OR d.note_public LIKE '%".$db->escape($sall)."%' OR d.note_private LIKE '%".$db->escape($sall)."%')";
         }
 }
 if ($type > 0)
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 727b3a9bcdc..79b7db086e6 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -1,6 +1,7 @@
 
- * Copyright (C) 2004-2014 Laurent Destailleur  
+/* Copyright (C) 2004       Rodolphe Quiedeville    
+ * Copyright (C) 2004-2014  Laurent Destailleur     
+ * Copyright (C) 2015       Frederic France         
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
 /**
  *      \file       htdocs/adherents/note.php
  *      \ingroup    member
- *      \brief      Tabe for note of a member
+ *      \brief      Tab for note of a member
 */
 
 require '../main.inc.php';
@@ -45,26 +46,13 @@ if ($result > 0)
     $result=$adht->fetch($object->typeid);
 }
 
+$permissionnote=$user->rights->adherent->creer;  // Used by the include of actions_setnotes.inc.php
 
 /*
  * Actions
  */
 
-if ($action == 'update' && $user->rights->adherent->creer && ! $_POST["cancel"])
-{
-	$db->begin();
-
-	$res=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
-	if ($res < 0)
-	{
-		setEventMessage($object->error, 'errors');
-		$db->rollback();
-	}
-	else
-	{
-		$db->commit();
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 
@@ -82,7 +70,7 @@ if ($id)
 
 	dol_fiche_head($head, 'note', $langs->trans("Member"), 0, 'user');
 
-	print "
";
+	print "";
 	print '';
 
     print '
';
 print $langs->trans("DefaultAmount");
 print '';
-print '';;
+print '';
 print "
';
     print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL");
     print '';
-	print '';;
+	print '';
     print "
';
@@ -129,49 +117,16 @@ if ($id)
     // Status
     print '';
 
-    // Note
-    print '';
-	print '";
-
-	if ($action == 'edit')
-	{
-		print '';
-	}
-
     print "
'.$langs->trans("Status").''.$object->getLibStatut(4).'
'.$langs->trans("Note").'';
-	if ($action == 'edit' && $user->rights->adherent->creer)
-	{
-	    print "";
-		print "id."\">";
-        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-        $doleditor=new DolEditor('note',$object->note,'',280,'dolibarr_notes','',true,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80);
-        $doleditor->Create();
-	}
-	else
-	{
-		print nl2br($object->note);
-	}
-	print "
';
-		print '';
-		print '   ';
-		print '';
-		print '
";
-	print "\n";
+    print '
';
 
 
-    /*
-    * Actions
-    */
-    print '';
-    print '
';
+    $colwidth='20';
+    $permission = $user->rights->adherent->creer;  // Used by the include of notes.tpl.php
+    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-    if ($user->rights->adherent->creer && $action != 'edit')
-    {
-        print '
'.$langs->trans('Modify')."
";
-    }
-
-    print "
";
 
+    dol_fiche_end();
 
 }
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 22b8cdbfd68..cdeaa21ba9f 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -386,7 +386,7 @@ if ($rowid > 0)
 		{
 		    $sql.= " AND (d.firstname LIKE '%".$sall."%' OR d.lastname LIKE '%".$sall."%' OR d.societe LIKE '%".$sall."%'";
 		    $sql.= " OR d.email LIKE '%".$sall."%' OR d.login LIKE '%".$sall."%' OR d.address LIKE '%".$sall."%'";
-		    $sql.= " OR d.town LIKE '%".$sall."%' OR d.note LIKE '%".$sall."%')";
+		    $sql.= " OR d.town LIKE '%".$sall."%' OR d.note_public LIKE '%".$sall."%' OR d.note_private LIKE '%".$sall."%')";
 		}
 		if ($status != '')
 		{
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 5d10f4614cc..3f952bae511 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2008-2014	Laurent Destailleur 
  * Copyright (C) 2011		Regis Houssin		
  * Copyright (C) 2011-2012  Juanjo Menent		
+ * Copyright (C) 2015		Jean-François Ferry		
  *
  * 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
@@ -132,7 +133,7 @@ if (preg_match('/del_(.*)/',$action,$reg))
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print "
\n";
 
 
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index f03af469bca..d7af0bc8d9e 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004-2013	Laurent Destailleur		
  * Copyright (C) 2012		Regis Houssin			
  * Copyright (C) 2012		Florian Henry			
+ * Copyright (C) 2015		Jean-François Ferry		
  *
  * 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
@@ -69,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("Agenda");
 llxHeader('',$langs->trans("AgendaSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print "
\n";
 
 $head=agenda_prepare_head();
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index fe0539f7348..f0187da6881 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -1,6 +1,7 @@
 
  * Copyright (C) 2011-2014 Juanjo Menent        
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
@@ -123,7 +124,7 @@ $arrayofcss=array();
 llxHeader('',$langs->trans("AgendaSetup"),'','',0,0,$arrayofjs,$arrayofcss);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print '
';
 
 $head=agenda_prepare_head();
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 85623270edf..f0d9f2ca00d 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -1,7 +1,8 @@
 
- * Copyright (C) 2011		Regis Houssin		
- * Copyright (C) 2011-2013  Juanjo Menent		
+/* Copyright (C) 2008-2010	Laurent Destailleur             
+ * Copyright (C) 2011		Regis Houssin                   
+ * Copyright (C) 2011-2013      Juanjo Menent                   
+ * Copyright (C) 2015		Jean-François Ferry		
  *
  * 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
@@ -88,7 +89,7 @@ $formactions=new FormActions($db);
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print "
\n";
 
 
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index ecf49c01201..d196664bdf9 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2008-2013 	Laurent Destailleur 
  * Copyright (C) 2012-2013	Juanjo Menent		
  * Copyright (C) 2012		Regis Houssin		
+ * Copyright (C) 2015		Jean-François Ferry	
  *
  * 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
@@ -73,7 +74,7 @@ if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_A
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print '
';
 
 
diff --git a/htdocs/admin/askpricesupplier.php b/htdocs/admin/askpricesupplier.php
index 6307e81042c..ed73898278e 100644
--- a/htdocs/admin/askpricesupplier.php
+++ b/htdocs/admin/askpricesupplier.php
@@ -6,7 +6,8 @@
  * Copyright (C) 2004      Eric Seigne                 
  * Copyright (C) 2005-2012 Regis Houssin               
  * Copyright (C) 2008      Raphael Bertrand (Resultic) 
- * Copyright (C) 2011-2013 Juanjo Menent			   
+ * Copyright (C) 2011-2013 Juanjo Menent                
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
@@ -239,7 +240,7 @@ $form=new Form($db);
 //if ($mesg) print $mesg;
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
 
 $head = askpricesupplier_admin_prepare_head();
 
@@ -319,7 +320,6 @@ foreach ($dirmodels as $reldir)
 						// Info
 						$htmltooltip='';
 						$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
-						$askpricesupplier->type=0;
 						$nextval=$module->getNextValue($mysoc,$askpricesupplier);
                         if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
                             $htmltooltip.=''.$langs->trans("NextValue").': ';
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index a63e310a9b3..dee635c1778 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -1,7 +1,8 @@
 
- * Copyright (C) 2010-2013  Juanjo Menent			       
- * Copyright (C) 2013-2014  Philippe Grand                 
+/* Copyright (C) 2009       Laurent Destailleur        
+ * Copyright (C) 2010-2013  Juanjo Menent	       
+ * Copyright (C) 2013-2014  Philippe Grand             
+ * Copyright (C) 2015       Jean-François Ferry         
  *
  * 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
@@ -86,7 +87,7 @@ llxHeader("",$langs->trans("BankSetupModule"));
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
+print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');
 
 
 print '
';
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index 5bec4097d35..d8155c57f1c 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004-2011	Laurent Destailleur		
  * Copyright (C) 2012		Regis Houssin			
  * Copyright (C) 2014		Florian Henry			
+ * Copyright (C) 2015		Jean-François Ferry		
  *
  * 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
@@ -65,7 +66,7 @@ llxHeader('',$langs->trans("BankSetupModule"),$help_url);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
+print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');
 
 
 $head = bank_admin_prepare_head(null);
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index d8e9d8b22f4..7be66a40d4a 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -130,7 +130,7 @@ $help_url='EN:Module_Barcode|FR:Module_Codes_Barre|ES:Módulo Código de barra';
 llxHeader('',$langs->trans("BarcodeSetup"),$help_url);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'title_setup');
 
 // Detect bar codes modules
 $barcodelist=array();
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 8b6d833778e..6ec43d4b7b4 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville 
  * Copyright (C) 2004-2013 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
@@ -218,7 +219,7 @@ $form=new Form($db);
 
 llxHeader('',$langs->trans("Boxes"));
 
-print_fiche_titre($langs->trans("Boxes"),'','setup');
+print_fiche_titre($langs->trans("Boxes"),'','title_setup');
 
 print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."
\n";
 
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 414e0ed1e99..b6d7e8b3449 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -60,7 +60,7 @@ $wikihelp='EN:Module_ClickToDial_En|FR:Module_ClickToDial|ES:Módulo_ClickTodial
 llxHeader('',$langs->trans("ClickToDialSetup"),$wikihelp);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'title_setup');
 
 print $langs->trans("ClickToDialDesc")."
\n";
 
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 2484df559e2..364b87a2d35 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -263,7 +263,7 @@ llxHeader("",$langs->trans("OrdersSetup"));
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
 print '
';
 
 $head = order_admin_prepare_head();
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index a349973b3dc..f9e5cd99e5d 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -275,7 +275,7 @@ $formcompany=new FormCompany($db);
 
 $countrynotdefined=''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-print_fiche_titre($langs->trans("CompanyFoundation"),'','setup');
+print_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup');
 
 print $langs->trans("CompanyFundationDesc")."
\n";
 print "
\n";
@@ -369,7 +369,7 @@ if ($action == 'edit' || $action == 'updateedit')
     // Logo
     $var=!$var;
     print '';
-    print '';
         }
         print '';
         print "
';
+    print '';
 
+        $opcions=array($langs->trans("CalcLocaltax1").' '.$langs->trans("CalcLocaltax1Desc"),$langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc"),$langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc"));
+
         print '';
         print "
';
     print '';
     print '';
     if (! empty($mysoc->logo_mini))
@@ -605,8 +605,9 @@ if ($action == 'edit' || $action == 'updateedit')
         }
         print '
'.$langs->trans("CalcLocaltax").': ';
-        $opcions=array($langs->transcountry("CalcLocaltax1",$mysoc->country_code),$langs->transcountry("CalcLocaltax2",$mysoc->country_code),$langs->transcountry("CalcLocaltax3",$mysoc->country_code));
         print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1);
         print '
";
@@ -649,7 +650,6 @@ if ($action == 'edit' || $action == 'updateedit')
 	        print '
: ';
-        $opcions=array($langs->transcountry("CalcLocaltax1",$mysoc->country_code),$langs->transcountry("CalcLocaltax2",$mysoc->country_code),$langs->transcountry("CalcLocaltax3",$mysoc->country_code));
         print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
         print '
";
@@ -754,7 +754,7 @@ else
     $var=!$var;
     print ''.$langs->trans("Logo").'';
 
-    print '';
-	print '';
-	print '';
+	print '';
+	print '';
 	print '';
 
 	print "
';
+    print '';
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 7b041fa3991..48cad667a51 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -104,7 +104,7 @@ llxHeader();
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup');
+print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'title_setup');
 
 print '
';
 
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index ae8a7452244..273f4405f9a 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -74,7 +74,7 @@ $form=new Form($db);
 llxHeader("","");
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
 print '
';
 
 $h = 0;
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index f8fdb461d1e..6b63ba74c6b 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -172,7 +172,7 @@ jQuery(document).ready(function() {
 trans("OtherSetup"),'','setup');
+print_fiche_titre($langs->trans("OtherSetup"),'','title_setup');
 
 print $langs->trans("ConstDesc")."
\n";
 print "
\n";
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 45d79f01ae5..c77d71a9af9 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -214,7 +214,7 @@ llxHeader();
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
 
 print "
";
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index b795f121234..e48dba1c355 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -127,7 +127,7 @@ $form = new Form($db);
 
 llxHeader();
 
-print_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','setup');
+print_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','title_setup');
 
 print $langs->transnoentities("DelaysOfToleranceDesc",img_warning());
 print " ".$langs->trans("OnlyActiveElementsAreShown",DOL_URL_ROOT.'/admin/modules.php')."
\n";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 8de52ef73c5..0480d7a7ab9 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -748,7 +748,7 @@ if ($id)
     $titre.=' - '.$langs->trans($tablib[$id]);
     $linkback=''.$langs->trans("BackToDictionaryList").'';
 }
-print_fiche_titre($titre,$linkback,'setup');
+print_fiche_titre($titre,$linkback,'title_setup');
 
 if (empty($id))
 {
@@ -913,7 +913,7 @@ if ($id)
         print "";
 
         $colspan=count($fieldlist)+2;
-        if ($id == 4) $colspan++;;
+        if ($id == 4) $colspan++;
 
         if (! empty($alabelisused))  // Si un des champs est un libelle
         {
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 50ad5ce13e8..2f107a558b5 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -69,7 +69,7 @@ $help_url='';
 llxHeader('',$langs->trans("ECMSetup"),$help_url);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("ECMSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ECMSetup"),$linkback,'title_setup');
 print '
';
 
 print '
';
     print $mysoc->logo;
     print '';
 
@@ -1061,15 +1061,15 @@ else
         print '
'.$langs->trans("CalcLocaltax").': ';
         if($conf->global->MAIN_INFO_LOCALTAX_CALC2==0)
         {
-        	print $langs->transcountry("CalcLocaltax1",$mysoc->country_code);
+        	print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc");
         }
         else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==1)
         {
-        	print $langs->transcountry("CalcLocaltax2",$mysoc->country_code);
+        	print $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc");
         }
         else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==2)
         {
-        	print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
+        	print $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc");
         }
 
         print '
';
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index d5562248c55..fe109e81bbe 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -73,7 +73,7 @@ if ($action == "save")
 llxHeader('',$langs->trans("Audit"));
 
 //$linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
 
 print $langs->trans("LogEventDesc")."
\n";
 print "
\n";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 933f9a87d18..e3842921d7f 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -217,7 +217,7 @@ $form=new Form($db);
 llxHeader("","");
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
 print '
';
 
 
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index d8b3d727bb5..eb21636126a 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -231,7 +231,7 @@ llxHeader();
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_setup');
 
 
 $head=expensereport_admin_prepare_head();
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 520193a81c3..e067b5dcb6e 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -189,7 +189,7 @@ if ($_POST["delete"])
 llxHeader('',$langs->trans("ExternalRSSSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("ExternalRSSSetup"), $linkback, 'setup');
+print_fiche_titre($langs->trans("ExternalRSSSetup"), $linkback, 'title_setup');
 print '
';
 
 // Formulaire ajout
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 51c627c277b..10f6cffc18a 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -293,7 +293,7 @@ $form=new Form($db);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 print '
';
 
 $head = invoice_admin_prepare_head();
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index a66c417923b..7fbe4415b2b 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -112,7 +112,7 @@ if (GETPOST('save','alpha'))
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("AdvancedEditor"),$linkback,'setup');
+print_fiche_titre($langs->trans("AdvancedEditor"),$linkback,'title_setup');
 print '
';
 
 $var=true;
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 8e06e946dee..ba9625f97e0 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -247,7 +247,7 @@ llxHeader();
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');
 
 
 $head=fichinter_admin_prepare_head();
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 39267a0cefb..119f97ac840 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -76,7 +76,7 @@ $form=new Form($db);
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("GeoIPMaxmindSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("GeoIPMaxmindSetup"),$linkback,'title_setup');
 print '
';
 
 $version='';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index cbbcad66daa..41c4fe6956c 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -101,7 +101,7 @@ $form=new Form($db);
 $formother=new FormOther($db);
 $formadmin=new FormAdmin($db);
 
-print_fiche_titre($langs->trans("GUISetup"),'','setup');
+print_fiche_titre($langs->trans("GUISetup"),'','title_setup');
 
 print $langs->trans("DisplayDesc")."
\n";
 print "
\n";
@@ -323,8 +323,6 @@ else	// Show
     $var=true;
 
     // Language
-    print_fiche_titre($langs->trans("Language"),'','');
-    print '
';
     print '
';
     print '';
 
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 6ec184d68ec..2d47206d6ad 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -1,6 +1,7 @@
 
  * Copyright (C) 2004-2012 Laurent Destailleur  
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +43,7 @@ llxHeader('',$langs->trans("Setup"),$wikihelp);
 $form = new Form($db);
 
 
-print_fiche_titre($langs->trans("SetupArea"),'','setup');
+print_fiche_titre($langs->trans("SetupArea"),'','title_setup.png');
 
 
 if (! empty($conf->global->MAIN_MOTD_SETUPPAGE))
@@ -100,6 +101,7 @@ print '
';
 print '
';
 
 // Add hook to add information
+$parameters=array();
 $reshook=$hookmanager->executeHooks('addHomeSetup',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 print $hookmanager->resPrint;
 if (empty($reshook))
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index e84a3abfffa..ce4ba172583 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -82,7 +82,7 @@ llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&o
 
 $linkback=''.$langs->trans("BackToModuleList").'';
 
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
 
 $head = ldap_prepare_head();
 
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 81724449ecd..0c6b1a59e5f 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -95,7 +95,7 @@ if ($action == 'setvalue' && $user->admin)
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP');
 $linkback=''.$langs->trans("BackToModuleList").'';
 
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
 
 $head = ldap_prepare_head();
 
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index a0bb5c4b605..54e8f477b83 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -86,7 +86,7 @@ if ($action == 'setvalue' && $user->admin)
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP');
 $linkback=''.$langs->trans("BackToModuleList").'';
 
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
 
 $head = ldap_prepare_head();
 
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index bddf16f8670..6dd2f3d22c9 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -65,13 +65,14 @@ if ($action == 'setvalue' && $user->admin)
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_PHONE',GETPOST("fieldphone"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_PHONE_PERSO',GETPOST("fieldphoneperso"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_MOBILE',GETPOST("fieldmobile"),'chaine',0,'',$conf->entity)) $error++;
-  if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_SKYPE',GETPOST("fieldskype"),'chaine',0,'',$conf->entity)) $error++;
+    if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_SKYPE',GETPOST("fieldskype"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_FAX',GETPOST("fieldfax"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_ADDRESS',GETPOST("fieldaddress"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_ZIP',GETPOST("fieldzip"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_TOWN',GETPOST("fieldtown"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_COUNTRY',GETPOST("fieldcountry"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_DESCRIPTION',GETPOST("fielddescription"),'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_NOTE_PUBLIC',GETPOST("fieldnotepublic"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_BIRTHDATE',GETPOST("fieldbirthdate"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_STATUS',GETPOST("fieldstatus"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION', GETPOST("fieldendlastsubscription"),'chaine',0,'',$conf->entity)) $error++;
@@ -109,7 +110,7 @@ if ($action == 'setvalue' && $user->admin)
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP');
 $linkback=''.$langs->trans("BackToModuleList").'';
 
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
 
 $head = ldap_prepare_head();
 
@@ -312,6 +313,14 @@ print '';
 print '';
 print '';
 
+// Public Note
+$var=!$var;
+print '';
+print '';
+print '';
+
 // Birthday
 $var=!$var;
 print '';
 	    print '';
 	    print '';
 	    print '';
 	}
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index cbaee8179dd..0c71c3285ad 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("Orders");
 llxHeader('',$langs->trans("OrdersSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
 print "
\n";
 
 $head = order_admin_prepare_head();
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index dfd81b4241e..9f16d7934b1 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -71,7 +71,7 @@ $textobject=$langs->transnoentitiesnoconv("OrderLines");
 llxHeader('',$langs->trans("OrdersSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
 print "
\n";
 
 $head = order_admin_prepare_head();
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 1453f80eef2..d635b64803a 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -93,7 +93,7 @@ $form=new Form($db);
 $formother=new FormOther($db);
 $formadmin=new FormAdmin($db);
 
-print_fiche_titre($langs->trans("PDF"),'','setup');
+print_fiche_titre($langs->trans("PDF"),'','title_setup');
 
 print $langs->trans("PDFDesc")."
\n";
 print "
\n";
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 3a7c47f3acf..5bb526352f6 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -64,7 +64,7 @@ if ($action == 'remove')
 
 llxHeader('',$langs->trans("DefaultRights"));
 
-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
 
 print $langs->trans("DefaultRightsDesc");
 print " ".$langs->trans("OnlyActiveElementsAreShown")."

\n";
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index b56ee74e10f..31c1e5e7dba 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -119,7 +119,7 @@ llxHeader('',$langs->trans("WithdrawalsSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
 
-print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'title_setup');
 print '
';
 
 print '';
@@ -180,7 +180,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
     $langs->load("mails");
     print_titre($langs->trans("Notifications"));
 
-    $sql = "SELECT u.rowid, u.lastname, u.firstname, u.fk_societe, u.email";
+    $sql = "SELECT u.rowid, u.lastname, u.firstname, u.fk_soc, u.email";
     $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
     $sql.= " WHERE entity IN (0,".$conf->entity.")";
 
@@ -194,7 +194,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
         {
             $obj = $db->fetch_object($resql);
             $var=!$var;
-            if (!$obj->fk_societe)
+            if (!$obj->fk_soc)
             {
                 $username=dolGetFirstLastname($obj->firstname,$obj->lastname);
                 $internalusers[$obj->rowid] = $username;
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 55a6ec749b6..b407f5bc6f8 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -261,7 +261,7 @@ $form=new Form($db);
 //if ($mesg) print $mesg;
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
 
 $head = propal_admin_prepare_head();
 
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 2e9d1f49169..00d66944c97 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -81,7 +81,7 @@ $form = new Form($db);
 
 llxHeader('',$langs->trans("Proxy"));
 
-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
 
 print $langs->trans("ProxyDesc")."
\n";
 print "
\n";
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index 99651a4f4f3..01ae0d11d13 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -77,7 +77,7 @@ llxHeader('',$langs->trans('SalariesSetup'));
 $form = new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans('SalariesSetup'),$linkback,'setup');
+print_fiche_titre($langs->trans('SalariesSetup'),$linkback,'title_setup');
 
 print '';
 print '';
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index adb590ffcd2..9be7f09aa0e 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -185,7 +185,7 @@ $form = new Form($db);
 
 llxHeader('',$langs->trans("Passwords"));
 
-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
 
 print $langs->trans("GeneratedPasswordDesc")."
\n";
 print "
\n";
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index d99db6ed638..e72ece4375c 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -111,7 +111,7 @@ $form = new Form($db);
 
 llxHeader('',$langs->trans("Files"));
 
-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
 
 //print $langs->trans("FilesDesc")."
\n";
 //print "
\n";
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 4dc0c0e06a3..74101f29710 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -89,7 +89,7 @@ $form = new Form($db);
 
 llxHeader('',$langs->trans("Miscellaneous"));
 
-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
 
 print $langs->trans("MiscellaneousDesc")."
\n";
 print "
\n";
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 6213acec5b7..682b1e456eb 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -147,7 +147,7 @@ if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
 $wikihelp='EN:Setup Sms|FR:Paramétrage Sms|ES:Configuración Sms';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
-print_fiche_titre($langs->trans("SmsSetup"),'','setup');
+print_fiche_titre($langs->trans("SmsSetup"),'','title_setup');
 
 print $langs->trans("SmsDesc")."
\n";
 print "
\n";
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 76f66d4e96b..753fef37be6 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -110,7 +110,7 @@ llxHeader('',$langs->trans("MailmanSpipSetup"),$help_url);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup');
 
 
 $head = mailmanspip_admin_prepare_head();
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 84e0574032f..49df241e957 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -113,7 +113,7 @@ if($action)
 llxHeader('',$langs->trans("StockSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("StockSetup"),$linkback,'title_setup');
 
 $form=new Form($db);
 
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 6fe32cf4485..9c70ecc5e4c 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -194,7 +194,7 @@ llxHeader("","");
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 
 print "
";
 
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 5be30f08ee3..87d46ea10b0 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -165,22 +165,45 @@ else if ($action == 'addcat')
     $fourn->CreateCategory($user,$_POST["cat"]);
 }
 
-else if ($action == 'set_SUPPLIER_ORDER_FREE_TEXT')
+else if ($action == 'set_SUPPLIER_ORDER_OTHER')
 {
     $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT');	// No alpha here, we want exact string
+	$doubleapproval = GETPOST('SUPPLIER_ORDER_DOUBLE_APPROVAL');
+	//$doubleapprovalgroup = GETPOST('SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP') > 0 ? GETPOST('SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP') : '';
 
-    $res = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+    $res1 = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+    $res2 = dolibarr_set_const($db, "SUPPLIER_ORDER_DOUBLE_APPROVAL",$doubleapproval,'chaine',0,'',$conf->entity);
+    /*if (isset($_POST["SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP"]))
+    {
+    	$res3 = dolibarr_set_const($db, "SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP",$doubleapprovalgroup,'chaine',0,'',$conf->entity);
+    }
+    else
+    {
+    	$res3=1;
+    }*/
 
-    if (! $res > 0) $error++;
+    // TODO We add/delete permission here until permission can have a condition on a global var
+    include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
+    $newmodule=new modFournisseur($db);
+	// clear default rights array
+    $newmodule->rights=array();
+    // add new right
+    $r=0;
+    $newmodule->rights[$r][0] = 1190;
+	$newmodule->rights[$r][1] = $langs->trans("Permission1190");
+	$newmodule->rights[$r][2] = 'w';
+	$newmodule->rights[$r][3] = 0;
+	$newmodule->rights[$r][4] = 'commande';
+	$newmodule->rights[$r][5] = 'approve2';
 
-	if (! $error)
-	{
-		setEventMessage($langs->trans("SetupSaved"));
-	}
-	else
-	{
-		setEventMessage($langs->trans("Error"),'errors');
-	}
+    if ($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL)
+    {
+    	$newmodule->insert_permissions(1);
+    }
+    else
+    {
+    	$newmodule->delete_permissions();
+    }
 }
 
 
@@ -188,14 +211,14 @@ else if ($action == 'set_SUPPLIER_ORDER_FREE_TEXT')
  * View
  */
 
+$form=new Form($db);
+
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
 llxHeader("","");
 
-$form=new Form($db);
-
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 
 print "
";
 
@@ -447,7 +470,7 @@ print '
'.$langs->trans("Parameters").''.$langs->trans("Value").' 
'.$langs->trans("LDAPFieldDescriptionExample").' 
'.$langs->trans("LDAPFieldNotePublic").'';
+print '';
+print ''.$langs->trans("LDAPFieldNotePublicExample").' 
'.$langs->trans("LDAPFieldBirthdate").'';
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 32e5310a201..8a97a27d342 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -96,7 +96,7 @@ if ($action == 'setvalue' && $user->admin)
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP');
 $linkback=''.$langs->trans("BackToModuleList").'';
 
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
 
 $head = ldap_prepare_head();
 
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 2281f83bdd1..9bfb8f801ed 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -88,7 +88,7 @@ $form=new Form($db);
 
 llxHeader();
 
-print_fiche_titre($langs->trans("LimitsSetup"),'','setup');
+print_fiche_titre($langs->trans("LimitsSetup"),'','title_setup');
 
 
 print $langs->trans("LimitsDesc")."
\n";
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 69f5d30b09a..2accd8236d4 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -208,7 +208,7 @@ llxHeader("","");
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
 print '
';
 
 
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 4cd22ef2c8c..bac6b748a93 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -78,7 +78,7 @@ llxHeader();
 $form = new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans('ConfigLoan'),$linkback,'setup');
+print_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup');
 
 print '';
 print '';
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 8c080999e6c..c934a46b8e0 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -81,7 +81,7 @@ if ($action == 'setvalue')
 llxHeader('',$langs->trans("MailingSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("MailingSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MailingSetup"),$linkback,'title_setup');
 
 if (! empty($conf->use_javascript_ajax))
 {
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 384400b8597..dc8cf57aa53 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -152,7 +152,7 @@ llxHeader('',$langs->trans("MailmanSpipSetup"),$help_url);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup');
 
 $head = mailmanspip_admin_prepare_head();
 
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index e3908ad19d7..159c03589b1 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -245,7 +245,7 @@ if (! $server) $server='127.0.0.1';
 $wikihelp='EN:Setup EMails|FR:Paramétrage EMails|ES:Configuración EMails';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
-print_fiche_titre($langs->trans("EMailsSetup"),'','setup');
+print_fiche_titre($langs->trans("EMailsSetup"),'','title_setup');
 
 print $langs->trans("EMailsDesc")."
\n";
 print "
\n";
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 2b6a2263a9b..3bceffeacfc 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -131,7 +131,7 @@ $formadmin=new FormAdmin($db);
 $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
-print_fiche_titre($langs->trans("Menus"),'','setup');
+print_fiche_titre($langs->trans("Menus"),'','title_setup');
 
 
 $h = 0;
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index cb030f9b892..e69719603c3 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -270,7 +270,7 @@ if ($action == 'create')
     });
     ';
 
-    print_fiche_titre($langs->trans("NewMenu"),'','setup');
+    print_fiche_titre($langs->trans("NewMenu"),'','title_setup');
 
     print '';
     print '';
@@ -379,7 +379,7 @@ if ($action == 'create')
 }
 elseif ($action == 'edit')
 {
-    print_fiche_titre($langs->trans("ModifMenu"),'','setup');
+    print_fiche_titre($langs->trans("ModifMenu"),'','title_setup');
     print '
';
 
     print '';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index d7fce1c937d..62bf0bbd617 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -214,7 +214,7 @@ $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css')
 llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs,$arrayofcss);
 
 
-print_fiche_titre($langs->trans("Menus"),'','setup');
+print_fiche_titre($langs->trans("Menus"),'','title_setup');
 
 
 $h = 0;
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index 9da251ccb66..8a893b21321 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -71,7 +71,7 @@ else if ($action == 'disable_layoutmenu')
 
 llxHeader('',$langs->trans("Setup"));
 
-print_fiche_titre($langs->trans("Menus"),'','setup');
+print_fiche_titre($langs->trans("Menus"),'','title_setup');
 
 
 $h = 0;
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index e3524425c6c..aab09001bd8 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004      Eric Seigne          
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2011	   Juanjo Menent        
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
@@ -210,7 +211,7 @@ asort($orders);
 $nbofactivatedmodules=count($conf->modules);
 $moreinfo=$langs->trans("TotalNumberOfActivatedModules",($nbofactivatedmodules-1));
 if ($nbofactivatedmodules <= 1) $moreinfo .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
-print load_fiche_titre($langs->trans("ModulesSetup"),$moreinfo,'setup');
+print load_fiche_titre($langs->trans("ModulesSetup"),$moreinfo,'title_setup');
 
 // Start to show page
 if (empty($mode)) $mode='common';
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index b9c163972ce..bab6db29959 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -115,7 +115,7 @@ $notify = new Notify($db);
 llxHeader('',$langs->trans("NotificationSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'title_setup');
 
 print $langs->trans("NotificationsDesc").'

';
 
@@ -174,8 +174,8 @@ if ($conf->societe->enabled)
 	    print '		'.$notifiedevent['code'].''.$label.'';
-		$nb = $notify->countDefinedNotifications($notifiedevent['code'], 0);
-		print $nb;
+		$tmparray = $notify->getNotificationsArray($notifiedevent['code'], 0);
+		print count($tmparray);
 	    print '

';
 
 print '';
 print '';
-print '';
+print '';
 
 print_titre($langs->trans("OtherOptions"));
 print '';
@@ -456,6 +479,26 @@ print '';
 print '';
 print '';
 print "\n";
+$var=false;
+if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+{
+	print '\n";
+	$var=!$var;
+	/*print '\n";
+	$var=!$var;*/
+}
 
 print '';
@@ -245,7 +254,7 @@ if (! $found)
 // Total
 foreach ($total as $key=>$solde)
 {
-	print '';
+	print '';
 }
 
 print "
'.$langs->trans("Parameter").''.$langs->trans("Value").' 
';
+	print $langs->trans("UseDoubleApproval").'
';
+	print $langs->trans("IfSetToYesDontForgetPermission");
+	print '		';
+	print $form->selectyesno('SUPPLIER_ORDER_DOUBLE_APPROVAL', $conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL, 1);
+	print '';
+	print '';
+	print "
';
+	print $langs->trans("GroupOfUserForSecondApproval").'';
+	print $form->select_dolgroups($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP,'SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP', 1);
+	print '';
+	print '';
+	print "
';
 print $langs->trans("FreeLegalTextOnOrders").' ('.$langs->trans("AddCRIfTooLong").')
';
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index bff385cfb45..4e9f1fce9ae 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -74,7 +74,7 @@ $textobject=$langs->transnoentitiesnoconv("BillsSuppliers");
 llxHeader('',$langs->trans("SuppliersSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 print "
\n";
 
 $head = supplierorder_admin_prepare_head();
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index e05ed75bb0f..b6f71ecc00c 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -74,7 +74,7 @@ $textobject=$langs->transnoentitiesnoconv("BillsSuppliers");
 llxHeader('',$langs->trans("SuppliersSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 print "
\n";
 
 $head = supplierorder_admin_prepare_head();
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index c62d05a3e32..135e02a92b4 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("SuppliersOrders");
 llxHeader('',$langs->trans("SuppliersSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 print "
\n";
 
 $head = supplierorder_admin_prepare_head();
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index 2b8364ea297..6d422de4d31 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -71,7 +71,7 @@ $textobject=$langs->transnoentitiesnoconv("SuppliersOrders");
 llxHeader('',$langs->trans("SuppliersSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 print "
\n";
 
 $head = supplierorder_admin_prepare_head();
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index c1fc11add9b..f923c164157 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -147,7 +147,7 @@ llxHeader();
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'title_setup');
 print '
';
 
 $def = array();
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index 532293cdad2..db16c024c13 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -38,7 +38,7 @@ $langs->load("members");
 llxHeader();
 
 
-print_fiche_titre("Dolibarr",'','setup');
+print_fiche_titre("Dolibarr",'','title_setup');
 
 print '
'.img_picto_common('', 'dolibarr_box.png','height="120"').'
';
 
diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php
index a25ca7b1622..1a68133127d 100644
--- a/htdocs/admin/system/browser.php
+++ b/htdocs/admin/system/browser.php
@@ -42,7 +42,7 @@ $form=new Form($db);
 
 llxHeader();
 
-print_fiche_titre($langs->trans("InfoBrowser"),'','setup');
+print_fiche_titre($langs->trans("InfoBrowser"),'','title_setup');
 
 $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
 
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index b0dfc40281f..16c63b1b1fd 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -39,7 +39,7 @@ if (!$user->admin)
 
 llxHeader();
 
-print_fiche_titre($langs->trans("SummaryConst"),'','setup');
+print_fiche_titre($langs->trans("SummaryConst"),'','title_setup');
 
 
 print_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')');
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 39b3dd4cad5..9650b32bd5c 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -46,7 +46,7 @@ if ($action == 'convert')
 
 llxHeader();
 
-print_fiche_titre($langs->trans("Tables")." ".ucfirst($conf->db->type),'','setup');
+print_fiche_titre($langs->trans("Tables")." ".ucfirst($conf->db->type),'','title_setup');
 
 
 // Define request to get table description
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 1cacc757971..e6fc31c4426 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -39,7 +39,7 @@ $form=new Form($db);
 
 llxHeader();
 
-print_fiche_titre($langs->trans("InfoDatabase"),'','setup');
+print_fiche_titre($langs->trans("InfoDatabase"),'','title_setup');
 
 // Database
 print '';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 3102248bc0a..b2e01f65ebb 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -41,7 +41,7 @@ $table=GETPOST('table','alpha');
 llxHeader();
 
 
-print_fiche_titre($langs->trans("Table") . " ".$table,'','setup');
+print_fiche_titre($langs->trans("Table") . " ".$table,'','title_setup');
 
 // Define request to get table description
 $base=0;
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 4ec093dfafc..a3788e04023 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -42,7 +42,7 @@ $form=new Form($db);
 
 llxHeader();
 
-print_fiche_titre($langs->trans("InfoDolibarr"),'','setup');
+print_fiche_titre($langs->trans("InfoDolibarr"),'','title_setup');
 
 // Version
 $var=true;
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 8eff6821224..aa981d8e725 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -37,7 +37,7 @@ if (!$user->admin)
 
 llxHeader();
 
-print_fiche_titre($langs->trans("FileCheckDolibarr"),'','setup');
+print_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup');
 
 // Version
 $var = true;
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 64df9432e82..133b6cfbfff 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -45,7 +45,7 @@ if (! $user->admin) accessforbidden();
 
 llxHeader();
 
-print_fiche_titre($langs->trans("SummarySystem"),'','setup');
+print_fiche_titre($langs->trans("SummarySystem"),'','title_setup');
 
 
 print '
';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 7e32055e180..47a386c1a03 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -39,7 +39,7 @@ if (! $user->admin)
 
 llxHeader();
 
-print_fiche_titre($langs->trans("AvailableModules"),'','setup');
+print_fiche_titre($langs->trans("AvailableModules"),'','title_setup');
 
 print $langs->trans("ToActivateModule").'
';
 print "
\n";
diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php
index 669e8d84be9..5c20fda1cd4 100644
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.php
@@ -35,7 +35,7 @@ if (!$user->admin)
 
 llxHeader();
 
-print_fiche_titre($langs->trans("InfoOS"),'','setup');
+print_fiche_titre($langs->trans("InfoOS"),'','title_setup');
 
 print '
';
 print '';
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 0e49564ece7..afa33e6b38f 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -48,7 +48,7 @@ $nowstring=dol_print_date(dol_now(),'dayhourlog');
 
 llxHeader();
 
-print_fiche_titre($langs->trans("PerfDolibarr"),'','setup');
+print_fiche_titre($langs->trans("PerfDolibarr"),'','title_setup');
 
 print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' ('.$langs->trans("Reload").')
';
 
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 681c5d43cf3..89b0f8cd8dc 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -43,7 +43,7 @@ $title='InfoPHP';
 
 if (isset($title))
 {
-	print_fiche_titre($langs->trans($title), '', 'setup');
+	print_fiche_titre($langs->trans($title), '', 'title_setup');
 }
 
 
diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php
index 6c2e36a3e8e..2d51344b68c 100644
--- a/htdocs/admin/system/web.php
+++ b/htdocs/admin/system/web.php
@@ -42,7 +42,7 @@ if (!$user->admin) accessforbidden();
 
 llxHeader();
 
-print_fiche_titre($langs->trans("InfoWebServer"),'','setup');
+print_fiche_titre($langs->trans("InfoWebServer"),'','title_setup');
 
 print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
';
 print "\n";
diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php
index 143e62b8b3c..e6c0f7ae477 100644
--- a/htdocs/admin/system/xcache.php
+++ b/htdocs/admin/system/xcache.php
@@ -35,7 +35,7 @@ $action=GETPOST('action');
 
 llxHeader();
 
-print_fiche_titre("XCache",'','setup');
+print_fiche_titre("XCache",'','title_setup');
 
 print "
\n";
 
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 7d32c76fb4d..501f74b414b 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -34,7 +34,7 @@ accessforbidden();
 
 llxHeader();
 
-print_fiche_titre("XDebug",'','setup');
+print_fiche_titre("XDebug",'','title_setup');
 
 print "
\n";
 
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 9184ede0920..bcbf11cfdb2 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -120,7 +120,7 @@ llxHeader();
 $form=new Form($db);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans('TaxSetup'),$linkback,'setup');
+print_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');
 
 print '
';
 if (empty($mysoc->tva_assuj))
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index aec78f8aaac..6faf0b79eab 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -108,14 +108,9 @@ jQuery(document).ready(function() {
 trans("Backup"),'','setup');
+print_fiche_titre($langs->trans("Backup"),'','title_setup');
 
 print $langs->trans("BackupDesc",DOL_DATA_ROOT).'

';
-print $langs->trans("BackupDesc2",DOL_DATA_ROOT).'
';
-print $langs->trans("BackupDescX").'

';
-print $langs->trans("BackupDesc3",DOL_DATA_ROOT).'
';
-print $langs->trans("BackupDescY").'

';
-
 
 ?>
 
@@ -124,9 +119,29 @@ print $langs->trans("BackupDescY").'

';
 	name="token" value="" /> 
 
-

-'.$langs->trans("DatabaseName").' : '.$dolibarr_main_db_name.''; ?>
-
".$langs->trans("Parameter")."".$langs->trans("Value")."

 

+
1
+
+trans("BackupDesc3",$dolibarr_main_db_name).'
';
+//print $langs->trans("BackupDescY").'
';
+print '
';
+?>
+
+

+
+trans("BackupDumpWizard"));
+
+print '
';
+print '';
+print '';
+print '';
+print '
';
+print $langs->trans("DatabaseName").' : '.$dolibarr_main_db_name.'
';
+print '
';
+?>
+

 	

 		
 
@@ -182,7 +197,7 @@ print $langs->trans("BackupDescY").'

';
 				$fullpathofmysqldump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
 			}
 			?>

-			
 
 			

@@ -317,7 +332,7 @@ print $langs->trans("BackupDescY").'

';
 				$fullpathofpgdump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
 			}
 			?>

-			
 
 
@@ -357,12 +372,12 @@ print $langs->trans("BackupDescY").'

';
 	

 

 
-
 
-

-trans("Destination"); ?>
-:
- 
+trans("Destination"); ?> -->
+

+

+

+?> 
+
 
 

 

 

 
+
';
+?>
 
-
+
+

+

 
 admin->dir_output.'/backup','files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
 $result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'backup/',1,0,$langs->trans("NoBackupFileAvailable"),0,$langs->trans("PreviousDumpFiles"));
 print '
';
+?>
 
+

+

+
+
+
+

+
+
2
+trans("BackupDesc2",DOL_DATA_ROOT).'
';
+print $langs->trans("BackupDescX").'

';
+?>
+

+
+
+
+
+
 trans("Restore"),'','setup');
+print_fiche_titre($langs->trans("Restore"),'','title_setup');
 
 print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'

';
+?>
+

+1
+trans("RestoreDesc2",DOL_DATA_ROOT).'

';
-print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'

';
+?>
+

 
+

+
+

+2
+trans("RestoreDesc3",$dolibarr_main_db_name).'

';
 ?>
 
-

-'.$langs->trans("DatabaseName").' : '.$dolibarr_main_db_name.''; ?>
+trans("DatabaseName").' : '.$dolibarr_main_db_name.''; ?>


+
 \n";
 }
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 5301b7986e0..0483caa29ae 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -76,7 +76,7 @@ $linkback=''.$langs->trans("BackToM
 llxHeader('',$langs->trans("Categories"),$help_url);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup');
 
 
 $head=categoriesadmin_prepare_head();
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index c57fae8c311..df31e07d95b 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -49,6 +49,7 @@ if (!$user->admin) accessforbidden();
 /*
  * Actions
  */
+
 require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 
@@ -63,7 +64,7 @@ llxHeader('',$langs->trans("Categories"),$help_url);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup');
 
 $head = categoriesadmin_prepare_head();
 
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 5ad9cad777a..14f953e977c 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -347,9 +347,9 @@ else if ($id || $ref)
 		llxHeader("","",$langs->trans("CardProduct".$product->type));
 
 
-		$head=product_prepare_head($product, $user);
+		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
-		$picto=($product->type==1?'service':'product');
+		$picto=($product->type== Product::TYPE_SERVICE?'service':'product');
 		dol_fiche_head($head, 'category', $titre,0,$picto);
 
 
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 9a76211b828..8e6772dec5d 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2007      Patrick Raguin	  	
  * Copyright (C) 2013      Juanjo Menent      	
  * Copyright (C) 2013      Philippe Grand	  	
+ * Copyright (C) 2015      Marcos García        
  *
  * 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
@@ -201,7 +202,7 @@ class Categorie extends CommonObject
 				$action='create';
 
 				// Actions on extra fields (by external module or standard code)
-				// FIXME le hook fait double emploi avec le trigger !!
+				// TODO le hook fait double emploi avec le trigger !!
 				$hookmanager->initHooks(array('HookModuleNamedao'));
 				$parameters=array('socid'=>$this->id);
 				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -294,7 +295,7 @@ class Categorie extends CommonObject
 			$action='update';
 
 			// Actions on extra fields (by external module or standard code)
-			// FIXME le hook fait double emploi avec le trigger !!
+			// TODO le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('HookCategorydao'));
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1164,10 +1165,10 @@ class Categorie extends CommonObject
 	{
 		$cats = array();
 
-		$typeid=-1; $table='';;
+		$typeid=-1; $table='';
 		if ($type == '0' || $type == 'product')	       { $typeid=0; $table='product';   $type='product'; }
-		else if ($type == '1' || $type == 'supplier') { $typeid=1; $table='societe';   $type='fournisseur'; }
-		else if ($type == '2' || $type == 'customer') { $typeid=2; $table='societe';   $type='societe'; }
+		else if ($type == '1' || $type == 'supplier') { $typeid=1; $table='soc';   $type='fournisseur'; }
+		else if ($type == '2' || $type == 'customer') { $typeid=2; $table='soc';   $type='societe'; }
 		else if ($type == '3' || $type == 'member')   { $typeid=3; $table='member';    $type='member'; }
         else if ($type == '4' || $type == 'contact')  { $typeid=4; $table='socpeople'; $type='contact'; }
 
@@ -1551,4 +1552,21 @@ class Categorie extends CommonObject
         $this->socid = 1;
         $this->type = 0;
     }
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'categorie_societe'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 37758eea2ab..543cf862d8f 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -333,7 +333,7 @@ class ActionComm extends CommonObject
             	$action='create';
 
 	            // Actions on extra fields (by external module or standard code)
-				// FIXME le hook fait double emploi avec le trigger !!
+				// TODO le hook fait double emploi avec le trigger !!
             	$hookmanager->initHooks(array('actioncommdao'));
 	            $parameters=array('actcomm'=>$this->id);
 	            $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -421,7 +421,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);
 
@@ -477,13 +478,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;
+
     }
 
 
@@ -654,7 +657,7 @@ class ActionComm extends CommonObject
 			$action='update';
 
         	// Actions on extra fields (by external module or standard code)
-			// FIXME le hook fait double emploi avec le trigger !!
+			// TODO le hook fait double emploi avec le trigger !!
         	$hookmanager->initHooks(array('actioncommdao'));
         	$parameters=array('actcomm'=>$this->id);
         	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -970,12 +973,15 @@ class ActionComm extends CommonObject
 
         $result='';
         $tooltip = '' . $langs->trans('ShowAction'.$objp->code) . '';
-        $tooltip .= '
' . $langs->trans('Ref') . ': ' . $this->label;
+        if (! empty($this->ref))
+            $tooltip .= '
' . $langs->trans('Ref') . ': ' . $this->ref;
+        if (! empty($this->label))
+            $tooltip .= '
' . $langs->trans('Title') . ': ' . $this->label;
         $label = $this->label;
         if (empty($label)) $label=$this->libelle;   // For backward compatibility
-        $linkclose = '" title="'.dol_escape_htmltag($tooltip, 1).'" class="classfortooltip">';
-        if ($option=='birthday') $link = '';
+        if ($option=='birthday') $link = 'ical_date_to_unix($value);
-        if ($key == "RRULE" ) $value = $this->ical_rrule($value);
-
+        //if ($key == "RRULE" ) $value = $this->ical_rrule($value);
+        
         if (stristr($key,"DTSTART") or stristr($key,"DTEND") or stristr($key,"DTSTART;VALUE=DATE") or stristr($key,"DTEND;VALUE=DATE"))
         {
         	if (stristr($key,"DTSTART;VALUE=DATE") or stristr($key,"DTEND;VALUE=DATE"))
diff --git a/htdocs/comm/admin/askpricesupplier_extrafields.php b/htdocs/comm/admin/askpricesupplier_extrafields.php
index 0e74ca265e9..4342549c46a 100644
--- a/htdocs/comm/admin/askpricesupplier_extrafields.php
+++ b/htdocs/comm/admin/askpricesupplier_extrafields.php
@@ -60,7 +60,7 @@ llxHeader('',$langs->trans("AskPriceSupplierSetup"));
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
 
 
 $head = askpricesupplier_admin_prepare_head();
diff --git a/htdocs/comm/admin/askpricesupplierdet_extrafields.php b/htdocs/comm/admin/askpricesupplierdet_extrafields.php
index a58164b63dd..e419b6a3168 100644
--- a/htdocs/comm/admin/askpricesupplierdet_extrafields.php
+++ b/htdocs/comm/admin/askpricesupplierdet_extrafields.php
@@ -66,7 +66,7 @@ $textobject=$langs->transnoentitiesnoconv("CommRequests");
 llxHeader('',$langs->trans("AskPriceSupplierSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
 
 $head = askpricesupplier_admin_prepare_head();
 
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index 304fbc45a3e..bd0ce34329d 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -64,7 +64,7 @@ $textobject=$langs->transnoentitiesnoconv("Proposals");
 llxHeader('',$langs->trans("PropalSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
 
 
 $head = propal_admin_prepare_head();
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index fed0eb6b98a..58ab3adf109 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -72,7 +72,7 @@ $textobject=$langs->transnoentitiesnoconv("Proposals");
 llxHeader('',$langs->trans("PropalSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
 
 $head = propal_admin_prepare_head();
 
diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php
index 3a3b283f8e9..b87a579b0e8 100644
--- a/htdocs/comm/askpricesupplier/card.php
+++ b/htdocs/comm/askpricesupplier/card.php
@@ -1730,6 +1730,9 @@ if ($action == 'create')
 	/*
 	 * Action presend
  	 */
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 	if ($action == 'presend')
 	{
 		$object->fetch_projet();
@@ -1802,6 +1805,7 @@ if ($action == 'create')
 		// Tableau des parametres complementaires
 		$formmail->param['action'] = 'send';
 		$formmail->param['models'] = 'askpricesupplier_send';
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
 		$formmail->param['id'] = $object->id;
 		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
 		// Init list of files
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index dfc8c41a197..46090341384 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -156,7 +156,7 @@ if (empty($reshook))
 	if ($action == 'setoutstanding_limit')
 	{
 		$object->fetch($id);
-		$object->outstanding_limit=GETPOST('setoutstanding_limit');
+		$object->outstanding_limit=GETPOST('outstanding_limit');
 		$result=$object->set_OutstandingBill($user);
 		if ($result < 0) setEventMessage($object->error,'errors');
 	}
@@ -412,9 +412,15 @@ if ($id > 0)
 		$limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
 		print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
 		// display amount and link to unpaid bill
-		$outstandigBills = $object->get_OutstandingBill();
-		if ($outstandigBills != 0)
-			print " (".$langs->trans("CurrentOutstandingBill")." ".price($outstandigBills, '', $langs, 0, 0, -1, $conf->currency).')';
+		$outstandingBills = $object->get_OutstandingBill();
+		if ($outstandingBills != 0) {
+			print ' ('.$langs->trans("CurrentOutstandingBill");
+			print ' ';
+			print price($outstandingBills, '', $langs, 0, -1, -1, $conf->currency);
+			print '';
+			if ($outstandingBills > $object->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+			print ')';
+		}
 		print '';
 		print '';
 	}
@@ -633,7 +639,7 @@ if ($id > 0)
 				print '

 
 use_javascript_ajax) { ?>
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index e5173563c19..da168eec510 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -227,7 +227,7 @@ function create_key_table($list)
 
 
 $form=new Form($db);
-print_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','','setup');
+print_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','','title_setup');
 
 $var=true;
 
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 1668e4f4c67..88896e97734 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -88,10 +88,10 @@ if (!empty($MemoryLimit))
 $form=new Form($db);
 $formfile = new FormFile($db);
 
-$help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad';
-llxHeader('','',$help_url);
+//$help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad';
+//llxHeader('','',$help_url);
 
-print_fiche_titre($langs->trans("Backup"),'','setup');
+//print_fiche_titre($langs->trans("Backup"),'','title_setup');
 
 
 // Start with empty buffer
@@ -165,13 +165,18 @@ if ($what == 'mysql')
         $paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"';
     }
 
+    $_SESSION["commandbackuplastdone"]=$command." ".$paramcrypted;
+    $_SESSION["commandbackuptorun"]="";
+    /*
     print ''.$langs->trans("RunCommandSummary").':
'."\n";
     print '
'."\n";
     print '
';
+
     //print $paramclear;
 
     // Now run command and show result
     print ''.$langs->trans("BackupResult").': ';
+	*/
 
     $errormsg='';
 
@@ -264,6 +269,9 @@ if ($what == 'mysqlnobin')
     {
         backup_tables($outputfile);
     }
+
+    $_SESSION["commandbackuplastdone"]="";
+    $_SESSION["commandbackuptorun"]="";
 }
 
 // POSTGRESQL
@@ -320,7 +328,9 @@ if ($what == 'postgresql')
     $paramcrypted.=" -w ".$dolibarr_main_db_name;
     $paramclear.=" -w ".$dolibarr_main_db_name;
 
-    print $langs->trans("RunCommandSummaryToLaunch").':
'."\n";
+    $_SESSION["commandbackuplastdone"]="";
+    $_SESSION["commandbackuptorun"]=$command." ".$paramcrypted;
+    /*print $langs->trans("RunCommandSummaryToLaunch").':
'."\n";
     print '
'."\n";
 
     print '
';
@@ -330,7 +340,7 @@ if ($what == 'postgresql')
     print $langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user);
 
     print '
';
-    print '
';
+    print '
';*/
 
     $what='';
 }
@@ -339,34 +349,46 @@ if ($what == 'postgresql')
 
 
 // Si on a demande une generation
-if ($what)
-{
+//if ($what)
+//{
     if ($errormsg)
     {
+    	setEventMessage($langs->trans("Error")." : ".$errormsg, 'errors');
+    	/*
         print '
'.$langs->trans("Error")." : ".$errormsg.'
';
-        //		print ''.$langs->trans("DownloadErrorFile").'
';
-        print '
';
         print '
';
+        print '
';*/
     }
     else
-    {
-        print '
';
-        print $langs->trans("BackupFileSuccessfullyCreated").'.
';
-        print $langs->trans("YouCanDownloadBackupFile");
-        print '
';
-        print '
';
+	{
+		if ($what)
+		{
+	        setEventMessage($langs->trans("BackupFileSuccessfullyCreated").'.
'.$langs->trans("YouCanDownloadBackupFile"));
+	        /*print '
';
+	        print $langs->trans("BackupFileSuccessfullyCreated").'.
';
+	        print $langs->trans("YouCanDownloadBackupFile");
+	        print '
';
+	        print '
';*/
+		}
+		else
+		{
+			setEventMessage($langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user));
+		}
     }
-}
+//}
 
+/*
 $filearray=dol_dir_list($conf->admin->dir_output.'/backup','files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
 $result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'backup/',1,0,($langs->trans("NoBackupFileAvailable").'
'.$langs->trans("ToBuildBackupFileClickHere",DOL_URL_ROOT.'/admin/tools/dolibarr_export.php')),0,$langs->trans("PreviousDumpFiles"));
 
 print '
';
+*/
+
+// Redirect t backup page
+header("Location: dolibarr_export.php");
 
 $time_end = time();
 
-llxFooter();
-
 $db->close();
 
 
diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index abb9710cc03..ae1fad8c272 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -42,7 +42,7 @@ if (GETPOST('leftmenu') == 'modulesadmintools') $title=$langs->trans("ModulesSys
 
 llxHeader(array(),$title);
 
-print_fiche_titre($title,'','setup');
+print_fiche_titre($title,'','title_setup');
 
 print $langs->trans("SystemToolsAreaDesc").'
';
 print "
";
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index a872c0676f2..e0a4f892d8b 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -117,7 +117,7 @@ llxHeader();
 
 $form=new Form($db);
 
-print_fiche_titre($langs->trans("Purge"),'','setup');
+print_fiche_titre($langs->trans("Purge"),'','title_setup');
 
 print $langs->trans("PurgeAreaDesc",$dolibarr_main_data_root).'
';
 print '
';
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 7c85f820eab..b391ffa0d2a 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -29,6 +29,8 @@ include_once DOL_DOCUMENT_ROOT . '/core/lib/geturl.lib.php';
 $langs->load("admin");
 $langs->load("other");
 
+$action=GETPOST('action','alpha');
+
 if (! $user->admin) accessforbidden();
 
 if (GETPOST('msg','alpha')) {
@@ -43,14 +45,18 @@ $dolibarrroot=preg_replace('/([\\/]+)$/i','',DOL_DOCUMENT_ROOT);
 $dolibarrroot=preg_replace('/([^\\/]+)$/i','',$dolibarrroot);
 $dolibarrdataroot=preg_replace('/([\\/]+)$/i','',DOL_DATA_ROOT);
 
+$dirins=DOL_DOCUMENT_ROOT.'/custom';
+
+
 /*
  *	Actions
  */
 
-if (GETPOST('action','alpha')=='install')
+if ($action=='install')
 {
 	$error=0;
 
+	// $original_file should match format module_modulename-x.y[.z].zip
 	$original_file=basename($_FILES["fileinstall"]["name"]);
 	$newfile=$conf->admin->dir_temp.'/'.$original_file.'/'.$original_file;
 
@@ -72,38 +78,92 @@ if (GETPOST('action','alpha')=='install')
 
 	if (! $error)
 	{
-		@dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$original_file);
-		dol_mkdir($conf->admin->dir_temp.'/'.$original_file);
+		if ($original_file)
+		{
+			@dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$original_file);
+			dol_mkdir($conf->admin->dir_temp.'/'.$original_file);
+		}
+
+		$tmpdir=preg_replace('/\.zip$/','',$original_file).'.dir';
+		if ($tmpdir)
+		{
+			@dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$tmpdir);
+			dol_mkdir($conf->admin->dir_temp.'/'.$tmpdir);
+		}
 
 		$result=dol_move_uploaded_file($_FILES['fileinstall']['tmp_name'],$newfile,1,0,$_FILES['fileinstall']['error']);
 		if ($result > 0)
 		{
-			$documentrootalt=DOL_DOCUMENT_ROOT.'/extensions';
-			$result=dol_uncompress($newfile,$documentrootalt);
+			$result=dol_uncompress($newfile,$conf->admin->dir_temp.'/'.$tmpdir);
+
 			if (! empty($result['error']))
 			{
 				$langs->load("errors");
 				setEventMessage($langs->trans($result['error'],$original_file), 'errors');
+				$error++;
 			}
 			else
 			{
-				setEventMessage($langs->trans("SetupIsReadyForUse"));
+				// Now we move the dir of the module
+				$modulename=preg_replace('/module_/', '', $original_file);
+				$modulename=preg_replace('/\-[\d]+\.[\d]+.*$/', '', $modulename);
+				// Search dir $modulename
+				$modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename;
+				//var_dump($modulenamedir);
+				if (! dol_is_dir($modulenamedir))
+				{
+					$modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename;
+					//var_dump($modulenamedir);
+					if (! dol_is_dir($modulenamedir))
+					{
+						setEventMessage($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat"), 'errors');
+						$error++;
+					}
+				}
+
+				if (! $error)
+				{
+					//var_dump($dirins);
+					@dol_delete_dir_recursive($dirins.'/'.$modulename);
+					$result=dolCopyDir($modulenamedir, $dirins.'/'.$modulename, '0444', 1);
+					if ($result <= 0)
+					{
+						setEventMessage($langs->trans("ErrorFailedToCopy"), 'errors');
+						$error++;
+					}
+				}
 			}
 		}
+		else
+		{
+			$error++;
+		}
+	}
+
+	if (! $error)
+	{
+		setEventMessage($langs->trans("SetupIsReadyForUse"));
 	}
 }
 
+
 /*
  * View
  */
 
-$dirins=DOL_DOCUMENT_ROOT.'/extensions';
-$dirins_ok=(is_dir($dirins));
+
+
+// Set dir where external modules are installed
+if (! dol_is_dir($dirins))
+{
+	dol_mkdir($dirins);
+}
+$dirins_ok=(dol_is_dir($dirins));
 
 $wikihelp='EN:Installation_-_Upgrade|FR:Installation_-_Mise_à_jour|ES:Instalación_-_Actualización';
 llxHeader('',$langs->trans("Upgrade"),$wikihelp);
 
-print_fiche_titre($langs->trans("Upgrade"),'','setup');
+print_fiche_titre($langs->trans("Upgrade"),'','title_setup');
 
 print $langs->trans("CurrentVersion").' : '.DOL_VERSION.'
';
 
@@ -143,6 +203,8 @@ else
 }
 print '
';
 
+
+// Upgrade
 print $langs->trans("Upgrade").'
';
 print '
';
 print $langs->trans("ThisIsProcessToFollow").'
';
@@ -162,20 +224,76 @@ print $langs->trans("RestoreLock",$dolibarrdataroot.'/install.lock').'
';
 print '
';
 print '
';
 
+
+// Install external module
+
+$allowonlineinstall=true;
+$allowfromweb=1;
+if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false;
+
 $fullurl=''.$urldolibarrmodules.'';
+$message='';
+if (! empty($allowonlineinstall))
+{
+	if (! in_array('/custom',explode(',',$dolibarr_main_url_root_alt)))
+	{
+		$message=info_admin($langs->trans("ConfFileMuseContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
+		$allowfromweb=-1;
+	}
+	else
+	{
+		if ($dirins_ok)
+		{
+			if (! is_writable(dol_osencode($dirins)))
+			{
+				$langs->load("errors");
+				$message=info_admin($langs->trans("ErrorFailedToWriteInDir",$dirins));
+				$allowfromweb=0;
+			}
+		}
+		else
+		{
+
+			$message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
+			$allowfromweb=0;
+		}
+	}
+}
+else
+{
+	$message=info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile",$dolibarrdataroot.'/installmodules.lock'));
+	$allowfromweb=0;
+}
+
+
+
+
+
 print $langs->trans("AddExtensionThemeModuleOrOther").'
';
 print '
';
-print $langs->trans("ThisIsProcessToFollow").'
';
-print ''.$langs->trans("StepNb",1).': ';
-print $langs->trans("FindPackageFromWebSite",$fullurl).'
';
-print ''.$langs->trans("StepNb",2).': ';
-print $langs->trans("DownloadPackageFromWebSite",$fullurl).'
';
-print ''.$langs->trans("StepNb",3).': ';
-print $langs->trans("UnpackPackageInDolibarrRoot",$dolibarrroot).'
';
-if (! empty($conf->global->MAIN_ONLINE_INSTALL_MODULE))
+
+if ($allowfromweb < 1)
 {
-	if ($dirins_ok)
+	print $langs->trans("SomethingMakeInstallFromWebNotPossible");
+	print $message;
+	//print $langs->trans("SomethingMakeInstallFromWebNotPossible2");
+	print '
';
+}
+
+
+if ($allowfromweb >= 0)
+{
+	if ($allowfromweb == 1) print $langs->trans("ThisIsProcessToFollow").'
';
+	else print $langs->trans("ThisIsAlternativeProcessToFollow").'
';
+	print ''.$langs->trans("StepNb",1).': ';
+	print $langs->trans("FindPackageFromWebSite",$fullurl).'
';
+	print ''.$langs->trans("StepNb",2).': ';
+	print $langs->trans("DownloadPackageFromWebSite",$fullurl).'
';
+	print ''.$langs->trans("StepNb",3).': ';
+
+	if ($allowfromweb == 1)
 	{
+		print $langs->trans("UnpackPackageInDolibarrRoot",$dirins).'
';
 		print '
';
 		print '';
 		print $langs->trans("YouCanSubmitFile").'  ';
@@ -184,16 +302,12 @@ if (! empty($conf->global->MAIN_ONLINE_INSTALL_MODULE))
 	}
 	else
 	{
-		$message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
-		setEventMessage($message, 'warnings');
+		print $langs->trans("UnpackPackageInDolibarrRoot",$dirins).'
';
+		print ''.$langs->trans("StepNb",4).': ';
+		print $langs->trans("SetupIsReadyForUse").'
';
 	}
 }
-else
-{
-	print ''.$langs->trans("StepNb",4).': ';
-	print $langs->trans("SetupIsReadyForUse").'
';
-}
-print '
';
+
 
 if (! empty($result['return']))
 {
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 95e3f555b6d..cdea31fd7c4 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -52,7 +52,7 @@ $action=GETPOST('action');
 $wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
-print_fiche_titre($langs->trans("TranslationSetup"),'','setup');
+print_fiche_titre($langs->trans("TranslationSetup"),'','title_setup');
 
 print $langs->trans("TranslationDesc")."
\n";
 print "
\n";
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 85139b56ba9..fb7085a6ba8 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -42,7 +42,7 @@ llxHeader("","");
 
 $form = new Form($db);
 
-print_fiche_titre($langs->trans("TriggersAvailable"),'','setup');
+print_fiche_titre($langs->trans("TriggersAvailable"),'','title_setup');
 
 print $langs->trans("TriggersDesc")."
";
 print "
\n";
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index b2a0d9f8363..d7cfe2c790e 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -94,7 +94,7 @@ $help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:Módulo_Usuarios';
 llxHeader('',$langs->trans("UsersSetup"),$help_url);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("UsersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 
 $head=user_admin_prepare_head();
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index bbf2ce751ba..255fc0f6d9c 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -61,7 +61,7 @@ if (preg_match('/del(.*)/',$action,$reg))
 llxHeader('',$langs->trans("WorkflowSetup"),'');
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("WorkflowSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("WorkflowSetup"),$linkback,'title_setup');
 
 print $langs->trans("WorkflowDesc").'
';
 print "
";
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index 95be1b5251a..51274716eda 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -59,7 +59,7 @@ if ($action == 'setvalue')
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("BookmarkSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("BookmarkSetup"),$linkback,'title_setup');
 
 print $langs->trans("BookmarkDesc")."
\n";
 
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index aa92d2bedb9..06490f21cda 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -1,5 +1,6 @@
 
+ * Copyright (C) 2015      Marcos García        
  *
  * 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
@@ -210,4 +211,21 @@ class Bookmark
 
     }
 
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'bookmark'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+
 }
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 7be283528b4..a8ef98b0b0b 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -85,7 +85,7 @@ $formproduct=new FormProduct($db);
 llxHeader('',$langs->trans("CashDeskSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("CashDeskSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("CashDeskSetup"),$linkback,'title_setup');
 print '
';
 
 
@@ -164,7 +164,7 @@ if (! empty($conf->service->enabled))
     $var=! $var;
     print '
';
     print $langs->trans("CashdeskShowServices");
-    print '';;
+    print '';
     print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1);
     print "
';
 
 				print '';
-				print '';
+	print '';
 }
 
 print '
';
+				print '';
 
 	// Date de livraison
@@ -1366,7 +1368,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 "";
@@ -1810,7 +1812,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		$absolute_discount = price2num($absolute_discount, 'MT');
 		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 		if ($absolute_discount) {
-			if ($object->statut > 0) {
+			if ($object->statut > Commande::STATUS_DRAFT) {
 				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
 			} else {
 				// Remise dispo de type remise fixe (not credit note)
@@ -2105,7 +2107,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		
 		';
 
-		if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+		if (! empty($conf->use_javascript_ajax) && $object->statut == Commande::STATUS_DRAFT) {
 			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 		}
 
@@ -2120,7 +2122,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		/*
 		 * Form to add new line
 		 */
-		if ($object->statut == 0 && $user->rights->commande->creer)
+		if ($object->statut == Commande::STATUS_DRAFT && $user->rights->commande->creer)
 		{
 			if ($action != 'editline')
 			{
@@ -2150,7 +2152,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			                                                                                          // modified by hook
 			if (empty($reshook)) {
 				// Valid
-				if ($object->statut == 0 && $object->total_ttc >= 0 && $numlines > 0 &&
+				if ($object->statut == Commande::STATUS_DRAFT && $object->total_ttc >= 0 && $numlines > 0 &&
 				    ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
 			       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
 				)
@@ -2158,7 +2160,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 					print '
' . $langs->trans('Validate') . '
';
 				}
 				// Edit
-				if ($object->statut == 1 && $user->rights->commande->creer) {
+				if ($object->statut == Commande::STATUS_VALIDATED && $user->rights->commande->creer) {
 					print '
' . $langs->trans('Modify') . '
';
 				}
 				// Create event
@@ -2169,7 +2171,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 					print '' . $langs->trans("AddAction") . '';
 				}
 				// Send
-				if ($object->statut > 0) {
+				if ($object->statut > Commande::STATUS_DRAFT) {
 					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
 						print '
' . $langs->trans('SendByMail') . '
';
 					} else
@@ -2181,7 +2183,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 				if (! empty($conf->expedition->enabled)) {
 					$numshipping = $object->nb_expedition();
 
-					if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfProductsLines() > 0) {
+					if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfProductsLines() > 0) {
 						if (($conf->expedition_bon->enabled && $user->rights->expedition->creer) || ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)) {
 							if ($user->rights->expedition->creer) {
 								print '
' . $langs->trans('ShipProduct') . '
';
@@ -2199,7 +2201,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 				if ($conf->ficheinter->enabled) {
 					$langs->load("interventions");
 
-					if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfServicesLines() > 0) {
+					if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0) {
 						if ($user->rights->ficheinter->creer) {
 							print '
' . $langs->trans('AddIntervention') . '
';
 						} else {
@@ -2209,12 +2211,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 				}
 
 				// Reopen a closed order
-				if ($object->statut == 3 && $user->rights->commande->creer) {
+				if (($object->statut == Commande::STATUS_CLOSED || $object->statut == Commande::STATUS_CANCELED) && $user->rights->commande->creer) {
 					print '
' . $langs->trans('ReOpen') . '
';
 				}
 
 				// Create contract
-				if ($conf->contrat->enabled && ($object->statut == 1 || $object->statut == 2)) {
+				if ($conf->contrat->enabled && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_ACCEPTED)) {
 					$langs->load("contracts");
 
 					if ($user->rights->contrat->creer) {
@@ -2224,17 +2226,17 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 				// Create bill and Classify billed
 				// Note: Even if module invoice is not enabled, we should be able to use button "Classified billed"
-				if ($object->statut > 0 && ! $object->billed) {
+				if ($object->statut > Commande::STATUS_DRAFT && ! $object->billed) {
 					if (! empty($conf->facture->enabled) && $user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
 						print '
' . $langs->trans("CreateBill") . '
';
 					}
-					if ($user->rights->commande->creer && $object->statut > 2 && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
+					if ($user->rights->commande->creer && $object->statut > Commande::STATUS_ACCEPTED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
 						print '
' . $langs->trans("ClassifyBilled") . '
';
 					}
 				}
 
 				// Set to shipped
-				if (($object->statut == 1 || $object->statut == 2) && $user->rights->commande->cloturer) {
+				if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_ACCEPTED) && $user->rights->commande->cloturer) {
 					print '
' . $langs->trans('ClassifyShipped') . '
';
 				}
 
@@ -2244,7 +2246,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 				}
 
 				// Cancel order
-				if ($object->statut == 1 &&
+				if ($object->statut == Commande::STATUS_VALIDATED &&
 				    ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->cloturer))
 			       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler)))
 				)
@@ -2395,6 +2397,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			// Tableau des parametres complementaires
 			$formmail->param['action'] = 'send';
 			$formmail->param['models'] = 'order_send';
+			$formmail->param['models_id']=GETPOST('modelmailselected','int');
 			$formmail->param['orderid'] = $object->id;
 			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index ac567742f0f..eba8a557d25 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -51,8 +51,17 @@ class Commande extends CommonOrder
 
     var $id;
 
-    var $socid;		// Id client
-    var $client;		// Objet societe client (a charger par fetch_client)
+	/**
+	 * Client ID
+	 * @var int
+	 */
+    var $socid;
+
+	/**
+	 * Client (loaded by fetch_client)
+	 * @var Societe
+	 */
+    var $client;
 
     var $ref;
     var $ref_client;
@@ -60,7 +69,19 @@ 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)
+
+	/**
+	 * Status of the order. Check the following constants:
+	 * - STATUS_CANCELED
+	 * - STATUS_DRAFT
+	 * - STATUS_ACCEPTED
+	 * - STATUS_CLOSED
+	 * @var int
+	 */
+    var $statut;
+	/**
+	 * @deprecated
+	 */
     var $facturee;		// deprecated
     var $billed;		// billed or not
 
@@ -118,12 +139,32 @@ class Commande extends CommonOrder
     var $nbtodo;
     var $nbtodolate;
 
-
-     /**
+    /**
      * ERR Not engouch stock
      */
     const STOCK_NOT_ENOUGH_FOR_ORDER = -3;
 
+	/**
+	 * Canceled status
+	 */
+	const STATUS_CANCELED = -1;
+	/**
+	 * Draft status
+	 */
+	const STATUS_DRAFT = 0;
+	/**
+	 * Validated status
+	 */
+	const STATUS_VALIDATED = 1;
+	/**
+	 * Accepted/On process not managed for customer orders
+	 */
+	const STATUS_ACCEPTED = 2;
+	/**
+	 * Closed (Sent/Received, billed or not)
+	 */
+	const STATUS_CLOSED = 3;
+
 
     /**
      *	Constructor
@@ -212,7 +253,7 @@ class Commande extends CommonOrder
         $error=0;
 
         // Protection
-        if ($this->statut == 1)
+        if ($this->statut == self::STATUS_VALIDATED)
         {
             dol_syslog(get_class($this)."::valid no draft status", LOG_WARNING);
             return 0;
@@ -251,7 +292,7 @@ class Commande extends CommonOrder
         // Validate
         $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
         $sql.= " SET ref = '".$num."',";
-        $sql.= " fk_statut = 1,";
+        $sql.= " fk_statut = ".self::STATUS_VALIDATED.",";
         $sql.= " date_valid='".$this->db->idate($now)."',";
         $sql.= " fk_user_valid = ".$user->id;
         $sql.= " WHERE rowid = ".$this->id;
@@ -309,7 +350,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);
@@ -341,7 +382,7 @@ class Commande extends CommonOrder
         if (! $error)
         {
             $this->ref = $num;
-            $this->statut = 1;
+            $this->statut = self::STATUS_VALIDATED;
         }
 
         if (! $error)
@@ -370,7 +411,7 @@ class Commande extends CommonOrder
         $error=0;
 
         // Protection
-        if ($this->statut <= 0)
+        if ($this->statut <= self::STATUS_DRAFT)
         {
             return 0;
         }
@@ -385,7 +426,7 @@ class Commande extends CommonOrder
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-        $sql.= " SET fk_statut = 0";
+        $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
         $sql.= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
@@ -411,7 +452,7 @@ class Commande extends CommonOrder
 
                 if (!$error)
                 {
-                    $this->statut=0;
+                    $this->statut=self::STATUS_DRAFT;
                     $this->db->commit();
                     return $result;
                 }
@@ -423,7 +464,7 @@ class Commande extends CommonOrder
                 }
             }
 
-            $this->statut=0;
+            $this->statut=self::STATUS_DRAFT;
             $this->db->commit();
             return 1;
         }
@@ -448,7 +489,7 @@ class Commande extends CommonOrder
         global $conf,$langs;
         $error=0;
 
-        if ($this->statut != 3)
+        if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED)
         {
         	dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING);
             return 0;
@@ -457,7 +498,7 @@ class Commande extends CommonOrder
         $this->db->begin();
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-        $sql.= ' SET fk_statut=1, facture=0';
+        $sql.= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0';
         $sql.= ' WHERE rowid = '.$this->id;
 
         dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
@@ -472,13 +513,13 @@ class Commande extends CommonOrder
         else
         {
             $error++;
-            $this->error=$this->db->error();
+            $this->error=$this->db->lasterror();
             dol_print_error($this->db);
         }
 
         if (! $error)
         {
-        	$this->statut = 1;
+        	$this->statut = self::STATUS_VALIDATED;
         	$this->billed = 0;
         	$this->facturee = 0; // deprecated
 
@@ -517,10 +558,10 @@ class Commande extends CommonOrder
             $now=dol_now();
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-            $sql.= ' SET fk_statut = 3,';
+            $sql.= ' SET fk_statut = '.self::STATUS_CLOSED.',';
             $sql.= ' fk_user_cloture = '.$user->id.',';
             $sql.= " date_cloture = '".$this->db->idate($now)."'";
-            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
             if ($this->db->query($sql))
             {
@@ -531,7 +572,7 @@ class Commande extends CommonOrder
 
                 if (! $error)
                 {
-                	$this->statut=3;
+                	$this->statut=self::STATUS_CLOSED;
 
                     $this->db->commit();
                     return 1;
@@ -568,9 +609,9 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-		$sql.= " SET fk_statut = -1";
+		$sql.= " SET fk_statut = ".self::STATUS_CANCELED;
 		$sql.= " WHERE rowid = ".$this->id;
-		$sql.= " AND fk_statut = 1";
+		$sql.= " AND fk_statut = ".self::STATUS_VALIDATED;
 
 		dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -609,7 +650,7 @@ class Commande extends CommonOrder
 
 			if (! $error)
 			{
-				$this->statut=-1;
+				$this->statut=self::STATUS_CANCELED;
 				$this->db->commit();
 				return 1;
 			}
@@ -761,7 +802,7 @@ class Commande extends CommonOrder
                         $this->lines[$i]->fk_fournprice,
                         $this->lines[$i]->pa_ht,
                     	$this->lines[$i]->label,
-		    	$this->lines[$i]->array_options
+                    	$this->lines[$i]->array_options
                     );
                     if ($result < 0)
                     {
@@ -833,28 +874,25 @@ class Commande extends CommonOrder
 
                     if (! $error)
                     {
-                    	$action='create';
+                    	//$action='create';
 
 	                    // Actions on extra fields (by external module or standard code)
-	                    // FIXME le hook fait double emploi avec le trigger !!
-	                    $hookmanager->initHooks(array('orderdao'));
+	                    // TODO le hook fait double emploi avec le trigger !!
+	                    /*$hookmanager->initHooks(array('orderdao'));
 	                    $parameters=array('socid'=>$this->id);
 	                    $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 	                    if (empty($reshook))
 	                    {
 	                    	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-	                    	{
+	                    	{*/
 	                    		$result=$this->insertExtraFields();
-	                    		if ($result < 0)
-	                    		{
-	                    			$error++;
-	                    		}
-	                    	}
+	                    		if ($result < 0) $error++;
+	                    /*	}
 	                    }
-	                    else if ($reshook < 0) $error++;
+	                    else if ($reshook < 0) $error++;*/
                     }
 
-                    if (! $notrigger)
+                    if (! $error && ! $notrigger)
                     {
 			            // Call trigger
 			            $result=$this->call_trigger('ORDER_CREATE',$user);
@@ -862,29 +900,27 @@ class Commande extends CommonOrder
 			            // End call triggers
                     }
 
-	                if (!$error) {
+	                if (! $error)
+	                {
 		                $this->db->commit();
 		                return $this->id;
 	                }
-
-	                foreach($this->errors as $errmsg)
-	                {
-		                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-		                $this->error.=($this->error?', '.$errmsg:$errmsg);
-	                }
-	                $this->db->rollback();
-	                return -1*$error;
-
+	                else
+					{
+	                	$this->db->rollback();
+	                	return -1*$error;
+					}
                 }
                 else
-                {
+				{
+					$this->error=$this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
             }
         }
         else
-        {
+		{
             dol_print_error($this->db);
             $this->db->rollback();
             return -1;
@@ -933,7 +969,7 @@ class Commande extends CommonOrder
         }
 
         $this->id=0;
-        $this->statut=0;
+        $this->statut=self::STATUS_DRAFT;
 
         // Clear fields
         $this->user_author_id     = $user->id;
@@ -1178,7 +1214,7 @@ class Commande extends CommonOrder
         // Check parameters
         if ($type < 0) return -1;
 
-        if ($this->statut == 0)
+        if ($this->statut == self::STATUS_DRAFT)
         {
             $this->db->begin();
 
@@ -1494,7 +1530,7 @@ class Commande extends CommonOrder
 
                 $this->lines				= array();
 
-                if ($this->statut == 0) $this->brouillon = 1;
+                if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
 
                 // Retreive all extrafield for invoice
                 // fetch optionals attributes and labels
@@ -1806,7 +1842,7 @@ class Commande extends CommonOrder
      *
      *	TODO  deprecated, move to Shipping class
      */
-    function livraison_array($filtre_statut=-1)
+    function livraison_array($filtre_statut=self::STATUS_CANCELED)
     {
         $delivery = new Livraison($this->db);
         $deliveryArray = $delivery->livraison_array($filtre_statut);
@@ -1821,7 +1857,7 @@ class Commande extends CommonOrder
      *
      *	TODO		FONCTION NON FINIE A FINIR
      */
-    function stock_array($filtre_statut=-1)
+    function stock_array($filtre_statut=self::STATUS_CANCELED)
     {
         $this->stocks = array();
 
@@ -1863,7 +1899,7 @@ class Commande extends CommonOrder
     {
         global $user;
 
-        if ($this->statut == 0)
+        if ($this->statut == self::STATUS_DRAFT)
         {
             $this->db->begin();
 
@@ -1946,7 +1982,7 @@ class Commande extends CommonOrder
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
             $sql.= ' SET remise_percent = '.$remise;
-            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = 0 ;';
+            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
 
             if ($this->db->query($sql))
             {
@@ -1980,7 +2016,7 @@ class Commande extends CommonOrder
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
             $sql.= ' SET remise_absolue = '.$remise;
-            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = 0 ;';
+            $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;';
 
             dol_syslog(get_class($this)."::set_remise_absolue", LOG_DEBUG);
 
@@ -2012,7 +2048,7 @@ class Commande extends CommonOrder
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
             $sql.= " SET date_commande = ".($date ? $this->db->idate($date) : 'null');
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(get_class($this)."::set_date",LOG_DEBUG);
             $resql=$this->db->query($sql);
@@ -2156,7 +2192,7 @@ class Commande extends CommonOrder
         	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
         }
         if ($socid) $sql.= " AND s.rowid = ".$socid;
-        if ($draft) $sql.= " AND c.fk_statut = 0";
+        if ($draft) $sql.= " AND c.fk_statut = ".self::STATUS_DRAFT;
         if (is_object($excluser)) $sql.= " AND c.fk_user_author <> ".$excluser->id;
         $sql.= $this->db->order($sortfield,$sortorder);
         $sql.= $this->db->plimit($limit,$offset);
@@ -2207,7 +2243,7 @@ class Commande extends CommonOrder
     function availability($availability_id)
     {
         dol_syslog('Commande::availability('.$availability_id.')');
-        if ($this->statut >= 0)
+        if ($this->statut >= self::STATUS_DRAFT)
         {
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
             $sql .= ' SET fk_availability = '.$availability_id;
@@ -2241,7 +2277,7 @@ class Commande extends CommonOrder
     function demand_reason($demand_reason_id)
     {
         dol_syslog('Commande::demand_reason('.$demand_reason_id.')');
-        if ($this->statut >= 0)
+        if ($this->statut >= self::STATUS_DRAFT)
         {
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
             $sql .= ' SET fk_input_reason = '.$demand_reason_id;
@@ -2312,7 +2348,7 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
-		$sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+		$sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
 		dol_syslog(get_class($this)."::classifyBilled", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -2627,7 +2663,7 @@ class Commande extends CommonOrder
     	$action='create';
 
     	// Actions on extra fields (by external module or standard code)
-    	// FIXME le hook fait double emploi avec le trigger !!
+    	// TODO le hook fait double emploi avec le trigger !!
     	$hookmanager->initHooks(array('orderdao'));
     	$parameters=array('id'=>$this->id);
     	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -2790,7 +2826,7 @@ class Commande extends CommonOrder
         }
         $sql.= $clause." c.entity = ".$conf->entity;
         //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
-        $sql.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
+        $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
         if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
 
         $resql=$this->db->query($sql);
@@ -2864,57 +2900,57 @@ class Commande extends CommonOrder
         //print 'x'.$statut.'-'.$billed;
         if ($mode == 0)
         {
-            if ($statut==-1) return $langs->trans('StatusOrderCanceled');
-            if ($statut==0) return $langs->trans('StatusOrderDraft');
-            if ($statut==1) return $langs->trans('StatusOrderValidated');
-            if ($statut==2) return $langs->trans('StatusOrderSentShort');
-            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
-            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
+            if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled');
+            if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft');
+            if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated');
+            if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort');
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
+            if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
         }
         elseif ($mode == 1)
         {
-            if ($statut==-1) return $langs->trans('StatusOrderCanceledShort');
-            if ($statut==0) return $langs->trans('StatusOrderDraftShort');
-            if ($statut==1) return $langs->trans('StatusOrderValidatedShort');
-            if ($statut==2) return $langs->trans('StatusOrderSentShort');
-            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
-            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
+            if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort');
+            if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort');
+            if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort');
+            if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort');
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
+            if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
         }
         elseif ($mode == 2)
         {
-            if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
-            if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
-            if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort');
-            if ($statut==2) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort');
-            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort');
-            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort');
+            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
+            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
+            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort');
+            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort');
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort');
+            if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort');
         }
         elseif ($mode == 3)
         {
-            if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-            if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
-            if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
-            if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3');
-            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7');
-            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6');
+            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
+            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
+            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort'),'statut3');
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7');
+            if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6');
         }
         elseif ($mode == 4)
         {
-            if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
-            if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
-            if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated');
-            if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSent');
-            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill');
-            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed');
+            if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
+            if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
+            if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated');
+            if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSent');
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill');
+            if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed');
         }
         elseif ($mode == 5)
         {
-            if ($statut==-1) return ''.$langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-            if ($statut==0) return ''.$langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
-            if ($statut==1) return ''.$langs->trans('StatusOrderValidatedShort').' '.img_picto($langs->trans('StatusOrderValidated'),'statut1');
-            if ($statut==2) return ''.$langs->trans('StatusOrderSentShort').' '.img_picto($langs->trans('StatusOrderSent'),'statut3');
-            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut7');
-            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
+            if ($statut==self::STATUS_CANCELED) return ''.$langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+            if ($statut==self::STATUS_DRAFT) return ''.$langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
+            if ($statut==self::STATUS_VALIDATED) return ''.$langs->trans('StatusOrderValidatedShort').' '.img_picto($langs->trans('StatusOrderValidated'),'statut1');
+            if ($statut==self::STATUS_ACCEPTED) return ''.$langs->trans('StatusOrderSentShort').' '.img_picto($langs->trans('StatusOrderSent'),'statut3');
+            if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut7');
+            if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
         }
     }
 
@@ -3256,6 +3292,23 @@ class Commande extends CommonOrder
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'commande'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index e51ded5e297..5164b30eed7 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -7,6 +7,8 @@
  * Copyright (C) 2013      Christophe Battarel    
  * Copyright (C) 2013      Cédric Salvador        
  * Copyright (C) 2015      Frederic France        
+ * Copyright (C) 2015      Marcos García          
+ * Copyright (C) 2015      Jean-François Ferry      
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,7 +46,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');
@@ -114,7 +116,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, s.code_client, c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, 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
@@ -261,7 +263,7 @@ if ($resql)
 	if ($search_total_ht != '') $param.='&search_total_ht='.$search_total_ht;
 
 	$num = $db->num_rows($resql);
-	print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+	print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_commercial.png');
 	$i = 0;
 
 	// Lignes des champs de filtre
@@ -430,7 +432,7 @@ if ($resql)
 
         // warning late icon
 		print '';
 
 		// Amount HT
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index fcc33a666d2..71558be0e57 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2013 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2012      Marcos García        
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -76,7 +77,7 @@ if ($mode == 'supplier')
     $dir=$conf->fournisseur->dir_output.'/commande/temp';
 }
 
-print_fiche_titre($title);
+print_fiche_titre($title,'','title_commercial.png');
 
 dol_mkdir($dir);
 
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index cabb63aa2b1..2eb94d7974a 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -30,7 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $langs->load("orders");
 echo '
';
-print_titre($langs->trans('RelatedOrders'));
+print_titre($langs->trans('RelatedCustomerOrders'));
 
 ?>
 
'.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.'';
 				print '';
 				//if($num2 > 0) print '';
 				//else print '';
@@ -860,7 +866,7 @@ if ($id > 0)
 		$facturestatic = new Facture($db);
 
         $sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.amount';
-        $sql.= ', f.total';
+        $sql.= ', f.total as total_ht';
         $sql.= ', f.tva as total_tva';
         $sql.= ', f.total_ttc';
 		$sql.= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut';
@@ -902,7 +908,7 @@ if ($id > 0)
 				$facturestatic->id = $objp->facid;
 				$facturestatic->ref = $objp->facnumber;
 				$facturestatic->type = $objp->type;
-                $facturestatic->total_ht = $objp->total;
+                $facturestatic->total_ht = $objp->total_ht;
                 $facturestatic->total_tva = $objp->total_tva;
                 $facturestatic->total_ttc = $objp->total_ttc;
 				print $facturestatic->getNomUrl(1);
@@ -915,7 +921,7 @@ if ($id > 0)
 				{
 					print '';
 				}
-				print '';
+				print '';
 
 				print '';
 				print "\n";
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index cb5a07c32d3..70f98220c21 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -1,7 +1,8 @@
 
- * Copyright (C) 2004-2013 Laurent Destailleur  
+ * Copyright (C) 2004-2015 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
+ * Copyright (C) 2015       Jean-François Ferry	
  *
  * 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
@@ -67,7 +68,7 @@ if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db);
 
 llxHeader();
 
-print_fiche_titre($langs->trans("CustomerArea"));
+print_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png');
 
 print '
';
 
@@ -579,6 +580,103 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 	}
 }
 
+/*
+ * Opened Order
+ */
+if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+{
+	$langs->load("order");
+
+	$sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total as total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv ";
+	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql.= ", ".MAIN_DB_PREFIX."commande as c";
+	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE c.fk_soc = s.rowid";
+	$sql.= " AND c.entity = ".$conf->entity;
+	$sql.= " AND c.fk_statut = 1";
+	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	$sql.= " ORDER BY c.rowid DESC";
+
+	$result=$db->query($sql);
+	if ($result)
+	{
+		$total = 0;
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num > 0)
+		{
+			$var=true;
+
+			print '
'.$langs->trans("LastCustomerOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').''.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'!!!'.price($objp->total_ttc).''.price($objp->total_ht).''.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'
';
+			print '';
+
+			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
+			while ($i < $nbofloop)
+			{
+				$obj = $db->fetch_object($result);
+				$var=!$var;
+				print '';
+
+				// Ref
+				print '";
+
+                print '';
+				print ''."\n";
+				print '';
+				print ''."\n";
+				print ''."\n";
+				$i++;
+				$total += $obj->total_ttc;
+			}
+			if ($num > $nbofloop)
+			{
+				print '";
+			}
+			else if ($total>0)
+			{
+				print '";
+			}
+			print "
'.$langs->trans("OrdersOpened").' '.$num.'
';
+
+				$orderstatic->id=$obj->commandeid;
+				$orderstatic->ref=$obj->ref;
+                $orderstatic->ref_client=$obj->ref_client;
+                $orderstatic->total_ht = $obj->total_ht;
+                $orderstatic->total_tva = $obj->total_tva;
+                $orderstatic->total_ttc = $obj->total_ttc;
+
+				print '';
+				print '';
+				print '';
+				print '
';
+				print $orderstatic->getNomUrl(1);
+				print '';
+				//if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+				print '';
+				$filename=dol_sanitizeFileName($obj->ref);
+				$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
+				print $formfile->getDocumentsLink($orderstatic->element, $filename, $filedir);
+				print '
';
+
+				print "		';
+                $companystatic->id=$obj->rowid;
+                $companystatic->name=$obj->name;
+                $companystatic->client=$obj->client;
+                $companystatic->canvas=$obj->canvas;
+                print $companystatic->getNomUrl(1, 'company', 44);
+                print '';
+				print dol_print_date($db->jdate($obj->dp),'day').''.price($obj->total_ttc).''.$orderstatic->LibStatut($obj->fk_statut,3).'
'.$langs->trans("XMoreLines", ($num - $nbofloop))."
'.$langs->trans("Total")."".price($total)." 

";
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+
 
 print '';
 
diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php
index 4960d610e2c..92b954e98e1 100644
--- a/htdocs/comm/list.php
+++ b/htdocs/comm/list.php
@@ -4,9 +4,10 @@
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2013      Cédric Salvador      
  * Copyright (C) 2013      Florian Henry       
+ * Copyright (C) 2015       Jean-François Ferry		
  * Copyright (C) 2015      Marcos García        
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is freei software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
@@ -106,7 +107,7 @@ $sql = "SELECT s.rowid, s.nom as name, s.commercial_name, s.client, s.zip, s.tow
 $sql.= " s.datec, s.canvas";
 if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_societe"; // We need this table joined to the select in order to filter by categ
+if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
 if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 $sql.= " WHERE s.fk_stcomm = st.id";
@@ -164,7 +165,7 @@ if ($result)
  	if ($search_sale > 0)	$param.='&search_sale='.$search_sale;
  	if ($search_status != '') $param.='&search_status='.$search_status;
 
-	print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+	print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies.png');
 
 	$i = 0;
 
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index be60d721d6a..c5cd570c241 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -302,7 +302,7 @@ if (empty($reshook))
 					$object->modelpdf = GETPOST('model');
 					$object->author = $user->id; // deprecated
 					$object->note = GETPOST('note');
-					$object->statut = 0;
+					$object->statut = Propal::STATUS_DRAFT;
 					$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 					$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
@@ -542,52 +542,80 @@ if (empty($reshook))
 	}
 
 	// Classify billed
-	else if ($action == 'classifybilled' && $user->rights->propal->cloturer) {
-		$object->cloture($user, 4, '');
+	else if ($action == 'classifybilled' && $user->rights->propal->cloturer)
+	{
+		$result=$object->cloture($user, 4, '');
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+			$error++;
+		}
 	}
 
 	// Reopen proposal
-	else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel')) {
+	else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel'))
+	{
 		// prevent browser refresh from reopening proposal several times
-		if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) {
+		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) {
 			$object->reopen($user, 1);
 		}
 	}
 
 	// Close proposal
-	else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST('cancel')) {
+	else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST('cancel'))
+	{
 		if (! GETPOST('statut')) {
 			setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentities("CloseAs")), 'errors');
 			$action = 'statut';
 		} else {
 			// prevent browser refresh from closing proposal several times
-			if ($object->statut == 1) {
-				$object->cloture($user, GETPOST('statut'), GETPOST('note'));
+			if ($object->statut == Propal::STATUS_VALIDATED)
+			{
+				$result=$object->cloture($user, GETPOST('statut'), GETPOST('note'));
+				if ($result < 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
 			}
 		}
 	}
 
 	// Classify billed
-	else if ($action == 'classifybilled' && $user->rights->propal->cloturer) {
-		$object->cloture($user, 4, '');
+	else if ($action == 'classifybilled' && $user->rights->propal->cloturer)
+	{
+		$result=$object->cloture($user, 4, '');
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+			$error++;
+		}
 	}
 
 	// Reopen proposal
-	else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel')) {
+	else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel'))
+	{
 		// prevent browser refresh from reopening proposal several times
-		if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) {
-			$object->reopen($user, 1);
+		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED)
+		{
+			$result=$object->reopen($user, 1);
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
 		}
 	}
 
 	// Close proposal
-	else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST('cancel')) {
+	else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST('cancel'))
+	{
 		if (! GETPOST('statut')) {
 			setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentities("CloseAs")), 'errors');
 			$action = 'statut';
 		} else {
 			// prevent browser refresh from closing proposal several times
-			if ($object->statut == 1) {
+			if ($object->statut == Propal::STATUS_VALIDATED) {
 				$object->cloture($user, GETPOST('statut'), GETPOST('note'));
 			}
 		}
@@ -1144,7 +1172,7 @@ if (empty($reshook))
 		if (! $error)
 		{
 			// Actions on extra fields (by external module or standard code)
-			// FIXME le hook fait double emploi avec le trigger !!
+			// TODO le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('propaldao'));
 			$parameters = array('id' => $object->id);
 			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been
@@ -1735,7 +1763,7 @@ if ($action == 'create')
 	$absolute_discount = price2num($absolute_discount, 'MT');
 	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 	if ($absolute_discount) {
-		if ($object->statut > 0) {
+		if ($object->statut > Propal::STATUS_DRAFT) {
 			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount, 0, $langs, 0, 0, -1, $conf->currency));
 		} else {
 			// Remise dispo de type non avoir
@@ -1797,7 +1825,7 @@ if ($action == 'create')
 	} else {
 		if (! empty($object->fin_validite)) {
 			print dol_print_date($object->fin_validite, 'daytext');
-			if ($object->statut == 1 && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay))
+			if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay))
 				print img_warning($langs->trans("Late"));
 		} else {
 			print ' ';
@@ -2081,7 +2109,7 @@ if ($action == 'create')
 	
 	';
 
-	if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+	if (! empty($conf->use_javascript_ajax) && $object->statut == Propal::STATUS_DRAFT) {
 		include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 	}
 
@@ -2091,7 +2119,7 @@ if ($action == 'create')
 		$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
 
 	// Form to add new line
-	if ($object->statut == 0 && $user->rights->propal->creer)
+	if ($object->statut == Propal::STATUS_DRAFT && $user->rights->propal->creer)
 	{
 		if ($action != 'editline')
 		{
@@ -2154,7 +2182,7 @@ if ($action == 'create')
 			if ($action != 'statut' && $action != 'editline')
 			{
 				// Validate
-				if ($object->statut == 0 && $object->total_ttc >= 0 && count($object->lines) > 0 &&
+				if ($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 &&
 			        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->creer))
        				|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->propal_advance->validate)))
 				) {
@@ -2168,18 +2196,18 @@ if ($action == 'create')
 					print '' . $langs->trans("AddAction") . '';
 				}
 				// Edit
-				if ($object->statut == 1 && $user->rights->propal->creer) {
+				if ($object->statut == Propal::STATUS_VALIDATED && $user->rights->propal->creer) {
 					print '
' . $langs->trans('Modify') . '
';
 				}
 
 				// ReOpen
-				if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->propal->cloturer) {
+				if (($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) && $user->rights->propal->cloturer) {
 					print '
global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"';
 					print '>' . $langs->trans('ReOpen') . '
';
 				}
 
 				// Send
-				if ($object->statut == 1 || $object->statut == 2) {
+				if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED) {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send) {
 						print '
' . $langs->trans('SendByMail') . '
';
 					} else
@@ -2187,14 +2215,14 @@ if ($action == 'create')
 				}
 
 				// Create an order
-				if (! empty($conf->commande->enabled) && $object->statut == 2) {
+				if (! empty($conf->commande->enabled) && $object->statut == Propal::STATUS_SIGNED) {
 					if ($user->rights->commande->creer) {
 						print '
' . $langs->trans("AddOrder") . '
';
 					}
 				}
 
 				// Create contract
-				if ($conf->contrat->enabled && $object->statut == 2) {
+				if ($conf->contrat->enabled && $object->statut == Propal::STATUS_SIGNED) {
 					$langs->load("contracts");
 
 					if ($user->rights->contrat->creer) {
@@ -2203,7 +2231,8 @@ if ($action == 'create')
 				}
 
 				// Create an invoice and classify billed
-				if ($object->statut == 2) {
+				if ($object->statut == Propal::STATUS_SIGNED)
+				{
 					if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
 					{
 						print '
' . $langs->trans("AddBill") . '
';
@@ -2217,7 +2246,7 @@ if ($action == 'create')
 				}
 
 				// Close
-				if ($object->statut == 1 && $user->rights->propal->cloturer) {
+				if ($object->statut == Propal::STATUS_VALIDATED && $user->rights->propal->cloturer) {
 					print '
global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
 					print '>' . $langs->trans('Close') . '
';
 				}
@@ -2278,6 +2307,10 @@ if ($action == 'create')
 	/*
 	 * Action presend
  	 */
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 	if ($action == 'presend')
 	{
 		$object->fetch_projet();
@@ -2372,6 +2405,7 @@ if ($action == 'create')
 		// Tableau des parametres complementaires
 		$formmail->param['action'] = 'send';
 		$formmail->param['models'] = 'propal_send';
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
 		$formmail->param['id'] = $object->id;
 		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
 		// Init list of files
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 533df89b773..e7a7421e6ea 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -54,19 +54,56 @@ class Propal extends CommonObject
 
     var $id;
 
-    var $socid;		// Id client
-    var $client;		// Objet societe client (a charger par fetch_client)
+	/**
+	 * ID of the client
+	 * @var int
+	 */
+    var $socid;
+	/**
+	 * Client (loaded by fetch_client)
+	 * @var Societe
+	 */
+    var $client;
 
     var $contactid;
     var $fk_project;
     var $author;
     var $ref;
     var $ref_client;
-    var $statut;					// 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (billed)
-    var $datec;						// Date of creation
-    var $datev;						// Date of validation
-    var $date;						// Date of proposal
-    var $datep;						// Same than date
+
+	/**
+	 * Status of the quote
+	 * Check the following constants:
+	 * - STATUS_DRAFT
+	 * - STATUS_VALIDATED
+	 * - STATUS_SIGNED
+	 * - STATUS_NOTSIGNED
+	 * - STATUS_BILLED
+	 * @var int
+	 */
+    var $statut;
+
+	/**
+	 * Date of creation
+	 * @var
+	 */
+    var $datec;
+	/**
+	 * Date of validation
+	 * @var
+	 */
+    var $datev;
+	/**
+	 * Date of the quote
+	 * @var
+	 */
+    var $date;
+
+	/**
+	 * Same than date ¿?
+	 * @var
+	 */
+    var $datep;
     var $date_livraison;
     var $fin_validite;
 
@@ -79,9 +116,19 @@ class Propal extends CommonObject
     var $total_localtax1;			// Total Local Taxes 1
     var $total_localtax2;			// Total Local Taxes 2
     var $total_ttc;					// Total with tax
-    var $price;						// deprecated (for compatibility)
-    var $tva;						// deprecated (for compatibility)
-    var $total;						// deprecated (for compatibility)
+
+	/**
+	 * @deprecated
+	 */
+    var $price;
+	/**
+	 * @deprecated
+	 */
+    var $tva;
+	/**
+	 * @deprecated
+	 */
+    var $total;
 
     var $cond_reglement_id;
     var $cond_reglement_code;
@@ -91,10 +138,16 @@ class Propal extends CommonObject
     var $remise;
     var $remise_percent;
     var $remise_absolue;
-    var $note;						// deprecated (for compatibility)
+	/**
+	 * @deprecated
+	 */
+    var $note;
     var $note_private;
     var $note_public;
-    var $fk_delivery_address;		// deprecated (for compatibility)
+	/**
+	 * @deprecated
+	 */
+    var $fk_delivery_address;
     var $fk_address;
     var $address_type;
     var $address;
@@ -120,12 +173,32 @@ class Propal extends CommonObject
     var $labelstatut_short=array();
 
     var $specimen;
-	
+
 	//Incorterms
 	var $fk_incoterms;
 	var $location_incoterms;
 	var $libelle_incoterms;  //Used into tooltip
 
+	/**
+	 * Draft status
+	 */
+	const STATUS_DRAFT = 0;
+	/**
+	 * Validated status
+	 */
+	const STATUS_VALIDATED = 1;
+	/**
+	 * Signed quote
+	 */
+	const STATUS_SIGNED = 2;
+	/**
+	 * Not signed quote
+	 */
+	const STATUS_NOTSIGNED = 3;
+	/**
+	 * Billed quote
+	 */
+	const STATUS_BILLED = 4;
 
     /**
      *	Constructor
@@ -361,7 +434,7 @@ class Propal extends CommonObject
         // Check parameters
         if ($type < 0) return -1;
 
-        if ($this->statut == 0)
+        if ($this->statut == self::STATUS_DRAFT)
         {
             $this->db->begin();
 
@@ -525,7 +598,7 @@ class Propal extends CommonObject
         if (empty($qty) && empty($special_code)) $special_code=3;    // Set option tag
         if (! empty($qty) && $special_code == 3) $special_code=0;    // Remove option tag
 
-        if ($this->statut == 0)
+        if ($this->statut == self::STATUS_DRAFT)
         {
             $this->db->begin();
 
@@ -650,7 +723,7 @@ class Propal extends CommonObject
      */
     function deleteline($lineid)
     {
-        if ($this->statut == 0)
+        if ($this->statut == self::STATUS_DRAFT)
         {
             $line=new PropaleLigne($this->db);
 
@@ -885,7 +958,7 @@ class Propal extends CommonObject
                     	$action='update';
 
                     	// Actions on extra fields (by external module or standard code)
-                    	// FIXME le hook fait double emploi avec le trigger !!
+                    	// TODO le hook fait double emploi avec le trigger !!
                     	$hookmanager->initHooks(array('propaldao'));
                     	$parameters=array('socid'=>$this->id);
                     	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1007,7 +1080,7 @@ class Propal extends CommonObject
         }
 
         $this->id=0;
-        $this->statut=0;
+        $this->statut=self::STATUS_DRAFT;
 
         if (empty($conf->global->PROPALE_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
         {
@@ -1189,10 +1262,10 @@ class Propal extends CommonObject
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
-				$this->location_incoterms = $obj->location_incoterms;									
+				$this->location_incoterms = $obj->location_incoterms;
 				$this->libelle_incoterms = $obj->libelle_incoterms;
-				
-                if ($obj->fk_statut == 0)
+
+                if ($obj->fk_statut == self::STATUS_DRAFT)
                 {
                     $this->brouillon = 1;
                 }
@@ -1227,7 +1300,7 @@ class Propal extends CommonObject
                 	$extrafieldsline=new ExtraFields($this->db);
                 	$line = new PropaleLigne($this->db);
                 	$extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
-                	
+
                     $num = $this->db->num_rows($result);
                     $i = 0;
 
@@ -1280,7 +1353,7 @@ class Propal extends CommonObject
                         $line->date_end  		= $objp->date_end;
 
                         $line->fetch_optionals($line->id,$extralabelsline);
-                        
+
                         $this->lines[$i]        = $line;
                         //dol_syslog("1 ".$line->fk_product);
                         //print "xx $i ".$this->lines[$i]->fk_product;
@@ -1319,7 +1392,7 @@ class Propal extends CommonObject
     	$action='update';
 
     	// Actions on extra fields (by external module or standard code)
-    	// FIXME le hook fait double emploi avec le trigger !!
+    	// TODO le hook fait double emploi avec le trigger !!
     	$hookmanager->initHooks(array('propaldao'));
     	$parameters=array('id'=>$this->id);
     	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1385,8 +1458,8 @@ class Propal extends CommonObject
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
             $sql.= " SET ref = '".$num."',";
-            $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql.= " fk_statut = ".self::STATUS_VALIDATED.", date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
+            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(get_class($this)."::valid", LOG_DEBUG);
 			$resql=$this->db->query($sql);
@@ -1441,7 +1514,7 @@ class Propal extends CommonObject
 
             	$this->ref=$num;
             	$this->brouillon=0;
-            	$this->statut = 1;
+            	$this->statut = self::STATUS_VALIDATED;
             	$this->user_valid_id=$user->id;
             	$this->datev=$now;
 
@@ -1476,7 +1549,7 @@ class Propal extends CommonObject
         if (! empty($user->rights->propal->creer))
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(get_class($this)."::set_date", LOG_DEBUG);
             if ($this->db->query($sql) )
@@ -1505,7 +1578,7 @@ class Propal extends CommonObject
         if (! empty($user->rights->propal->creer))
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fin_validite = ".($date_fin_validite!=''?"'".$this->db->idate($date_fin_validite)."'":'null');
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
             if ($this->db->query($sql) )
             {
                 $this->fin_validite = $date_fin_validite;
@@ -1655,7 +1728,7 @@ class Propal extends CommonObject
             $remise = price2num($remise);
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET remise_percent = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             if ($this->db->query($sql) )
             {
@@ -1689,7 +1762,7 @@ class Propal extends CommonObject
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
             $sql.= " SET remise_absolue = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             if ($this->db->query($sql) )
             {
@@ -1781,7 +1854,6 @@ class Propal extends CommonObject
     {
         global $langs,$conf;
 
-        $this->statut = $statut;
         $error=0;
         $now=dol_now();
 
@@ -1797,7 +1869,7 @@ class Propal extends CommonObject
         	$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
         	$trigger_name='PROPAL_CLOSE_REFUSED';
 
-            if ($statut == 2)
+            if ($statut == self::STATUS_SIGNED)
             {
             	$trigger_name='PROPAL_CLOSE_SIGNED';
 				$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
@@ -1809,12 +1881,12 @@ class Propal extends CommonObject
 
                 if ($result < 0)
                 {
-                    $this->error=$this->db->error();
+                    $this->error=$this->db->lasterror();
                     $this->db->rollback();
                     return -2;
                 }
             }
-            if ($statut == 4)
+            if ($statut == self::STATUS_BILLED)
             {
             	$trigger_name='PROPAL_CLASSIFY_BILLED';
             }
@@ -1840,7 +1912,9 @@ class Propal extends CommonObject
 
             if ( ! $error )
             {
-                $this->db->commit();
+		        $this->statut = $statut;
+        
+		        $this->db->commit();
                 return 1;
             }
             else
@@ -1851,7 +1925,7 @@ class Propal extends CommonObject
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error=$this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -1864,11 +1938,11 @@ class Propal extends CommonObject
      */
     function classifyBilled()
     {
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_statut = 4';
-        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ;';
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_statut = '.self::STATUS_BILLED;
+        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT.' ;';
         if ($this->db->query($sql) )
         {
-        	$this->statut=4;
+        	$this->statut=self::STATUS_BILLED;
             return 1;
         }
         else
@@ -1896,12 +1970,12 @@ class Propal extends CommonObject
      */
     function set_draft($user)
     {
-        $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = 0";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = ".self::STATUS_DRAFT;
         $sql.= " WHERE rowid = ".$this->id;
 
         if ($this->db->query($sql))
         {
-            $this->statut = 0;
+            $this->statut = self::STATUS_DRAFT;
             $this->brouillon = 1;
             return 1;
         }
@@ -1945,7 +2019,7 @@ class Propal extends CommonObject
         	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
         }
         if ($socid) $sql.= " AND s.rowid = ".$socid;
-        if ($draft)	$sql.= " AND p.fk_statut = 0";
+        if ($draft)	$sql.= " AND p.fk_statut = ".self::STATUS_DRAFT;
         if ($notcurrentuser > 0) $sql.= " AND p.fk_user_author <> ".$user->id;
         $sql.= $this->db->order($sortfield,$sortorder);
         $sql.= $this->db->plimit($limit,$offset);
@@ -2215,7 +2289,7 @@ class Propal extends CommonObject
     function availability($availability_id)
     {
         dol_syslog('Propale::availability('.$availability_id.')');
-        if ($this->statut >= 0)
+        if ($this->statut >= self::STATUS_DRAFT)
         {
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal';
             $sql .= ' SET fk_availability = '.$availability_id;
@@ -2249,7 +2323,7 @@ class Propal extends CommonObject
     function demand_reason($demand_reason_id)
     {
         dol_syslog('Propale::demand_reason('.$demand_reason_id.')');
-        if ($this->statut >= 0)
+        if ($this->statut >= self::STATUS_DRAFT)
         {
             $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal';
             $sql .= ' SET fk_input_reason = '.$demand_reason_id;
@@ -2356,11 +2430,11 @@ class Propal extends CommonObject
 	global $langs;
 	$langs->load("propal");
 
-	if ($statut==0) $statuttrans='statut0';
-	if ($statut==1) $statuttrans='statut1';
-	if ($statut==2) $statuttrans='statut3';
-	if ($statut==3) $statuttrans='statut5';
-	if ($statut==4) $statuttrans='statut6';
+	if ($statut==self::STATUS_DRAFT) $statuttrans='statut0';
+	if ($statut==self::STATUS_VALIDATED) $statuttrans='statut1';
+	if ($statut==self::STATUS_SIGNED) $statuttrans='statut3';
+	if ($statut==self::STATUS_NOTSIGNED) $statuttrans='statut5';
+	if ($statut==self::STATUS_BILLED) $statuttrans='statut6';
 
 	if ($mode == 0)	return $this->labelstatut[$statut];
 	if ($mode == 1)	return $this->labelstatut_short[$statut];
@@ -2393,8 +2467,8 @@ class Propal extends CommonObject
             $clause = " AND";
         }
         $sql.= $clause." p.entity = ".$conf->entity;
-        if ($mode == 'opened') $sql.= " AND p.fk_statut = 1";
-        if ($mode == 'signed') $sql.= " AND p.fk_statut = 2";
+        if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
+        if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
         if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
 
         $resql=$this->db->query($sql);
@@ -2405,17 +2479,17 @@ class Propal extends CommonObject
 
             if ($mode == 'opened') {
 	            $delay_warning=$conf->propal->cloture->warning_delay;
-	            $statut = 1;
+	            $statut = self::STATUS_VALIDATED;
 	            $label = $langs->trans("PropalsToClose");
             }
             if ($mode == 'signed') {
 	            $delay_warning=$conf->propal->facturation->warning_delay;
-	            $statut = 2;
+	            $statut = self::STATUS_SIGNED;
 	            $label = $langs->trans("PropalsToBill");
             }
 
 	        $response = new WorkboardResponse();
-	        $response->warning_delay = $delay_warning;
+	        $response->warning_delay = $delay_warning/60/60/24;
 	        $response->label = $label;
 	        $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut;
 	        $response->img = img_object($langs->trans("Propals"),"propal");
@@ -2794,7 +2868,22 @@ class Propal extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'propal'
+		);
 
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
@@ -2815,7 +2904,14 @@ class PropaleLigne  extends CommonObject
     var $fk_parent_line;
     var $desc;          	// Description ligne
     var $fk_product;		// Id produit predefini
-    var $product_type = 0;	// Type 0 = product, 1 = Service
+	/**
+	 * Product type.
+	 * Use the following constants:
+	 * - Product::TYPE_PRODUCT
+	 * - Product::TYPE_SERVICE
+	 * @var int
+	 */
+    var $product_type = Product::TYPE_PRODUCT;
 
     var $qty;
     var $tva_tx;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index da6e56c9460..c22b1952f9b 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2010-2011 Philippe Grand        
  * Copyright (C) 2012      Christophe Battarel   
  * Copyright (C) 2013      Cédric Salvador       
+ * Copyright (C) 2015       Jean-François Ferry     
 *
  * 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
@@ -250,7 +251,7 @@ if ($result)
 	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
 	if ($search_author)  	 $param.='&search_author='.$search_author;
 	if ($search_town)		 $param.='&search_town='.$search_town;
-	print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+	print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_commercial.png');
 
 	// Lignes des champs de filtre
 	print '
';
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 9292684d06f..05cd2db3f04 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -126,7 +126,7 @@ if ($id > 0 || ! empty($ref))
 			if ($object->fin_validite)
 			{
 				print dol_print_date($object->fin_validite,'daytext');
-				if ($object->statut == 1 && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+				if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
 			}
 			else
 			{
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 61985c8560f..291d4b4557f 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2012      Marcos García        
+ * Copyright (C) 2015       Jean-François Ferry	
  *
  * 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
@@ -60,7 +61,7 @@ $langs->load('other');
 
 llxHeader();
 
-print_fiche_titre($langs->trans("ProposalsStatistics"));
+print_fiche_titre($langs->trans("ProposalsStatistics"),'','title_commercial.png');
 
 $dir=$conf->propal->dir_temp;
 
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 9290fd36599..d224bc25f6e 100644
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011      Philippe Grand       
  * Copyright (C) 2013      Florian Henry       
  * Copyright (C) 2013      Cédric Salvador      
+ * Copyright (C) 2015       Jean-François Ferry		
  * Copyright (C) 2015      Marcos García        
  *
  * This program is free software; you can redistribute it and/or modify
@@ -202,7 +203,7 @@ if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql
 $sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)";
-if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_societe"; // We need this table joined to the select in order to filter by categ
+if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
 if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND s.client IN (2, 3)";
@@ -295,7 +296,7 @@ if ($resql)
  	// $param and $urladd should have the same value
  	$urladd = $param;
 
-	print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"], $param, $sortfield,$sortorder,'',$num,$nbtotalofrecords);
+	print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"], $param, $sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies.png');
 
 
  	// Print the search-by-sale and search-by-categ filters
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index c091817d606..8383e83f4f0 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2012		Marcos García			
  * Copyright (C) 2013		Florian Henry			
  * Copyright (C) 2014       Ferran Marcet			
+ * Copyright (C) 2015           Jean-François Ferry		
  *
  * 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
@@ -144,7 +145,7 @@ if (empty($reshook))
 	// Reopen a closed order
 	else if ($action == 'reopen' && $user->rights->commande->creer)
 	{
-		if ($object->statut == 3)
+		if ($object->statut == STATUS_CANCELED || $object->statut == Commande::STATUS_CLOSED)
 		{
 			$result = $object->set_reopen($user);
 			if ($result > 0)
@@ -1117,7 +1118,7 @@ if (empty($reshook))
 		if (! $error)
 		{
 			// Actions on extra fields (by external module or standard code)
-			// FIXME le hook fait double emploi avec le trigger !!
+			// TODO le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('orderdao'));
 			$parameters = array('id' => $object->id);
 			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
@@ -1214,7 +1215,7 @@ $formorder = new FormOrder($db);
  */
 if ($action == 'create' && $user->rights->commande->creer)
 {
-	print_fiche_titre($langs->trans('CreateOrder'));
+	print_fiche_titre($langs->trans('CreateOrder'),'','title_commercial.png');
 
 	$soc = new Societe($db);
 	if ($socid > 0)
@@ -1269,7 +1270,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 : '');
 
@@ -1290,7 +1291,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();
@@ -1358,7 +1359,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 	}
 	// Date
 	print '
' . $langs->trans('Date') . '';
-	$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 '
';
-		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))
 		{
@@ -482,7 +484,7 @@ if ($resql)
 
 		// Delivery date
 		print '';
-		print dol_print_date($db->jdate($objp->date_livraison), 'day');
+		print dol_print_date($db->jdate($objp->date_delivery), 'day');
 		print '

diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 20ef8bcc3cc..ce2bbc5381e 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -78,6 +78,16 @@ if ($negpage)
 
 $object = new Account($db);
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$paiementtype="";
+	$req_nb="";
+	$thirdparty="";
+	$req_desc="";
+    $req_debit="";
+	$req_credit="";
+}
+
 /*
  * Action
  */
@@ -393,7 +403,7 @@ if ($id > 0 || ! empty($ref))
 		print '';
 		if ($nbcategories)
 		{
-			print '
'.$langs->trans("Category").': ';
+			print '
'.$langs->trans("Rubrique").': ';
 		}
 		print '';
 		print '';
@@ -446,7 +456,10 @@ if ($id > 0 || ! empty($ref))
 	print '';
 	print '';
 	print '';
-	print '';
+	print '';
 	print "\n";
 
 
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 5c9d5bdd934..f22ce342bf0 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville 
  * Copyright (C) 2004-2010 Laurent Destailleur  
  * Copyright (C) 2005-2009 Regis Houssin        
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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 @@ $companystatic=new Societe($db);
 llxHeader();
 
 // List movements bu category for bank transactions
-print_fiche_titre($langs->trans("BankTransactionByCategories"));
+print_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'title_bank.png');
 
 print '
 ';
+	print '';
+	print '';
+	print '
';
 print "";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index c84e7f47482..64d282782e8 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -1,9 +1,10 @@
 
- * Copyright (C) 2003		Jean-Louis Bergamo		
- * Copyright (C) 2004-2012	Laurent Destailleur		
- * Copyright (C) 2005-2009	Regis Houssin			
- * Copyright (C) 2014-2015	Alexandre Spangaro		
+ * Copyright (C) 2003		Jean-Louis Bergamo	
+ * Copyright (C) 2004-2012	Laurent Destailleur	
+ * Copyright (C) 2005-2009	Regis Houssin		
+ * Copyright (C) 2014-2015	Alexandre Spangaro	
+ * Copyright (C) 2015           Jean-François Ferry	
  *
  * 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
@@ -242,7 +243,7 @@ if ($action == 'create')
 {
 	$account=new Account($db);
 
-	print_fiche_titre($langs->trans("NewFinancialAccount"));
+	print_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png');
 
     if ($conf->use_javascript_ajax)
     {
@@ -772,7 +773,7 @@ else
         $account = new Account($db);
         $account->fetch(GETPOST('id','int'));
 
-        print_fiche_titre($langs->trans("EditFinancialAccount"));
+        print_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png');
 
         if ($conf->use_javascript_ajax)
         {
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 1b734df5028..b854503f084 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -2,7 +2,8 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville 
  * Copyright (C) 2004-2013 Laurent Destailleur  
  * Copyright (C) 2005-2009 Regis Houssin        
- * Copyright (C) 2013      Charles-Fr BENKE		
+ * Copyright (C) 2013      Charles-Fr BENKE     
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -107,7 +108,7 @@ if ($action == 'delete')
 llxHeader();
 
 
-print_fiche_titre($langs->trans("Rubriques"));
+print_fiche_titre($langs->trans("Rubriques"), '', 'title_bank.png');
 
 print '';
 print '';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 900a970d949..b6215165d35 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -781,8 +781,8 @@ class Account extends CommonObject
         		$result=$this->deleteExtraFields();
         		if ($result < 0)
         		{
-        			return -1;
         			dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+        			return -1;
         		}
         	}
 
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 9c9f0574c31..ac175b5b7d7 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville 
  * Copyright (C) 2004-2014 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -50,7 +51,7 @@ llxHeader('',$langs->trans('AccountsArea'),$help_url);
 $link='';
 if ($statut == '') $link=''.$langs->trans("IncludeClosedAccount").'';
 if ($statut == 'all') $link=''.$langs->trans("OnlyOpenedAccount").'';
-print_fiche_titre($langs->trans("AccountsArea"),$link);
+print_fiche_titre($langs->trans("AccountsArea"),$link, 'title_bank.png');
 
 
 // On charge tableau des comptes financiers (ouverts par defaut)
@@ -111,8 +112,12 @@ foreach ($accounts as $key=>$type)
 		if ($acc->rappro)
 		{
 			$result=$acc->load_board($user,$acc->id);
-			print $acc->nbtodo;
-			if ($acc->nbtodolate) print ' ('.$acc->nbtodolate.img_warning($langs->trans("Late")).')';
+            if ($result<0) {
+                setEventMessage($acc->error, 'errors');
+            } else {
+                print $result->nbtodo;
+                if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')';
+            }
 		}
 		else print $langs->trans("FeatureDisabled");
 		print '';
@@ -129,7 +134,7 @@ if (! $found) print '';
+	print '';
 }
 
 print '
'.$langs->trans("None").'
 // Total
 foreach ($total as $key=>$solde)
 {
-	print '
'.$langs->trans("Total ").$key.''.price($solde, 0, $langs, 0, 0, -1, $key).'
'.$langs->trans("Total").' '.$key.''.price($solde, 0, $langs, 0, 0, -1, $key).'
';
@@ -182,7 +187,7 @@ if (! $found)
 // Total
 foreach ($total as $key=>$solde)
 {
-	print '
'.$langs->trans("Total ").$key.''.price($solde, 0, $langs, 0, 0, -1, $key).'
'.$langs->trans("Total").' '.$key.''.price($solde, 0, $langs, 0, 0, -1, $key).'
';
@@ -223,8 +228,12 @@ foreach ($accounts as $key=>$type)
 		if ($acc->rappro)
 		{
 			$result=$acc->load_board($user,$acc->id);
-			print $acc->nbtodo;
-			if ($acc->nbtodolate) print ' ('.$acc->nbtodolate.img_warning($langs->trans("Late")).')';
+            if ($result<0) {
+                setEventMessage($acc->error, 'errors');
+            } else {
+                print $result->nbtodo;
+                if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')';
+            }
 		}
 		else print $langs->trans("FeatureDisabled");
 		print '
'.$langs->trans("Total ").$key.''.price($solde, 0, $langs, 0, 0, -1, $key).'
'.$langs->trans("Total").' '.$key.''.price($solde, 0, $langs, 0, 0, -1, $key).'
";
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 69fa076c584..8bba13039a9 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004      Christophe Combelles 
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2015      Alexandre Spangaro	
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +36,7 @@ $langs->load("compta");
 $langs->load("bills");
 if (! empty($conf->adherent->enabled)) $langs->load("members");
 if (! empty($conf->don->enabled)) $langs->load("donations");
+if (! empty($conf->loan->enabled)) $langs->load("loan");
 
 
 $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int'));
@@ -347,6 +349,18 @@ if ($result)
                     print $langs->trans("SalaryPayment");
                     print '';
                 }
+                else if ($links[$key]['type']=='payment_loan') {
+                    print '';
+                    print img_object($langs->trans('ShowLoanPayment'),'payment').' ';
+                    print $langs->trans("PaymentLoan");
+                    print '';
+                }
+                else if ($links[$key]['type']=='loan') {
+                    print '';
+                    print img_object($langs->trans('ShowLoan'),'bill').' ';
+                    print $langs->trans("Loan");
+                    print '';
+                }
                 else if ($links[$key]['type']=='member') {
                     print '';
                     print img_object($langs->trans('ShowMember'),'user').' ';
@@ -538,7 +552,7 @@ if ($result)
         if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
         {
             print '
'."\n";
-            print_fiche_titre($langs->trans("Reconciliation"),'','');
+            print_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png');
             print '';
             print '';
             print '';
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 9339ff202ec..bfbdf1a8f94 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville 
  * Copyright (C) 2004-2013 Laurent Destailleur  
  * Copyright (C) 2010	   Juanjo Menent	    
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -180,7 +181,7 @@ if ($resql)
     $var=True;
     $num = $db->num_rows($resql);
 
-    print_fiche_titre($langs->trans("Reconciliation").': '.$acct->label.'');
+    print_fiche_titre($langs->trans("Reconciliation").': '.$acct->label.'','title_bank.png');
     print '
';
 
     // Show last bank receipts
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 6f207b198cf..1b5549b2c4e 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville 
  * Copyright (C) 2004-2013 Laurent Destailleur  
  * Copyright (C) 2005-2013 Regis Houssin        
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -268,7 +269,7 @@ else
 	$mesprevnext ="id\">".img_previous()."  ";
 	$mesprevnext.= $langs->trans("AccountStatement")." $num";
 	$mesprevnext.="   id\">".img_next()."";
-	print_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$acct->getNomUrl(0),$mesprevnext);
+	print_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$acct->getNomUrl(0),$mesprevnext, 'title_bank.png');
 	print '
';
 
 	print "";
@@ -379,7 +380,7 @@ else
 				elseif ($links[$key]['type']=='payment_supplier')
 				{
 					$paymentsupplierstatic->id=$links[$key]['url_id'];
-					$paymentsupplierstatic->ref=$langs->trans("Payment");;
+					$paymentsupplierstatic->ref=$langs->trans("Payment");
 					print ' '.$paymentsupplierstatic->getNomUrl(1);
 					$newline=0;
 				}
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index a1e114430ce..63afe63c03c 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2010  Regis Houssin        
  * Copyright (C) 2012       Vinícius Nogueira    
  * Copyright (C) 2014       Florian Henry    	 
+ * Copyright (C) 2015       Jean-François Ferry	
  *
  * 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
@@ -168,19 +169,20 @@ if ($resql)
 	if (GETPOST("bid"))
 	{
 		$result=$bankcateg->fetch(GETPOST("bid"));
-		print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
+		print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num,'', 'title_bank.png');
 	}
 	else
 	{
-		print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
+		print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', 'title_bank.png');
 	}
 
 	print ''."\n";
 	print ''."\n";
 
-	$moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('StartDate') . ': ';
-	$moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 1, 1);
-	$moreforfilter .= $langs->trans('EndDate') . ':' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 1, 1);
+	$moreforfilter .= $langs->trans('Period') . ' ('.$langs->trans('DateOperationShort').') : ' . $langs->trans('StartDate') . ' ';
+	$moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 1);
+	$moreforfilter .= ' - ';
+	$moreforfilter .= $langs->trans('EndDate') . ' ' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1);
 
 
 	if ($moreforfilter) {
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 91c41aa5e3c..292742315bb 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -329,8 +329,8 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	// Solde actuel
 	$var=!$var;
 	print '
'.$langs->trans("FutureBalance").''.price($solde).''.$langs->trans("FutureBalance").' ('.$acct->currency_code.')'.price($solde, 0, $langs, 0, 0, -1, $acct->currency_code).'
";
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index 5583edbe357..ea229880c7c 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  
  * Copyright (C) 2005-2009 Regis Houssin        
  * Copyright (C) 2012	   Juanjo Menent        
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -79,7 +80,7 @@ if ($action == 'add')
 		$accountto=new Account($db);
 		$accountto->fetch(GETPOST('account_to','int'));
 
-		if ($accountto->id != $accountfrom->id)
+		if (($accountto->id != $accountfrom->id) && ($accountto->currency_code == $accountfrom->currency_code))
 		{
 			$db->begin();
 
@@ -150,7 +151,7 @@ if($error)
 	$amount = GETPOST('amount','int');
 }
 
-print_fiche_titre($langs->trans("BankTransfer"));
+print_fiche_titre($langs->trans("BankTransfer"), '', 'title_bank.png');
 
 print $langs->trans("TransferDesc");
 print "

";
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index eb10fce7768..519c24792f9 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2010 Regis Houssin        
  * Copyright (C) 2011-2014 Alexandre Spangaro   
  * Copyright (C) 2011-2014 Juanjo Menent	    
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -74,7 +75,7 @@ if (GETPOST("mode") == 'sconly') $param='&mode=sconly';
 if ($sortfield) $param.='&sortfield='.$sortfield;
 if ($sortorder) $param.='&sortorder='.$sortorder;
 
-print_fiche_titre($title, ($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":""));
+print_fiche_titre($title, ($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":""), 'title_accountancy.png');
 
 if ($year) $param.='&year='.$year;
 
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index e8f3bde2fd9..3cf9456fbe7 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -5,13 +5,15 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo 
  * Copyright (C) 2005-2012 Regis Houssin         
  * Copyright (C) 2006      Andre Cianfarani      
- * Copyright (C) 2010-2013 Juanjo Menent         
+ * Copyright (C) 2010-2015 Juanjo Menent         
  * Copyright (C) 2012-2013 Christophe Battarel   
  * Copyright (C) 2012-2013 Cédric Salvador       
  * Copyright (C) 2012-2014 Raphaël Doursenaud    
  * Copyright (C) 2013      Jean-Francois FERRY   
  * Copyright (C) 2013-2014 Florian Henry         
- * Copyright (C) 2014	   Ferran Marcet		
+ * Copyright (C) 2013      Cédric Salvador       
+ * Copyright (C) 2014	   Ferran Marcet	 	 
+ * Copyright (C) 2015      Marcos García         
  *
  * 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
@@ -1077,7 +1079,11 @@ if (empty($reshook))
 											$array_options = $lines[$i]->array_options;
 										}
 
-										$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_options, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id);
+										// 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, $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_options, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id);
 
 										if ($result > 0) {
 											$lineid = $result;
@@ -1805,7 +1811,7 @@ if (empty($reshook))
 
 		if (! $error) {
 			// Actions on extra fields (by external module or standard code)
-			// FIXME le hook fait double emploi avec le trigger !!
+			// TODO le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('invoicedao'));
 			$parameters = array('id' => $object->id);
 			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
@@ -1960,12 +1966,12 @@ if ($action == 'create')
 		print $soc->getNomUrl(1);
 		print '';
 		// Outstanding Bill
-		$outstandigBills = $soc->get_OutstandingBill();
+		$outstandingBills = $soc->get_OutstandingBill();
 		print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
-		print price($outstandigBills, '', $langs, 0, 0, -1, $conf->currency);
+		print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
 		if ($soc->outstanding_limit != '')
 		{
-			if ($outstandigBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+			if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
 			print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
 		}
 		print ')';
@@ -2354,15 +2360,25 @@ if ($action == 'create')
 		print '';
 		print '';
 
-		$newclassname = $classname;
-		if ($newclassname == 'Propal')
-			$newclassname = 'CommercialProposal';
-		elseif ($newclassname == 'Commande')
-			$newclassname = 'Order';
-		elseif ($newclassname == 'Expedition')
-			$newclassname = 'Sending';
-		elseif ($newclassname == 'Fichinter')
-			$newclassname = 'Intervention';
+		switch ($classname) {
+			case 'Propal':
+				$newclassname = 'CommercialProposal';
+				break;
+			case 'Commande':
+				$newclassname = 'Order';
+				break;
+			case 'Expedition':
+				$newclassname = 'Sending';
+				break;
+			case 'Contrat':
+				$newclassname = 'Contract';
+				break;
+			case 'Fichinter':
+				$newclassname = 'Intervention';
+				break;
+			default:
+				$newclassname = $classname;
+		}
 
 		print '' . $langs->trans($newclassname) . '' . $objectsrc->getNomUrl(1);
 		//We check if Origin document has already an invoice attached to it
@@ -2816,11 +2832,11 @@ if ($action == 'create')
 		print '   ';
 		print '(' . $langs->trans('OtherBills') . '';
 		// Outstanding Bill
-		$outstandigBills = $soc->get_OutstandingBill();
+		$outstandingBills = $soc->get_OutstandingBill();
 		print ' - ' . $langs->trans('CurrentOutstandingBill') . ': ';
-		print price($outstandigBills, '', $langs, 0, 0, - 1, $conf->currency);
+		print price($outstandingBills, '', $langs, 0, 0, - 1, $conf->currency);
 		if ($soc->outstanding_limit != '') {
-			if ($outstandigBills > $soc->outstanding_limit)
+			if ($outstandingBills > $soc->outstanding_limit)
 				print img_warning($langs->trans("OutstandingBillReached"));
 			print ' / ' . price($soc->outstanding_limit);
 		}
@@ -3717,6 +3733,10 @@ if ($action == 'create')
 	}
 	print '
';
 
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 	if ($action != 'prerelance' && $action != 'presend')
 	{
 		print '
';
@@ -3937,6 +3957,7 @@ if ($action == 'create')
 		// Tableau des parametres complementaires du post
 		$formmail->param['action'] = $action;
 		$formmail->param['models'] = $modelmail;
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
 		$formmail->param['facid'] = $object->id;
 		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
 
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index bc1933f9959..58d4e46f8dd 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -65,7 +65,7 @@ $textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
 llxHeader('',$langs->trans("BillsSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 print '
';
 
 $head = invoice_admin_prepare_head();
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index 67efab746bf..e69060aa3cf 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -66,7 +66,7 @@ $textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
 llxHeader('',$langs->trans("BillsSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 print '
';
 
 $head = invoice_admin_prepare_head();
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index 8f03e33bb03..340df8172dc 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -147,16 +147,16 @@ if ($id > 0 || ! empty($ref))
         if ($absolute_discount > 0)
         {
             print '. ';
-            if ($object->statut > 0 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
+            if ($object->statut > Facture::STATUS_DRAFT || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
             {
-                if ($object->statut == 0)
+                if ($object->statut == Facture::STATUS_DRAFT)
                 {
                     print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
                     print '. ';
                 }
                 else
                 {
-                    if ($object->statut < 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
+                    if ($object->statut < Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
                     {
                         $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
                         print '
'.$text.'.
';
@@ -181,7 +181,7 @@ if ($id > 0 || ! empty($ref))
         {
             if ($absolute_creditnote > 0)    // If not linked will be added later
             {
-                if ($object->statut == 0 && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'
';
+                if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'
';
                 else print '.';
             }
             else print '. ';
@@ -189,9 +189,9 @@ if ($id > 0 || ! empty($ref))
         if ($absolute_creditnote > 0)
         {
             // If validated, we show link "add credit note to payment"
-            if ($object->statut != 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
+            if ($object->statut != Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
             {
-                if ($object->statut == 0 && $object->type != Facture::TYPE_DEPOSIT)
+                if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_DEPOSIT)
                 {
                     $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency));
                     print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
@@ -212,7 +212,7 @@ if ($id > 0 || ! empty($ref))
         if (! $absolute_discount && ! $absolute_creditnote)
         {
             print $langs->trans("CompanyHasNoAbsoluteDiscount");
-            if ($object->statut == 0 && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'
';
+            if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'
';
             else print '. ';
         }
         /*if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c87ddb8abfc..d0067be2b01 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2009-2012	Regis Houssin			
  * Copyright (C) 2010-2011	Juanjo Menent			
  * Copyright (C) 2013       Florian Henry		  	
+ * Copyright (C) 2015       Marcos García           
  *
  * 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
@@ -260,7 +261,7 @@ class FactureRec extends Facture
 				$this->rang					  = $obj->rang;
 				$this->special_code			  = $obj->special_code;
 
-				if ($this->statut == 0)	$this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
 
 				/*
 				 * Lines
@@ -593,5 +594,21 @@ class FactureRec extends Facture
 
 		$this->usenewprice = 1;
 	}
-		
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'facture_rec'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 9cacb6389ac..83210476a13 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -95,10 +95,15 @@ class Facture extends CommonInvoice
 	var $note;
 	var $note_private;
 	var $note_public;
-	//! 0=draft,
-	//! 1=validated (need to be paid),
-	//! 2=classified paid partially (close_code='discount_vat','badcustomer') or completely (close_code=null),
-	//! 3=classified abandoned and no payment done (close_code='badcustomer','abandon' or 'replaced')
+
+	/**
+	 * Check constants for more info:
+	 * - STATUS_DRAFT
+	 * - STATUS_VALIDATED
+	 * - STATUS_PAID
+	 * - STATUS_ABANDONED
+	 * @var int
+	 */
 	var $statut;
 	//! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon
 	//! Fermeture alors que aucun paiement: replaced (si remplace), abandon
@@ -131,7 +136,7 @@ class Facture extends CommonInvoice
 	var $specimen;
 
 	var $fac_rec;
-	
+
 	//Incoterms
 	var $fk_incoterms;
 	var $location_incoterms;
@@ -182,6 +187,39 @@ class Facture extends CommonInvoice
 	 */
 	const TYPE_SITUATION = 5;
 
+	/**
+	 * Draft
+	 */
+	const STATUS_DRAFT = 0;
+
+	/**
+	 * Validated (need to be paid)
+	 */
+	const STATUS_VALIDATED = 1;
+
+	/**
+	 * Classified paid.
+	 * If paid partially, $this->close_code can be:
+	 * - CLOSECODE_DISCOUNTVAT
+	 * - CLOSECODE_BADDEBT
+	 * If paid completelly, this->close_code will be null
+	 */
+	const STATUS_CLOSED = 2;
+
+	/**
+	 * Classified abandoned and no payment done.
+	 * $this->close_code can be:
+	 * - CLOSECODE_BADDEBT
+	 * - CLOSECODE_ABANDONED
+	 * - CLOSECODE_REPLACED
+	 */
+	const STATUS_ABANDONED = 3;
+
+	const CLOSECODE_DISCOUNTVAT = 'discount_vat';
+	const CLOSECODE_BADDEBT = 'badcustomer';
+	const CLOSECODE_ABANDONED = 'abandon';
+	const CLOSECODE_REPLACED = 'replaced';
+
 	/**
 	 * 	Constructor
 	 *
@@ -521,7 +559,7 @@ class Facture extends CommonInvoice
 					$action='create';
 
 					// Actions on extra fields (by external module or standard code)
-					// FIXME le hook fait double emploi avec le trigger !!
+					// TODO le hook fait double emploi avec le trigger !!
 					$hookmanager->initHooks(array('invoicedao'));
 					$parameters=array('invoiceid'=>$this->id);
 					$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
@@ -680,7 +718,7 @@ class Facture extends CommonInvoice
 		}
 
 		$this->id=0;
-		$this->statut=0;
+		$this->statut= self::STATUS_DRAFT;
 
 		// Clear fields
 		$this->date               = dol_now();	// Date of invoice is set to current date when cloning. // TODO Best is to ask date into confirm box
@@ -1002,10 +1040,10 @@ class Facture extends CommonInvoice
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
-				$this->location_incoterms = $obj->location_incoterms;									
+				$this->location_incoterms = $obj->location_incoterms;
 				$this->libelle_incoterms = $obj->libelle_incoterms;
-				
-				if ($this->statut == 0)	$this->brouillon = 1;
+
+				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
 
 				// Retreive all extrafield for invoice
 				// fetch optionals attributes and labels
@@ -1542,7 +1580,7 @@ class Facture extends CommonInvoice
 
 			dol_syslog(get_class($this)."::set_paid rowid=".$this->id, LOG_DEBUG);
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
-			$sql.= ' fk_statut=2';
+			$sql.= ' fk_statut='.self::STATUS_CLOSED;
 			if (! $close_code) $sql.= ', paye=1';
 			if ($close_code) $sql.= ", close_code='".$this->db->escape($close_code)."'";
 			if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'";
@@ -1597,7 +1635,7 @@ class Facture extends CommonInvoice
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-		$sql.= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
+		$sql.= ' SET paye=0, fk_statut='.self::STATUS_VALIDATED.', close_code=null, close_note=null';
 		$sql.= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this)."::set_unpaid", LOG_DEBUG);
@@ -1650,7 +1688,7 @@ class Facture extends CommonInvoice
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
-		$sql.= ' fk_statut=3';
+		$sql.= ' fk_statut='.self::STATUS_ABANDONED;
 		if ($close_code) $sql.= ", close_code='".$this->db->escape($close_code)."'";
 		if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'";
 		$sql.= ' WHERE rowid = '.$this->id;
@@ -1801,7 +1839,7 @@ class Facture extends CommonInvoice
 
 			// Validate
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-			$sql.= " SET facnumber='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
+			$sql.= " SET facnumber='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
 			if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
 			{
 				$sql.= ", datef='".$this->db->idate($this->date)."'";
@@ -1902,7 +1940,7 @@ class Facture extends CommonInvoice
 			{
 				$this->ref = $num;
 				$this->facnumber=$num;
-				$this->statut=1;
+				$this->statut= self::STATUS_VALIDATED;
 				$this->brouillon=0;
 				$this->date_validation=$now;
 				$i = 0;
@@ -1946,7 +1984,7 @@ class Facture extends CommonInvoice
 
 		$error=0;
 
-		if ($this->statut == 0)
+		if ($this->statut == self::STATUS_DRAFT)
 		{
 			dol_syslog(get_class($this)."::set_draft already draft status", LOG_WARNING);
 			return 0;
@@ -1955,7 +1993,7 @@ class Facture extends CommonInvoice
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-		$sql.= " SET fk_statut = 0";
+		$sql.= " SET fk_statut = ".self::STATUS_DRAFT;
 		$sql.= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
@@ -1986,7 +2024,7 @@ class Facture extends CommonInvoice
 			{
 				$old_statut=$this->statut;
 				$this->brouillon = 1;
-				$this->statut = 0;
+				$this->statut = self::STATUS_DRAFT;
 	            // Call trigger
 	            $result=$this->call_trigger('BILL_UNVALIDATE',$user);
 	            if ($result < 0)
@@ -2478,7 +2516,7 @@ class Facture extends CommonInvoice
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 			$sql.= ' SET remise_percent = '.$remise;
 			$sql.= ' WHERE rowid = '.$this->id;
-			$sql.= ' AND fk_statut = 0';
+			$sql.= ' AND fk_statut = '.self::STATUS_DRAFT;
 
 			if ($this->db->query($sql))
 			{
@@ -2513,7 +2551,7 @@ class Facture extends CommonInvoice
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 			$sql.= ' SET remise_absolue = '.$remise;
 			$sql.= ' WHERE rowid = '.$this->id;
-			$sql.= ' AND fk_statut = 0';
+			$sql.= ' AND fk_statut = '.self::STATUS_DRAFT;
 
 			dol_syslog(get_class($this)."::set_remise_absolue", LOG_DEBUG);
 
@@ -2813,7 +2851,7 @@ class Facture extends CommonInvoice
 				return $last;
 			}
 		}
-		else if ($this->statut == 0 && $facref == 'PROV') // Si facture brouillon et provisoire
+		else if ($this->statut == self::STATUS_DRAFT && $facref == 'PROV') // Si facture brouillon et provisoire
 		{
 			return 1;
 		}
@@ -2853,7 +2891,7 @@ class Facture extends CommonInvoice
 			$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 		}
 		if ($socid) $sql.= " AND s.rowid = ".$socid;
-		if ($draft) $sql.= " AND f.fk_statut = 0";
+		if ($draft) $sql.= " AND f.fk_statut = ".self::STATUS_DRAFT;
 		if (is_object($excluser)) $sql.= " AND f.fk_user_author <> ".$excluser->id;
 		$sql.= $this->db->order($sortfield,$sortorder);
 		$sql.= $this->db->plimit($limit,$offset);
@@ -2914,7 +2952,7 @@ class Facture extends CommonInvoice
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as ff ON f.rowid = ff.fk_facture_source";
-		$sql.= " WHERE (f.fk_statut = 1 OR (f.fk_statut = 3 AND f.close_code = 'abandon'))";
+		$sql.= " WHERE (f.fk_statut = ".self::STATUS_VALIDATED." OR (f.fk_statut = ".self::STATUS_ABANDONED." AND f.close_code = '".self::CLOSECODE_ABANDONED."'))";
 		$sql.= " AND f.entity = ".$conf->entity;
 		$sql.= " AND f.paye = 0";					// Pas classee payee completement
 		$sql.= " AND pf.fk_paiement IS NULL";		// Aucun paiement deja fait
@@ -2962,7 +3000,7 @@ class Facture extends CommonInvoice
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as ff ON (f.rowid = ff.fk_facture_source AND ff.type=".self::TYPE_REPLACEMENT.")";
 		$sql.= " WHERE f.entity = ".$conf->entity;
-		$sql.= " AND f.fk_statut in (1,2)";
+		$sql.= " AND f.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
 		//  $sql.= " WHERE f.fk_statut >= 1";
 		//	$sql.= " AND (f.paye = 1";				// Classee payee completement
 		//	$sql.= " OR f.close_code IS NOT NULL)";	// Classee payee partiellement
@@ -2978,8 +3016,8 @@ class Facture extends CommonInvoice
 			while ($obj=$this->db->fetch_object($resql))
 			{
 				$qualified=0;
-				if ($obj->fk_statut == 1) $qualified=1;
-				if ($obj->fk_statut == 2) $qualified=1;
+				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified=1;
+				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified=1;
 				if ($qualified)
 				{
 					//$ref=$obj->facnumber;
@@ -3010,7 +3048,7 @@ class Facture extends CommonInvoice
 
 		dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 
-		if ($this->statut > 0 && $this->paye == 0)
+		if ($this->statut > self::STATUS_DRAFT && $this->paye == 0)
 		{
 	        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
 	        $bac = new CompanyBankAccount($this->db);
@@ -3143,7 +3181,7 @@ class Facture extends CommonInvoice
 		}
 		$sql.= $clause." f.paye=0";
 		$sql.= " AND f.entity = ".$conf->entity;
-		$sql.= " AND f.fk_statut = 1";
+		$sql.= " AND f.fk_statut = ".self::STATUS_VALIDATED;
 		if ($user->societe_id) $sql.= " AND f.fk_soc = ".$user->societe_id;
 
 		$resql=$this->db->query($sql);
@@ -3569,7 +3607,7 @@ class Facture extends CommonInvoice
 			$this->db->commit();
 			return 1;
 		} else {
-			$this->error = $this->db->error();
+			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this) . "::update Error setFinal " . $sql, LOG_ERR);
 			$this->db->rollback();
 			return -1;
@@ -3592,12 +3630,29 @@ class Facture extends CommonInvoice
 			$last = $res['max(situation_counter)'];
 			return ($last == $this->situation_counter);
 		} else {
-			$this->error = $this->db->error();
+			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this) . "::select Error " . $this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'facture'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 /**
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 1fd4d2c80fc..381148865b6 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -2,8 +2,9 @@
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville 
  * Copyright (C) 2004-2014 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
- * Copyright (C) 2013      Florian Henry		
- * Copyright (C) 2013      Juanjo Menent		
+ * Copyright (C) 2013      Florian Henry	
+ * Copyright (C) 2013      Juanjo Menent	
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -115,7 +116,7 @@ $companystatic = new Societe($db);
  */
 if ($action == 'create')
 {
-	print_fiche_titre($langs->trans("CreateRepeatableInvoice"));
+	print_fiche_titre($langs->trans("CreateRepeatableInvoice"),'','title_accountancy.png');
 
 	$object = new Facture($db);   // Source invoice
 	$product_static = new Product($db);
@@ -523,12 +524,12 @@ else
 			 */
 			print '
';
 
-			if ($object->statut == 0 && $user->rights->facture->creer)
+			if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->creer)
 			{
 			    	echo '
'.$langs->trans("CreateBill").'
';
 			}
 
-			if ($object->statut == 0 && $user->rights->facture->supprimer)
+			if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
 			{
 				print '
'.$langs->trans('Delete').'
';
 			}
@@ -558,7 +559,7 @@ else
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],"&socid=$socid",$sortfield,$sortorder,'',$num);
+			print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],"&socid=$socid",$sortfield,$sortorder,'',$num,'','title_accountancy.png');
 
 			print $langs->trans("ToCreateAPredefinedInvoice").'

';
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index dc081424ace..e888941e95e 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2012      Christophe Battarel   
  * Copyright (C) 2013      Florian Henry		  	
  * Copyright (C) 2013      Cédric Salvador       
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -265,7 +266,7 @@ if ($resql)
     if ($search_user > 0)    $param.='&search_user=' .$search_user;
     if ($search_montant_ht != '')  $param.='&search_montant_ht='.$search_montant_ht;
     if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc;
-    print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+    print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png');
 
     $i = 0;
     print ''."\n";
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/mergepdftool.php
similarity index 88%
rename from htdocs/compta/facture/impayees.php
rename to htdocs/compta/facture/mergepdftool.php
index ea945940492..3f3315fda04 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/mergepdftool.php
@@ -1,7 +1,7 @@
 
  * Copyright (C) 2004      Eric Seigne          
- * Copyright (C) 2004-2014 Laurent Destailleur  
+ * Copyright (C) 2004-2015 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2012      Cédric Salvador      
  * Copyright (C) 2014      Raphaël Doursenaud   
@@ -24,17 +24,19 @@
  */
 
 /**
- *		\file       htdocs/compta/facture/impayees.php
+ *		\file       htdocs/compta/facture/mergepdftool.php
  *		\ingroup    facture
- *		\brief      Page to list and build liste of unpaid invoices
+ *		\brief      Page to list and build doc of selected invoices
  */
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $langs->load("mails");
 $langs->load("bills");
@@ -44,6 +46,18 @@ $action = GETPOST('action','alpha');
 $option = GETPOST('option');
 $mode=GETPOST('mode');
 $builddoc_generatebutton=GETPOST('builddoc_generatebutton');
+$month = GETPOST("month","int");
+$year = GETPOST("year","int");
+$filter = GETPOST("filtre");
+if (GETPOST('button_search'))
+{
+	$filter=GETPOST('filtre',2);
+	if ($filter != 'payed:0') $option='';
+}
+if ($option == 'late') $filter = 'paye:0';
+if ($option == 'unpaidall') $filter = 'paye:0';
+if ($mode == 'sendremind' && $filter == '') $filter = 'paye:0';
+if ($filter == '') $filter = 'paye:0';
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
@@ -54,6 +68,20 @@ if (! $user->rights->societe->client->voir || $socid) $diroutputpdf.='/private/'
 
 $resultmasssend='';
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))		// Both test must be present to be compatible with all browsers
+{
+	$search_ref="";
+	$search_ref_supplier="";
+	$search_label="";
+	$search_company="";
+	$search_amount_no_tax="";
+	$search_amount_all_tax="";
+	$year="";
+	$month="";
+	$filter="";
+}
+
+
 
 /*
  * Action
@@ -95,7 +123,7 @@ if ($action == 'presend' && GETPOST('sendmail'))
 
 			if ($result > 0)	// Invoice was found
 			{
-				if ($object->statut != 1)
+				if ($object->statut != Facture::STATUS_VALIDATED)
 				{
 					continue; // Payment done or started or canceled
 				}
@@ -297,8 +325,14 @@ if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_s
 		dol_mkdir($diroutputpdf);
 
 		// Save merged file
-		$filename=strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
-		if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+		$filename=strtolower(dol_sanitizeFileName($langs->transnoentities("Invoices")));
+		if ($filter=='paye:0')
+		{
+			if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+			else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+		}
+		if ($year) $filename.='_'.$year;
+		if ($month) $filename.='_'.$month;
 		if ($pagecount)
 		{
 			$now=dol_now();
@@ -306,6 +340,9 @@ if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_s
 			$pdf->Output($file,'F');
 			if (! empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+			$langs->load("exports");
+			setEventMessage($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')));
 		}
 		else
 		{
@@ -340,9 +377,9 @@ if ($action == 'remove_file')
 
 $form = new Form($db);
 $formfile = new FormFile($db);
+$formother = new FormOther($db);
 
-$title=$langs->trans("BillsCustomersUnpaid");
-if ($option=='late') $title=$langs->trans("BillsCustomersUnpaid");
+$title=$langs->trans("MergingPDFTool");
 
 llxHeader('',$title);
 
@@ -410,14 +447,15 @@ $sql.= ",".MAIN_DB_PREFIX."facture as f";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= " AND f.entity = ".$conf->entity;
-$sql.= " AND f.type IN (0,1,3,5) AND f.fk_statut = 1";
-$sql.= " AND f.paye = 0";
+$sql.= " AND f.type IN (0,1,3,5)";
+if ($filter == 'paye:0') $sql.= " AND f.fk_statut = 1";
+//$sql.= " AND f.paye = 0";
 if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if (! empty($socid)) $sql .= " AND s.rowid = ".$socid;
-if (GETPOST('filtre'))
+if ($filter && $filter != -1)		// GETPOST('filtre') may be a string
 {
-	$filtrearr = explode(",", GETPOST('filtre'));
+	$filtrearr = explode(",", $filter);
 	foreach ($filtrearr as $fil)
 	{
 		$filt = explode(":", $fil);
@@ -427,10 +465,21 @@ if (GETPOST('filtre'))
 if ($search_ref)         $sql .= " AND f.facnumber LIKE '%".$db->escape($search_ref)."%'";
 if ($search_refcustomer) $sql .= " AND f.ref_client LIKE '%".$db->escape($search_refcustomer)."%'";
 if ($search_societe)     $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'";
-if ($search_paymentmode)     $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
+if ($search_paymentmode) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
 if ($search_montant_ht)  $sql .= " AND f.total = '".$db->escape($search_montant_ht)."'";
 if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$db->escape($search_montant_ttc)."'";
 if (GETPOST('sf_ref'))   $sql .= " AND f.facnumber LIKE '%".$db->escape(GETPOST('sf_ref'))."%'";
+if ($month > 0)
+{
+	if ($year > 0)
+	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
+	else
+	$sql.= " AND date_format(f.datef, '%m') = '$month'";
+}
+else if ($year > 0)
+{
+	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+}
 $sql.= " GROUP BY s.nom, s.rowid, s.email, f.rowid, f.facnumber, f.ref_client, f.increment, f.total, f.tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp,";
 $sql.= " f.datef, f.date_lim_reglement, f.paye, f.fk_statut, f.type, fk_mode_reglement";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
@@ -438,7 +487,7 @@ $sql.= " ORDER BY ";
 $listfield=explode(',',$sortfield);
 foreach ($listfield as $key => $value) $sql.=$listfield[$key]." ".$sortorder.",";
 $sql.= " f.facnumber DESC";
-
+//print $sql;
 //$sql .= $db->plimit($limit+1,$offset);
 
 $resql = $db->query($sql);
@@ -454,30 +503,36 @@ if ($resql)
 
 	$param="";
 	$param.=(! empty($socid)?"&socid=".$socid:"");
-	$param.=(! empty($option)?"&option=".$option:"");
 	if ($search_ref)         $param.='&search_ref='.urlencode($search_ref);
-    	if ($search_refcustomer) $param.='&search_ref='.urlencode($search_refcustomer);
+   	if ($search_refcustomer) $param.='&search_ref='.urlencode($search_refcustomer);
 	if ($search_societe)     $param.='&search_societe='.urlencode($search_societe);
 	if ($search_societe)     $param.='&search_paymentmode='.urlencode($search_paymentmode);
 	if ($search_montant_ht)  $param.='&search_montant_ht='.urlencode($search_montant_ht);
 	if ($search_montant_ttc) $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
 	if ($late)               $param.='&late='.urlencode($late);
-
+	if ($mode)               $param.='&mode='.urlencode($mode);
 	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	$urlsource.=str_replace('&','&',$param);
 
-	$titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->name):$langs->trans("BillsCustomersUnpaid"));
+	//$titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->name):$langs->trans("BillsCustomersUnpaid"));
+	$titre=(! empty($socid)?$langs->trans("BillsCustomersForCompany",$soc->name):$langs->trans("BillsCustomers"));
 	if ($option == 'late') $titre.=' ('.$langs->trans("Late").')';
-	else $titre.=' ('.$langs->trans("All").')';
+	//else $titre.=' ('.$langs->trans("All").')';
 
 	$link='';
-	if (empty($option)) $link=''.$langs->trans("ShowUnpaidLateOnly").'';
-	elseif ($option == 'late') $link=''.$langs->trans("ShowUnpaidAll").'';
+	if (empty($option) || $option == 'late') $link.=($link?' - ':'').''.$langs->trans("ShowUnpaidAll").'';
+	if (empty($option) || $option == 'unpaidall') $link.=($link?' - ':'').''.$langs->trans("ShowUnpaidLateOnly").'';
+
+	$param.=(! empty($option)?"&option=".$option:"");
+
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
 	print '';
 
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 	if (! empty($mode) && $action == 'presend')
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -520,6 +575,7 @@ if ($resql)
 		// Tableau des parametres complementaires du post
 		$formmail->param['action']=$action;
 		$formmail->param['models']=$modelmail;
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
 		$formmail->param['facid']=$object->id;
 		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 
@@ -574,7 +630,11 @@ if ($resql)
     print '';
     print '';
     print '';
-	print ' ';
+	print '';
+	print '';
+	$syear = $year;
+	$formother->select_year($syear?$syear:-1,'year',1, 20, 5);
+	print '';
 	print ' ';
 	print '';
 	print '';
@@ -586,21 +646,22 @@ if ($resql)
 	print ' ';
 	print ' ';
 	print '';
+	$liststatus=array('paye:0'=>$langs->trans("Unpaid"), 'paye:1'=>$langs->trans("Paid"));
+	print $form->selectarray('filtre', $liststatus, $filter, 1);
+	print '';
+	print '';
 	print '';
 	print '';
-	print '';
+	print '
';
 	if (empty($mode))
 	{
-		print '';
 		if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").'';
-		print '';
 	}
 	else
 	{
-		print '';
 		if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").'';
-		print '';
 	}
+	print '';
 	print "\n";
 
 	if ($num > 0)
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 1b4f440b461..9d8b9123b68 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -229,15 +229,15 @@ if ($object->id > 0)
 	print '. ';
 	if ($absolute_discount > 0)
 	{
-		if ($object->statut > 0 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
+		if ($object->statut > Facture::STATUS_DRAFT || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
 		{
-			if ($object->statut == 0)
+			if ($object->statut == Facture::STATUS_DRAFT)
 			{
 				print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)).'. ';
 			}
 			else
 			{
-				if ($object->statut < 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
+				if ($object->statut < Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
 				{
 					$text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
 					print '
'.$text.'.
';
@@ -261,9 +261,9 @@ if ($object->id > 0)
 	if ($absolute_creditnote > 0)
 	{
 		// If validated, we show link "add credit note to payment"
-		if ($object->statut != 1 || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_CREDIT_NOTE)
+		if ($object->statut != Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_CREDIT_NOTE)
 		{
-			if ($object->statut == 0 && $object->type != Facture::TYPE_DEPOSIT)
+			if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_DEPOSIT)
 			{
 				$text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency));
 				print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
@@ -350,7 +350,7 @@ if ($object->id > 0)
 		else
 		{
 			print dol_print_date($object->date_lim_reglement,'daytext');
-			if ($object->date_lim_reglement < ($now - $conf->facture->client->warning_delay) && ! $object->paye && $object->statut == 1 && ! isset($object->am)) print img_warning($langs->trans('Late'));
+			if ($object->date_lim_reglement < ($now - $conf->facture->client->warning_delay) && ! $object->paye && $object->statut == Facture::STATUS_VALIDATED && ! isset($object->am)) print img_warning($langs->trans('Late'));
 		}
 	}
 	else
@@ -473,7 +473,7 @@ if ($object->id > 0)
 	print "\n
\n";
 
 	// Add a withdraw request
-	if ($object->statut > 0 && $object->paye == 0 && $num == 0)
+	if ($object->statut > Facture::STATUS_DRAFT && $object->paye == 0 && $num == 0)
 	{
 		if ($user->rights->prelevement->bons->creer)
 		{
@@ -488,7 +488,7 @@ if ($object->id > 0)
 	{
 		if ($num == 0)
 		{
-			if ($object->statut > 0) print ''.$langs->trans("MakeWithdrawRequest").'';
+			if ($object->statut > Facture::STATUS_DRAFT) print ''.$langs->trans("MakeWithdrawRequest").'';
 			else print ''.$langs->trans("MakeWithdrawRequest").'';
 		}
 		else print ''.$langs->trans("MakeWithdrawRequest").'';
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 18aeaa722da..3dc2461de28 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -3,6 +3,7 @@
  * Copyright (c) 2004-2012 Laurent Destailleur  
  * Copyright (C) 2012      Marcos García        
  * Copyright (C) 2013      Juanjo Menent        
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -74,7 +75,7 @@ if ($mode == 'supplier')
 	$dir=$conf->fournisseur->dir_output.'/facture/temp';
 }
 
-print_fiche_titre($title, $mesg);
+print_fiche_titre($title, $mesg, 'title_accountancy.png');
 
 dol_mkdir($dir);
 
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 12f40f8ef97..eac0043e56f 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -30,8 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $langs->load("bills");
 echo '
';
-if ($num > 1) print_titre($langs->trans("RelatedBills"));
-else print_titre($langs->trans("RelatedBill"));
+print_titre($langs->trans("RelatedCustomerInvoices"));
 ?>
 
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 698676829d1..3d3a8ab2197 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -2,6 +2,8 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville 
  * Copyright (C) 2004-2013 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
+ * Copyright (C) 2015 	   Juanjo Menent	    
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -78,7 +80,7 @@ $thirdpartystatic = new Societe($db);
 
 llxHeader("",$langs->trans("AccountancyTreasuryArea"));
 
-print_fiche_titre($langs->trans("AccountancyTreasuryArea"));
+print_fiche_titre($langs->trans("AccountancyTreasuryArea"),'','title_accountancy.png');
 
 
 print '
';
@@ -321,7 +323,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql.= " AND f.entity = ".$conf->entity;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-	$sql.= " GROUP BY f.rowid, f.facnumber, f.fk_statut, f.type, f.total, f.total_ttc, f.paye, f.tms, f.date_lim_reglement, s.nom, s.rowid";
+	$sql.= " GROUP BY f.rowid, f.facnumber, f.fk_statut, f.type, f.total, f.tva, f.total_ttc, f.paye, f.tms, f.date_lim_reglement, s.nom, s.rowid, s.code_client";
 	$sql.= " ORDER BY f.tms DESC ";
 	$sql.= $db->plimit($max, 0);
 
@@ -426,7 +428,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 	$sql.= " AND ff.entity = ".$conf->entity;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	if ($socid) $sql.= " AND ff.fk_soc = ".$socid;
-	$sql.= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.tva, ff.total_ttc, ff.tms, ff.paye, s.nom, s.rowid";
+	$sql.= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.tva, ff.total_tva, ff.total_ttc, ff.tms, ff.paye, s.nom, s.rowid, s.code_fournisseur";
 	$sql.= " ORDER BY ff.tms DESC ";
 	$sql.= $db->plimit($max, 0);
 
@@ -658,7 +660,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
 	$sql.= " AND c.fk_statut = 3";
 	$sql.= " AND c.facture = 0";
-	$sql.= " GROUP BY s.nom, s.rowid, c.rowid, c.ref, c.facture, c.fk_statut, c.total_ht, c.total_ttc";
+	$sql.= " GROUP BY s.nom, s.rowid, s.code_client, c.rowid, c.ref, c.facture, c.fk_statut, c.tva, c.total_ht, c.total_ttc";
 
 	$resql = $db->query($sql);
 	if ( $resql )
@@ -762,7 +764,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql.= " AND f.entity = ".$conf->entity;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-	$sql.= " GROUP BY f.rowid, f.facnumber, f.fk_statut, f.datef, f.type, f.total, f.total_ttc, f.paye, f.tms, f.date_lim_reglement, s.nom, s.rowid";
+	$sql.= " GROUP BY f.rowid, f.facnumber, f.fk_statut, f.datef, f.type, f.total, f.tva, f.total_ttc, f.paye, f.tms, f.date_lim_reglement, s.nom, s.rowid, s.code_client";
 	$sql.= " ORDER BY f.datef ASC, f.facnumber ASC";
 
 	$resql = $db->query($sql);
@@ -876,8 +878,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 	$sql.= " AND ff.fk_statut = 1";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	if ($socid) $sql.= " AND ff.fk_soc = ".$socid;
-	$sql.= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.tva, ff.total_ttc, ff.paye,";
-	$sql.= " s.nom, s.rowid";
+	$sql.= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.tva, ff.total_tva, ff.total_ttc, ff.paye,";
+	$sql.= " s.nom, s.rowid, s.code_client, s.code_fournisseur";
 
 	$resql=$db->query($sql);
 	if ($resql)
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 994e3cca40c..04461117271 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -109,13 +109,21 @@ class Localtax extends CommonObject
             if ($result < 0) $error++;
             // End call triggers
 
-			//FIXME: Add rollback if trigger fail
-
-            return $this->id;
+            if (! $error)
+            {
+            	$this->db->commit();
+            	return $this->id;
+            }
+            else
+			{
+				$this->db->rollback();
+				return -1;
+            }
         }
         else
-        {
+		{
             $this->error="Error ".$this->db->lasterror();
+            $this->db->rollback();
             return -1;
         }
     }
@@ -141,7 +149,9 @@ class Localtax extends CommonObject
 		$this->fk_user_creat=trim($this->fk_user_creat);
 		$this->fk_user_modif=trim($this->fk_user_modif);
 
-        // Update request
+		$this->db->begin();
+
+		// Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."localtax SET";
         $sql.= " localtaxtype=".$this->ltt.",";
 		$sql.= " tms=".$this->db->idate($this->tms).",";
@@ -160,20 +170,27 @@ class Localtax extends CommonObject
         if (! $resql)
         {
             $this->error="Error ".$this->db->lasterror();
-            return -1;
+            $error++;
         }
 
-		if (! $notrigger)
+		if (! $error && ! $notrigger)
 		{
             // Call trigger
             $result=$this->call_trigger('LOCALTAX_MODIFY',$user);
             if ($result < 0) $error++;
             // End call triggers
-
-            //FIXME: Add rollback if trigger fail
     	}
 
-        return 1;
+    	if (! $error)
+    	{
+    		$this->db->commit();
+    		return 1;
+    	}
+    	else
+    	{
+    		$this->db->rollback();
+    		return -1;
+    	}
     }
 
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 883110e9d5b..077bbde2420 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -70,9 +70,10 @@ class Paiement extends CommonObject
 	 *    Load payment from database
 	 *
 	 *    @param	int		$id     Id of payment to get
+	 *    @param	int		$ref    Ref of payment to get (same as $id)
 	 *    @return   int     		<0 if KO, 0 if not found, >0 if OK
 	 */
-	function fetch($id)
+	function fetch($id, $ref='')
 	{
 		$sql = 'SELECT p.rowid, p.datep as dp, p.amount, p.statut, p.fk_bank,';
 		$sql.= ' c.code as type_code, c.libelle as type_libelle,';
@@ -81,7 +82,10 @@ class Paiement extends CommonObject
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiement as p';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid ';
 		$sql.= ' WHERE p.fk_paiement = c.id';
-		$sql.= ' AND p.rowid = '.$id;
+		if ($ref)
+			$sql.= ' AND p.rowid = '.$ref;
+		else
+			$sql.= ' AND p.rowid = '.$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 5cf941302c7..34cf3b94460 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  
  * Copyright (C) 2005-2009 Regis Houssin        
  * Copyright (C) 2013      Cédric Salvador      
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -144,7 +145,7 @@ if ($resql)
     $paramlist.=($search_company?"&search_company=".$search_company:"");
     $paramlist.=($search_amount?"&search_amount=".$search_amount:"");
 
-    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num);
+    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num,'','title_accountancy.png');
 
     print '';
     print '

 
';
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 8cd9a31c783..142ea7b5a4a 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -1,6 +1,7 @@
 
  * Copyright (C) 2004-2014 Laurent Destailleur  
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -87,7 +88,7 @@ $formother=new FormOther($db);
 llxHeader();
 
 $titre=($year?$langs->trans("PaymentsReportsForYear",$year):$langs->trans("PaymentsReports"));
-print_fiche_titre($titre);
+print_fiche_titre($titre,'','title_accountancy.png');
 
 // Formulaire de generation
 print '';
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 2b71c5c8004..0cc1b3d2f94 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005      Rodolphe Quiedeville 
  * Copyright (C) 2005-2009 Regis Houssin        
  * Copyright (C) 2010-2011 Juanjo Menent        
+ * Copyright (C) 2015      Marcos García        
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,7 +62,7 @@ class LignePrelevement
 	 *  Recupere l'objet prelevement
 	 *
 	 *  @param	int		$rowid       id de la facture a recuperer
-	 *  @return	void|int
+	 *  @return	integer
 	 */
 	function fetch($rowid)
 	{
@@ -156,5 +157,22 @@ class LignePrelevement
 			if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut8');
 		}
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'prelevement_lignes'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 59599e93dc6..0375297316b 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -142,7 +142,7 @@ if ($socid > 0)
 
 				print '';
 				print '\n";
-				if (($fac->statut == 3 ) || ($fac->statut == 2 && ! $fact->close_code) )  $solde = $solde = $solde + $totalpaye;
+				if (($fac->statut == Facture::STATUS_ABANDONED ) || ($fac->statut == Facture::STATUS_CLOSED && ! $fact->close_code) )  $solde = $solde = $solde + $totalpaye;
 				else $solde = $solde + $fac->total_ttc;
 
 				print '';
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index e4376af61de..5c943aacbca 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -1,6 +1,7 @@
 
  * Copyright (C) 2014      Laurent Destailleur  
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -215,7 +216,7 @@ if ($action == 'create')
 	print '';
 	print '';
 
-	print_fiche_titre($langs->trans("NewSalaryPayment"));
+	print_fiche_titre($langs->trans("NewSalaryPayment"),'', 'title_accountancy.png');
 
 	print '
'.$fac->getLibStatut(2,$totalpaye).''.price($fac->total_ttc)." 
';
 
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index 0db00c10c7f..f7da679196b 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -95,6 +95,8 @@ class PaymentSalary extends CommonObject
 			return -1;
 		}
 
+		$this->db->begin();
+
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
 
@@ -129,11 +131,18 @@ class PaymentSalary extends CommonObject
             $result=$this->call_trigger('PAYMENT_SALARY_MODIFY',$user);
             if ($result < 0) $error++;
             // End call triggers
-
-			//FIXME: Add rollback if trigger fail
 		}
 
-		return 1;
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 484010c9f03..37ab81dff34 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -1,6 +1,7 @@
 
  * Copyright (C) 2015      Laurent Destailleur 
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -83,7 +84,7 @@ $form = new Form($db);
 $salstatic = new PaymentSalary($db);
 $userstatic = new User($db);
 
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_societe as fk_soc,";
+$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc,";
 $sql.= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datev as dm, s.fk_typepayment as type, s.num_payment,";
 $sql.= " pst.code as payment_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
@@ -118,7 +119,7 @@ if ($result)
 	$param='';
 	if ($typeid) $param.='&typeid='.$typeid;
 
-	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines);
+	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy.png');
 
 	print '';
 
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index ad5af8f84c2..f87791dfed9 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -88,8 +88,8 @@ llxHeader("",$langs->trans("SocialContribution"),$help_url);
 if ($object->id)
 {
 	$alreadypayed=$object->getSommePaiement();
-	
-    $head=tax_prepare_head($object, $user);
+
+    $head=tax_prepare_head($object);
 
     dol_fiche_head($head, 'documents',  $langs->trans("SocialContribution"), 0, 'bill');
 
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index a4c4663dc40..0f352defc5e 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -183,7 +183,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category 
 	{
-	    $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_societe";
+	    $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	}
 	else if ($selected_cat) 	// Into a specific category
 	{
@@ -201,13 +201,13 @@ if ($modecompta == 'CREANCES-DETTES') {
 	}
 	if ($selected_cat === -2)	// Without any category  
 	{
-	    $sql.=" AND cs.fk_societe is null";
+	    $sql.=" AND cs.fk_soc is null";
 	}
 	else if ($selected_cat) {	// Into a specific category
 	    $sql.= " AND (c.rowid = ".$selected_cat;
 	    if ($subcat) $sql.=" OR c.fk_parent = " . $selected_cat;
 	    $sql.= ")";
-		$sql.= " AND cs.fk_categorie = c.rowid AND cs.fk_societe = s.rowid";
+		$sql.= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 } else {
 	/*
@@ -221,7 +221,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category 
 	{
-	    $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_societe";
+	    $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	}
 	else if ($selected_cat) 	// Into a specific category
 	{
@@ -235,13 +235,13 @@ if ($modecompta == 'CREANCES-DETTES') {
 	}
 	if ($selected_cat === -2)	// Without any category  
 	{
-	    $sql.=" AND cs.fk_societe is null";
+	    $sql.=" AND cs.fk_soc is null";
 	}
 	else if ($selected_cat) {	// Into a specific category
 	    $sql.= " AND (c.rowid = ".$selected_cat;
 	    if ($subcat) $sql.=" OR c.fk_parent = " . $selected_cat;
 	    $sql.= ")";
-		$sql.= " AND cs.fk_categorie = c.rowid AND cs.fk_societe = s.rowid";
+		$sql.= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 }
 $sql.= " AND f.entity = ".$conf->entity;
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index f704ca90f73..a44cb4ed48e 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -298,7 +298,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 			if ($annee_decalage != $year_end) print '';
 		}
 
-		$total_ht[$annee]+=!empty($cum_ht[$case]) ? $cum_ht[$case] : 0;;
+		$total_ht[$annee]+=!empty($cum_ht[$case]) ? $cum_ht[$case] : 0;
 		$total[$annee]+=$cum[$case];
 	}
 
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 948b5096fa3..fa8a71a24e4 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -89,7 +89,9 @@ class Tva extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		$this->db->begin();
+
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva(";
 		$sql.= "tms,";
 		$sql.= "datep,";
@@ -126,13 +128,22 @@ class Tva extends CommonObject
             if ($result < 0) $error++;
             // End call triggers
 
-            //FIXME: Add rollback if trigger fail
-            return $this->id;
+            if (! $error)
+            {
+            	$this->db->commit();
+            	return $this->id;
+            }
+            else
+			{
+				$this->db->rollback();
+				return -1;
+            }
         }
         else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
+		{
+			$this->error="Error ".$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
         }
     }
 
@@ -160,7 +171,9 @@ class Tva extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
+		$this->db->begin();
+
+		// Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
 
 		$sql.= " tms=".$this->db->idate($this->tms).",";
@@ -181,20 +194,27 @@ class Tva extends CommonObject
         if (! $resql)
         {
             $this->error="Error ".$this->db->lasterror();
-            return -1;
+            $error++;
         }
 
-		if (! $notrigger)
+		if (! $error && ! $notrigger)
 		{
             // Call trigger
             $result=$this->call_trigger('TVA_MODIFY',$user);
             if ($result < 0) $error++;
             // End call triggers
-
-            //FIXME: Add rollback if trigger fail
     	}
 
-        return 1;
+        if (! $error)
+    	{
+    		$this->db->commit();
+    		return 1;
+    	}
+    	else
+    	{
+    		$this->db->rollback();
+    		return -1;
+    	}
     }
 
 
diff --git a/htdocs/conf/phpinfo.php b/htdocs/conf/phpinfo.php
deleted file mode 100644
index 179bd651458..00000000000
--- a/htdocs/conf/phpinfo.php
+++ /dev/null
@@ -1,5 +0,0 @@
-Go back to index
-| ">Refresh
-


-
-
\ No newline at end of file
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index f8ebe12cd9b..dcc7949340e 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2013      Florian Henry		  	
  * Copyright (C) 2013      Alexandre Spangaro 	
  * Copyright (C) 2014      Juanjo Menent	 	
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
@@ -255,7 +256,7 @@ if (empty($reshook))
         }
         else
         {
-            setEventMessage($object->error,$object->errors,'errors');
+            setEventMessages($object->error,$object->errors,'errors');
         }
     }
 
@@ -412,7 +413,8 @@ else
             }
 
             $title = $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
-            print_fiche_titre($title);
+            $linkback='';
+            print_fiche_titre($title,$linkback,'title_companies.png');
 
             // Affiche les erreurs
             dol_htmloutput_errors(is_numeric($error)?'':$error,$errors);
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 19ea13f6a39..a61b0ea37bf 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2013      Florian Henry		  	       
  * Copyright (C) 2013      Alexandre Spangaro 	       
  * Copyright (C) 2013      Juanjo Menent	 	       
+ * Copyright (C) 2015      Marcos García               
  *
  * 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
@@ -1084,4 +1085,20 @@ class Contact extends CommonObject
 		}
 	}
 
-}
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'socpeople'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+}
\ No newline at end of file
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
new file mode 100644
index 00000000000..2241a1e67f1
--- /dev/null
+++ b/htdocs/contact/document.php
@@ -0,0 +1,123 @@
+
+ * Copyright (C) 2015       Frederic France     
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ *       \file       htdocs/contact/document.php
+ *       \ingroup    contact
+ *       \brief      Page with attached files on contact
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+$langs->load("other");
+$langs->load("companies");
+$langs->load("contact");
+
+$id = GETPOST('id','int');
+$action = GETPOST("action");
+$confirm = GETPOST('confirm', 'alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'contact', $id, '','');
+
+// Get parameters
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) {
+    $page = 0;
+}
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+$object = new Contact($db);
+if ($id > 0) $object->fetch($id);
+
+$upload_dir = $conf->societe->dir_output.'/contact/'.dol_sanitizeFileName($object->ref);
+$modulepart='contact';
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader("",$langs->trans("Contact"), $helpurl);
+
+if ($object->id)
+{
+    $head = contact_prepare_head($object);
+
+    dol_fiche_head($head, 'documents',  $langs->trans("Contact"), 0, 'contact');
+
+
+    // Construit liste des fichiers
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $totalsize=0;
+    foreach($filearray as $key => $file)
+    {
+        $totalsize+=$file['size'];
+    }
+
+    print '
 
';
+
+    // Ref
+    print '';
+
+    // Name
+    print '';
+    print '';
+
+    print '';
+    print '';
+    print '
'.$langs->trans("Ref").'';
+    print $form->showrefnav($object, 'id', $linkback);
+    print '
'.$langs->trans("Lastname").' / '.$langs->trans("Label").''.$object->lastname.''.$langs->trans("Firstname").''.$object->firstname.'
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
';
+
+    print '
';
+
+    $modulepart = 'contact';
+    $permission = $user->rights->societe->contact->creer;
+    $param = '&id=' . $object->id;
+    include DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+} else {
+    print $langs->trans("ErrorUnknown");
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 4413b721fc9..21f48e58fb3 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2013      Raphaël Doursenaud   
  * Copyright (C) 2013      Cédric Salvador      
  * Copyright (C) 2013      Alexandre Spangaro   
+ * Copyright (C) 2015       Jean-François Ferry		
  *
  * 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
@@ -264,7 +265,7 @@ if ($result)
 	$num = $db->num_rows($result);
     $i = 0;
 
-    print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
+    print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,'title_companies.png');
 
     print '';
     print '';
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index 39e72a9a2f7..29e060551de 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -67,7 +67,7 @@ $textobject = $langs->transnoentitiesnoconv('Contracts');
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
 
 print '
';
 $head=contract_admin_prepare_head();
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index 839700e8416..283a400bc80 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -67,7 +67,7 @@ $textobject = $langs->transnoentitiesnoconv('Contracts');
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
 
 print '
';
 $head=contract_admin_prepare_head();
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 232df30e280..f541e6288c2 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2013-2014  Florian Henry		  	
  * Copyright (C) 2014		Ferran Marcet		  	
  * Copyright (C) 2014       Marcos García           
+ * Copyright (C) 2015           Jean-François Ferry		
  *
  * 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
@@ -899,7 +900,7 @@ if ($result > 0)
  *********************************************************************/
 if ($action == 'create')
 {
-	print_fiche_titre($langs->trans('AddContract'));
+	print_fiche_titre($langs->trans('AddContract'),'','title_commercial.png');
 
     $soc = new Societe($db);
     if ($socid>0) $soc->fetch($socid);
@@ -958,6 +959,8 @@ if ($action == 'create')
     print ''."\n";
     print '';
 
+    dol_fiche_head();
+    
     print '';
 
     // Ref
@@ -1053,7 +1056,9 @@ if ($action == 'create')
 
     print "
\n";
 
-    print '
';
+    dol_fiche_end();
+
+    print '
';
 
     if (is_object($objectsrc))
     {
@@ -1065,10 +1070,8 @@ if ($action == 'create')
         	print '
'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed");
         }
 	}
-
+    
     print "\n";
-
-    dol_fiche_end();
 }
 else
 /* *************************************************************************** */
@@ -1270,7 +1273,9 @@ else
         $usemargins=0;
 		if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
 
-        // Title line for service
+        $var=false;
+        
+		// Title line for service
         $cursorline=1;
         while ($cursorline <= $nbofservices)
         {
@@ -1309,8 +1314,6 @@ else
                 print ' ';
                 print "\n";
 
-                $var=true;
-
                 $objp = $db->fetch_object($result);
 
                 $var=!$var;
@@ -1338,18 +1341,18 @@ else
                     }
                     else
                     {
-                        print "".dol_htmlentitiesbr($objp->description)."\n";
+                        print ''.dol_htmlentitiesbr($objp->description)."\n";
                     }
                     // TVA
                     print ''.vatrate($objp->tva_tx,'%',$objp->info_bits).'';
                     // Prix
-                    print ''.price($objp->subprice)."\n";
+                    print ''.($objp->subprice != '' ? price($objp->subprice) : '')."\n";
                     // Quantite
                     print ''.$objp->qty.'';
                     // Remise
                     if ($objp->remise_percent > 0)
                     {
-                        print ''.$objp->remise_percent."%\n";
+                        print ''.$objp->remise_percent."%\n";
                     }
                     else
                     {
@@ -1481,7 +1484,7 @@ else
                     print '';
                     print $langs->trans("DateStartPlanned").' ';
                     $form->select_date($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update");
-                    print '
'.$langs->trans("DateEndPlanned").' ';
+                    print '   '.$langs->trans("DateEndPlanned").' ';
                     $form->select_date($db->jdate($objp->date_fin),"date_end_update",$usehm,$usehm,($db->jdate($objp->date_fin)>0?0:1),"update");
                     print '';
 
@@ -1505,7 +1508,7 @@ else
 
             if ($object->statut > 0)
             {
-                print '';
+                print '';
                 print '
';
                 print "\n";
             }
@@ -1521,7 +1524,7 @@ else
             if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
             {
                 print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
-                if ($ret == 'html') print '
';
+                if ($ret == 'html') print '
';
             }
 
             /*
@@ -1541,7 +1544,7 @@ else
                 array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
 
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
-                print '
';
+                print '
';
             }
 
             /*
@@ -1553,7 +1556,7 @@ else
                 $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
                 $comment      = GETPOST('comment');
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
-                print '
';
+                print '
';
             }
 
             /*
@@ -1565,7 +1568,7 @@ else
                 $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
                 $comment      = GETPOST('comment');
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
-                print '
';
+                print '
';
             }
 
 
@@ -1574,7 +1577,7 @@ else
             {
                 print '';
 
-                print '';
+                print '';
                 print '';
                 print '';
                 print "\n";
 
-                print '';
+                print '';
 
                 print '';
 	print "\n";
 
-	// Lignes des champs de filtre
+	// Line for filters
 
 	print '';
 	print '';
 	print '';
 	print '';
 
+	// Status
+	$alreadypaid=$object->getSommePaiement();
+	print '';
+
+	// Amount
+	print '';
+	print '';
+
+	// Amount Local Taxes
+	//TODO: Place into a function to control showing by country or study better option
+	if ($societe->localtax1_assuj=="1") //Localtax1
+	{
+		print '';
+		print '';
+		print '';
+	}
+	if ($societe->localtax2_assuj=="1") //Localtax2
+	{
+		print '';
+		print '';
+		print '';
+	}
+	print '';
+
 	print "
'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'';
                 if ($user->societe_id == 0)
@@ -1591,7 +1594,7 @@ else
                 print '
';
                 // Si pas encore active
@@ -1630,7 +1633,7 @@ else
                 print '
';
                 print '';
 
-                print '';
+                print '
';
 
                 // Definie date debut et fin par defaut
                 $dateactstart = $objp->date_debut;
@@ -1680,7 +1683,7 @@ else
 
                 print '';
 
-                print '
';
+                print '
';
 
                 // Definie date debut et fin par defaut
                 $dateactstart = $objp->date_debut_reelle;
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index dcabc4e0b52..b6776d97916 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1131,7 +1131,7 @@ class Contrat extends CommonObject
 		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
 		if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
 		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->statut)) $this->statut=trim($this->statut);
+		if (isset($this->statut)) $this->statut=(int) $this->statut;
 		if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
 		if (isset($this->fk_projet)) $this->fk_projet=trim($this->fk_projet);
 		if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature=trim($this->fk_commercial_signature);
@@ -2112,6 +2112,23 @@ class Contrat extends CommonObject
 
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'contrat'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
@@ -2417,7 +2434,7 @@ class ContratLigne extends CommonObject
 		// Clean parameters
 		$this->fk_contrat=trim($this->fk_contrat);
 		$this->fk_product=trim($this->fk_product);
-		$this->statut=trim($this->statut);
+		$this->statut=(int) $this->statut;
 		$this->label=trim($this->label);
 		$this->description=trim($this->description);
 		$this->tva_tx=trim($this->tva_tx);
@@ -2439,7 +2456,12 @@ class ContratLigne extends CommonObject
 		$this->fk_user_ouverture=trim($this->fk_user_ouverture);
 		$this->fk_user_cloture=trim($this->fk_user_cloture);
 		$this->commentaire=trim($this->commentaire);
-
+		//if (empty($this->subprice)) $this->subprice = 0;
+		if (empty($this->price_ht)) $this->price_ht = 0;
+		if (empty($this->total_ht)) $this->total_ht = 0;
+		if (empty($this->total_tva)) $this->total_tva = 0;
+		if (empty($this->total_ttc)) $this->total_ttc = 0;
+		
 		// Check parameters
 		// Put here code to add control on parameters values
 
@@ -2483,8 +2505,8 @@ class ContratLigne extends CommonObject
 		$sql.= " remise_percent='".$this->remise_percent."',";
 		$sql.= " remise=".($this->remise?"'".$this->remise."'":"null").",";
 		$sql.= " fk_remise_except=".($this->fk_remise_except?"'".$this->fk_remise_except."'":"null").",";
-		$sql.= " subprice='".$this->subprice."',";
-		$sql.= " price_ht='".$this->price_ht."',";
+		$sql.= " subprice=".($this->subprice != '' ? $this->subprice : "null").",";
+		$sql.= " price_ht=".($this->price_ht != '' ? $this->price_ht : "null").",";
 		$sql.= " total_ht='".$this->total_ht."',";
 		$sql.= " total_tva='".$this->total_tva."',";
 		$sql.= " total_localtax1='".$this->total_localtax1."',";
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 3d0fee451be..484893215eb 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville 
  * Copyright (C) 2004-2011 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -63,7 +64,7 @@ $now = dol_now();
 
 llxHeader();
 
-print_fiche_titre($langs->trans("ContractsArea"));
+print_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png');
 
 
 //print '
';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 505c2d3e79a..25b5d80fa98 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013      Cédric Salvador      
  * Copyright (C) 2014      Juanjo Menent        
  * Copyright (C) 2015			 Claudio Aschieri			
+ * Copyright (C) 2015      Jean-François Ferry		
  *
  * 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
@@ -129,8 +130,8 @@ if ($resql)
     $num = $db->num_rows($resql);
     $i = 0;
 
-    print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_name='.$search_name, $sortfield, $sortorder,'',$num);
-
+    print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_name='.$search_name, $sortfield, $sortorder,'',$num,$totalnboflines,'title_commercial.png');
+    
     print '';
     print '
';
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 22ae64ef9cd..fe89907279c 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville 
  * Copyright (C) 2004-2011 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
+ * Copyright (C) 2015      Jean-François Ferry	
  *
  * 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
@@ -151,7 +152,7 @@ if ($resql)
 	if ($mode == "4" && $filter != "expired") $title=$langs->trans("ListOfRunningServices");
 	if ($mode == "4" && $filter == "expired") $title=$langs->trans("ListOfExpiredServices");
 	if ($mode == "5") $title=$langs->trans("ListOfClosedServices");
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num,$totalnboflines,'title_commercial.png');
 
 	print '
';
 
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index cc898d02c85..fce813aaa05 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -63,7 +63,7 @@ if (! empty($_POST['removedfile']))
 /*
  * Send mail
  */
-if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_POST['cancel'])
+if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
 {
 	$langs->load('mails');
 
@@ -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'];
 
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 2b251a6599f..0f6e48a1520 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -95,6 +95,7 @@ class box_actions extends ModeleBoxes
 					$late = '';
 					$objp = $db->fetch_object($result);
 					$datelimite = $db->jdate($objp->dp);
+                    $actionstatic->id = $objp->id;
                     $actionstatic->label = $objp->label;
                     $actionstatic->type_label = $objp->type_label;
                     $actionstatic->code = $objp->code;
@@ -108,7 +109,6 @@ class box_actions extends ModeleBoxes
 					//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
 					$label = empty($objp->label)?$objp->type_label:$objp->label;
 
-                    $tooltip = $langs->trans('Action'.$objp->code).': '.$label;
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="left"',
                         'text' => $actionstatic->getNomUrl(1),
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 7fdb3510afe..f7e09d33583 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -1,6 +1,6 @@
 
- * Copyright (C) 2005-2013 Laurent Destailleur    
+ * Copyright (C) 2005-2015 Laurent Destailleur    
  * Copyright (C) 2014-2015 Frederic France        
  *
  * This program is free software; you can redistribute it and/or modify
@@ -80,7 +80,7 @@ class box_activity extends ModeleBoxes
         $nbofyears=2;
 
         if (! empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofyears=$conf->global->MAIN_BOX_ACTIVITY_DURATION;
-        $textHead = $langs->trans("Activity").' '.$nbofyears.' '.$langs->trans("DurationYears").'';
+        $textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofyears*12);
         $this->info_box_head = array(
             'text' => $textHead,
             'limit'=> dol_strlen($textHead),
@@ -102,7 +102,8 @@ class box_activity extends ModeleBoxes
 
             $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
             $data = array();
-            if ($refresh) {
+            if ($refresh)
+            {
                 $sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
                 $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
                 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 74d106b7f69..eb2d3a183bf 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -1,5 +1,5 @@
 
+/* Copyright (C) 2013-2015 Laurent Destailleur  
  *
  * 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
@@ -70,18 +70,6 @@ class box_graph_product_distribution extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
-		$text = $langs->trans("BoxProductDistribution",$max);
-		$this->info_box_head = array(
-				'text' => $text,
-				'limit'=> dol_strlen($text),
-				'graph'=> 1,
-				'sublink'=>'',
-				'subtext'=>$langs->trans("Filter"),
-				'subpicto'=>'filter.png',
-				'subclass'=>'linkobject',
-				'target'=>'none'	// Set '' to get target="_blank"
-		);
-
 		$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 		$param_showinvoicenb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
 		$param_showpropalnb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
@@ -110,6 +98,20 @@ class box_graph_product_distribution extends ModeleBoxes
 		$nowarray=dol_getdate(dol_now(),true);
 		if (empty($year)) $year=$nowarray['year'];
 
+
+		$text = $langs->trans("BoxProductDistribution",$max).' - '.$langs->trans("Year").': '.$year;
+		$this->info_box_head = array(
+				'text' => $text,
+				'limit'=> dol_strlen($text),
+				'graph'=> 1,
+				'sublink'=>'',
+				'subtext'=>$langs->trans("Filter"),
+				'subpicto'=>'filter.png',
+				'subclass'=>'linkobject',
+				'target'=>'none'	// Set '' to get target="_blank"
+		);
+
+
 		$nbofgraph=0;
 		if ($showinvoicenb) $nbofgraph++;
 		if ($showpropalnb)  $nbofgraph++;
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 8096dfdec10..06442571b6e 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2005-2012 Maxime Kohlhaas      
  * Copyright (C) 2015      Frederic France      
+ * Copyright (C) 2015      Juanjo Menent	    
  *
  * 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
@@ -73,7 +74,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 			$sql.= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
 			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
 			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
-			$sql.= " GROUP BY p.rowid, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte";
+			$sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte";
 			$sql.= " HAVING SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") < p.seuil_stock_alerte";
 			$sql.= $db->order('p.seuil_stock_alerte', 'DESC');
 			$sql.= $db->plimit($max, 0);
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 61ea308df39..967b764dc65 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -514,8 +514,12 @@ class CMailFile
 		return $res;
 	}
 
-
-	// Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word
+	/**
+	 * Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word
+	 * 
+	 * @param string $stringtoencode String to encode
+	 * @return string                string encoded
+	 */
 	function encodetorfc2822($stringtoencode)
 	{
 		global $conf;
@@ -639,7 +643,7 @@ class CMailFile
 	/**
 	 * Create SMTP headers (mode = 'mail')
 	 *
-	 * @return	smtp headers
+	 * @return	string headers
 	 */
 	function write_smtpheaders()
 	{
@@ -690,7 +694,7 @@ class CMailFile
 	 *
 	 * @param	array	$filename_list			Array of filenames
 	 * @param 	array	$mimefilename_list		Array of mime types
-	 * @return	array							mime headers
+	 * @return	string							mime headers
 	 */
 	function write_mimeheaders($filename_list, $mimefilename_list)
 	{
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 1a7ebfc34c8..42265846d04 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -60,6 +60,34 @@ abstract class CommonInvoice extends CommonObject
      */
     const TYPE_SITUATION = 5;
 
+	/**
+	 * Draft
+	 */
+	const STATUS_DRAFT = 0;
+
+	/**
+	 * Validated (need to be paid)
+	 */
+	const STATUS_VALIDATED = 1;
+
+	/**
+	 * Classified paid.
+	 * If paid partially, $this->close_code can be:
+	 * - CLOSECODE_DISCOUNTVAT
+	 * - CLOSECODE_BADDEBT
+	 * If paid completelly, this->close_code will be null
+	 */
+	const STATUS_CLOSED = 2;
+
+	/**
+	 * Classified abandoned and no payment done.
+	 * $this->close_code can be:
+	 * - CLOSECODE_BADDEBT
+	 * - CLOSECODE_ABANDONED
+	 * - CLOSECODE_REPLACED
+	 */
+	const STATUS_ABANDONED = 3;
+
 	/**
 	 * 	Return amount of payments already done
 	 *
@@ -188,7 +216,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  Return label of object status
 	 *
 	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
-	 *  @param      double	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
 	 *  @return     string			        Label
 	 */
 	function getLibStatut($mode=0,$alreadypaid=-1)
@@ -202,7 +230,7 @@ abstract class CommonInvoice extends CommonObject
 	 *	@param    	int  	$paye          	Status field paye
 	 *	@param      int		$status        	Id status
 	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
-	 *	@param		double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
 	 *	@param		int		$type			Type facture
 	 *	@return     string        			Libelle du statut
 	 */
@@ -326,7 +354,7 @@ abstract class CommonInvoice extends CommonObject
 	 *	Renvoi une date limite de reglement de facture en fonction des
 	 *	conditions de reglements de la facture et date de facturation
 	 *
-	 *	@param      string	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
+	 *	@param      integer	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
 	 *	@return     date     			       	Date limite de reglement si ok, <0 si ko
 	 */
 	function calculate_date_lim_reglement($cond_reglement=0)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d240c13110b..257e6897422 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2010-2014 Juanjo Menent        
  * Copyright (C) 2012-2013 Christophe Battarel  
  * Copyright (C) 2011-2014 Philippe Grand	    
- * Copyright (C) 2012-2014 Marcos García        
+ * Copyright (C) 2012-2015 Marcos García        
  * Copyright (C) 2012-2014 Raphaël Doursenaud   
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1611,7 +1611,7 @@ abstract class CommonObject
     	}
 		if (! in_array($suffix,array('','_public','_private')))
 		{
-    		dol_syslog(get_class($this)."::upate_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
+    		dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
 			return -2;
 		}
 
@@ -1887,10 +1887,11 @@ abstract class CommonObject
      *	@param  int		$targetid		Object target id
      *	@param  string	$targettype		Object target type
      *	@param  string	$clause			'OR' or 'AND' clause used when both source id and target id are provided
+     *  @param	int		$alsosametype	0=Return only links to different object than source. 1=Include also link to objects of same type.
      *	@return	void
      *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked
      */
-	function fetchObjectLinked($sourceid='',$sourcetype='',$targetid='',$targettype='',$clause='OR')
+	function fetchObjectLinked($sourceid='',$sourcetype='',$targetid='',$targettype='',$clause='OR',$alsosametype=1)
     {
         global $conf;
 
@@ -1924,7 +1925,7 @@ abstract class CommonObject
         	return -1;
         }
 
-        // Links beetween objects are stored in this table
+        // Links between objects are stored in table element_element
         $sql = 'SELECT fk_source, sourcetype, fk_target, targettype';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';
         $sql.= " WHERE ";
@@ -1983,7 +1984,7 @@ abstract class CommonObject
 
                     $classpath = $element.'/class';
 
-                    // To work with non standard path
+                    // To work with non standard classpath or module name
                     if ($objecttype == 'facture')			{
                         $classpath = 'compta/facture/class';
                     }
@@ -2019,7 +2020,7 @@ abstract class CommonObject
                         $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
                     }
 
-                    if ($conf->$module->enabled && $element != $this->element)
+                    if ($conf->$module->enabled && (($element != $this->element) || $alsosametype))
                     {
                         dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
 
@@ -3214,7 +3215,7 @@ abstract class CommonObject
 
 		$marginInfo = $this->getMarginInfos($force_price);
 
-		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// FIXME Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
+		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
 		{
 			print $langs->trans('ShowMarginInfos').' : ';
 	        $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
@@ -3349,25 +3350,26 @@ abstract class CommonObject
 	    $this->db->begin();
 
 	    $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
-	    $sql.= " WHERE rowid =".$rowid;
+	    $sql.= " WHERE rowid=".$rowid;
 
 	    dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
-	    if ($this->db->query($sql))
-	    {
-	        if (! $notrigger)
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->error=$this->db->lasterror();
+                $this->db->rollback();
+                return -1;
+            }
+            else
+            {
+                if (! $notrigger)
 	        {
 	            $result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
 	            if ($result < 0) { $this->db->rollback(); return -1; }
 	        }
-
-	        return 1;
-	    }
-	    else
-	    {
-	        $this->error=$this->db->lasterror();
-	        $this->db->rollback();
-	        return -1;
-	    }
+                $this->db->commit();
+                return 1;
+            }
 	}
 
 
@@ -3894,5 +3896,27 @@ abstract class CommonObject
 		return $user->rights->{$this->element};
 	}
 
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 * This function is meant to be called from replaceThirdparty with the appropiate tables
+	 * Column name fk_soc MUST be used to identify thirdparties
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @param array $tables Tables that need to be changed
+	 * @return bool
+	 */
+	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables)
+	{
+		foreach ($tables as $table) {
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;
 
+			if (!$db->query($sql)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
 }
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 15a0535598d..b65c5c8ede4 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -115,7 +115,7 @@ class DolGraph
 	 * Set Y precision
 	 *
 	 * @param 	float	$which_prec		Precision
-	 * @return 	string
+	 * @return 	boolean
 	 */
 	function SetPrecisionY($which_prec)
 	{
@@ -187,7 +187,7 @@ class DolGraph
 	 * Set y label
 	 *
 	 * @param 	string	$label		Y label
-	 * @return	boolean				True
+	 * @return	boolean|null				True
 	 */
 	function SetYLabel($label)
 	{
@@ -198,7 +198,7 @@ class DolGraph
 	 * Set width
 	 *
 	 * @param 	int		$w			Width
-	 * @return	boolean				True
+	 * @return	boolean|null				True
 	 */
 	function SetWidth($w)
 	{
@@ -554,7 +554,7 @@ class DolGraph
 	/**
 	 * Return min value of all data
 	 *
-	 * @return 	int		Max value of all data
+	 * @return 	double		Max value of all data
 	 */
 	function GetFloorMinValue()
 	{
@@ -578,7 +578,7 @@ class DolGraph
 	 *
 	 * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
 	 * @param	string	$fileurl	Url path to show image if saved onto disk
-	 * @return	void
+	 * @return	integer|null
 	 */
 	function draw($file,$fileurl='')
 	{
diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php
index 252b742cc9d..4b934b331f3 100644
--- a/htdocs/core/class/dolprintipp.class.php
+++ b/htdocs/core/class/dolprintipp.class.php
@@ -18,7 +18,7 @@
 
 /**
  *  \file           htdocs/core/class/dolprintipp.class.php
- *  \brief          A set of functions for using printIPP
+ *  \brief          List jobs printed with driver printipp
  */
 
 /**
@@ -57,78 +57,6 @@ class dolprintIPP
     }
 
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return array                list of printers
-     */
-    function getlist_available_printers()
-    {
-        global $conf,$db;
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-        $ipp->getPrinters();
-        return $ipp->available_printers;
-    }
-
-    /**
-     *  Print selected file
-     *
-     * @param   string      $file       file
-     * @param   string      $module     module
-     *
-     * @return 	string					'' if OK, Error message if KO
-     */
-    function print_file($file, $module)
-    {
-        global $conf,$db;
-
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setJobName($file,true);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-
-        // select printer uri for module order, propal,...
-        $sql = 'SELECT rowid,printer_uri,copy FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-                $ipp->setPrinterURI($obj->printer_uri);
-            }
-            else
-            {
-            	if (! empty($conf->global->PRINTIPP_URI_DEFAULT))
-            	{
-                	$ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
-            	}
-            	else
-            	{
-            		return 'NoDefaultPrinterDefined';
-            	}
-            }
-        }
-
-        // Set number of copy
-        $ipp->setCopies($obj->copy);
-        $ipp->setData(DOL_DATA_ROOT.'/'.$module.'/'.$file);
-        $ipp->printJob();
-
-        return '';
-    }
-
     /**
      *  List jobs print
      *
@@ -191,25 +119,4 @@ class dolprintIPP
         print "
";
     }
 
-    /**
-     *  Get printer detail
-     *
-     *	@param	string	$uri	URI
-     *	@return	array			List of attributes
-     */
-    function get_printer_detail($uri)
-    {
-        global $conf,$db;
-
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-        $ipp->setPrinterURI($uri);
-        $ipp->getPrinterAttributes();
-        return $ipp->printer_attributes;
-    }
 }
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 4ab3ce8f6fe..f94252d076d 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -31,7 +31,6 @@
 
 /**
  *	Events class
- *	Initialy built by build_class_from_table on 2008-02-28 17:25
  */
 class Events // extends CommonObject
 {
@@ -41,6 +40,8 @@ class Events // extends CommonObject
 	var $id;
 	var $db;
 
+	var $error;
+
 	var $tms;
 	var $type;
 	var $entity;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 0a2c39abbe8..a9a44fc27d1 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -74,11 +74,11 @@ class ExtraFields
 	'mail'=>'ExtrafieldMail',
 	'select' => 'ExtrafieldSelect',
 	'sellist' => 'ExtrafieldSelectList',
-	'separate' => 'ExtrafieldSeparator',
-	'checkbox' => 'ExtrafieldCheckBox',
 	'radio' => 'ExtrafieldRadio',
+	'checkbox' => 'ExtrafieldCheckBox',
 	'chkbxlst' => 'ExtrafieldCheckBoxFromList',
 	'link' => 'ExtrafieldLink',
+	'separate' => 'ExtrafieldSeparator',
 	);
 
 	/**
@@ -568,11 +568,11 @@ class ExtraFields
 		global $conf;
 
 		if ( empty($elementtype) ) return array();
-		
+
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 
 		$array_name_label=array();
-		
+
 		// For avoid conflicts with external modules
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
@@ -602,7 +602,7 @@ class ExtraFields
 					$this->attribute_elementtype[$tab->name]=$tab->elementtype;
 					$this->attribute_unique[$tab->name]=$tab->fieldunique;
 					$this->attribute_required[$tab->name]=$tab->fieldrequired;
-					$this->attribute_param[$tab->name]=unserialize($tab->param);
+					$this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
 					$this->attribute_pos[$tab->name]=$tab->pos;
 					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
 					$this->attribute_perms[$tab->name]=$tab->perms;
@@ -805,7 +805,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);
@@ -1056,7 +1056,7 @@ class ExtraFields
 		elseif ($type == 'link')
 		{
 			$out='';
-			
+
 			$param_list=array_keys($param['options']);
 			// 0 : ObjectName
 			// 1 : classPath
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 5cb0ca81faf..94ea025879a 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -192,7 +192,7 @@ class HookManager
                     		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
                     	}
 
-                    	if (is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
                     	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
                     }
                     // Generic hooks that return a string or array (printSearchForm, printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ae7b0e2d1e8..507dc9acb18 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -395,12 +395,12 @@ class Form
         $htmltext=str_replace("\n","",$htmltext);
 
         $htmltext=str_replace('"',""",$htmltext);
-        if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
+        if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
         else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
-        if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
+        if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
         else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
         $s="";
-        if (empty($notabs)) $s.='';
+        if (empty($notabs)) $s.='
';
         elseif ($notabs == 2) $s.='
';
         if ($direction < 0) {
             $s.='<'.$tag.$paramfortooltipimg;
@@ -412,8 +412,8 @@ class Form
         // Use another method to help avoid having a space in value in order to use this value with jquery
         // TODO add this in css
         //if ($text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.(($direction < 0)?' ':'').$text.(($direction > 0)?' ':'').'';
-        $paramfortooltiptd.= (($direction < 0)?' class="inline-block" style="padding-left: 3px !important;"':'');
-        $paramfortooltiptd.= (($direction > 0)?' class="inline-block" style="padding-right: 3px !important;"':'');
+        $paramfortooltiptd.= (($direction < 0)?' class="inline-block" style="padding: 0px; padding-left: 3px !important;"':'');
+        $paramfortooltiptd.= (($direction > 0)?' class="inline-block" style="padding: 0px; padding-right: 3px !important;"':'');
         if ((string) $text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.'';
         if ($direction > 0) {
             $s.='<'.$tag.$paramfortooltipimg;
@@ -868,7 +868,7 @@ class Form
      *
      *	@param	string	$selected       Preselected type
      *	@param  string	$htmlname       Name of field in form
-     *  @param  string	$filter         optional filters criteras (example: 's.rowid <> x')
+     *  @param  string	$filter         optional filters criteras (example: 's.rowid <> x', 's.client in (1,3)')
      *	@param	int		$showempty		Add an empty field
      * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
      * 	@param	int		$forcecombo		Force to use combo box
@@ -1306,7 +1306,7 @@ class Form
         		$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
         	}
         }
-        if (! empty($user->societe_id)) $sql.= " AND u.fk_societe = ".$user->societe_id;
+        if (! empty($user->societe_id)) $sql.= " AND u.fk_soc = ".$user->societe_id;
         if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN ('".$excludeUsers."')";
         if (is_array($include) && $includeUsers) $sql.= " AND u.rowid IN ('".$includeUsers."')";
         if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut <> 0";
@@ -1529,7 +1529,7 @@ class Form
             		print img_picto($langs->trans("Search"), 'search');
             	}
             }
-            print '';
+            print '';
             if ($hidelabel == 3) {
             	print img_picto($langs->trans("Search"), 'search');
             }
@@ -1646,7 +1646,7 @@ class Form
             require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
             $num = $this->db->num_rows($result);
 
-            $out.='';
             $out.='';
 
             $i = 0;
@@ -2871,7 +2871,7 @@ class Form
                     {
                         print '';
                     $i++;
@@ -2930,10 +2930,11 @@ class Form
      *    @param    string	$htmlname			HTML field name
      *    @param    int		$maxlength      	Maximum length for labels
      *    @param    int		$excludeafterid 	Exclude all categories after this leaf in category tree.
+     *    @param	int		$outputmode			0=HTML select string, 1=Array
      *    @return	string
      *    @see select_categories
      */
-    function select_all_categories($type, $selected='', $htmlname="parent", $maxlength=64, $excludeafterid=0)
+    function select_all_categories($type, $selected='', $htmlname="parent", $maxlength=64, $excludeafterid=0, $outputmode=0)
     {
         global $langs;
         $langs->load("categories");
@@ -2942,6 +2943,7 @@ class Form
         $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
 
         $output = '';
         $output.= "\n";
-        return $output;
+
+		if ($outputmode) return $outarray;
+		return $output;
     }
 
     /**
@@ -3872,7 +3878,7 @@ class Form
                 {
                     $prodstatic=new Product($this->db);
                     $prodstatic->fetch($idprod);
-                    if ($prodstatic->type == 1)   // We know product is a service
+                    if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
                     {
                         $code_country.=",'".$societe_acheteuse->country_code."'";
                     }
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index cfab0e52b7c..3c16facdd4a 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -211,7 +211,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 '';
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index d2014837373..bc63d9c51ac 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -455,7 +455,7 @@ class FormCompany
 		{
 			$out.= '
';
 			$out.= ''."\n";
         	}
+        	
+        	$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
+        	if ($result<0) {
+        		setEventMessage($this->error,'errors');
+        	}
+        	$modelmail_array=array();
+        	foreach($this->lines_model as $line) {
+        		$modelmail_array[$line->id]=$line->label;
+        	}
+        	
+        	if (count($modelmail_array)>0) {
+	        	$out.= '
';
+	        	$out.= '';
+	        	$out.= '';
+	        	$out.= '
'."\n";
+	        	$out.= $langs->trans('SelectMailModel').':'.$this->selectarray('modelmailselected', $modelmail_array,$model_id);
+	        	$out.= '';
+	        	if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	        	$out.= '
';
+        	}
+        	
+        	
         	$out.= ''."\n";
 
         	// Substitution array
@@ -617,8 +644,8 @@ class FormMail
 					$defaultmessage = dol_nl2br($defaultmessage);
 				}
 
-
-        		if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
+				
+        		if (isset($_POST["message"]) &&  ! $_POST['modelselected']) $defaultmessage=$_POST["message"];
 				else
 				{
 					$defaultmessage=make_substitutions($defaultmessage,$this->substit);
@@ -690,9 +717,10 @@ class FormMail
 	 * 		@param	string		$type_template	Get message for key module
 	 *      @param	string		$user			Use template public or limited to this user
 	 *      @param	Translate	$outputlangs	Output lang object
+	 *      @param	int			$id				Id template to find
 	 *      @return array						array('topic'=>,'content'=>,..)
 	 */
-	private function getEMailTemplate($db, $type_template, $user, $outputlangs)
+	private function getEMailTemplate($db, $type_template, $user, $outputlangs,$id=0)
 	{
 		$ret=array();
 
@@ -702,6 +730,7 @@ class FormMail
 		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		if (!empty($id)) $sql.= " AND rowid=".$id;
 		$sql.= $db->order("lang,label","ASC");
 		//print $sql;
 
@@ -745,5 +774,98 @@ class FormMail
 			return -1;
 		}
 	}
+	
+	/**
+	 *      Find if template exists
+	 *      Search into table c_email_templates
+	 *
+	 * 		@param	string		$type_template	Get message for key module
+	 *      @param	string		$user			Use template public or limited to this user
+	 *      @param	Translate	$outputlangs	Output lang object
+	 *      @return	int		<0 if KO,
+	 */
+	public function isEMailTemplate($type_template, $user, $outputlangs)
+	{
+		$ret=array();
+	
+		$sql = "SELECT label, topic, content, lang";
+		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
+		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
+		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
+		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		$sql.= $this->db->order("lang,label","ASC");
+		//print $sql;
+	
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num= $this->db->num_rows($resql);
+			$this->db->free($resql);
+			return $num;
+		}
+		else
+		{
+			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
+			return -1;
+		}
+	}
+	
+	/**
+	 *      Find if template exists
+	 *      Search into table c_email_templates
+	 *
+	 * 		@param	string		$type_template	Get message for key module
+	 *      @param	string		$user			Use template public or limited to this user
+	 *      @param	Translate	$outputlangs	Output lang object
+	 *      @return	int		<0 if KO,
+	 */
+	public function fetchAllEMailTemplate($type_template, $user, $outputlangs)
+	{
+		$ret=array();
+	
+		$sql = "SELECT rowid, label, topic, content, lang";
+		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
+		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
+		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
+		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		$sql.= $this->db->order("lang,label","ASC");
+		//print $sql;
+	
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->lines_model=array();
+			while ($obj = $this->db->fetch_object($resql)) 
+			{
+				$line = new ModelMail();
+				$line->id=$obj->rowid;
+				$line->label=$obj->label;
+				$line->topic=$obj->topic;
+				$line->content=$obj->lacontentbel;
+				$line->lang=$obj->lang;
+				$this->lines_model[]=$line;
+			}
+			$this->db->free($resql);
+			return $num;
+		}
+		else
+		{
+			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
+			return -1;
+		}
+	}
 }
 
+/**
+ * ModelMail
+ */
+class ModelMail
+{
+	public $id;
+	public $label;
+	public $topic;
+	public $content;
+	public $lang;
+}
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 786d2c53a34..3233b479b6c 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -374,9 +374,13 @@ class FormOther
         if ($conf->use_javascript_ajax)
         {
             include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+
             $comboenhancement = ajax_combobox($htmlname);
-            $out.=$comboenhancement;
-            $nodatarole=($comboenhancement?' data-role="none"':'');
+            if ($comboenhancement)
+            {
+            	$out.=$comboenhancement;
+            	$nodatarole=($comboenhancement?' data-role="none"':'');
+            }
         }
         // Select each sales and print them in a select input
         $out.='';
+		print '';
 		print '';
 		if ($showproject) print '';
 		print '';
@@ -504,9 +504,10 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
  * @param   string		$tasksrole				Array of roles user has on task
  * @param	string		$mine					Show only task lines I am assigned to
  * @param   int			$restricteditformytask	0=No restriction, 1=Enable add time only if task is a task i am affected to
+ * @param	int			$preselectedday			Preselected day
  * @return  $inc
  */
-function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0)
+function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0, $preselectedday='')
 {
 	global $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic;
@@ -527,6 +528,12 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t
 			{
 				$var = !$var;
 				$lastprojectid=$lines[$i]->fk_project;
+
+				if ($preselectedday)
+				{
+					$projectstatic->id = $lines[$i]->fk_project;
+					$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTaks for all day of a week
+				}
 			}
 
 			// If we want all or we have a role on task, we show it
@@ -549,7 +556,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t
 				// Ref
 				print '';
 
 				// Label task
@@ -559,7 +566,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t
 				$taskstatic->ref=$lines[$i]->label;
 				$taskstatic->date_start=$lines[$i]->date_start;
 				$taskstatic->date_end=$lines[$i]->date_end;
-				print $taskstatic->getNomUrl(0);
+				print $taskstatic->getNomUrl(0,'withproject');
 				//print "
";
 				//for ($k = 0 ; $k < $level ; $k++) print "   ";
 				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
@@ -613,14 +620,21 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t
 
 				// Form to add new time
 				print '';
 
 				print '';
                     print $tableCell;
 		        }
+
+				print '';
+
 		        print "\n";
 			}
 
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 9040b59c85e..a163047e61b 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -36,7 +36,7 @@
  */
 function tax_prepare_head(ChargeSociales $object)
 {
-    global $langs, $conf;
+    global $langs, $conf, $user;
 
     $h = 0;
     $head = array();
@@ -57,7 +57,7 @@ function tax_prepare_head(ChargeSociales $object)
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.'';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -496,7 +496,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
         	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
 			else $sql.= " AND f.type IN (0,1,2,3,5)";
-            $sql.= " AND f.rowid = d.".$fk_facture;;
+            $sql.= " AND f.rowid = d.".$fk_facture;
             $sql.= " AND pf.".$fk_facture2." = f.rowid";
             $sql.= " AND pa.rowid = pf.".$fk_payment;
             if ($y && $m)
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 8654c866969..74da1f97ff0 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -112,18 +112,16 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 				}
 
 				// We must check entity
-				if ($passok)
+				if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
 				{
 					global $mc;
 
-					if (!isset($mc)) {
-						//Global not available, disable $conf->multicompany->enabled for safety
-						$conf->multicompany->enabled = false;
-					}
-
-					if (! empty($conf->multicompany->enabled)) {
+					if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
+					else
+					{
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
-						if ($ret < 0) {
+						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
 						}
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index f481abdcf0c..fd4d41ce6a7 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -93,7 +93,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->product->enabled', __HANDLER__, 'left', 2801__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/card.php?leftmenu=product&action=create&type=0', 'NewProduct', 1, 'products', '$user->rights->produit->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->product->enabled', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/list.php?leftmenu=product&type=0', 'List', 1, 'products', '$user->rights->produit->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->product->enabled', __HANDLER__, 'left', 2803__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassort.php?type=0', 'Stocks', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->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->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&type=0', 'Statistics', 1, 'main', '$user->rights->produit->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->productbatch->enabled', __HANDLER__, 'left', 2805__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassortlot.php?type=0', 'StocksByLotSerial', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->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->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 6, __ENTITY__);
 -- Product - Services
 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->service->enabled', __HANDLER__, 'left', 2900__+MAX_llx_menu__, 'products', 'service', 3__+MAX_llx_menu__, '/product/index.php?leftmenu=service&type=1', 'Services', 0, 'products', '$user->rights->service->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->service->enabled', __HANDLER__, 'left', 2901__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/card.php?leftmenu=service&action=create&type=1', 'NewService', 1, 'products', '$user->rights->service->creer', '', 2, 0, __ENTITY__);
@@ -104,8 +105,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__);
@@ -165,9 +166,16 @@ 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->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'accountancy', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture.php?action=create&leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 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->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'Repeatable', 1, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1703__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/impayees.php?action=facturer&leftmenu=customers_bills', 'Unpaid', 1, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1705__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'List', 1, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1720__+MAX_llx_menu__, 'accountancy', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&search_status=0', 'BillShortStatusDraft', 2, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1721__+MAX_llx_menu__, 'accountancy', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&search_status=1', 'BillShortStatusNotPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1722__+MAX_llx_menu__, 'accountancy', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&search_status=2', 'BillShortStatusPaid', 2, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1723__+MAX_llx_menu__, 'accountancy', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&search_status=3', 'BillShortStatusCanceled', 2, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?leftmenu=customers_bills', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __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->facture->enabled', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'accountancy', '', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?leftmenu=customers_bills', 'Reportings', 2, 'bills', '$user->rights->facture->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->facture->enabled', __HANDLER__, 'left', 1703__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/mergepdftool.php?action=facturer&leftmenu=customers_bills', 'MergingPDFTool', 1, 'bills', '$user->rights->facture->lire', '', 2, 7, __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->facture->enabled', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__);
 -- Accountancy - Orders to bill
 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->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index d6ee928b121..e076e674be2 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1,7 +1,7 @@
 
  * Copyright (C) 2010      Regis Houssin        
- * Copyright (C) 2012-2014 Juanjo Menent        
+ * Copyright (C) 2012-2015 Juanjo Menent        
  * Copyright (C) 2013      Cédric Salvador      
  * Copyright (C) 2015      Marcos García        
  *
@@ -218,9 +218,9 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0)
 
 
 	// Tools
-	$tmpentry=array('enabled'=>(! empty($conf->barcode->enabled) || ! empty($conf->mailing->enabled) || ! empty($conf->export->enabled) || ! empty($conf->import->enabled) || ! empty($conf->opensurvey->enabled)),
-	'perms'=>(! empty($conf->barcode->enabled) || ! empty($user->rights->mailing->lire) || ! empty($user->rights->export->lire) || ! empty($user->rights->import->run) || ! empty($user->rights->opensurvey->read)),
-	'module'=>'mailing|export|import|opensurvey');
+	$tmpentry=array('enabled'=>(! empty($conf->barcode->enabled) || ! empty($conf->mailing->enabled) || ! empty($conf->export->enabled) || ! empty($conf->import->enabled) || ! empty($conf->opensurvey->enabled)  || ! empty($conf->resource->enabled)),
+	'perms'=>(! empty($conf->barcode->enabled) || ! empty($user->rights->mailing->lire) || ! empty($user->rights->export->lire) || ! empty($user->rights->import->run) || ! empty($user->rights->opensurvey->read) || ! empty($user->rights->resource->read)),
+	'module'=>'mailing|export|import|opensurvey|resource');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
 	{
@@ -695,7 +695,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
                 if ((empty($leftmenu) || $leftmenu=="orders_suppliers") && empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartially"), 2, $user->rights->fournisseur->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
@@ -741,27 +741,30 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->facture->enabled))
 			{
 				$langs->load("bills");
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire, '', $mainmenu, 'customers_bills');
-				$newmenu->add("/compta/facture.php?action=create&leftmenu=customers_bills",$langs->trans("NewBill"),1,$user->rights->facture->creer);
-				$newmenu->add("/compta/facture/fiche-rec.php?leftmenu=customers_bills",$langs->trans("Repeatables"),1,$user->rights->facture->lire);
+				$newmenu->add("/compta/facture/list.php",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire, '', $mainmenu, 'customers_bills');
+				$newmenu->add("/compta/facture.php?action=create",$langs->trans("NewBill"),1,$user->rights->facture->creer);
+				$newmenu->add("/compta/facture/fiche-rec.php",$langs->trans("Repeatables"),1,$user->rights->facture->lire);
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire);
 
-				if (empty($leftmenu) || ($leftmenu == 'customers_bills')) {
+				if (empty($leftmenu) || ($leftmenu == 'customers_bills'))
+				{
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=0",$langs->trans("BillShortStatusDraft"),2,$user->rights->facture->lire);
-					$newmenu->add("/compta/facture/impayees.php?leftmenu=customers_bills",$langs->trans("BillShortStatusNotPaid"),2,$user->rights->facture->lire);
+					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=1",$langs->trans("BillShortStatusNotPaid"),2,$user->rights->facture->lire);
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=2",$langs->trans("BillShortStatusPaid"),2,$user->rights->facture->lire);
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=3",$langs->trans("BillShortStatusCanceled"),2,$user->rights->facture->lire);
 				}
 
-				$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payments",$langs->trans("Payments"),1,$user->rights->facture->lire);
+				$newmenu->add("/compta/paiement/list.php",$langs->trans("Payments"),1,$user->rights->facture->lire);
 
 				if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
 				{
-					$newmenu->add("/compta/paiement/avalider.php?leftmenu=customers_bills_payments",$langs->trans("MenuToValid"),2,$user->rights->facture->lire);
+					$newmenu->add("/compta/paiement/avalider.php",$langs->trans("MenuToValid"),2,$user->rights->facture->lire);
 				}
-				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_payments",$langs->trans("Reportings"),2,$user->rights->facture->lire);
+				$newmenu->add("/compta/paiement/rapport.php",$langs->trans("Reportings"),2,$user->rights->facture->lire);
 
-				$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills", $langs->trans("Statistics"),1,$user->rights->facture->lire);
+				$newmenu->add("/compta/facture/mergepdftool.php",$langs->trans("MergingPDFTool"),1,$user->rights->facture->lire);
+
+				$newmenu->add("/compta/facture/stats/index.php", $langs->trans("Statistics"),1,$user->rights->facture->lire);
 			}
 
 			// Suppliers
@@ -1052,14 +1055,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/product/index.php?leftmenu=product&type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product');
 				$newmenu->add("/product/card.php?leftmenu=product&action=create&type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);
 				$newmenu->add("/product/list.php?leftmenu=product&type=0", $langs->trans("List"), 1, $user->rights->produit->lire);
-				if (! empty($conf->propal->enabled))
-				{
-					$newmenu->add("/product/popuprop.php?leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);
-				}
 				if (! empty($conf->stock->enabled))
 				{
 					$newmenu->add("/product/reassort.php?type=0", $langs->trans("Stocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 				}
+				if (! empty($conf->productbatch->enabled))
+				{
+					$langs->load("stocks");
+					$newmenu->add("/product/reassortlot.php?type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
+				}
+				if (! empty($conf->propal->enabled))
+				{
+					$newmenu->add("/product/popuprop.php?leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);
+				}
 			}
 
 			// Services
@@ -1091,8 +1099,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
@@ -1102,6 +1110,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings');
 				$newmenu->add("/expedition/card.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
 				$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);
+				if (empty($leftmenu) || $leftmenu=="sendings") $newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);
+				if (empty($leftmenu) || $leftmenu=="sendings") $newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);
+				if (empty($leftmenu) || $leftmenu=="sendings") $newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);
 				$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);
 			}
 
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index ff7ce036c5d..867c3bf663a 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -453,7 +453,7 @@ class pdf_strato extends ModelePDFContract
 	 *  Show top header of page.
 	 *
 	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  CommonObject		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -631,10 +631,10 @@ class pdf_strato extends ModelePDFContract
 	 *   	Show footer of page. Need this->emetteur object
      *
 	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	CommonObject		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	void
+	 *      @return	integer
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 8f789e03644..7555204a84d 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -69,7 +69,7 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	public $posxprogress;
 
-	
+
 	/**
 	 *	Constructor
 	 *
@@ -294,7 +294,7 @@ class pdf_crabe extends ModelePDFFactures
 				}
 
 				// Situation invoice handling
-				if ($object->situation_cycle_ref) 
+				if ($object->situation_cycle_ref)
 				{
 					$this->situationinvoice = True;
 					$progress_width = 14;
@@ -333,16 +333,16 @@ class pdf_crabe extends ModelePDFFactures
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
 						$nexY = $pdf->GetY();
 						$height_incoterms=$nexY-$tab_top;
-	
+
 						// Rect prend une longueur en 3eme param
 						$pdf->SetDrawColor(192,192,192);
 						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
-	
+
 						$tab_top = $nexY+6;
 						$height_incoterms += 4;
 					}
 				}
-				
+
 				// Affiche notes
 				$notetoshow=empty($object->note_public)?'':$object->note_public;
 				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
@@ -509,7 +509,7 @@ class pdf_crabe extends ModelePDFFactures
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
-					
+
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					$prev_progress = $object->lines[$i]->get_prev_progress();
 					if ($prev_progress > 0) // Compute progress from previous situation
@@ -1217,7 +1217,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			// Escompte
-			if ($object->close_code == 'discount_vat')
+			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
 			{
 				$index++;
 				$pdf->SetFillColor(255,255,255);
@@ -1482,12 +1482,12 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
 		}
 
-		if ($object->client->code_client)
+		if ($object->thirdparty->code_client)
 		{
 			$posy+=3;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		$posy+=1;
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 22008bb054d..da59679b1be 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -376,7 +376,7 @@ class ImportCsv extends ModeleImports
 						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
 						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
 					}
-					else dol_print_error($this->db);;
+					else dol_print_error($this->db);
 				}
 				else
 				{
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index 49fb7decd69..4fa5052a90a 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -63,7 +63,7 @@ class ModeleImports
 	 *  Charge en memoire et renvoie la liste des modeles actifs
 	 *
      *  @param	DoliDB	$db     			Database handler
-     *  @param  string	$maxfilenamelength  Max length of value to show
+     *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
 	function liste_modeles($db,$maxfilenamelength=0)
diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php
index 22c25bcfd5f..0a439ed8fe7 100644
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/livraison/modules_livraison.php
@@ -42,7 +42,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
 	 *  Return list of active generation modules
 	 *
      *  @param	DoliDB	$db     			Database handler
-     *  @param  string	$maxfilenamelength  Max length of value to show
+     *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
 	static function liste_modeles($db,$maxfilenamelength=0)
@@ -151,7 +151,7 @@ abstract class ModeleNumRefDeliveryOrder
  *	Create object on disk
  *
  *	@param	DoliDB		$db  			objet base de donnee
- *	@param	Object		$object			object delivery
+ *	@param	Livraison		$object			object delivery
  *	@param	string		$modele			force le modele a utiliser ('' to not force)
  *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
  *  @return int         				0 if KO, 1 if OK
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 3f8df87cd7a..558b83ed53f 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -60,7 +60,7 @@ class mailing_contacts1 extends MailingTargets
 	 *	array of SQL request that returns two field:
 	 *	One called "label", One called "nb".
 	 *
-	 *	@return		array		Array with SQL requests
+	 *	@return		string[]		Array with SQL requests
 	 */
 	function getSqlArrayForStats()
 	{
@@ -85,7 +85,7 @@ class mailing_contacts1 extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param	string	$sql		Requete sql de comptage
+	 *  @param		string	$sql		Requete sql de comptage
 	 *	@return		int
 	 */
 	function getNbOfRecipients($sql='')
diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php
index fe49ce56b35..b1e22110f5e 100644
--- a/htdocs/core/modules/mailings/contacts2.modules.php
+++ b/htdocs/core/modules/mailings/contacts2.modules.php
@@ -152,7 +152,7 @@ class mailing_contacts2 extends MailingTargets
     /**
      * 		Return here number of distinct emails returned by your selector.
      *
-     *		@param	string	$sql		Requete sql de comptage
+     *		@param		string	$sql		Requete sql de comptage
      * 		@return		int
      */
     function getNbOfRecipients($sql='')
diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php
index 92640291088..0c1ccc86d61 100644
--- a/htdocs/core/modules/mailings/contacts3.modules.php
+++ b/htdocs/core/modules/mailings/contacts3.modules.php
@@ -88,7 +88,7 @@ class mailing_contacts3 extends MailingTargets
     	$sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
     	$sql.= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
     	if ($filtersarray[0] <> 'all') $sql.= " AND cs.fk_categorie = c.rowid";
-    	if ($filtersarray[0] <> 'all') $sql.= " AND cs.fk_societe = sp.fk_soc";
+    	if ($filtersarray[0] <> 'all') $sql.= " AND cs.fk_soc = sp.fk_soc";
     	if ($filtersarray[0] <> 'all') $sql.= " AND c.label = '".$this->db->escape($filtersarray[0])."'";
     	$sql.= " ORDER BY sp.lastname, sp.firstname";
 
@@ -144,7 +144,7 @@ class mailing_contacts3 extends MailingTargets
             $statssql[$i].= " AND sp.email != ''";    // Note that null != '' is false
             $statssql[$i].= " AND sp.entity IN (".getEntity('societe', 1).")";
             $statssql[$i].= " AND cs.fk_categorie = c.rowid";
-            $statssql[$i].= " AND cs.fk_societe = sp.fk_soc";
+            $statssql[$i].= " AND cs.fk_soc = sp.fk_soc";
             $statssql[$i].= " GROUP BY c.label";
             $statssql[$i].= " ORDER BY nb DESC";
             $statssql[$i].= " LIMIT $i,1";
@@ -157,7 +157,7 @@ class mailing_contacts3 extends MailingTargets
     /**
      *		Return here number of distinct emails returned by your selector.
      *
-     *		@param	string	$sql		Requete sql de comptage
+     *		@param		string	$sql		Requete sql de comptage
      *		@return		int		Number of recipients
      */
     function getNbOfRecipients($sql='')
@@ -183,7 +183,7 @@ class mailing_contacts3 extends MailingTargets
         $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
         $sql.= " AND sp.email != ''"; // Note that null != '' is false
         $sql.= " AND cs.fk_categorie = c.rowid";
-        $sql.= " AND cs.fk_societe = sp.fk_soc";
+        $sql.= " AND cs.fk_soc = sp.fk_soc";
         */
     	// La requete doit retourner un champ "nb" pour etre comprise
     	// par parent::getNbOfRecipients
@@ -210,7 +210,7 @@ class mailing_contacts3 extends MailingTargets
         $sql.= " AND sp.no_email = 0";
         $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
         $sql.= " AND cs.fk_categorie = c.rowid";
-        $sql.= " AND cs.fk_societe = sp.fk_soc";
+        $sql.= " AND cs.fk_soc = sp.fk_soc";
         $sql.= " GROUP BY c.label";
         $sql.= " ORDER BY c.label";
 
diff --git a/htdocs/core/modules/mailings/contacts4.modules.php b/htdocs/core/modules/mailings/contacts4.modules.php
index 59355b372fe..56134d38932 100644
--- a/htdocs/core/modules/mailings/contacts4.modules.php
+++ b/htdocs/core/modules/mailings/contacts4.modules.php
@@ -145,7 +145,7 @@ class mailing_contacts4 extends MailingTargets
             $statssql[$i].= " AND sp.email != ''";    // Note that null != '' is false
             $statssql[$i].= " AND sp.entity IN (".getEntity('societe', 1).")";
             $statssql[$i].= " AND cs.fk_categorie = c.rowid";
-            $statssql[$i].= " AND cs.fk_societe = sp.fk_soc";
+            $statssql[$i].= " AND cs.fk_soc = sp.fk_soc";
             $statssql[$i].= " GROUP BY c.label";
             $statssql[$i].= " ORDER BY nb DESC";
             $statssql[$i].= " LIMIT $i,1";
@@ -158,7 +158,7 @@ class mailing_contacts4 extends MailingTargets
     /**
      *		Return here number of distinct emails returned by your selector.
      *
-     *		@param	string	$sql		Requete sql de comptage
+     *		@param		string	$sql		Requete sql de comptage
      *		@return		int		Number of recipients
      */
     function getNbOfRecipients($sql='')
@@ -183,7 +183,7 @@ class mailing_contacts4 extends MailingTargets
         $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
         $sql.= " AND sp.email != ''"; // Note that null != '' is false
         $sql.= " AND cs.fk_categorie = c.rowid";
-        $sql.= " AND cs.fk_societe = sp.fk_soc";
+        $sql.= " AND cs.fk_soc = sp.fk_soc";
         */
     	// La requete doit retourner un champ "nb" pour etre comprise
     	// par parent::getNbOfRecipients
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index a7eb1b0b839..428285fb20b 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -100,8 +100,8 @@ class mailing_example extends MailingTargets
      *	For example if this selector is used to extract 500 different
      *	emails from a text file, this function must return 500.
      *
-     *  @param	string	$sql		Requete sql de comptage
-     *	@return		int
+     *  @param		string		$sql		Requete sql de comptage
+     *	@return		int|string				Number of recipient or '?'
      */
     function getNbOfRecipients($sql='')
     {
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index dd6e18dfa91..963e8ef0c28 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -63,7 +63,7 @@ class mailing_fraise extends MailingTargets
 	 *	array of SQL request that returns two field:
 	 *	One called "label", One called "nb".
 	 *
-	 *	@return		array		Array with SQL requests
+	 *	@return		string[]		Array with SQL requests
 	 */
     function getSqlArrayForStats()
 	{
@@ -86,8 +86,8 @@ class mailing_fraise extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param	string	$sql		Requete sql de comptage
-	 *	@return		int			Nb of recipients
+	 *  @param		string		$sql		Requete sql de comptage
+	 *	@return		int						Nb of recipients
 	 */
     function getNbOfRecipients($sql='')
     {
diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php
index c647466e796..e25ffad5f1b 100644
--- a/htdocs/core/modules/mailings/framboise.modules.php
+++ b/htdocs/core/modules/mailings/framboise.modules.php
@@ -150,8 +150,8 @@ class mailing_framboise extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param	string	$sql		Requete sql de comptage
-	 *	@return		int			Nb of recipients
+	 *  @param		string	$sql		Requete sql de comptage
+	 *	@return		int					Nb of recipients
 	 */
 	function getNbOfRecipients($sql='')
 	{
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 5561526a7ff..2508440c147 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -72,8 +72,8 @@ class MailingTargets    // This can't be abstract as it is used for some method
     /**
      * Retourne nombre de destinataires
      *
-     * @param      string	$sql        Requete sql de comptage
-     * @return     int       			Nb de destinataires si ok, < 0 si erreur
+     * @param      string	$sql        Sql request to count
+     * @return     int       			Nb of recipient, or <0 if error
      */
     function getNbOfRecipients($sql)
     {
@@ -85,7 +85,7 @@ class MailingTargets    // This can't be abstract as it is used for some method
         }
         else
         {
-        	$this->error=$this->db->error();
+        	$this->error=$this->db->lasterror();
             return -1;
         }
     }
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index df8ec79f988..cfccc1ff673 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -74,7 +74,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql.= " WHERE s.email <> ''";
 		    $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
 		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql.= " AND cs.fk_societe = s.rowid";
+		    $sql.= " AND cs.fk_soc = s.rowid";
 		    $sql.= " AND c.rowid = cs.fk_categorie";
 		    $sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
 		    $sql.= " UNION ";
@@ -83,7 +83,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql.= " WHERE s.email <> ''";
 		    $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
 		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql.= " AND cs.fk_societe = s.rowid";
+		    $sql.= " AND cs.fk_soc = s.rowid";
 		    $sql.= " AND c.rowid = cs.fk_categorie";
 		    $sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
 		}
@@ -157,7 +157,7 @@ class mailing_thirdparties extends MailingTargets
 	 *	emails from a text file, this function must return 500.
 	 *
 	 *  @param      string	$sql        Requete sql de comptage
-	 *	@return		int			Nb of recipients
+	 *	@return		int					Nb of recipients
 	 */
 	function getNbOfRecipients($sql='')
 	{
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 777621fa432..7b6f8361d24 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -73,8 +73,8 @@ class mailing_xinputfile extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param      string	$sql        Requete sql de comptage
-	 *	@return		int			'' means NA
+	 *  @param      string	$sql        Sql request to count
+	 *	@return		string				'' means NA
 	 */
 	function getNbOfRecipients($sql='')
 	{
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index 0d01aa53912..7832d1f6a93 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -73,8 +73,8 @@ class mailing_xinputuser extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param      string	$sql   Requete sql de comptage
-	 *	@return		int			'' means NA
+	 *  @param      string	$sql   	Sql request to count
+	 *	@return		string			'' means NA
 	 */
 	function getNbOfRecipients($sql='')
 	{
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 246aac2b6d7..df698b26a90 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -143,9 +143,9 @@ class modBanque extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Ecritures bancaires et releves';
 		$this->export_permission[$r]=array(array("banque","export"));
-		$this->export_fields_array[$r]=array('b.rowid'=>'IdTransaction','ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.dateo'=>'DateOperation','b.label'=>'Label','b.num_chq'=>'ChequeOrTransferNumber','-b.amount'=>'Debit','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","s.code_compta"=>"CustomerAccountancyCode","s.code_compta_fournisseur"=>"SupplierAccountancyCode");
-		$this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.dateo'=>'Date','b.label'=>'Text','b.num_chq'=>'Text','-b.amount'=>'Number','b.amount'=>'Number','b.num_releve'=>'Text','b.datec'=>"Date","bu.url_id"=>"Text","s.nom"=>"Text","s.code_compta"=>"Text","s.code_compta_fournisseur"=>"Text");
-		$this->export_entities_array[$r]=array('b.rowid'=>'account','ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.dateo'=>'account','b.label'=>'account','b.num_chq'=>'account','-b.amount'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account","bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company");
+		$this->export_fields_array[$r]=array('b.rowid'=>'IdTransaction','ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.dateo'=>'DateOperation','b.label'=>'Label','b.num_chq'=>'ChequeOrTransferNumber','b.fk_bordereau'=>'ChequeBordereau','-b.amount'=>'Debit','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","s.code_compta"=>"CustomerAccountancyCode","s.code_compta_fournisseur"=>"SupplierAccountancyCode");
+		$this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.dateo'=>'Date','b.label'=>'Text','b.num_chq'=>'Text','b.fk_bordereau'=>'Text','-b.amount'=>'Number','b.amount'=>'Number','b.num_releve'=>'Text','b.datec'=>"Date","bu.url_id"=>"Text","s.nom"=>"Text","s.code_compta"=>"Text","s.code_compta_fournisseur"=>"Text");
+		$this->export_entities_array[$r]=array('b.rowid'=>'account','ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.dateo'=>'account','b.label'=>'account','b.num_chq'=>'account','b.fk_bordereau'=>'account','-b.amount'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account","bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company");
 		$this->export_special_array[$r]=array('-b.amount'=>'NULLIFNEG','b.amount'=>'NULLIFNEG');
 	    if (empty($conf->fournisseur->enabled))
         {
@@ -164,11 +164,11 @@ class modBanque extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Bordereaux remise Chq/Fact';
 		$this->export_permission[$r]=array(array("banque","export"));
-		$this->export_fields_array[$r]=array("bch.number"=>"Numero","bch.ref_ext"=>"RefExt",'ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.num_chq'=>'ChequeOrTransferNumber','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation",
+		$this->export_fields_array[$r]=array("bch.rowid"=>"bordereauid","bch.number"=>"Numero","bch.ref_ext"=>"RefExt",'ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.num_chq'=>'ChequeOrTransferNumber','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation",
 			"bch.date_bordereau"=>"Date","bch.amount"=>"Total","bch.nbcheque"=>"NbCheque","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","f.facnumber"=>"InvoiceRef"
 			);
 		$this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.num_chq'=>'Text','b.amount'=>'Number','b.num_releve'=>'Text','b.datec'=>"Date",
-			"bch.date_bordereau"=>"Date","bch.number"=>"Number","bch.ref_ext"=>"Text","bch.amount"=>"Number","bch.nbcheque"=>"NumBer","bu.url_id"=>"Text","s.nom"=>"Text","f.facnumber"=>"Text"
+			"bch.date_bordereau"=>"Date","bch.rowid"=>"Number","bch.number"=>"Number","bch.ref_ext"=>"Text","bch.amount"=>"Number","bch.nbcheque"=>"NumBer","bu.url_id"=>"Text","s.nom"=>"Text","f.facnumber"=>"Text"
 			);
 		$this->export_entities_array[$r]=array('ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.num_chq'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account",
 			"bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company","f.facnumber"=>"invoice");
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 3084677c4ef..51a55d0cab0 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -121,7 +121,7 @@ class modCategorie extends DolibarrModules
 		$this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company");	// We define here only fields that use another picto
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_fournisseur as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_societe = s.rowid';
+		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
 		$this->export_sql_end[$r] .=' AND u.type = 1';	// Supplier categories
 
@@ -136,7 +136,7 @@ class modCategorie extends DolibarrModules
 		$this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company",'s.fk_prospectlevel'=>'company','s.fk_stcomm'=>'company');	// We define here only fields that use another picto
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_societe as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_societe = s.rowid';
+		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
 		$this->export_sql_end[$r] .=' AND u.type = 2';	// Customer/Prospect categories
 
@@ -316,14 +316,14 @@ class modCategorie extends DolibarrModules
 			$this->import_icon[$r]=$this->picto;
 			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 			$this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
-			$this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_societe'=>"ThirdParty*"
+			$this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_soc'=>"ThirdParty*"
 			);
 
 			$this->import_convertvalue_array[$r]=array(
 					'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
-					'cs.fk_societe'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
+					'cs.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
 			);
-			$this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_societe'=>"MyBigCompany");
+			$this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_soc'=>"MyBigCompany");
 		}
 
 		if (! empty($conf->fournisseur->enabled))
@@ -335,14 +335,14 @@ class modCategorie extends DolibarrModules
 			$this->import_icon[$r]=$this->picto;
 			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 			$this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_fournisseur');
-			$this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_societe'=>"Supplier*"
+			$this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_soc'=>"Supplier*"
 			);
 
 			$this->import_convertvalue_array[$r]=array(
 					'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
-					'cs.fk_societe'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
+					'cs.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
 			);
-			$this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_societe'=>"MyBigCompany");
+			$this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_soc'=>"MyBigCompany");
 		}
 	}
 
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 7b070ae6340..9458a7844f6 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -209,8 +209,11 @@ class modFacture extends DolibarrModules
         				$typeFilter="Boolean";
         				break;
         			case 'sellist':
-        				$typeFilter="List:".$obj->param;
-        				break;
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
         			}
         			$this->export_fields_array[$r][$fieldname]=$fieldlabel;
         			$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
@@ -265,7 +268,10 @@ class modFacture extends DolibarrModules
 						$typeFilter="Boolean";
 						break;
 					case 'sellist':
-						$typeFilter="List:".$obj->param;
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 98986a045da..dc537426179 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -67,425 +67,466 @@ 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;
+		$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] = "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++;
+
+		// 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;
+
+		$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] = 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] = 'supplier_order_advance';
+		$this->rights[$r][5] = 'validate';
+
+		$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] = 1191;
+		$this->rights[$r][1] = 'Approuver une commande fournisseur (si supérieur hiérarchique)';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'approve_ifsupervisor_advance';*/
+
+		$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] = 1189;
+        $this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'commande_advance';
+        $this->rights[$r][5] = 'check';
+
+		$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] = 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] = 'supplier_invoice_advance';
+		$this->rights[$r][5] = 'validate';
+
+		$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] = 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';
+
+	    if ($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL)
+	    {
 			$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_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'),
-            );
-
-            // 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] = 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] = 1184;
-            $this->rights[$r][1] = 'Valider une commande fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'supplier_order_advance';
-            $this->rights[$r][5] = 'validate';
-
-            $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] = 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] = 1189;
-            $this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande_advance';
-            $this->rights[$r][5] = 'check';
-
-            $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] = 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] = 'supplier_invoice_advance';
-            $this->rights[$r][5] = 'validate';
-
-            $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][0] = 1190;
+			$this->rights[$r][1] = 'Approve supplier order (second level)';		// $langs->trans("Permission1190");
+			$this->rights[$r][2] = 'w';
 			$this->rights[$r][3] = 0;
-			$this->rights[$r][4] = 'supplier_invoice_advance';
-			$this->rights[$r][5] = 'send';
+			$this->rights[$r][4] = 'commande';
+			$this->rights[$r][5] = 'approve2';
+	    }
 
-            $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';
+		// 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'=>'Number','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'=>'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'=>"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 object
-			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
-			$resql=$this->db->query($sql);
-			if ($resql)    // This can fail when class is used on old database (during migration for example)
+		$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'=>'Number','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'=>'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'=>"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 object
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
+		$resql=$this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj=$this->db->fetch_object($resql))
 			{
-				while ($obj=$this->db->fetch_object($resql))
+				$fieldname='extra.'.$obj->name;
+				$fieldlabel=ucfirst($obj->label);
+				$typeFilter="Text";
+				switch($obj->type)
 				{
-					$fieldname='extra.'.$obj->name;
-					$fieldlabel=ucfirst($obj->label);
-					$typeFilter="Text";
-					switch($obj->type)
-					{
-						case 'int':
-						case 'double':
-						case 'price':
-							$typeFilter="Numeric";
-							break;
-						case 'date':
-						case 'datetime':
-							$typeFilter="Date";
-							break;
-						case 'boolean':
-							$typeFilter="Boolean";
-							break;
-						case 'sellist':
-							$typeFilter="List:".$obj->param;
-							break;
-					}
-					$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-					$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-					$this->export_entities_array[$r][$fieldname]='invoice';
+					case 'int':
+					case 'double':
+					case 'price':
+						$typeFilter="Numeric";
+						break;
+					case 'date':
+					case 'datetime':
+						$typeFilter="Date";
+						break;
+					case 'boolean':
+						$typeFilter="Boolean";
+						break;
+					case 'sellist':
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
 				}
+				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+				$this->export_entities_array[$r][$fieldname]='invoice';
 			}
-			// End add extra fields
-			// Add extra fields line
-			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det'";
-			$resql=$this->db->query($sql);
-			if ($resql)    // This can fail when class is used on old database (during migration for example)
+		}
+		// End add extra fields
+		// Add extra fields line
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det'";
+		$resql=$this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj=$this->db->fetch_object($resql))
 			{
-				while ($obj=$this->db->fetch_object($resql))
+				$fieldname='extraline.'.$obj->name;
+				$fieldlabel=ucfirst($obj->label);
+				$typeFilter="Text";
+				switch($obj->type)
 				{
-					$fieldname='extraline.'.$obj->name;
-					$fieldlabel=ucfirst($obj->label);
-					$typeFilter="Text";
-					switch($obj->type)
-					{
-						case 'int':
-						case 'double':
-						case 'price':
-							$typeFilter="Numeric";
-							break;
-						case 'date':
-						case 'datetime':
-							$typeFilter="Date";
-							break;
-						case 'boolean':
-							$typeFilter="Boolean";
-							break;
-						case 'sellist':
-							$typeFilter="List:".$obj->param;
-							break;
-					}
-					$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-					$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-					$this->export_entities_array[$r][$fieldname]='invoice_line';
+					case 'int':
+					case 'double':
+					case 'price':
+						$typeFilter="Numeric";
+						break;
+					case 'date':
+					case 'datetime':
+						$typeFilter="Date";
+						break;
+					case 'boolean':
+						$typeFilter="Boolean";
+						break;
+					case 'sellist':
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
 				}
+				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+				$this->export_entities_array[$r][$fieldname]='invoice_line';
 			}
-			// End add extra fields line
-			$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.'facture_fourn_det_extrafields as extraline ON fd.rowid = extraline.fk_object';
-            $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 IN ('.getEntity('supplier_invoice',1).')';
+		}
+		// End add extra fields line
+		$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.'facture_fourn_det_extrafields as extraline ON fd.rowid = extraline.fk_object';
+		$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 IN ('.getEntity('supplier_invoice',1).')';
 
-            $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 object
-			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
-			$resql=$this->db->query($sql);
-			if ($resql)    // This can fail when class is used on old database (during migration for example)
+		$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 object
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
+		$resql=$this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj=$this->db->fetch_object($resql))
 			{
-				while ($obj=$this->db->fetch_object($resql))
+				$fieldname='extra.'.$obj->name;
+				$fieldlabel=ucfirst($obj->label);
+				$typeFilter="Text";
+				switch($obj->type)
 				{
-					$fieldname='extra.'.$obj->name;
-					$fieldlabel=ucfirst($obj->label);
-					$typeFilter="Text";
-					switch($obj->type)
-					{
-						case 'int':
-						case 'double':
-						case 'price':
-							$typeFilter="Numeric";
-							break;
-						case 'date':
-						case 'datetime':
-							$typeFilter="Date";
-							break;
-						case 'boolean':
-							$typeFilter="Boolean";
-							break;
-						case 'sellist':
-							$typeFilter="List:".$obj->param;
-							break;
-					}
-					$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-					$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-					$this->export_entities_array[$r][$fieldname]='invoice';
+					case 'int':
+					case 'double':
+					case 'price':
+						$typeFilter="Numeric";
+						break;
+					case 'date':
+					case 'datetime':
+						$typeFilter="Date";
+						break;
+					case 'boolean':
+						$typeFilter="Boolean";
+						break;
+					case 'sellist':
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
 				}
+				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+				$this->export_entities_array[$r][$fieldname]='invoice';
 			}
-			// End add extra fields object
-            $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 IN ('.getEntity('supplier_invoice',1).')';
+		}
+		// End add extra fields object
+		$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 IN ('.getEntity('supplier_invoice',1).')';
 
-
-
-            $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_public'=>"NotePublic",'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_public'=>"Text",'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_public'=>"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
-			// Add extra fields object
-			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur'";
-			$resql=$this->db->query($sql);
-			if ($resql)    // This can fail when class is used on old database (during migration for example)
+		// Order
+		$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.date_approve'=>'DateApprove','f.date_approve2'=>'DateApprove2','f.note_public'=>"NotePublic",'f.note_private'=>"NotePrivate",'ua1.login'=>'ApprovedBy','ua2.login'=>'ApprovedBy2','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');
+		if (empty($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL))
+		{
+			unset($this->export_fields_array['f.date_approve2']);
+			unset($this->export_fields_array['ua2.login']);
+		}
+		$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.date_approve'=>'Date','f.date_approve2'=>'Date','f.note_public'=>"Text",'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','ua1.login'=>'user','ua2.login'=>'user','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
+		// Add extra fields object
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur'";
+		$resql=$this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj=$this->db->fetch_object($resql))
 			{
-				while ($obj=$this->db->fetch_object($resql))
+				$fieldname='extra.'.$obj->name;
+				$fieldlabel=ucfirst($obj->label);
+				$typeFilter="Text";
+				switch($obj->type)
 				{
-					$fieldname='extra.'.$obj->name;
-					$fieldlabel=ucfirst($obj->label);
-					$typeFilter="Text";
-					switch($obj->type)
-					{
-						case 'int':
-						case 'double':
-						case 'price':
-							$typeFilter="Numeric";
-							break;
-						case 'date':
-						case 'datetime':
-							$typeFilter="Date";
-							break;
-						case 'boolean':
-							$typeFilter="Boolean";
-							break;
-						case 'sellist':
-							$typeFilter="List:".$obj->param;
-							break;
-					}
-					$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-					$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-					$this->export_entities_array[$r][$fieldname]='order';
+					case 'int':
+					case 'double':
+					case 'price':
+						$typeFilter="Numeric";
+						break;
+					case 'date':
+					case 'datetime':
+						$typeFilter="Date";
+						break;
+					case 'boolean':
+						$typeFilter="Boolean";
+						break;
+					case 'sellist':
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
 				}
+				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+				$this->export_entities_array[$r][$fieldname]='order';
 			}
-			// End add extra fields object
-			// Add extra fields line
-			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet'";
-			$resql=$this->db->query($sql);
-			if ($resql)    // This can fail when class is used on old database (during migration for example)
+		}
+		// End add extra fields object
+		// Add extra fields line
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet'";
+		$resql=$this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj=$this->db->fetch_object($resql))
 			{
-				while ($obj=$this->db->fetch_object($resql))
+				$fieldname='extraline.'.$obj->name;
+				$fieldlabel=ucfirst($obj->label);
+				$typeFilter="Text";
+				switch($obj->type)
 				{
-					$fieldname='extraline.'.$obj->name;
-					$fieldlabel=ucfirst($obj->label);
-					$typeFilter="Text";
-					switch($obj->type)
-					{
-						case 'int':
-						case 'double':
-						case 'price':
-							$typeFilter="Numeric";
-							break;
-						case 'date':
-						case 'datetime':
-							$typeFilter="Date";
-							break;
-						case 'boolean':
-							$typeFilter="Boolean";
-							break;
-						case 'sellist':
-							$typeFilter="List:".$obj->param;
-							break;
-					}
-					$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-					$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-					$this->export_entities_array[$r][$fieldname]='order_line';
+					case 'int':
+					case 'double':
+					case 'price':
+						$typeFilter="Numeric";
+						break;
+					case 'date':
+					case 'datetime':
+						$typeFilter="Date";
+						break;
+					case 'boolean':
+						$typeFilter="Boolean";
+						break;
+					case 'sellist':
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
 				}
+				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+				$this->export_entities_array[$r][$fieldname]='order_line';
 			}
-			// End add extra fields line
-            $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';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur_extrafields as extra ON f.rowid = extra.fk_object,';
-            $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields as extraline ON fd.rowid = extraline.fk_object';
-            $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 IN ('.getEntity('supplier_order',1).')';
-
+		}
+		// End add extra fields line
+		$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';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua1 ON ua1.rowid = f.fk_user_approve';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua2 ON ua2.rowid = f.fk_user_approve2';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur_extrafields as extra ON f.rowid = extra.fk_object,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields as extraline ON fd.rowid = extraline.fk_object';
+		$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 IN ('.getEntity('supplier_order',1).')';
 	}
 
 
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index a23fc59a2d0..dbdc56be3b2 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -190,7 +190,10 @@ class modProduct extends DolibarrModules
 						$typeFilter="Boolean";
 						break;
 					case 'sellist':
-						$typeFilter="List:".$obj->param;
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
 						break;
 				}
 		        $this->export_fields_array[$r][$fieldname]=$fieldlabel;
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 50d53f72c57..bf77943ea6c 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -51,7 +51,7 @@ class modProductBatch extends DolibarrModules
 
 		$this->rights_class = 'productbatch';
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'experimental';
+		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;
@@ -113,15 +113,15 @@ class modProductBatch extends DolibarrModules
 	function init($options='')
 	{
 	    global $db,$conf;
-	    
+
 		$sql = array();
-		
+
 		if(! empty($conf->cashdesk->enabled)) {
     		if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
     		    $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
     		}
 		}
-				
+
 		return $this->_init($sql, $options);
 	}
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 548306fc022..3f47ef3a0f5 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -231,8 +231,11 @@ class modProjet extends DolibarrModules
         				$typeFilter="Boolean";
         				break;
         			case 'sellist':
-        				$typeFilter="List:".$obj->param;
-        				break;
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
         		}
         		$this->export_fields_array[$r][$fieldname]=$fieldlabel;
         		$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
@@ -269,8 +272,11 @@ class modProjet extends DolibarrModules
         				$typeFilter="Boolean";
         				break;
         			case 'sellist':
-        				$typeFilter="List:".$obj->param;
-        				break;
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
         		}
         		$this->export_fields_array[$r][$fieldname]=$fieldlabel;
         		$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index e63f44c3945..da1f807ecac 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -61,7 +61,7 @@ class modResource extends DolibarrModules
 		// (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Manage resources (printers, cars, room, ...) you can then share into events";
 		// Possible values for version are: 'development', 'experimental' or version
-		$this->version = 'development';
+		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled
 		// (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
@@ -114,8 +114,7 @@ class modResource extends DolibarrModules
 		$this->requiredby = array('modPlace');
 		// Minimum version of PHP required by module
 		$this->phpmin = array(5, 3);
-		// Minimum version of Dolibarr required by module
-		$this->need_dolibarr_version = array(3, 5);
+		
 		$this->langfiles = array("resource@resource"); // langfiles@resource
 		// Constants
 		// List of particular constants to add when module is enabled
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 839d50709c7..b8040e41c7c 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -171,7 +171,10 @@ class modService extends DolibarrModules
 						$typeFilter="Boolean";
 						break;
 					case 'sellist':
-						$typeFilter="List:".$obj->param;
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 3a2bcefe8b2..6de689e792c 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -294,8 +294,11 @@ class modSociete extends DolibarrModules
         				$typeFilter="Boolean";
         				break;
         			case 'sellist':
-        				$typeFilter="List:".$obj->param;
-        				break;
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
         		}
         		$this->export_fields_array[$r][$fieldname]=$fieldlabel;
         		$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
@@ -353,8 +356,11 @@ class modSociete extends DolibarrModules
         				$typeFilter="Boolean";
         				break;
         			case 'sellist':
-        				$typeFilter="List:".$obj->param;
-        				break;
+						$tmp='';
+						$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+						break;
         		}
         		$this->export_fields_array[$r][$fieldname]=$fieldlabel;
         		$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 8f6840a21b0..63613862550 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -42,7 +42,7 @@ class modStock extends DolibarrModules
 	 */
 	function __construct($db)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		$this->db = $db;
 		$this->numero = 52;
@@ -123,16 +123,35 @@ class modStock extends DolibarrModules
 		$this->export_label[$r]="WarehousesAndProducts";	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("stock","lire"));
 		$this->export_fields_array[$r]=array('e.rowid'=>'IdWarehouse','e.label'=>'LocationSummary','e.description'=>'DescWareHouse','e.lieu'=>'LieuWareHouse','e.address'=>'Address','e.zip'=>'Zip','e.town'=>'Town','p.rowid'=>"ProductId",'p.ref'=>"Ref",'p.fk_product_type'=>"Type",'p.label'=>"Label",'p.description'=>"Description",'p.note'=>"Note",'p.price'=>"Price",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell",'p.duration'=>"Duration",'p.datec'=>'DateCreation','p.tms'=>'DateModification','ps.reel'=>'Stock');
-		$this->export_TypeFields_array[$r]=array('e.rowid'=>'List:entrepot:LabelWareHouse','e.label'=>'Text','e.lieu'=>'Text','e.address'=>'Text','e.zip'=>'Text','e.town'=>'Text','p.rowid'=>"List:produit:label",'p.ref'=>"Text",'p.fk_product_type'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.note'=>"Text",'p.price'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.duration'=>"Duree",'p.datec'=>'Date','p.tms'=>'Date','ps.reel'=>'Number');
+		$this->export_TypeFields_array[$r]=array('e.rowid'=>'List:entrepot:label','e.label'=>'Text','e.lieu'=>'Text','e.address'=>'Text','e.zip'=>'Text','e.town'=>'Text','p.rowid'=>"List:product:label",'p.ref'=>"Text",'p.fk_product_type'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.note'=>"Text",'p.price'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.duration'=>"Duree",'p.datec'=>'Date','p.tms'=>'Date','ps.reel'=>'Number');
 		$this->export_entities_array[$r]=array('e.rowid'=>'warehouse','e.label'=>'warehouse','e.description'=>'warehouse','e.lieu'=>'warehouse','e.address'=>'warehouse','e.zip'=>'warehouse','e.town'=>'warehouse','p.rowid'=>"product",'p.ref'=>"product",'p.fk_product_type'=>"product",'p.label'=>"product",'p.description'=>"product",'p.note'=>"product",'p.price'=>"product",'p.tva_tx'=>'product','p.tosell'=>"product",'p.duration'=>"product",'p.datec'=>'product','p.tms'=>'product','ps.reel'=>'stock');
 		$this->export_aggregate_array[$r]=array('ps.reel'=>'SUM');    // TODO Not used yet
-		$this->export_dependencies_array[$r]=array('stock'=>array('p.rowid','e.rowid')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-
+		$this->export_dependencies_array[$r]=array('stock'=>array('p.rowid','e.rowid')); // We must keep this until the aggregate_array is used. 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.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e';
 		$this->export_sql_end[$r] .=' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid';
 		$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock',1).')';
 
+		if ($conf->productbatch->enabled)
+		{
+			$langs->load("productbatch");
+
+			// This request is same than previous but without field ps.stock (real stock in warehouse) and with link to subtable productbatch
+			$r++;
+
+			$this->export_code[$r]=$this->rights_class.'_'.$r;
+			$this->export_label[$r]="WarehousesAndProductsBatchDetail";	// Translation key (used only if key ExportDataset_xxx_z not found)
+			$this->export_permission[$r]=array(array("stock","lire"));
+			$this->export_fields_array[$r]=array('e.rowid'=>'IdWarehouse','e.label'=>'LocationSummary','e.description'=>'DescWareHouse','e.lieu'=>'LieuWareHouse','e.address'=>'Address','e.zip'=>'Zip','e.town'=>'Town','p.rowid'=>"ProductId",'p.ref'=>"Ref",'p.fk_product_type'=>"Type",'p.label'=>"Label",'p.description'=>"Description",'p.note'=>"Note",'p.price'=>"Price",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell",'p.duration'=>"Duration",'p.datec'=>'DateCreation','p.tms'=>'DateModification','pb.rowid'=>'Id','pb.batch'=>'Batch','pb.eatby'=>'l_eatby','pb.sellby'=>'l_sellby','pb.qty'=>'Qty');
+			$this->export_TypeFields_array[$r]=array('e.rowid'=>'List:entrepot:label','e.label'=>'Text','e.lieu'=>'Text','e.address'=>'Text','e.zip'=>'Text','e.town'=>'Text','p.rowid'=>"List:product:label",'p.ref'=>"Text",'p.fk_product_type'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.note'=>"Text",'p.price'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.duration'=>"Duree",'p.datec'=>'Date','p.tms'=>'Date','pb.batch'=>'Text','pb.eatby'=>'Date','pb.sellby'=>'Date','pb.qty'=>'Number');
+			$this->export_entities_array[$r]=array('e.rowid'=>'warehouse','e.label'=>'warehouse','e.description'=>'warehouse','e.lieu'=>'warehouse','e.address'=>'warehouse','e.zip'=>'warehouse','e.town'=>'warehouse','p.rowid'=>"product",'p.ref'=>"product",'p.fk_product_type'=>"product",'p.label'=>"product",'p.description'=>"product",'p.note'=>"product",'p.price'=>"product",'p.tva_tx'=>'product','p.tosell'=>"product",'p.duration'=>"product",'p.datec'=>'product','p.tms'=>'product','pb.rowid'=>'batch','pb.batch'=>'batch','pb.eatby'=>'batch','pb.sellby'=>'batch','pb.qty'=>'batch');
+			$this->export_aggregate_array[$r]=array('ps.reel'=>'SUM');    // TODO Not used yet
+			$this->export_dependencies_array[$r]=array('batch'=>array('pb.rowid')); // We must keep this until the aggregate_array is used. 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.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e, '.MAIN_DB_PREFIX.'product_batch as pb';
+			$this->export_sql_end[$r] .=' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid AND ps.rowid = pb.fk_product_stock';
+			$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock',1).')';
+		}
 
 		// Imports
 		//--------
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index c683c2b34cc..fd7efdae5bc 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -209,10 +209,10 @@ class modUser extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Liste des utilisateurs Dolibarr et attributs';
 		$this->export_permission[$r]=array(array("user","user","export"));
-		$this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.office_phone'=>'Phone','u.office_fax'=>'Fax','u.email'=>'EMail','u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Administrator",'u.statut'=>'Status','u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion','u.fk_socpeople'=>"IdContact",'u.fk_societe'=>"IdCompany",'u.fk_member'=>"MemberId");
-		$this->export_TypeFields_array[$r]=array('u.login'=>"Text",'u.lastname'=>"Text",'u.firstname'=>"Text",'u.office_phone'=>'Text','u.office_fax'=>'Text','u.email'=>'Text','u.datec'=>"Date",'u.tms'=>"Date",'u.admin'=>"Boolean",'u.statut'=>'Status','u.note'=>"Text",'u.datelastlogin'=>'Date','u.datepreviouslogin'=>'Date','u.fk_societe'=>"List:societe:nom:rowid",'u.fk_member'=>"List:adherent:nom");
+		$this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.office_phone'=>'Phone','u.office_fax'=>'Fax','u.email'=>'EMail','u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Administrator",'u.statut'=>'Status','u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion','u.fk_socpeople'=>"IdContact",'u.fk_soc'=>"IdCompany",'u.fk_member'=>"MemberId");
+		$this->export_TypeFields_array[$r]=array('u.login'=>"Text",'u.lastname'=>"Text",'u.firstname'=>"Text",'u.office_phone'=>'Text','u.office_fax'=>'Text','u.email'=>'Text','u.datec'=>"Date",'u.tms'=>"Date",'u.admin'=>"Boolean",'u.statut'=>'Status','u.note'=>"Text",'u.datelastlogin'=>'Date','u.datepreviouslogin'=>'Date','u.fk_soc'=>"List:societe:nom:rowid",'u.fk_member'=>"List:adherent:nom");
 
-		$this->export_entities_array[$r]=array('u.rowid'=>"user",'u.login'=>"user",'u.lastname'=>"user",'u.firstname'=>"user",'u.office_phone'=>'user','u.office_fax'=>'user','u.email'=>'user','u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.statut'=>'user','u.note'=>"user",'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user','u.fk_socpeople'=>"contact",'u.fk_societe'=>"company",'u.fk_member'=>"member");
+		$this->export_entities_array[$r]=array('u.rowid'=>"user",'u.login'=>"user",'u.lastname'=>"user",'u.firstname'=>"user",'u.office_phone'=>'user','u.office_fax'=>'user','u.email'=>'user','u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.statut'=>'user','u.note'=>"user",'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user','u.fk_socpeople'=>"contact",'u.fk_soc'=>"company",'u.fk_member'=>"member");
         if (empty($conf->adherent->enabled))
         {
             unset($this->export_fields_array[$r]['u.fk_member']);
diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
index 3b53711f58c..7bb9ac98f58 100644
--- a/htdocs/core/modules/printing/modules_printing.php
+++ b/htdocs/core/modules/printing/modules_printing.php
@@ -49,7 +49,7 @@ class PrintingDriver
      *  Return list of printing driver
      *
      *  @param  DoliDB  $db                 Database handler
-     *  @param  string  $maxfilenamelength  Max length of value to show
+     *  @param  integer  $maxfilenamelength  Max length of value to show
      *  @return array                       List of drivers
     */
     static function listDrivers($db,$maxfilenamelength=0)
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 302adaeb965..a0e0d37d074 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -254,7 +254,7 @@ class printing_printgcp extends PrintingDriver
     /**
      *  Login into Google Account
      *
-     *  @return string           true or false
+     *  @return boolean           true or false
      */
     function GoogleLogin()
     {
@@ -324,8 +324,8 @@ class printing_printgcp extends PrintingDriver
      *
      *  @param  string  $url            url to hit
      *  @param  array   $postfields     array of post fields
-     *  @param  array   $headers        array of http headers
-     *  @return array                   response from curl
+     *  @param  string[]   $headers        array of http headers
+     *  @return string                   response from curl
      */
     private function makeCurl($url,$postfields=array(),$headers=array())
     {
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 0bfd3f8f03e..e08ea074bbd 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -105,7 +105,7 @@ abstract class ModeleProductCode
      *  Renvoi la liste des modeles de numérotation
      *
      *  @param	DoliDB	$db     			Database handler
-     *  @param  string	$maxfilenamelength  Max length of value to show
+     *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of numbers
      */
     static function liste_modeles($db,$maxfilenamelength=0)
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index f19d8a0e3a0..6e2601797f8 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -105,7 +105,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
-	 * @param   Object			$object             Main object to use as data source
+	 * @param   Project			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
 	 * @return	array								Array of substitution
 	 */
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 8a9669dadf1..31172a32f43 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -416,7 +416,7 @@ class doc_generic_task_odt extends ModelePDFTask
 			$project= new Project($this->db);
 			$project->fetch($object->fk_project);
 
-			$dir = $conf->projet->dir_output. "/" . $project->ref. "/";;
+			$dir = $conf->projet->dir_output. "/" . $project->ref. "/";
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
 			$file = $dir . "/" . $objectref . ".odt";
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 2564b017e4d..1abbd8834ee 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -590,6 +590,57 @@ class pdf_azur extends ModelePDFPropales
 				$this->_pagefoot($pdf,$object,$outputlangs);
 				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
+				//If propal merge product PDF is active
+				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) 
+				{
+					require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
+					
+					$already_merged = array ();
+					foreach ( $object->lines as $line ) {
+						if (! empty($line->fk_product) && ! (in_array($line->fk_product, $already_merged))) {
+							// Find the desire PDF
+							$filetomerge = new Propalmergepdfproduct($this->db);
+					
+							if ($conf->global->MAIN_MULTILANGS) {
+								$filetomerge->fetch_by_product($line->fk_product, $outputlangs->defaultlang);
+							} else {
+								$filetomerge->fetch_by_product($line->fk_product);
+							}
+					
+							$already_merged[] = $line->fk_product;
+					
+							// If PDF is selected and file is not empty
+							if (count($filetomerge->lines) > 0) {
+								foreach ( $filetomerge->lines as $linefile ) {
+									if (! empty($linefile->id) && ! empty($linefile->file_name)) {
+										if (! empty($conf->product->enabled))
+											$filetomerge_dir = $conf->product->multidir_output[$conf->entity] . '/' . dol_sanitizeFileName($line->product_ref);
+										elseif (! empty($conf->service->enabled))
+											$filetomerge_dir = $conf->service->multidir_output[$conf->entity] . '/' . dol_sanitizeFileName($line->product_ref);
+											
+										dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG);
+											
+										$infile = $filetomerge_dir . '/' . $linefile->file_name;
+										if (is_file($infile)) {
+											$pagecount = $pdf->setSourceFile($infile);
+											for($i = 1; $i <= $pagecount; $i ++) {
+												$tplidx = $pdf->ImportPage($i);
+												$s = $pdf->getTemplatesize($tplidx);
+												$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+												$pdf->useTemplate($tplidx);
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+				
+				//exit;
+				
+				
+				
 				$pdf->Close();
 
 				$pdf->Output($file,'F');
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index 9b0cc1d82a2..9ad90e9e3b5 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -43,7 +43,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator
 	 *  Return list of active generation modules
 	 *
      *  @param	DoliDB	$db     			Database handler
-     *  @param  string	$maxfilenamelength  Max length of value to show
+     *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
 	static function liste_modeles($db,$maxfilenamelength=0)
@@ -149,7 +149,7 @@ abstract class ModeleNumRefPropales
  *  Create a document onto disk according to template module.
  *
  * 	@param	    DoliDB		$db  			Database handler
- * 	@param	    object		$object			Object proposal
+ * 	@param	    Propal		$object			Object proposal
  * 	@param	    string		$modele			Force model to use ('' to not force)
  * 	@param		Translate	$outputlangs	Object langs to use for output
  *  @param      int			$hidedetails    Hide details of lines
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index b7aea75836f..83bbb0a59b4 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -60,8 +60,8 @@ class pdf_paiement
 		$this->tab_top = 30;
 
 		$this->line_height = 5;
-		$this->line_per_page = 25;
-		$this->tab_height = 230;	//$this->line_height * $this->line_per_page;
+		$this->line_per_page = 40;
+		$this->tab_height = $this->page_hauteur - $this->marge_haute - $this->marge_basse - $this->tab_top - 5;	// must be > $this->line_height * $this->line_per_page and < $this->page_hauteur - $this->marge_haute - $this->marge_basse - $this->tab_top - 5;
 
 		$this->posxdate=$this->marge_gauche+2;
 		$this->posxpaymenttype=42;
@@ -71,6 +71,7 @@ class pdf_paiement
 		$this->posxpaymentamount=162;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
+			$this->line_per_page = 35;
 			$this->posxpaymenttype-=10;
 			$this->posxinvoice-=0;
 			$this->posxinvoiceamount-=10;
@@ -145,6 +146,17 @@ class pdf_paiement
         $num=0;
         $lines=array();
 
+		// count number of ligne of payement
+		$sql = "SELECT p.rowid as prowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."paiement as p";
+		$sql.= " WHERE p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year,$month))."' AND '".$this->db->idate(dol_get_last_day($year,$month))."'";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$numpaiement = $this->db->num_rows($result);
+		}
+
+		// number of bill
 		$sql = "SELECT p.datep as dp, f.facnumber";
 		//$sql .= ", c.libelle as paiement_type, p.num_paiement";
 		$sql.= ", c.code as paiement_code, p.num_paiement";
@@ -201,9 +213,9 @@ class pdf_paiement
 			dol_print_error($this->db);
 		}
 
-		$pages = intval($num / $this->line_per_page);
+		$pages = intval(($num + $numpaiement) / $this->line_per_page);
 
-		if (($lines % $this->line_per_page)>0)
+		if ((($num + $numpaiement) % $this->line_per_page)>0)
 		{
 			$pages++;
 		}
@@ -231,7 +243,7 @@ class pdf_paiement
 		// New page
 		$pdf->AddPage();
 		$pagenb++;
-		$this->_pagehead($pdf, $pages, 1, $outputlangs);
+		$this->_pagehead($pdf, $pagenb, 1, $outputlangs);
 		$pdf->SetFont('','', 9);
 		$pdf->MultiCell(0, 3, '');		// Set interline to 3
 		$pdf->SetTextColor(0,0,0);
@@ -292,8 +304,8 @@ class pdf_paiement
         $pdf->SetXY($this->posxdate, 16);
 		$pdf->MultiCell(80, 2, $outputlangs->transnoentities("DateBuild")." : ".dol_print_date(time(),"day",false,$outputlangs,true), 0, 'L');
 
-        $pdf->SetXY($this->posxdate, 22);
-		$pdf->MultiCell(80, 2, $outputlangs->transnoentities("Page")." : ".$page, 0, 'L');
+        $pdf->SetXY($this->posxdate+100, 16);
+		$pdf->MultiCell(80, 2, $outputlangs->transnoentities("Page")." : ".$page, 0, 'R');
 
 
 		// Title line
@@ -348,9 +360,17 @@ class pdf_paiement
 		for ($j = 0 ; $j < $numlines ; $j++)
 		{
 			$i = $j;
+			if ($yp > $this->tab_height -5)
+			{
+				$page++;
+				$pdf->AddPage();
+				$this->_pagehead($pdf, $page, 0, $outputlangs);
+				$pdf->SetFont('','', $default_font_size - 1);
+				$yp = 0;
+			}
 			if ($oldprowid <> $lines[$j][7])
 			{
-				if ($yp > 200)
+				if ($yp > $this->tab_height -10)
 				{
 					$page++;
 					$pdf->AddPage();
@@ -380,7 +400,7 @@ class pdf_paiement
 			// BankAccount
 			$pdf->SetXY($this->posxbankaccount, $this->tab_top + 10 + $yp);
 			$pdf->MultiCell($this->posxbankaccount - $this->posxdate, $this->line_height, $lines[$j][8], 0, 'L', 0);
-			
+
 			// Invoice amount
 			$pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 10 + $yp);
 			$pdf->MultiCell($this->posxpaymentamount- $this->posxinvoiceamount - 1, $this->line_height, $lines[$j][5], 0, 'R', 0);
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index f1fc05d29db..72090a581ea 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -39,7 +39,7 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
      *  Return list of active generation modules
      *
 	 * 	@param	DoliDB		$db					Database handler
-     *  @param	string		$maxfilenamelength  Max length of value to show
+     *  @param	integer		$maxfilenamelength  Max length of value to show
      * 	@return	array							List of templates
      */
     static function liste_modeles($db,$maxfilenamelength=0)
@@ -142,7 +142,7 @@ abstract class ModeleThirdPartyCode
      *  Renvoi la liste des modeles de numéroation
      *
      *  @param	DoliDB	$db     			Database handler
-     *  @param  string	$maxfilenamelength  Max length of value to show
+     *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of numbers
      */
     static function liste_modeles($db,$maxfilenamelength=0)
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index 51eb675057e..03dc42280cb 100644
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -41,7 +41,7 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
 	 *  Return list of active generation models
 	 *
      *  @param	DoliDB	$db     			Database handler
-     *  @param  string	$maxfilenamelength  Max length of value to show
+     *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of numbers
 	 */
 	static function liste_modeles($db,$maxfilenamelength=0)
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index f17fa82a2b3..a4c4155a1c2 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -275,16 +275,16 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
 						$nexY = $pdf->GetY();
 						$height_incoterms=$nexY-$tab_top;
-	
+
 						// Rect prend une longueur en 3eme param
 						$pdf->SetDrawColor(192,192,192);
 						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
-	
+
 						$tab_top = $nexY+6;
 						$height_incoterms += 4;
 					}
 				}
-				
+
 				// Affiche notes
 				if (! empty($object->note_public))
 				{
@@ -820,7 +820,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *  Show payments table
 	 *
 	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Object		$object     	Object invoice
+	 *  @param  FactureFournisseur		$object     	Object invoice
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							<0 if KO, >0 if OK
@@ -904,7 +904,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *  Show top header of page.
 	 *
 	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  FactureFournisseur		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -958,46 +958,57 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierInvoice")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
-
-		$pdf->SetFont('','B', $default_font_size);
+		$posy+=1;
 
 		if ($object->ref_supplier)
 		{
     		$posy+=4;
+			$pdf->SetFont('','B', $default_font_size);
     		$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
     		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefSupplier")." : " . $object->ref_supplier, '', 'R');
+			$posy+=1;
 		}
 
 		$pdf->SetFont('','', $default_font_size - 1);
 
-		$posy+=6;
 		if (! empty($conf->global->PDF_SHOW_PROJECT))
 		{
 			$object->fetch_projet();
-			$pdf->SetXY($posx,$posy);
 			if (! empty($object->project->ref))
 			{
-				$langs->load("projects");
+        		$posy+=4;
+				$pdf->SetXY($posx,$posy);
+        		$langs->load("projects");
 				$pdf->SetTextColor(0,0,60);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
-        		$posy+=4;
 			}
 		}
 
-		$pdf->SetXY($posx,$posy);
 		if ($object->date)
 		{
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
 		}
 		else
 		{
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(255,0,0);
 			$pdf->MultiCell(100, 4, strtolower($outputlangs->transnoentities("OrderToProcess")), '', 'R');
 		}
 
-		$posy+=2;
+		if ($object->thirdparty->code_fournisseur)
+		{
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetTextColor(0,0,60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_fournisseur), '', 'R');
+		}
+
+		$posy+=1;
 		$pdf->SetTextColor(0,0,60);
 
 		// Show list of linked objects
@@ -1088,7 +1099,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *   	Show footer of page. Need this->emetteur object
      *
 	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	FactureFournisseur		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index bc544363b39..a968955ea73 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -44,7 +44,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
 	 *  Return list of active generation models
 	 *
      *  @param	DoliDB	$db     			Database handler
-     *  @param  string	$maxfilenamelength  Max length of value to show
+     *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
 	static function liste_modeles($db,$maxfilenamelength=0)
@@ -143,7 +143,7 @@ abstract class ModeleNumRefSuppliersOrders
  *  Create a document onto disk according to template model.
  *
  *  @param	    DoliDB		$db  			Database handler
- *  @param	    Object		$object			Object supplier order
+ *  @param	    CommandeFournisseur		$object			Object supplier order
  *  @param	    string		$modele			Force template to use ('' to not force)
  *  @param		Translate	$outputlangs	Object lang to use for traduction
  *  @param      int			$hidedetails    Hide details of lines
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 2a11cca84b7..377c6f02fb8 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -283,16 +283,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
 						$nexY = $pdf->GetY();
 						$height_incoterms=$nexY-$tab_top;
-	
+
 						// Rect prend une longueur en 3eme param
 						$pdf->SetDrawColor(192,192,192);
 						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
-	
+
 						$tab_top = $nexY+6;
 						$height_incoterms += 4;
 					}
 				}
-				
+
 				// Affiche notes
 				if (! empty($object->note_public))
 				{
@@ -1002,51 +1002,67 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetTextColor(0,0,60);
 		$title=$outputlangs->transnoentities("SupplierOrder")." ".$outputlangs->convToOutputCharset($object->ref);
 		$pdf->MultiCell(100, 3, $title, '', 'R');
-
-		$pdf->SetFont('','B', $default_font_size);
+		$posy+=1;
 
 		if ($object->ref_supplier)
 		{
 			$posy+=4;
+			$pdf->SetFont('','B', $default_font_size);
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefSupplier")." : " . $outputlangs->convToOutputCharset($object->ref_supplier), '', 'R');
+			$posy+=1;
 		}
 
 		$pdf->SetFont('','', $default_font_size -1);
 
-		$posy+=6;
 		if (! empty($conf->global->PDF_SHOW_PROJECT))
 		{
 			$object->fetch_projet();
-			$pdf->SetXY($posx,$posy);
 			if (! empty($object->project->ref))
 			{
+				$posy+=4;
+				$pdf->SetXY($posx,$posy);
 				$langs->load("projects");
 				$pdf->SetTextColor(0,0,60);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
-        		$posy+=4;
 			}
 		}
 
-		$pdf->SetXY($posx,$posy);
 		if (! empty($object->date_commande))
 		{
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date_commande,"day",false,$outputlangs,true), '', 'R');
 		}
 		else
 		{
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(255,0,0);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderToProcess"), '', 'R');
 		}
 
 		$pdf->SetTextColor(0,0,60);
 		$usehourmin='day';
-		if ( empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin='dayhour';
-		if (! empty($object->date_livraison)) $pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : " . dol_print_date($object->date_livraison,$usehourmin,false,$outputlangs,true), '', 'R');
+		if (empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin='dayhour';
+		if (! empty($object->date_livraison))
+		{
+			$posy+=4;
+			$pdf->SetXY($posx-90,$posy);
+			$pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : " . dol_print_date($object->date_livraison,$usehourmin,false,$outputlangs,true), '', 'R');
+		}
 
-		$posy+=5;
+		if ($object->thirdparty->code_fournisseur)
+		{
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetTextColor(0,0,60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_fournisseur), '', 'R');
+		}
+
+		$posy+=1;
 		$pdf->SetTextColor(0,0,60);
 
 		// Show list of linked objects
diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
index 3e24901f5af..9ea39caaf50 100644
--- a/htdocs/core/modules/syslog/mod_syslog_chromephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
@@ -55,7 +55,7 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 
 			//print 'rrrrr'.get_include_path();
-		    $res = include_once('ChromePhp.php');
+		    $res = @include_once('ChromePhp.php');
 		    if (! $res) $res=@include_once('ChromePhp.class.php');
 
 		    restore_include_path();
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 3a51a5f7567..80f849a0494 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -70,8 +70,8 @@ if ($id > 0)
 	$result = $object->fetch($id);
 	if ($result <= 0) dol_print_error($db,'Failed to load object');
 	$dir=$conf->product->multidir_output[$object->entity];	// By default
-	if ($object->type == 0) $dir=$conf->product->multidir_output[$object->entity];
-	if ($object->type == 1) $dir=$conf->service->multidir_output[$object->entity];
+	if ($object->type == Product::TYPE_PRODUCT) $dir=$conf->product->multidir_output[$object->entity];
+	if ($object->type == Product::TYPE_SERVICE) $dir=$conf->service->multidir_output[$object->entity];
 }
 
 /*
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 72eddc012d2..269232ddb76 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -15,6 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see .
  */
+
+/**
+ * The following vars must be defined
+ * $type2label
+ * $form
+ * $conf, $lang, 
+ */
+
 ?>
 
 
@@ -47,13 +55,13 @@
     		else if (type == 'varchar') { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
     		else if (type == 'boolean') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
     		else if (type == 'price') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'select') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'link') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();}
-    		else if (type == 'sellist') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'checkbox') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'radio') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'separate') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  required.val('').attr('disabled','disabled'); default_value.val('').attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'chkbxlst') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").hide(); jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();}
+    		else if (type == 'select') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+    		else if (type == 'link') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();}
+    		else if (type == 'sellist') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+    		else if (type == 'radio') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+    		else if (type == 'checkbox') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+    		else if (type == 'chkbxlst') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();}
+    		else if (type == 'separate') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  required.val('').attr('disabled','disabled'); default_value.val('').attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
     		else size.val('').attr('disabled','disabled');
     	}
     	init_typeoffields('');
@@ -66,7 +74,6 @@
 " method="post">
 
 
-
 
 
'.$langs->trans("Total").'';
 				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
-				print $taskstatic->getNomUrl(1);
+				print $taskstatic->getNomUrl(1,'withproject');
 				print '';
-				$s='';
-				$s.=$form->select_date('',$lines[$i]->id,1,1,2,"addtime",1,0,1,$disabledtask);
-				print $s;
+				$tableCell=$form->select_date($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask);
+				print $tableCell;
 				print '';
-				//$s.='   ';
-				$s=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
-				//$s.=' ';
-				print $s;
+
+				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
+		        $alreadyspent='';
+		        if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+
+				$tableCell='';
+				$tableCell.='';
+                $tableCell.=' + ';
+				//$tableCell.='   ';
+				$tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
+				//$tableCell.=' ';
+				print $tableCell;
 				print '';
@@ -633,7 +647,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t
 
 			$inc++;
 			$level++;
-			if ($lines[$i]->id) projectLinesPerDay($inc, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask);
+			if ($lines[$i]->id) projectLinesPerDay($inc, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday);
 			$level--;
 		}
 		else
@@ -776,18 +790,30 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				for ($idw = 0; $idw < 7; $idw++)
 		        {
 					$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
+					$tmparray=dol_getdate($tmpday);
 		        	$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
 		        	$alreadyspent='';
 		        	if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
                     $tableCell ='';
                     $tableCell.='';
-                    $tableCell.='+';
-		        	$tableCell.='';
+                    //$placeholder=' placeholder="00:00"';
+                    $placeholder='';
+                    //if (! $disabledtask)
+                    //{
+                    	$tableCell.='+';
+                    	$tableCell.='';
+                    //}
                     $tableCell.='';
+				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
+				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou"));
+				print '

@@ -90,7 +97,7 @@
 ';
 
+	// Status
+	$alreadypaid=$object->getSommePaiement();
+	print '';
+
+	// Amount
+	print '';
+	print '';
+
+	// Amount Local Taxes
+	//TODO: Place into a function to control showing by country or study better option
+	if ($societe->localtax1_assuj=="1") //Localtax1
+	{
+		print '';
+		print '';
+		print '';
+	}
+	if ($societe->localtax2_assuj=="1") //Localtax2
+	{
+		print '';
+		print '';
+		print '';
+	}
+	print '';
+
 	print '

 

 
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 76713be57df..9ce0183ab50 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -99,7 +99,7 @@ if(($type == 'select') || ($type == 'sellist') || ($type == 'checkbox') || ($typ
 
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index b6b26cc380d..7100453cab5 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -48,7 +48,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 			print '";
 
 							$linktoprod=''.img_object($langs->trans("ShowProduct"),'product').' '.$objp->ref.'';
@@ -442,16 +480,6 @@ if ($id > 0 || ! empty($ref))
 								print "";
 							}
 
-							// To show detail cref and description value, we must make calculation by cref
-							//print ($objp->cref?' ('.$objp->cref.')':'');
-							//if ($objp->description) print '
'.nl2br($objp->description);
-							if ((empty($conf->productbatch->enabled)) || $objp->tobatch==0)
-							{
-								$suffix='_'.$i;
-							} else {
-								$suffix='_0_'.$i;
-							}
-
 							$up_ht_disc=$objp->subprice;
 							if (! empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
 
@@ -475,13 +503,15 @@ if ($id > 0 || ! empty($ref))
 								print '';
 
 								print '';
 								print '';
 								print '';
 								print '';		// Qty ordered + qty already dispatached
 							}
@@ -494,7 +524,7 @@ if ($id > 0 || ! empty($ref))
 								print '';
 								print '';
 							}
-							print '';
+							print '';
 							print '';
 
 							// Warehouse
@@ -552,7 +582,8 @@ if ($id > 0 || ! empty($ref))
 
 		dol_fiche_end();
 
-		// List of already dispatching
+
+		// List of lines already dispatched
 		$sql = "SELECT p.ref, p.label,";
 		$sql.= " e.rowid as warehouse_id, e.label as entrepot,";
 		$sql.= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status";
@@ -597,7 +628,7 @@ if ($id > 0 || ! empty($ref))
 				while ($i < $num)
 				{
 					$objp = $db->fetch_object($resql);
-					
+
 					print "";
 					print '';	
+						print '';
 					}
-					
+
 					print "\n";
 
 					$i++;
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 386caad8134..88cf3a48555 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -316,7 +316,7 @@ if ($resql)
 	print "

 

-	
+	
 textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"),1,0)?>
 textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"),1,0)?>
 textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"),1,0)?>

 

 

-	
+	
 textwithpicto('', $langs->trans("ExtrafieldParamHelp".$type),1,0)?>

 

 
';
 			print 'attribute_required[$key])) print ' class="fieldrequired"';
+			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
 			print '>' . $label . '';
 
 			//TODO Improve element and rights detection
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 5b895a69da3..385274c6e35 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -23,6 +23,7 @@
  * $object (invoice, order, ...)
  * $conf
  * $langs
+ * $seller, $nuyer
  * $dateSelector
  * $forceall (0 by default, 1 for supplier invoices/orders)
  * $senderissupplier (0 by default, 1 for supplier invoices/orders)
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 7b4f27ae87e..f3131ca928a 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -53,7 +53,9 @@ if (empty($usemargins)) $usemargins=0;
 	
 
-	
+	
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index d57b66cc331..75a69996603 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -90,7 +90,7 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 			print img_edit();
 			print '';
 			print ' ';
-			print '';			
+			print '';			
 			print img_delete();
 			print '';
 			print '';
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 346932ec61e..46a6cd0daa6 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -79,6 +79,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		if ($action == 'COMPANY_CREATE')
         {
             $langs->load("other");
+            $langs->load("companies");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
@@ -91,7 +92,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
         elseif ($action == 'COMPANY_SENTBYMAIL')
         {
-            $langs->load("orders");
+            $langs->load("other");
+        	$langs->load("orders");
 
             if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
@@ -114,7 +116,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'PROPAL_VALIDATE')
         {
-            $langs->load("propal");
+            $langs->load("other");
+        	$langs->load("propal");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
@@ -125,7 +128,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
         elseif ($action == 'PROPAL_SENTBYMAIL')
         {
-            $langs->load("propal");
+            $langs->load("other");
+        	$langs->load("propal");
 
             $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
@@ -140,7 +144,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'PROPAL_CLOSE_SIGNED')
         {
-            $langs->load("propal");
+            $langs->load("other");
+        	$langs->load("propal");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
@@ -151,7 +156,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
         {
-            $langs->load("propal");
+            $langs->load("other");
+        	$langs->load("propal");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
@@ -162,7 +168,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'PROPAL_CLOSE_REFUSED')
         {
-            $langs->load("propal");
+            $langs->load("other");
+        	$langs->load("propal");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
@@ -182,9 +189,46 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid=0;
 		}
-        elseif ($action == 'ORDER_SENTBYMAIL')
+		elseif ($action == 'ORDER_CLOSE')
         {
-            $langs->load("orders");
+            $langs->load("other");
+        	$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("other");
+        	$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("other");
+        	$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("other");
+        	$langs->load("orders");
 
             $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderSentByEMail",$object->ref);
@@ -388,7 +432,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
         {
-            $langs->load("orders");
+            $langs->load("other");
+        	$langs->load("orders");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
@@ -399,6 +444,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
 		{
+            $langs->load("other");
 			$langs->load("orders");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -410,6 +456,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
 		{
+            $langs->load("other");
 			$langs->load("orders");
 
 			$object->actiontypecode='AC_OTH_AUTO';
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index c50a4afcc01..8da8c6e3e00 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -119,6 +119,7 @@ class InterfaceDemo extends DolibarrTriggers
 		    case 'ORDER_CLONE':
 		    case 'ORDER_VALIDATE':
 		    case 'ORDER_DELETE':
+		    case 'ORDER_CANCEL':
 		    case 'ORDER_SENTBYMAIL':
 		    case 'ORDER_CLASSIFY_BILLED':
 		    case 'LINEORDER_INSERT':
@@ -134,6 +135,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':
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index b77a8048db8..0c8e310d2dd 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -66,7 +66,7 @@ if (!empty($actionsave))
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("CronSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("CronSetup"),$linkback,'title_setup');
 
 // Configuration header
 $head = cronadmin_prepare_head();
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 0a55ff6e07e..9eb0d368c34 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -231,7 +231,7 @@ if ($action=='edit' || empty($action) || $action=='delete' || $action=='execute'
 }
 elseif ($action=='create')
 {
-	print_fiche_titre($langs->trans("CronTask"),'','setup');
+	print_fiche_titre($langs->trans("CronTask"),'','title_setup');
 }
 
 if ($conf->use_javascript_ajax)
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index e543c269fb4..43a4a76e725 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -131,7 +131,7 @@ $pagetitle=$langs->trans("CronList");
 
 llxHeader('',$pagetitle);
 
-print_fiche_titre($pagetitle,'','setup');
+print_fiche_titre($pagetitle,'','title_setup');
 
 print $langs->trans('CronInfo');
 
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index bd4683ec3c7..d62381e4597 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -199,7 +199,7 @@ $form=new Form($db);
 
 llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("DonationsSetup"),$linkback,title_setup);
 
 $head = donation_admin_prepare_head();
 
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index 2d08c36873f..3962ce73f8e 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -61,7 +61,7 @@ $textobject=$langs->transnoentitiesnoconv("Donations");
 llxHeader('',$langs->trans("DonationsSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("DonationsSetup"),$linkback,title_setup);
 
 
 $head = donation_admin_prepare_head();
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index d3ce60a5381..cfe28532637 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -106,7 +106,7 @@ if ($action == 'update')
         $object->email       = GETPOST("email");
 		$object->date        = $donation_date;
 		$object->public      = GETPOST("public");
-		$object->fk_project  = GETPOST("fk_project");
+		$object->fk_projet   = GETPOST("fk_projet");
 		$object->note_private= GETPOST("note_private");
 		$object->note_public = GETPOST("note_public");
 		
@@ -161,7 +161,7 @@ if ($action == 'add')
 		$object->note_private= GETPOST("note_private");
 		$object->note_public = GETPOST("note_public");
 		$object->public      = GETPOST("public");
-		$object->fk_project  = GETPOST("fk_project");
+		$object->fk_projet   = GETPOST("fk_projet");
 		
 		// Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -343,7 +343,7 @@ if ($action == 'create')
     	$formproject=new FormProjets($db);
     	
         print "\n";
     }
 
@@ -459,7 +459,7 @@ if (! empty($id) && $action == 'edit')
     	
         $langs->load('projects');
         print '';
     }
 
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 5e36037738f..33706ddd841 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -54,7 +54,7 @@ class Don extends CommonObject
     var $country;
     var $email;
     var $public;
-    var $fk_project;
+    var $fk_projet;
     var $modepaiement;
     var $modepaiementid;
     var $note_private;
@@ -337,7 +337,7 @@ class Don extends CommonObject
         // $sql.= ", country"; -- Deprecated
         $sql.= ", fk_country";
         $sql.= ", public";
-        $sql.= ", fk_project";
+        $sql.= ", fk_projet";
         $sql.= ", note_private";
         $sql.= ", note_public";
         $sql.= ", fk_user_author";
@@ -359,7 +359,7 @@ class Don extends CommonObject
         $sql.= ", '".$this->db->escape($this->town)."'";
 		$sql.= ", ".$this->country_id;
         $sql.= ", ".$this->public;
-        $sql.= ", ".($this->fk_project > 0?$this->fk_project:"null");
+        $sql.= ", ".($this->fk_projet > 0?$this->fk_projet:"null");
        	$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
 		$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
         $sql.= ", ".$user->id;
@@ -455,7 +455,7 @@ class Don extends CommonObject
         $sql .= ",town='".$this->db->escape($this->town)."'";
         $sql .= ",fk_country = ".$this->country_id;
         $sql .= ",public=".$this->public;
-        $sql .= ",fk_project=".($this->fk_project>0?$this->fk_project:'null');
+        $sql .= ",fk_projet=".($this->fk_projet>0?$this->fk_projet:'null');
         $sql .= ",note_private=".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
         $sql .= ",note_public=".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
         $sql .= ",datedon='".$this->db->idate($this->date)."'";
@@ -601,11 +601,11 @@ class Don extends CommonObject
         $sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,";
         $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, ";
         $sql.= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, cp.libelle, d.email, d.phone, ";
-        $sql.= " d.phone_mobile, d.fk_project,";
+        $sql.= " d.phone_mobile, d.fk_projet,";
         $sql.= " p.title as project_label,";
         $sql.= " c.code as country_code, c.label as country";
         $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_project";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_projet";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid";
 		if (! empty($id))
@@ -647,7 +647,7 @@ class Don extends CommonObject
                 $this->phone          = $obj->phone;
                 $this->phone_mobile   = $obj->phone_mobile;
                 $this->project        = $obj->project_label;
-                $this->fk_project     = $obj->fk_project;
+                $this->fk_projet      = $obj->fk_projet;
                 $this->public         = $obj->public;
                 $this->modepaymentid  = $obj->fk_payment;
                 $this->modepayment    = $obj->libelle;
@@ -677,8 +677,8 @@ class Don extends CommonObject
     /**
      *    Validate a promise of donation
      *
-     *    @param	int		$id   	id of donation
-     *    @param  	int		$userid  	User who validate the promise
+     *    @param	int		$id   		id of donation
+     *    @param  	int		$userid  	User who validate the donation/promise
      *    @return   int     			<0 if KO, >0 if OK
      */
     function valid_promesse($id, $userid)
@@ -706,16 +706,16 @@ class Don extends CommonObject
     }
 
     /**
-     *    Classe le don comme paye, le don a ete recu
+     *    Classify the donation as paid, the donation was received
      *
-     *    @param	int		$id           	    id du don a modifier
-     *    @param    int		$modepaiement   	mode de paiement
+     *    @param	int		$id           	    id of donation
+     *    @param    int		$modepayment   	    mode of payment
      *    @return   int      					<0 if KO, >0 if OK
      */
-    function set_paid($id, $modepaiement='')
+    function set_paid($id, $modepayment='')
     {
         $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
-        if ($modepaiement)
+        if ($modepayment)
         {
             $sql .= ", fk_payment=$modepayment";
         }
@@ -741,7 +741,7 @@ class Don extends CommonObject
     }
 
     /**
-     *    Set donation to status canceled
+     *    Set donation to status cancelled
      *
      *    @param	int		$id   	    id of donation
      *    @return   int     			<0 if KO, >0 if OK
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index ee7a6f5e6f9..2fb2e066b5b 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -73,7 +73,7 @@ $sql = "SELECT d.rowid, d.datedon, d.firstname, d.lastname, d.societe,";
 $sql.= " d.amount, d.fk_statut as statut, ";
 $sql.= " p.rowid as pid, p.ref, p.title, p.public";
 $sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
-$sql.= " ON p.rowid = d.fk_project WHERE 1 = 1";
+$sql.= " ON p.rowid = d.fk_projet WHERE 1 = 1";
 if ($statut >= 0)
 {
 	$sql .= " AND d.fk_statut = ".$statut;
@@ -125,7 +125,7 @@ if ($resql)
 	if (! empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_project","&page=$page&statut=$statut","","",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_projet","&page=$page&statut=$statut","","",$sortfield,$sortorder);
 	}
 	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"d.amount","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.fk_statut","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder);
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 3abff69a624..ba551deea67 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -202,7 +202,7 @@ $sql.= ' WHERE pd.fk_donation = d.rowid';
 $sql.= ' AND d.entity = '.$conf->entity;
 $sql.= ' AND pd.rowid = '.$id;
 
-dol_syslog("donations/payment/card.php", LOG_DEBUG);
+dol_syslog("don/payment/card.php", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index fa451f74f1c..879b66ebb39 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1513,6 +1513,10 @@ else if ($id || $ref)
 	/*
 	 * Action presend
 	*/
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 	if ($action == 'presend')
 	{
 		$ref = dol_sanitizeFileName($object->ref);
@@ -1611,6 +1615,7 @@ else if ($id || $ref)
 		// Tableau des parametres complementaires
 		$formmail->param['action']='send';
 		$formmail->param['models']='shipping_send';
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
 		$formmail->param['shippingid']=$object->id;
 		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 868ade3a7e1..24ce24bae47 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2011-2013	Juanjo Menent			
  * Copyright (C) 2013       Florian Henry		  	
  * Copyright (C) 2014		Cedric GROSS			
- * Copyright (C) 2014       Marcos García           
+ * Copyright (C) 2014-2015  Marcos García           
  * Copyright (C) 2014       Francis Appels          
  *
  * This program is free software; you can redistribute it and/or modify
@@ -492,9 +492,9 @@ class Expedition extends CommonObject
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
-				$this->location_incoterms = $obj->location_incoterms;									
+				$this->location_incoterms = $obj->location_incoterms;
 				$this->libelle_incoterms = $obj->libelle_incoterms;
-			
+
 				$this->db->free($result);
 
 				if ($this->statut == 0) $this->brouillon = 1;
@@ -878,7 +878,7 @@ class Expedition extends CommonObject
 		if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
 		if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id);
 		if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
-		if (isset($this->statut)) $this->statut=trim($this->statut);
+		if (isset($this->statut)) $this->statut=(int) $this->statut;
 		if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth);
 		if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth);
 		if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight);
@@ -1075,7 +1075,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;
@@ -1673,6 +1673,22 @@ class Expedition extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0);
 	}
 
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'expedition'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index d9e26368a74..195687a4ab7 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -51,6 +51,8 @@ if (! $sortfield) $sortfield="e.ref";
 if (! $sortorder) $sortorder="DESC";
 $limit = $conf->liste_limit;
 
+$viewstatut=GETPOST('viewstatut');
+
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
@@ -78,8 +80,8 @@ if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no p
 }
 $sql.= ")";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target AND ee.targettype = 'delivery'";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
 $sql.= " WHERE e.entity = ".$conf->entity;
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
@@ -90,6 +92,9 @@ if ($socid)
 {
 	$sql.= " AND e.fk_soc = ".$socid;
 }
+if ($viewstatut <> '') {
+	$sql.= " AND e.fk_statut = ".$viewstatut;
+}
 if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
 if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
@@ -120,11 +125,10 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateDeliveryPlanned"), $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	if($conf->expedition_bon->enabled) {
-		print_liste_field_titre($langs->trans("DeliveryOrder"), $_SERVER["PHP_SELF"],"e.date_expedition","",$param, '',$sortfield,$sortorder);
-    }
-        if($conf->livraison_bon->enabled) {
-		print_liste_field_titre($langs->trans("DateReceived"), $_SERVER["PHP_SELF"],"e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder);
+    if($conf->livraison_bon->enabled) 
+    {
+		print_liste_field_titre($langs->trans("DeliveryOrder"), $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
+    	print_liste_field_titre($langs->trans("DateReceived"), $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
 	}
 	print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print '';
@@ -138,13 +142,14 @@ if ($resql)
 	print '';
+	// Date
 	print '';
-	if($conf->expedition_bon->enabled) {
+    if ($conf->livraison_bon->enabled)
+    {
 		print '';
 	}
 	print '\n";
-		if($conf->expedition_bon->enabled) {
-			// Date real
-			print ''."\n";
-        }
-        if($conf->livraison_bon->enabled) {
-			print ''."\n";
+        
+        if ($conf->livraison_bon->enabled) 
+        {
+		    $shipment->fetchObjectLinked($shipment->id,$shipment->element);
+            $receiving=(! empty($shipment->linkedObjects['delivery'][0])?$shipment->linkedObjects['delivery'][0]:'');
+            
+        	// Ref
+            print '';
+            
+        	print ''."\n";
 		}
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 973066971a3..d29dc513e5c 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -216,7 +216,7 @@ if ($id > 0 || ! empty($ref))
 		$absolute_creditnote=price2num($absolute_creditnote,'MT');
 		if ($absolute_discount)
 		{
-			if ($commande->statut > 0)
+			if ($commande->statut > Commande::STATUS_DRAFT)
 			{
 				print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
 			}
@@ -606,7 +606,7 @@ if ($id > 0 || ! empty($ref))
 			print '
';
 
             // Bouton expedier sans gestion des stocks
-            if (empty($conf->stock->enabled) && ($commande->statut > 0 && $commande->statut < 3))
+            if (empty($conf->stock->enabled) && ($commande->statut > Commande::STATUS_DRAFT && $commande->statut < Commande::STATUS_CLOSED))
 			{
 				if ($user->rights->expedition->creer)
 				{
@@ -626,7 +626,7 @@ if ($id > 0 || ! empty($ref))
 
 
         // Bouton expedier avec gestion des stocks
-        if (! empty($conf->stock->enabled) && ($commande->statut > 0 && $commande->statut < 3))
+        if (! empty($conf->stock->enabled) && ($commande->statut > Commande::STATUS_DRAFT && $commande->statut < Commande::STATUS_CLOSED))
 		{
 			if ($user->rights->expedition->creer)
 			{
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 0d30602987f..c6c638f06f3 100755
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -623,7 +623,7 @@ class ExpenseReport extends CommonObject
 							print $langs->trans('Draft').' '.img_picto($langs->trans('Draft'),'statut0');
 							break;
 						case 2:
-							print $langs->trans('TripForValid').' '.img_picto($langs->trans('TripForValid'),'statut3');;
+							print $langs->trans('TripForValid').' '.img_picto($langs->trans('TripForValid'),'statut3');
 							break;
 						case 5:
 							print $langs->trans('TripForPaid').' '.img_picto($langs->trans('TripForPaid'),'statut3');
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index fd360ab35bf..c044dfc4704 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -328,7 +328,7 @@ class Export
 	function conditionDate($Field, $Value, $Sens)
 	{
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
-		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." ".$Value;
+		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
 		elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
 		else  $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
@@ -337,15 +337,15 @@ class Export
 	/**
 	 *      Build an input field used to filter the query
 	 *
-	 *      @param		string	$TypeField		Type of Field to filter. Example: Text, List:c_country:label:rowid, List:c_stcom:label:code, Number, Boolean
+	 *      @param		string	$TypeField		Type of Field to filter. Example: Text, Date, List:c_country:label:rowid, List:c_stcom:label:code, Numeric or Number, Boolean
 	 *      @param		string	$NameField		Name of the field to filter
 	 *      @param		string	$ValueField		Initial value of the field to filter
 	 *      @return		string					html string of the input field ex : ""
 	 */
 	function build_filterField($TypeField, $NameField, $ValueField)
 	{
-		global $langs;
-		
+		global $conf,$langs;
+
 		$szFilterField='';
 		$InfoFieldList = explode(":", $TypeField);
 
@@ -354,9 +354,14 @@ class Export
 		{
 			case 'Text':
 			case 'Date':
+				$szFilterField='';
+				break;
 			case 'Duree':
 			case 'Numeric':
-				$szFilterField='';
+			case 'Number':
+			case 'Status':
+				if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) $szFilterField='';
+				else $szFilterField='';
 				break;
 			case 'Boolean':
 				$szFilterField='";
 				break;
 			case 'List':
@@ -408,12 +413,12 @@ class Export
 							}
 							//var_dump($InfoFieldList[1]);
 							$labeltoshow=dol_trunc($obj->label,18);
-							if ($InfoFieldList[1] == 'c_stcomm') 
+							if ($InfoFieldList[1] == 'c_stcomm')
 							{
 								$langs->load("companies");
 								$labeltoshow=(($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id)?$langs->trans("StatusProspect".$obj->id):$obj->label);
 							}
-							if ($InfoFieldList[1] == 'c_country') 
+							if ($InfoFieldList[1] == 'c_country')
 							{
 								//var_dump($sql);
 								$langs->load("dict");
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 5c3400e5375..4b565069b5c 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -58,6 +58,7 @@ $entitytoicon = array(
 	'account'      => 'account',
 	'product'      => 'product',
     'warehouse'    => 'stock',
+    'batch'        => 'stock',
 	'category'     => 'category',
 	'shipment'     => 'sending',
     'shipment_line'=> 'sending',
@@ -88,7 +89,8 @@ $entitytolang = array(
 	'product'      => 'Product',
     'service'      => 'Service',
     'stock'        => 'Stock',
-    'warehouse'    => 'Warehouse',
+    'batch'        => 'Batch',
+	'warehouse'    => 'Warehouse',
 	'category'     => 'Category',
 	'other'        => 'Other',
     'trip'         => 'TripsAndExpenses',
@@ -99,7 +101,7 @@ $entitytolang = array(
     'task_time'    => 'TaskTimeSpent',
 	'action'       => 'Event',
 	'expensereport'=> 'ExpenseReport',
-	'expensereport_line'=> 'ExpenseReportLine',
+	'expensereport_line'=> 'ExpenseReportLine'
 );
 
 $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array();
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index 45f47c7d824..574d94c90b7 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -76,7 +76,7 @@ if ($action == 'update')
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'title_setup');
 print '
';
 
 print $langs->trans("Module100Desc")."
\n";
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index c5420948ab3..e14726e2f5f 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -67,7 +67,7 @@ $textobject=$langs->transnoentitiesnoconv("Interventions");
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');
 
 $head=fichinter_admin_prepare_head();
 
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index aaaa497f959..281b92750e8 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -67,7 +67,7 @@ $textobject=$langs->transnoentitiesnoconv("Interventions");
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');
 
 
 $head=fichinter_admin_prepare_head();
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 9eb9b243830..b0f0e2695ec 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -847,7 +847,7 @@ else if ($action == 'update_extras')
 	if (! $error)
 	{
 		// Actions on extra fields (by external module or standard code)
-		// FIXME le hook fait double emploi avec le trigger !!
+		// TODO le hook fait double emploi avec le trigger !!
 		$hookmanager->initHooks(array('interventiondao'));
 		$parameters=array('id'=>$object->id);
 		$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1732,6 +1732,9 @@ else if ($id > 0 || ! empty($ref))
 	/*
 	 * Action presend
 	 */
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 	if ($action == 'presend')
 	{
 		$ref = dol_sanitizeFileName($object->ref);
@@ -1819,6 +1822,7 @@ else if ($id > 0 || ! empty($ref))
 		// Tableau des parametres complementaires
 		$formmail->param['action']='send';
 		$formmail->param['models']='fichinter_send';
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
 		$formmail->param['fichinter_id']=$object->id;
 		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index baf2555a905..b72dec1f6fa 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2014 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2011-2013 Juanjo Menent        
+ * Copyright (C) 2015      Marcos García        
  *
  * 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
@@ -1011,6 +1012,23 @@ class Fichinter extends CommonObject
 			return -1;
 		}
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'fichinter'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 /**
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index fd039efff24..bd6746c98e4 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -88,7 +88,7 @@ if ($object->id)
 {
 	$object->fetch_thirdparty();
 
-	$head=fichinter_prepare_head($object, $user);
+	$head=fichinter_prepare_head($object);
 
 	dol_fiche_head($head, 'documents',  $langs->trans("InterventionCard"), 0, 'intervention');
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 851077b510f..1c3582620ab 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			
  * Copyright (C) 2011-2012	Juanjo Menent			
  * Copyright (C) 2013		Cédric Salvador			
+ * Copyright (C) 2015           Jean-François Ferry		
  *
  * 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
@@ -128,7 +129,7 @@ if ($result)
 	if ($search_desc) $urlparam.="&search_desc=".urlencode($search_desc);
 	if ($search_status != '' && $search_status > -1) $urlparam.="&search_status=".urlencode($search_status);
 
-	print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num);
+	print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_commercial.png');
 
 	print ''."\n";
 	print '

 	
 	

-	info_bits & 2) == 2) { ?>
+	info_bits & 2) == 2) {
+	?>
 		
 		fk_product > 0)
 		{
-
 			echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-
+			
 			// Show range
 			echo get_date_range($line->date_start, $line->date_end);
 
@@ -128,7 +129,7 @@ if (empty($usemargins)) $usemargins=0;
 	
 			tva_tx,'%',$line->info_bits); ?>pu_ht); ?>subprice); ?>
 
 	
 	pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?>
".$langs->trans("Project")."";
-        $formproject->select_projects(-1, GETPOST("fk_project"),'fk_project', 0, 1, 0, 1);
+        $formproject->select_projects(-1, GETPOST("fk_projet"),'fk_projet', 0, 1, 0, 1);
 		print "
'.$langs->trans('Project').'';
-		$formproject->select_projects(-1, $object->fk_project,'fk_project', 0, 1, 0, 1);
+		$formproject->select_projects(-1, $object->fk_projet,'fk_projet', 0, 1, 0, 1);
         print '
 ';
 	print '';
 	print ' ';
 		print '';
-    }
-    if($conf->livraison_bon->enabled) {
+    	
 		print ' ';
@@ -188,14 +193,23 @@ if ($resql)
 		{
 		}*/
 		print "';
-			print dol_print_date($db->jdate($objp->date_expedition),"day");
-			print '';
+
+		// Date real
+		print '';
+		print dol_print_date($db->jdate($objp->date_expedition),"day");
+		print '';
+            print !empty($receiving) ? $receiving->getNomUrl($db) : '';
+            print '';
 			print dol_print_date($db->jdate($objp->date_reception),"day");
 			print '
';
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 15bee891775..13b2d8d1669 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2005 	   Simon Tosser         
  * Copyright (C) 2006 	   Andre Cianfarani     
  * Copyright (C) 2010      Juanjo Menent        
+ * Copyright (C) 2015      Bahfir Abbes         
  *
  * 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
@@ -66,6 +67,14 @@ $conffiletoshow = "htdocs/conf/conf.php";
 //$conffile = "/etc/dolibarr/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";
 
+//replace conf filename with "conf" parameter on url by GET
+if (!empty($_GET['conf'])) {
+    setcookie('dolconf', $_GET['conf'],0,'/');
+    $conffile = 'conf/' . $_GET['conf'] . '.php';
+} else {
+    $conffile = 'conf/' . (!empty($_COOKIE['dolconf']) ? $_COOKIE['dolconf'] : 'conf') . '.php';
+}
+
 
 // Include configuration
 $result=@include_once $conffile;	// Keep @ because with some error reporting this break the redirect
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index f91507dece7..0d9230d55fe 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003      Eric Seigne          
  * Copyright (C) 2004-2014 Laurent Destailleur  
  * Copyright (C) 2005-2010 Regis Houssin        
- * Copyright (C) 2010-2014 Juanjo Menent        
+ * Copyright (C) 2010-2015 Juanjo Menent        
  * Copyright (C) 2014      Jean Heimburger		
  * Copyright (C) 2015      Marcos García        
  *
@@ -35,11 +35,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
+$langs->load('companies');
 $langs->load('suppliers');
 $langs->load('products');
 $langs->load('bills');
 $langs->load('orders');
-$langs->load('companies');
 $langs->load('commercial');
 
 $action	= GETPOST('action');
@@ -206,13 +206,13 @@ if ($object->id > 0)
 	// Local Taxes
 	if ($mysoc->useLocalTax(1))
 	{
-		print '';
 	}
 	if ($mysoc->useLocalTax(2))
 	{
-		print '';
 	}
@@ -369,7 +369,7 @@ if ($object->id > 0)
 
 
 	/*
-	 * Last orders
+	 * Last supplier orders
 	 */
 	$orderstatic = new CommandeFournisseur($db);
 
@@ -414,7 +414,7 @@ if ($object->id > 0)
 
 			    print '';
     			print '';
 
 
-	// Delai livraison jours
+	// Delivery delay (in days)
 	print '';
 	print '';
 	print '';
@@ -1953,11 +1970,12 @@ elseif (! empty($object->id))
 	$cols = 3;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-	// Ligne de	3 colonnes
+	// Total
 	print '';
 	print '';
 	print '';
 
+	// Total VAT
 	print '';
 	print '';
 
@@ -1975,6 +1993,7 @@ elseif (! empty($object->id))
 		print '';
 	}
 
+	// Total TTC
 	print '';
 	print '';
 
@@ -2021,7 +2040,7 @@ elseif (! empty($object->id))
 	// Show object lines
 	$inputalsopricewithtax=0;
 	if (! empty($object->lines))
-		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
+		$ret = $object->printObjectLines($action, $societe, $mysoc, $lineid, 1);
 
 	$num = count($object->lines);
 
@@ -2227,6 +2246,9 @@ elseif (! empty($object->id))
 	/*
 	 * Action presend
 	 */
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 	if ($action == 'presend')
 	{
 		$ref = dol_sanitizeFileName($object->ref);
@@ -2319,6 +2341,7 @@ elseif (! empty($object->id))
 		// Tableau des parametres complementaires
 		$formmail->param['action']='send';
 		$formmail->param['models']='order_supplier_send';
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
 		$formmail->param['orderid']=$object->id;
 		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 
@@ -2589,13 +2612,51 @@ elseif (! empty($object->id))
 				{
 					if ($user->rights->fournisseur->commande->approuver)
 					{
-						print ''.$langs->trans("ApproveOrder").'';
+						if (! empty($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL) && ! empty($object->user_approve_id))
+						{
+							print ''.$langs->trans("ApproveOrder").'';
+						}
+						else
+						{
+							print ''.$langs->trans("ApproveOrder").'';
+						}
+					}
+					else
+					{
+						print ''.$langs->trans("ApproveOrder").'';
+					}
+				}
+
+				// Second approval (if option SUPPLIER_ORDER_DOUBLE_APPROVAL is set)
+				if ($object->statut == 1)
+				{
+					if ($user->rights->fournisseur->commande->approve2)
+					{
+						if (! empty($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL) && ! empty($object->user_approve_id2))
+						{
+							print ''.$langs->trans("Approve2Order").'';
+						}
+						else
+						{
+							print ''.$langs->trans("Approve2Order").'';
+						}
+					}
+					else
+					{
+						print ''.$langs->trans("Approve2Order").'';
+					}
+				}
+
+				// Refuse
+				if ($object->statut == 1)
+				{
+					if ($user->rights->fournisseur->commande->approuver || $user->rights->fournisseur->commande->approve2)
+					{
 						print ''.$langs->trans("RefuseOrder").'';
 					}
 					else
 					{
-						print ''.$langs->trans("ApproveOrder").'';
-						print ''.$langs->trans("RefuseOrder").'';
+						print ''.$langs->trans("RefuseOrder").'';
 					}
 				}
 
@@ -2616,7 +2677,7 @@ elseif (! empty($object->id))
 						print ''.$langs->trans("Disapprove").'';
 					}
 				}
-				if (in_array($object->statut, array(5, 6, 7, 9)))
+				if (in_array($object->statut, array(3, 5, 6, 7, 9)))
 				{
 					if ($user->rights->fournisseur->commande->commander)
 					{
@@ -2625,26 +2686,34 @@ elseif (! empty($object->id))
 				}
 
 				// Create bill
-				if (! empty($conf->fournisseur->enabled) && $object->statut >= 2)  // 2 means accepted
+				if (! empty($conf->facture->enabled))
 				{
-					if ($user->rights->fournisseur->facture->creer)
+					if (! empty($conf->fournisseur->enabled) && ($object->statut >= 2 && $object->statut != 9))  // 2 means accepted
 					{
-						print ''.$langs->trans("CreateBill").'';
+						if ($user->rights->fournisseur->facture->creer)
+						{
+							print ''.$langs->trans("CreateBill").'';
+						}
+
+						//if ($user->rights->fournisseur->commande->creer && $object->statut > 2)
+						//{
+						//	print ''.$langs->trans("ClassifyBilled").'';
+						//}
 					}
-
-					//if ($user->rights->fournisseur->commande->creer && $object->statut > 2)
-					//{
-					//	print ''.$langs->trans("ClassifyBilled").'';
-					//}
 				}
 
-
 				// Create a remote order using WebService only if module is activated
 				if (! empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) // 2 means accepted
 				{
 					print ''.$langs->trans('CreateRemoteOrder').'';
 				}
 
+				// Clone
+				if ($user->rights->fournisseur->commande->creer)
+				{
+					print ''.$langs->trans("ToClone").'';
+				}
+
 				// Cancel
 				if ($object->statut == 2)
 				{
@@ -2654,12 +2723,6 @@ elseif (! empty($object->id))
 					}
 				}
 
-				// Clone
-				if ($user->rights->fournisseur->commande->creer)
-				{
-					print ''.$langs->trans("ToClone").'';
-				}
-
 				// Delete
 				if ($user->rights->fournisseur->commande->supprimer)
 				{
@@ -2696,26 +2759,21 @@ elseif (! empty($object->id))
 		print '
';
 
 
-        // List of actions on element
-        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-        $formactions=new FormActions($db);
-        $somethingshown=$formactions->showactions($object,'order_supplier',$socid);
-
-
 		if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
 		{
 			/*
 			 * Commander (action=commande)
 			 */
-			print '
';
+			print ''."\n";
 			print '';
 			print '';
 			print '';
+			print_fiche_titre($langs->trans("ToOrder"),'','');
 			print '
'.$langs->trans("LocalTax1IsUsed").'';
+		print '
'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'';
 		print yn($object->localtax1_assuj);
 		print '
'.$langs->trans("LocalTax2IsUsed").'';
+		print '
'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'';
 		print yn($object->localtax2_assuj);
 		print '
';
-    			print '';
+    			print '
'.$langs->trans("LastOrders",($num<$MAXLIST?"":$MAXLIST)).'
';
     			print '';
                 print '';
     			print '
'.$langs->trans("LastSupplierOrders",($num<$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
';
@@ -460,7 +460,7 @@ if ($object->id > 0)
 	}
 
 	/*
-	 * Last invoices
+	 * Last supplier invoices
 	 */
 	$MAXLIST=5;
 
@@ -476,7 +476,7 @@ if ($object->id > 0)
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn';
 		$sql.= ' WHERE f.fk_soc = '.$object->id;
 		$sql.= " AND f.entity =".$conf->entity;
-		$sql.= ' GROUP BY f.rowid,f.libelle,f.ref,f.ref_supplier,f.fk_statut,f.datef,f.total_ttc,f.paye';
+		$sql.= ' GROUP BY f.rowid,f.libelle,f.ref,f.ref_supplier,f.fk_statut,f.datef,f.total_ht,f.total_tva,f.total_ttc,f.paye';
 		$sql.= ' ORDER BY f.datef DESC';
 		$resql=$db->query($sql);
 		if ($resql)
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 52c215de6a4..3b6de210928 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -52,7 +52,11 @@ class CommandeFournisseur extends CommonOrder
 
     var $id;
 
-    var $ref;		 // TODO deprecated
+	/**
+	 * TODO: Remove
+	 * @deprecated
+	 */
+    var $ref;
     var $product_ref;
     var $ref_supplier;
     var $brouillon;
@@ -65,6 +69,7 @@ class CommandeFournisseur extends CommonOrder
     var $date;
     var $date_valid;
     var $date_approve;
+    var $date_approve2;		// Used when SUPPLIER_ORDER_DOUBLE_APPROVAL is set
     var $date_commande;
 	var $date_livraison;	// Date livraison souhaitee
     var $total_ht;
@@ -85,12 +90,13 @@ class CommandeFournisseur extends CommonOrder
     var $user_author_id;
     var $user_valid_id;
     var $user_approve_id;
+    var $user_approve_id2;	// Used when SUPPLIER_ORDER_DOUBLE_APPROVAL is set
 
 	//Incorterms
 	var $fk_incoterms;
 	var $location_incoterms;
 	var $libelle_incoterms;  //Used into tooltip
-	
+
     var $extraparams=array();
 
 	/**
@@ -110,7 +116,7 @@ class CommandeFournisseur extends CommonOrder
     function __construct($db)
     {
     	global $conf;
-    	
+
         $this->db = $db;
         $this->products = array();
 
@@ -144,8 +150,8 @@ class CommandeFournisseur extends CommonOrder
 
         $sql = "SELECT c.rowid, c.ref, ref_supplier, c.fk_soc, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva,";
         $sql.= " c.localtax1, c.localtax2, ";
-        $sql.= " c.date_creation, c.date_valid, c.date_approve,";
-        $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve,";
+        $sql.= " c.date_creation, c.date_valid, c.date_approve, c.date_approve2,";
+        $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve, c.fk_user_approve2,";
         $sql.= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
         $sql.= " c.fk_account,";
         $sql.= " c.note_private, c.note_public, c.model_pdf, c.extraparams,";
@@ -184,6 +190,7 @@ class CommandeFournisseur extends CommonOrder
             $this->user_author_id		= $obj->fk_user_author;
             $this->user_valid_id		= $obj->fk_user_valid;
             $this->user_approve_id		= $obj->fk_user_approve;
+            $this->user_approve_id2		= $obj->fk_user_approve2;
             $this->total_ht				= $obj->total_ht;
             $this->total_tva			= $obj->tva;
             $this->total_localtax1		= $obj->localtax1;
@@ -192,7 +199,8 @@ class CommandeFournisseur extends CommonOrder
             $this->date					= $this->db->jdate($obj->date_creation);
             $this->date_valid			= $this->db->jdate($obj->date_valid);
             $this->date_approve			= $this->db->jdate($obj->date_approve);
-            $this->date_commande		= $this->db->jdate($obj->date_commande); // date a laquelle la commande a ete transmise
+            $this->date_approve2		= $this->db->jdate($obj->date_approve2);
+            $this->date_commande		= $this->db->jdate($obj->date_commande); // date we make the order to supplier
 			$this->date_livraison       = $this->db->jdate($obj->date_livraison);
             $this->remise_percent		= $obj->remise_percent;
             $this->methode_commande_id	= $obj->fk_input_method;
@@ -216,9 +224,9 @@ class CommandeFournisseur extends CommonOrder
 
 			//Incoterms
 			$this->fk_incoterms = $obj->fk_incoterms;
-			$this->location_incoterms = $obj->location_incoterms;									
+			$this->location_incoterms = $obj->location_incoterms;
 			$this->libelle_incoterms = $obj->libelle_incoterms;
-				
+
             $this->extraparams			= (array) json_decode($obj->extraparams, true);
 
             $this->db->free($resql);
@@ -645,9 +653,10 @@ class CommandeFournisseur extends CommonOrder
      *
      *	@param	User	$user			Object user
      *	@param	int		$idwarehouse	Id of warhouse for stock change
+     *  @param	int		$secondlevel	0=Standard approval, 1=Second level approval (used when option SUPPLIER_ORDER_DOUBLE_APPROVAL is set)
      *	@return	int						<0 if KO, >0 if OK
      */
-    function approve($user, $idwarehouse=0)
+    function approve($user, $idwarehouse=0, $secondlevel=0)
     {
         global $langs,$conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -658,6 +667,8 @@ class CommandeFournisseur extends CommonOrder
 
         if ($user->rights->fournisseur->commande->approuver)
         {
+        	$now = dol_now();
+
             $this->db->begin();
 
 			// Definition du nom de modele de numerotation de commande
@@ -675,11 +686,26 @@ class CommandeFournisseur extends CommonOrder
             }
             $this->newref = $num;
 
+            // Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated)
+			$movetoapprovestatus=true;
+
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
 			$sql.= " SET ref='".$this->db->escape($num)."',";
-            $sql.= " fk_statut = 2,";
-            $sql.= " date_approve='".$this->db->idate(dol_now())."',";
-            $sql.= " fk_user_approve = ".$user->id;
+			if (empty($secondlevel))	// standard or first level approval
+			{
+	            $sql.= " date_approve='".$this->db->idate($now)."',";
+    	        $sql.= " fk_user_approve = ".$user->id;
+    	        if (! empty($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL)) $movetoapprovestatus=false;
+			}
+			else	// request a second level approval
+			{
+            	$sql.= " date_approve2='".$this->db->idate($now)."',";
+            	$sql.= " fk_user_approve2 = ".$user->id;
+    	        if (empty($this->user_approve_id)) $movetoapprovestatus=false;		// first level approval not done
+			}
+			// If double approval is required and first approval, we keep status to 1 = validated
+			if ($movetoapprovestatus) $sql.= ", fk_statut = 2";
+			else $sql.= ", fk_statut = 1";
             $sql.= " WHERE rowid = ".$this->id;
             $sql.= " AND fk_statut = 1";
 
@@ -697,7 +723,7 @@ class CommandeFournisseur extends CommonOrder
 	            }
 
                 // If stock is incremented on validate order, we must increment it
-                if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER))
+                if (! $error && $movetoapprovestatus && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER))
                 {
                     require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
                     $langs->load("agenda");
@@ -729,6 +755,20 @@ class CommandeFournisseur extends CommonOrder
 
                 if (! $error)
                 {
+                	$this->ref=$newref;
+                	if ($movetoapprovestatus) $this->statut = 2;
+					else $this->statut = 1;
+           			if (empty($secondlevel))	// standard or first level approval
+					{
+			            $this->date_approve = $now;
+		    	        $this->user_approve_id = $user->id;
+					}
+					else	// request a second level approval
+					{
+			            $this->date_approve2 = $now;
+		    	        $this->user_approve_id2 = $user->id;
+					}
+
                     $this->db->commit();
                     return 1;
                 }
@@ -1030,6 +1070,12 @@ class CommandeFournisseur extends CommonOrder
                         }
                     }
 
+	                if (! $error)
+                    {
+                    	$result=$this->insertExtraFields();
+	                    if ($result < 0) $error++;
+                    }
+
 					if (! $error && ! $notrigger)
 	                {
 						// Call trigger
@@ -1088,6 +1134,10 @@ class CommandeFournisseur extends CommonOrder
         $this->date_creation      = '';
         $this->date_validation    = '';
         $this->ref_supplier       = '';
+        $this->user_approve_id    = '';
+        $this->user_approve_id2   = '';
+        $this->date_approve       = '';
+        $this->date_approve2      = '';
 
         // Create clone
         $result=$this->create($user);
@@ -1336,23 +1386,30 @@ 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;
+        global $conf, $langs;
+
         $error = 0;
         require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
 
-        // Check parameters
-        if ($entrepot <= 0 || $qty <= 0)
+        // Check parameters (if test are wrong here, there is bug into caller)
+        if ($entrepot <= 0)
         {
-            $this->error='BadValueForParameterWarehouseOrQty';
+            $this->error='ErrorBadValueForParameterWarehouse';
+            return -1;
+        }
+        if ($qty <= 0)
+        {
+            $this->error='ErrorBadValueForParameterQty';
             return -1;
         }
 
         $dispatchstatus = 1;
-        if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0;	// Setting dispatch status (a validation step after receiving products) will be done manually to 1 if this option is on
+        if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0;	// Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
 
         $now=dol_now();
 
@@ -1377,13 +1434,11 @@ class CommandeFournisseur extends CommonOrder
 					$result=$this->call_trigger('LINEORDER_SUPPLIER_DISPATCH',$user);
 					if ($result < 0)
                     {
-                        $this->db->rollback();
+                        $error++;
                         return -1;
                     }
 					// End call triggers
                 }
-
-                $this->db->commit();
             }
             else
 			{
@@ -1392,7 +1447,7 @@ class CommandeFournisseur extends CommonOrder
             }
 
             // Si module stock gere et que incrementation faite depuis un dispatching en stock
-            if (!$error && $entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+            if (! $error && $entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
             {
 
                 $mouv = new MouvementStock($this->db);
@@ -1404,13 +1459,13 @@ class CommandeFournisseur extends CommonOrder
                     if ($result < 0)
                     {
                         $this->error=$mouv->error;
-                        dol_syslog(get_class($this)."::dispatchProduct ".$this->error, LOG_ERR);
+                        $this->errors=$mouv->errors;
+                        dol_syslog(get_class($this)."::dispatchProduct ".$this->error." ".join(',',$this->errors), LOG_ERR);
                         $error++;
                     }
                 }
             }
 
-            //TODO: Check if there is a current transaction in DB but seems not.
             if ($error == 0)
             {
                 $this->db->commit();
@@ -1423,7 +1478,7 @@ class CommandeFournisseur extends CommonOrder
             }
         }
         else
-        {
+		{
             $this->error='BadStatusForObject';
             return -2;
         }
@@ -1625,14 +1680,14 @@ class CommandeFournisseur extends CommonOrder
 
     /**
 	 * Return array of dispathed lines waiting to be approved for this order
-	 * 
+	 *
 	 * @param	int		$status		Filter on stats (-1 = no filter, 0 = lines draft to be approved, 1 = approved lines)
 	 * @return	array				Array of lines
      */
     function getDispachedLines($status=-1)
     {
     	$ret = array();
-    	
+
     	// List of already dispatched lines
 		$sql = "SELECT p.ref, p.label,";
 		$sql.= " e.rowid as warehouse_id, e.label as entrepot,";
@@ -1655,16 +1710,16 @@ class CommandeFournisseur extends CommonOrder
 			{
 				$objp = $this->db->fetch_object($resql);
 				if ($objp) $ret[]=array('id'=>$objp->dispatchedlineid, 'productid'=>$objp->fk_product, 'warehouseid'=>$objp->warehouse_id);
-				
+
 				$i++;
 			}
 		}
 		else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
-		
+
 		return $ret;
     }
-    
-    
+
+
     /**
      * 	Set a delivery in database for this supplier order
      *
@@ -1677,10 +1732,10 @@ class CommandeFournisseur extends CommonOrder
     function Livraison($user, $date, $type, $comment)
     {
     	global $conf;
-    	
+
         $result = 0;
 		$error = 0;
-		
+
         dol_syslog(get_class($this)."::Livraison");
 
         if ($user->rights->fournisseur->commande->receptionner)
@@ -1690,18 +1745,37 @@ class CommandeFournisseur extends CommonOrder
             if ($type == 'nev') $statut = 7;
             if ($type == 'can') $statut = 7;
 
-        	if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && ($type == 'tot'))
-	    	{
-	    		// If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done"
-	    		$dispatchedlinearray=$this->getDispachedLines(0);
-	    		if (count($dispatchedlinearray) > 0)
+            // Some checks to accept the record
+            if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
+            {
+				// If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done"
+	        	if (! $error && ($type == 'tot'))
+		    	{
+		    		$dispatchedlinearray=$this->getDispachedLines(0);
+		    		if (count($dispatchedlinearray) > 0)
+		    		{
+		    			$result=-1;
+		    			$error++;
+		    			$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
+		    			dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
+		    		}
+
+		    	}
+	    		if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot'))	// Accept to move to rception done, only if status of all line are ok (refuse denied)
 	    		{
-	    			$result=-1;
-	    			$error++;
-	    			$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
-	    			dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
+	    			$dispatcheddenied=$this->getDispachedLines(2);
+	    			if (count($dispatchedlinearray) > 0)
+	    			{
+		    			$result=-1;
+		    			$error++;
+		    			$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionDenied';
+		    			dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionDenied', LOG_DEBUG);
+	    			}
 	    		}
-	    	}
+            }
+
+            // TODO LDR01 Add option to accept only if ALL predefined products are received (same qty).
+
 
             if (! $error && ! ($statut == 4 or $statut == 5 or $statut == 7))
             {
@@ -1709,7 +1783,7 @@ class CommandeFournisseur extends CommonOrder
                 dol_syslog(get_class($this)."::Livraison Error -2", LOG_ERR);
                 $result = -2;
             }
-	    	
+
             if (! $error)
             {
                 $this->db->begin();
@@ -2094,6 +2168,8 @@ class CommandeFournisseur extends CommonOrder
         $this->mode_reglement_code = 'CHQ';
         $this->note_public='This is a comment (public)';
         $this->note_private='This is a comment (private)';
+        $this->statut=0;
+
         // Lines
         $nbp = 5;
         $xnbp = 0;
@@ -2324,7 +2400,7 @@ class CommandeFournisseur extends CommonOrder
 			}
 		}
 
-		if ($nb === 0) return $langs->trans('Undefined');
+		if ($nb === 0) return '';
 		else return $nb.' '.$langs->trans('Days');
 	}
 
@@ -2339,6 +2415,23 @@ class CommandeFournisseur extends CommonOrder
 		return $user->rights->fournisseur->commande;
 	}
 
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'commande_fournisseur'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
@@ -2350,7 +2443,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 {
 	public $element='commande_fournisseurdet';
 	public $table_element='commande_fournisseurdet';
-	
+
 	/**
 	 * Unit price without taxes
 	 * @var float
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index e7aea53945e..4d6f75444b8 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -495,16 +495,19 @@ class CommandeFournisseurDispatch extends CommonObject
         {
             if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
             if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
+            if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut8');
         }
         if ($mode == 4)
         {
             if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
             if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+            if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
         }
         if ($mode == 5)
         {
             if ($statut==0) return ''.$langs->trans($this->statutshort[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
             if ($statut==1) return ''.$langs->trans($this->statutshort[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
+            if ($statut==2) return ''.$langs->trans($this->statutshort[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut8');
         }
     }
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 19cb26cf17b..59ea5544681 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -55,10 +55,15 @@ class FactureFournisseur extends CommonInvoice
     var $socid;
     //Check constants for types
     var $type = self::TYPE_STANDARD;
-    //! 0=draft,
-    //! 1=validated
-    //! 2=classified paid partially (close_code='discount_vat','badcustomer') or completely (close_code=null),
-    //! Also 2, should be 3=classified abandoned and no payment done (close_code='badcustomer','abandon' ou 'replaced')
+
+	/**
+	 * Check constants for more info:
+	 * - STATUS_DRAFT
+	 * - STATUS_VALIDATED
+	 * - STATUS_PAID
+	 * - STATUS_ABANDONED
+	 * @var int
+	 */
     var $statut;
     //! 1 si facture payee COMPLETEMENT, 0 sinon (ce champ ne devrait plus servir car insuffisant)
     var $paye;
@@ -100,7 +105,7 @@ class FactureFournisseur extends CommonInvoice
 	var $fk_incoterms;
 	var $location_incoterms;
 	var $libelle_incoterms;  //Used into tooltip
-	
+
     var $extraparams=array();
 
     /**
@@ -248,7 +253,7 @@ class FactureFournisseur extends CommonInvoice
             	$action='create';
 
 				// Actions on extra fields (by external module or standard code)
-				// FIXME le hook fait double emploi avec le trigger !!
+				// TODO le hook fait double emploi avec le trigger !!
 				$hookmanager->initHooks(array('supplierinvoicedao'));
 				$parameters=array('socid'=>$this->id);
 				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -423,9 +428,9 @@ class FactureFournisseur extends CommonInvoice
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
-				$this->location_incoterms = $obj->location_incoterms;									
+				$this->location_incoterms = $obj->location_incoterms;
 				$this->libelle_incoterms = $obj->libelle_incoterms;
-				
+
                 $this->extraparams			= (array) json_decode($obj->extraparams, true);
 
                 $this->socid  = $obj->socid;
@@ -438,7 +443,7 @@ class FactureFournisseur extends CommonInvoice
                 $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
                 $this->fetch_optionals($this->id,$extralabels);
 
-                if ($this->statut == 0) $this->brouillon = 1;
+                if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
 
                 $result=$this->fetch_lines();
                 if ($result < 0)
@@ -502,7 +507,8 @@ class FactureFournisseur extends CommonInvoice
                     $this->lines[$i]->product_ref		= $obj->product_ref;       // Internal reference
                     $this->lines[$i]->ref				= $obj->product_ref;       // deprecated.
                     $this->lines[$i]->ref_supplier		= $obj->ref_supplier;      // Reference product supplier TODO Rename field ref to ref_supplier into table llx_facture_fourn_det and llx_commande_fournisseurdet and update fields it into updateline
-                    $this->lines[$i]->libelle			= $obj->label;             // This field may contains label of product (when invoice create from order)
+                    $this->lines[$i]->libelle			= $obj->label;             // Deprecated
+                    $this->lines[$i]->label  			= $obj->label;             // This field may contains label of product (when invoice create from order)
                     $this->lines[$i]->product_desc		= $obj->product_desc;      // Description du produit
                     $this->lines[$i]->subprice			= $obj->pu_ht;
                     $this->lines[$i]->pu_ht				= $obj->pu_ht;
@@ -520,6 +526,7 @@ class FactureFournisseur extends CommonInvoice
                     $this->lines[$i]->total_ttc			= $obj->total_ttc;
                     $this->lines[$i]->fk_product		= $obj->fk_product;
                     $this->lines[$i]->product_type		= $obj->product_type;
+                    $this->lines[$i]->product_label		= $obj->label;
                     $this->lines[$i]->info_bits		    = $obj->info_bits;
                     $this->lines[$i]->fk_parent_line    = $obj->fk_parent_line;
                     $this->lines[$i]->special_code		= $obj->special_code;
@@ -572,7 +579,7 @@ class FactureFournisseur extends CommonInvoice
         //	if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1);
         //	if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2);
         if (isset($this->total_ttc)) $this->total_ttc=trim($this->total_ttc);
-        if (isset($this->statut)) $this->statut=trim($this->statut);
+        if (isset($this->statut)) $this->statut=(int) $this->statut;
         if (isset($this->author)) $this->author=trim($this->author);
         if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
         if (isset($this->fk_facture_source)) $this->fk_facture_source=trim($this->fk_facture_source);
@@ -886,7 +893,7 @@ class FactureFournisseur extends CommonInvoice
         $error=0;
 
         // Protection
-        if ($this->statut > 0)	// This is to avoid to validate twice (avoid errors on logs and stock management)
+        if ($this->statut > self::STATUS_DRAFT)	// This is to avoid to validate twice (avoid errors on logs and stock management)
         {
             dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
             return 0;
@@ -995,7 +1002,7 @@ class FactureFournisseur extends CommonInvoice
             if (! $error)
             {
             	$this->ref = $num;
-            	$this->statut=1;
+            	$this->statut=self::STATUS_VALIDATED;
             	//$this->date_validation=$now; this is stored into log table
             }
 
@@ -1032,7 +1039,7 @@ class FactureFournisseur extends CommonInvoice
 
         $error=0;
 
-        if ($this->statut == 0)
+        if ($this->statut == self::STATUS_DRAFT)
         {
             dol_syslog(get_class($this)."::set_draft already draft status", LOG_WARNING);
             return 0;
@@ -1403,7 +1410,7 @@ class FactureFournisseur extends CommonInvoice
      */
     function info($id)
     {
-        $sql = 'SELECT c.rowid, datec, tms as datem,';
+        $sql = 'SELECT c.rowid, datec, tms as datem, ';
         $sql.= ' fk_user_author, fk_user_valid';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as c';
         $sql.= ' WHERE c.rowid = '.$id;
@@ -1429,7 +1436,7 @@ class FactureFournisseur extends CommonInvoice
                 }
                 $this->date_creation     = $obj->datec;
                 $this->date_modification = $obj->datem;
-                //$this->date_validation   = $obj->datev; Should be stored in log table
+                //$this->date_validation   = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders)
             }
             $this->db->free($result);
         }
@@ -1746,7 +1753,7 @@ class FactureFournisseur extends CommonInvoice
         // Load source object
         $object->fetch($fromid);
         $object->id=0;
-        $object->statut=0;
+        $object->statut=self::STATUS_DRAFT;
 
         // Clear fields
         $object->ref_supplier=$langs->trans("CopyOf").' '.$object->ref_supplier;
@@ -1847,7 +1854,22 @@ class FactureFournisseur extends CommonInvoice
 		return $user->rights->fournisseur->facture;
 	}
 
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'facture_fourn'
+		);
 
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index adc1f3a50fc..48c238d60be 100755
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2009-2014	Regis Houssin			
  * Copyright (C) 2011		Juanjo Menent			
  * Copyright (C) 2012		Christophe Battarel		
+ * Copyright (C) 2015       Marcos García           
  *
  * 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
@@ -154,7 +155,7 @@ class ProductFournisseur extends Product
 	 *    @param  	float		$remise_percent		Discount  regarding qty (percent)
 	 *    @param  	float		$remise				Discount  regarding qty (amount)
 	 *    @param  	int			$newnpr				Set NPR or not
-	 *    @param	int			$delivery_time_days	Delay in days for delivery (max)
+	 *    @param	int			$delivery_time_days	Delay in days for delivery (max). May be '' if not defined.
      *    @return	int								<0 if KO, >=0 if OK
      */
     function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges=0, $remise_percent=0, $remise=0, $newnpr=0, $delivery_time_days=0)
@@ -167,7 +168,7 @@ class ProductFournisseur extends Product
         if (empty($charges)) $charges=0;
         if (empty($availability)) $availability=0;
         if (empty($remise_percent)) $remise_percent=0;
-		if (empty($delivery_time_days)) $delivery_time_days=0;
+        if ($delivery_time_days != '' && ! is_numeric($delivery_time_days)) $delivery_time_days = '';
         if ($price_base_type == 'TTC')
 		{
 			//$ttx = get_default_tva($fourn,$mysoc,$this->id);	// We must use the VAT rate defined by user and not calculate it
@@ -202,7 +203,7 @@ class ProductFournisseur extends Product
 			$sql.= " entity = ".$conf->entity.",";
 			$sql.= " info_bits = ".$newnpr.",";
 			$sql.= " charges = ".$charges.",";
-			$sql.= " delivery_time_days = ".$delivery_time_days;
+			$sql.= " delivery_time_days = ".($delivery_time_days != '' ? $delivery_time_days : 'null');
 			$sql.= " WHERE rowid = ".$this->product_fourn_price_id;
 			// TODO Add price_base_type and price_ttc
 
@@ -360,7 +361,7 @@ class ProductFournisseur extends Product
             	$this->fk_product				= $obj->fk_product;
             	$this->fk_availability			= $obj->fk_availability;
 				$this->delivery_time_days		= $obj->delivery_time_days;
-            	//$this->fourn_tva_npr			= $obj->fourn_tva_npr; // FIXME this field not exist in llx_product_fournisseur_price
+            	//$this->fourn_tva_npr			= $obj->fourn_tva_npr; // TODO this field not exist in llx_product_fournisseur_price. We should add it ?
                 $this->fk_supplier_price_expression      = $obj->fk_supplier_price_expression;
 
                 if (empty($ignore_expression) && !empty($this->fk_supplier_price_expression)) {
@@ -437,16 +438,16 @@ class ProductFournisseur extends Product
 				$prodfourn->fourn_remise_percent	= $record["remise_percent"];
 				$prodfourn->fourn_remise			= $record["remise"];
                 $prodfourn->fourn_unitprice			= $record["unitprice"];
-				$prodfourn->fourn_charges          = $record["charges"];
-				$prodfourn->fourn_unitcharges      = $record["unitcharges"];
+				$prodfourn->fourn_charges           = $record["charges"];
+				$prodfourn->fourn_unitcharges       = $record["unitcharges"];
                 $prodfourn->fourn_tva_tx			= $record["tva_tx"];
                 $prodfourn->fourn_id				= $record["fourn_id"];
                 $prodfourn->fourn_name				= $record["supplier_name"];
                 $prodfourn->fk_availability			= $record["fk_availability"];
 				$prodfourn->delivery_time_days		= $record["delivery_time_days"];
                 $prodfourn->id						= $prodid;
-                $prodfourn->fourn_tva_npr						= $record["info_bits"];
-                $prodfourn->fk_supplier_price_expression     = $record["fk_supplier_price_expression"];
+                $prodfourn->fourn_tva_npr					= $record["info_bits"];
+                $prodfourn->fk_supplier_price_expression    = $record["fk_supplier_price_expression"];
 
                 if (!empty($prodfourn->fk_supplier_price_expression)) {
                     $priceparser = new PriceParser($this->db);
@@ -631,17 +632,19 @@ class ProductFournisseur extends Product
     /**
      *	Display supplier of product
      *
-     *	@param	int		$withpicto	Add picto
-     *	@param	string	$option		Target of link ('', 'customer', 'prospect', 'supplier')
-     *	@return	string				String with supplier price
+     *	@param	int		$withpicto		Add picto
+     *	@param	string	$option			Target of link ('', 'customer', 'prospect', 'supplier')
+     *	@param	int		$maxlen			Max length of name
+     *  @param	integer	$notooltip		1=Disable tooltip
+     *	@return	string					String with supplier price
 	 *  TODO Remove this method. Use getNomUrl directly.
      */
-    function getSocNomUrl($withpicto=0,$option='supplier')
+    function getSocNomUrl($withpicto=0,$option='supplier',$maxlen=0,$notooltip=0)
     {
         $thirdparty = new Fournisseur($this->db);
         $thirdparty->fetch($this->fourn_id);
 
-        return $thirdparty->getNomUrl($withpicto,$option);
+        return $thirdparty->getNomUrl($withpicto,$option,$maxlen,$notooltip);
     }
 
     /**
@@ -649,15 +652,34 @@ class ProductFournisseur extends Product
      *
      *  @param	int		$showunitprice	Show "Unit price" into output string
      *  @param	int		$showsuptitle	Show "Supplier" into output string
+     *	@param	int		$maxlen			Max length of name
+     *  @param	integer	$notooltip		1=Disable tooltip
      *	@return	string					String with supplier price
      */
-    function display_price_product_fournisseur($showunitprice=1,$showsuptitle=1)
+    function display_price_product_fournisseur($showunitprice=1,$showsuptitle=1,$maxlen=0,$notooltip=0)
     {
         global $langs;
         $langs->load("suppliers");
-        $out=($showunitprice?price($this->fourn_unitprice).' '.$langs->trans("HT").'   (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier').' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':'');
+        $out=($showunitprice?price($this->fourn_unitprice).' '.$langs->trans("HT").'   (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':'');
         return $out;
     }
 
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'product_fournisseur_price'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+
 }
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index ef5f708cc35..fe6751c28f2 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -140,6 +140,7 @@ if (empty($reshook))
 	{
 	    $result=$object->setValueFrom('ref_supplier',GETPOST('ref_supplier','alpha'));
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		else $object->ref_supplier = GETPOST('ref_supplier','alpha');	// The setValueFrom does not set new property of object
 	}
 
 	// Set incoterm
@@ -180,7 +181,8 @@ if (empty($reshook))
 	// Set project
 	if ($action ==	'classin' && $user->rights->fournisseur->commande->creer)
 	{
-	    $object->setProject($projectid);
+	    $result=$object->setProject($projectid);
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	if ($action == 'setremisepercent' && $user->rights->fournisseur->commande->creer)
@@ -189,26 +191,42 @@ if (empty($reshook))
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	if ($action == 'reopen' && $user->rights->fournisseur->commande->approuver)
+	if ($action == 'reopen')	// no test on permission here, permission to use will depends on status
 	{
-	    if (in_array($object->statut, array(1, 2, 5, 6, 7, 9)))
+	    if (in_array($object->statut, array(1, 2, 3, 5, 6, 7, 9)))
 	    {
 	        if ($object->statut == 1) $newstatus=0;	// Validated->Draft
 	        else if ($object->statut == 2) $newstatus=0;	// Approved->Draft
+	        else if ($object->statut == 3) $newstatus=2;	// Ordered->Approved
 	        else if ($object->statut == 5) $newstatus=4;	// Received->Received partially
 	        else if ($object->statut == 6) $newstatus=2;	// Canceled->Approved
 	        else if ($object->statut == 7) $newstatus=3;	// Canceled->Process running
 	        else if ($object->statut == 9) $newstatus=1;	// Refused->Validated
 
+	        $db->begin();
+
 	        $result = $object->setStatus($user, $newstatus);
 	        if ($result > 0)
 	        {
+	        	if ($newstatus == 0)
+	        	{
+		        	$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
+	        		$sql.= ' SET fk_user_approve = null, fk_user_approve2 = null, date_approve = null, date_approve2 = null';
+	        		$sql.= ' WHERE rowid = '.$object->id;
+
+	        		$resql=$db->query($sql);
+	        	}
+
+        		$db->commit();
+
 	            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            exit;
 	        }
 	        else
-	        {
-	        	setEventMessage($object->error, 'errors');
+			{
+				$db->rollback();
+
+	            setEventMessages($object->error, $object->errors, 'errors');
 	        }
 	    }
 	}
@@ -433,7 +451,7 @@ if (empty($reshook))
 	    }
 	    else
 		{
-	    	setEventMessage($object->error, 'errors');
+            setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
 
@@ -570,6 +588,7 @@ if (empty($reshook))
 		}
 	}
 
+	// Validate
 	if ($action == 'confirm_valid' && $confirm == 'yes' &&
 	    ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->commande->creer))
 	    || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->supplier_order_advance->validate)))
@@ -603,13 +622,13 @@ if (empty($reshook))
 	    }
 
 	    // If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step
-	    if ($user->rights->fournisseur->commande->approuver && ! (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1)))
+	    if (empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $user->rights->fournisseur->commande->approuver && ! (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1)))
 	    {
-	        $action='confirm_approve';
+	        $action='confirm_approve';	// can make standard or first level approval also if permission is set
 	    }
 	}
 
-	if ($action == 'confirm_approve' && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
+	if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
 	{
 	    $idwarehouse=GETPOST('idwarehouse', 'int');
 
@@ -624,7 +643,7 @@ if (empty($reshook))
 		}
 
 	    // Check parameters
-	    if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change)
+	    if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change)	// warning name of option should be STOCK_CALCULATE_ON_SUPPLIER_APPROVE_ORDER
 	    {
 	        if (! $idwarehouse || $idwarehouse == -1)
 	        {
@@ -636,7 +655,7 @@ if (empty($reshook))
 
 	    if (! $error)
 	    {
-	        $result	= $object->approve($user, $idwarehouse);
+	        $result	= $object->approve($user, $idwarehouse, ($action=='confirm_approve2'?1:0));
 	        if ($result > 0)
 	        {
 	            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -654,8 +673,8 @@ if (empty($reshook))
 	            exit;
 	        }
 	        else
-	        {
-	            setEventMessage($object->error, 'errors');
+			{
+	            setEventMessages($object->error, $object->errors, 'errors');
 	        }
 	    }
 	}
@@ -670,7 +689,7 @@ if (empty($reshook))
 	    }
 	    else
 	    {
-	        setEventMessage($object->error, 'errors');
+            setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
 
@@ -687,7 +706,7 @@ if (empty($reshook))
 	    }
 	    else
 	    {
-	        setEventMessage($object->error, 'errors');
+            setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
 
@@ -702,7 +721,7 @@ if (empty($reshook))
 	    }
 	    else
 	    {
-	        setEventMessage($object->error, 'errors');
+            setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
 
@@ -725,7 +744,7 @@ if (empty($reshook))
 				}
 				else
 				{
-					setEventMessage($object->error, 'errors');
+		            setEventMessages($object->error, $object->errors, 'errors');
 					$action='';
 				}
 			}
@@ -770,7 +789,7 @@ if (empty($reshook))
 	    }
 	    else
 	    {
-	        setEventMessage($object->error, 'errors');
+            setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
 
@@ -817,7 +836,7 @@ if (empty($reshook))
 		if (! $error)
 		{
 			// Actions on extra fields (by external module or standard code)
-			// FIXME le hook fait double emploi avec le trigger !!
+			// TODO le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('supplierorderdao'));
 			$parameters=array('id'=>$object->id);
 
@@ -901,22 +920,20 @@ if (empty($reshook))
 					}
 
 					$object_id = $object->create($user);
-
 					if ($object_id > 0)
 					{
 						dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
 
 						$classname = ucfirst($subelement);
 						$srcobject = new $classname($db);
-						$srcobject->fetch($object->origin_id);
-
-						$object->set_date_livraison($user, $srcobject->date_livraison);
-						$object->set_id_projet($user, $srcobject->fk_project);
 
 						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
 						$result = $srcobject->fetch($object->origin_id);
 						if ($result > 0)
 						{
+							$object->set_date_livraison($user, $srcobject->date_livraison);
+							$object->set_id_projet($user, $srcobject->fk_project);
+
 							$lines = $srcobject->lines;
 							if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
 							{
@@ -935,40 +952,40 @@ if (empty($reshook))
 								if (empty($lines[$i]->subprice) || $lines[$i]->qty <= 0)
 									continue;
 
-								$label = (! empty($lines [$i]->label) ? $lines [$i]->label : '');
-								$desc = (! empty($lines [$i]->desc) ? $lines [$i]->desc : $lines [$i]->libelle);
-								$product_type = (! empty($lines [$i]->product_type) ? $lines [$i]->product_type : 0);
+								$label = (! empty($lines[$i]->label) ? $lines[$i]->label : '');
+								$desc = (! empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->libelle);
+								$product_type = (! empty($lines[$i]->product_type) ? $lines[$i]->product_type : 0);
 
 								// Reset fk_parent_line for no child products and special product
-								if (($lines [$i]->product_type != 9 && empty($lines [$i]->fk_parent_line)) || $lines [$i]->product_type == 9) {
+								if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
 									$fk_parent_line = 0;
 								}
 
 								// Extrafields
-								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines [$i], 'fetch_optionals')) 							// For avoid conflicts if
+								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) 							// For avoid conflicts if
 								                                                                                                      // trigger used
 								{
-									$lines [$i]->fetch_optionals($lines [$i]->rowid);
-									$array_option = $lines [$i]->array_options;
+									$lines[$i]->fetch_optionals($lines[$i]->rowid);
+									$array_option = $lines[$i]->array_options;
 								}
 
-								$idprod = $productsupplier->find_min_price_product_fournisseur($lines [$i]->fk_product, $lines [$i]->qty);
+								$idprod = $productsupplier->find_min_price_product_fournisseur($lines[$i]->fk_product, $lines[$i]->qty);
 								$res = $productsupplier->fetch($idProductFourn);
 
 								$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]->subprice,
+									$lines[$i]->qty,
+									$lines[$i]->tva_tx,
+									$lines[$i]->localtax1_tx,
+									$lines[$i]->localtax2_tx,
+									$lines[$i]->fk_product,
 									$productsupplier->product_fourn_price_id,
 									$productsupplier->ref_fourn,
-									$lines [$i]->remise_percent,
+									$lines[$i]->remise_percent,
 									'HT',
 									0,
-									$lines [$i]->product_type,
+									$lines[$i]->product_type,
 									'',
 									'',
 									null,
@@ -981,7 +998,7 @@ if (empty($reshook))
 								}
 
 								// Defined the new fk_parent_line
-								if ($result > 0 && $lines [$i]->product_type == 9) {
+								if ($result > 0 && $lines[$i]->product_type == 9) {
 									$fk_parent_line = $result;
 								}
 							}
@@ -993,11 +1010,11 @@ if (empty($reshook))
 							if ($reshook < 0)
 								$error ++;
 						} else {
-							setEventMessage($srcobject->error, 'errors');
+			        		setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 							$error ++;
 						}
 					} else {
-						setEventMessage($object->error, 'errors');
+			        	setEventMessages($object->error, $object->errors, 'errors');
 						$error ++;
 					}
 				}
@@ -1007,7 +1024,7 @@ if (empty($reshook))
 		        	if ($id < 0)
 		        	{
 		        		$error++;
-			        	setEventMessage($langs->trans($object->error), 'errors');
+			        	setEventMessages($object->error, $object->errors, 'errors');
 		        	}
 				}
 	        }
@@ -1663,9 +1680,9 @@ elseif (! empty($object->id))
 	}
 
 	/*
-	 * Confirmation de l'approbation
+	 * Confirm approval
 	 */
-	if ($action	== 'approve')
+	if ($action	== 'approve' || $action	== 'approve2')
 	{
         $qualified_for_stock_change=0;
 	    if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
@@ -1699,7 +1716,7 @@ elseif (! empty($object->id))
 			$text.=$notify->confirmMessage('ORDER_SUPPLIER_APPROVE', $object->socid, $object);
 		}
 
-		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ApproveThisOrder"), $text, "confirm_approve", $formquestion, 1, 1, 240);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ApproveThisOrder"), $text, "confirm_".$action, $formquestion, 1, 1, 240);
 	}
 
 	/*
@@ -1896,7 +1913,7 @@ elseif (! empty($object->id))
 	print '
'.$langs->trans('NbDaysToDelivery').' '.img_picto($langs->trans('DescNbDaysToDelivery'), 'info', 'style="cursor:help"').''.$object->getMaxDeliveryTimeDay($langs).'
'.$langs->trans("AmountHT").''.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'
'.$langs->trans("AmountVAT").''.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'
'.$langs->trans("AmountTTC").''.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'
';
-			print '';
+			//print '';
 			print '';
 
 			print '';
 			print '
'.$langs->trans("ToOrder").'
'.$langs->trans("ToOrder").'
'.$langs->trans("OrderDate").'';
 			$date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-			print $form->select_date($date_com,'','','','',"commande");
+			print $form->select_date($date_com,'',1,1,'',"commande");
 			print '
'.$langs->trans("OrderMode").'';
@@ -2726,6 +2784,7 @@ elseif (! empty($object->id))
 			print '
';
 			print '';
+			print "
";
 		}
 
 		if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
@@ -2733,14 +2792,15 @@ elseif (! empty($object->id))
 			/*
 			 * Receptionner (action=livraison)
 			 */
-			print '
';
+			print ''."\n";
 			print '
';
 			print '';
 			print '';
+			print_fiche_titre($langs->trans("Receive"),'','');
 			print '';
-			print '';
+			//print '';
 			print '\n";
 
 			print "';
 			print "
'.$langs->trans("Receive").'
'.$langs->trans("Receive").'
'.$langs->trans("DeliveryDate").'';
-			print $form->select_date('','','','','',"commande");
+			print $form->select_date('','',1,1,'',"commande");
 			print "
".$langs->trans("Delivery")."\n";
@@ -2758,8 +2818,15 @@ elseif (! empty($object->id))
 			print '
\n";
 			print "
\n";
+			print "
";
 		}
 
+        // List of actions on element
+        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+        $formactions=new FormActions($db);
+        $somethingshown=$formactions->showactions($object,'order_supplier',$socid);
+
+
 		// List of actions on element
 		/* Hidden because" available into "Log" tab
 		print '
';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index f2dd3518868..b3d1c9b12dd 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -101,6 +101,23 @@ if ($action == 'uncheckdispatchline' &&
 	}
 }
 
+if ($action == 'denydispatchline' &&
+	! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner))
+       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))
+)
+{
+	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
+	$result=$supplierorderdispatch->fetch($lineid);
+	if (! $result) dol_print_error($db);
+	$result=$supplierorderdispatch->setStatut(2);
+	if ($result < 0)
+	{
+		setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors');
+		$error++;
+		$action='';
+	}
+}
+
 if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 {
 	$commande = new CommandeFournisseur($db);
@@ -110,11 +127,15 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 
 	$db->begin();
 
+	$pos=0;
 	foreach($_POST as $key => $value)
 	{
 		if (preg_match('/^product_([0-9]+)$/i', $key, $reg))	// without batch module enabled
 		{
-			$numline=$reg[1] + 1;	// line of product
+			$pos++;
+
+			//$numline=$reg[1] + 1;	// line of product
+			$numline=$pos;
 			$prod = "product_".$reg[1];
 			$qty = "qty_".$reg[1];
 			$ent = "entrepot_".$reg[1];
@@ -123,17 +144,17 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 
 			if (GETPOST($qty) > 0)	// We ask to move a qty
 			{
-				if (! GETPOST($ent,'int') > 0)
+				if (! (GETPOST($ent,'int') > 0))
 				{
 					dol_syslog('No dispatch for line '.$key.' as no warehouse choosed');
 					$text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').' ' .($numline);
 					setEventMessage($langs->trans('ErrorFieldRequired',$text), 'errors');
 					$error++;
 				}
-				
+
 				if (! $error)
 				{
-					$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);
 					if ($result < 0)
 					{
 						setEventMessages($commande->error, $commande->errors, 'errors');
@@ -144,8 +165,11 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 		}
 		if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg))	// with batch module enabled
 		{
+			$pos++;
+
 			//eat-by date dispatch
-			$numline=$reg[2] + 1;	// line of product
+			//$numline=$reg[2] + 1;	// line of product
+			$numline=$pos;
 			$prod = "product_".$reg[1]."_".$reg[2];
 			$qty = "qty_".$reg[1]."_".$reg[2];
 			$ent = "entrepot_".$reg[1]."_".$reg[2];
@@ -155,6 +179,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 			$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($qty) > 0)	// We ask to move a qty
 			{
 				if (! (GETPOST($ent,'int') > 0))
@@ -172,10 +197,10 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 					setEventMessage($langs->trans('ErrorFieldRequired',$text), 'errors');
 					$error++;
 				}
-				
+
 				if (! $error)
 				{
-					$result = $commande->dispatchProduct($user, GETPOST($prod,'int'), GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), $dDLC, $dDLUO, GETPOST($lot, 'alpha'), GETPOST($fk_commandefourndet, 'int'));
+					$result = $commande->dispatchProduct($user, GETPOST($prod,'int'), GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), $dDLC, $dDLUO, GETPOST($lot, 'alpha'), GETPOST($fk_commandefourndet, 'int'), $notrigger);
 					if ($result < 0)
 					{
 						setEventMessages($commande->error, $commande->errors, 'errors');
@@ -184,14 +209,13 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 				}
 			}
 		}
-
 	}
 
 	if (! $notrigger && ! $error)
 	{
 		global $conf, $langs, $user;
         // Call trigger
-        $result=$commande->call_trigger('ORDER_SUPPLIER_DISPATCH',$user);
+        $result = $commande->call_trigger('ORDER_SUPPLIER_DISPATCH', $user);
         // End call triggers
 
 		if ($result < 0)
@@ -412,6 +436,20 @@ if ($id > 0 || ! empty($ref))
 							$nbproduct++;
 
 							$var=!$var;
+
+							// To show detail cref and description value, we must make calculation by cref
+							//print ($objp->cref?' ('.$objp->cref.')':'');
+							//if ($objp->description) print '
'.nl2br($objp->description);
+							if ((empty($conf->productbatch->enabled)) || $objp->tobatch==0)
+							{
+								$suffix='_'.$i;
+							} else {
+								$suffix='_0_'.$i;
+							}
+
+
+							print "\n";
+							print ''."\n";
 							print "
';
-								print '';
+								print '';
 								print '';
-								$form->select_date('','dlc'.$suffix,'','',1,"");
+								$dlcdatesuffix=dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
+								$form->select_date($dlcdatesuffix,'dlc'.$suffix,'','',1,"");
 								print '';
-								$form->select_date('','dluo'.$suffix,'','',1,"");
+								$dluodatesuffix=dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
+								$form->select_date($dluodatesuffix,'dluo'.$suffix,'','',1,"");
 								print ' 
';
 					print ''.img_object($langs->trans("ShowProduct"),'product').' '.$objp->ref.'';
@@ -640,31 +671,40 @@ if ($id > 0 || ! empty($ref))
        					|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check))
 							)
 						{
-							if (empty($objp->status)) 
+							if (empty($objp->status))
 							{
-								print ''.$langs->trans("Check").'';
+								print ''.$langs->trans("Approve").'';
+								print ''.$langs->trans("Deny").'';
 							}
 							else
 							{
-								print ''.$langs->trans("Uncheck").'';
+								print ''.$langs->trans("Disapprove").'';
+								print ''.$langs->trans("Deny").'';
 							}
 						}
 						else
 						{
 							$disabled='';
 							if ($commande->statut == 5) $disabled=1;
-							if (empty($objp->status)) 
+							if (empty($objp->status))
 							{
-								print 'dispatchlineid.'">'.$langs->trans("Check").'';
+								print 'dispatchlineid.'">'.$langs->trans("Approve").'';
+								print 'dispatchlineid.'">'.$langs->trans("Deny").'';
 							}
-							else 
+							if ($objp->status == 1)
 							{
-								print 'dispatchlineid.'">'.$langs->trans("Uncheck").'';
+								print 'dispatchlineid.'">'.$langs->trans("Reinit").'';
+								print 'dispatchlineid.'">'.$langs->trans("Deny").'';
+							}
+							if ($objp->status == 2)
+							{
+								print 'dispatchlineid.'">'.$langs->trans("Reinit").'';
+								print 'dispatchlineid.'">'.$langs->trans("Approve").'';
 							}
 						}
-						print '
\n";
 	print "\n";
 
-	print '
'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'
';
+	if (! empty($conf->facture->enable)) print '
'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'
';
 
 	$db->free($resql);
 }
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 6792e9356b1..6cd0dfb02c2 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2012	   David Rodriguez Martinez 
  * Copyright (C) 2012	   Juanjo Menent			
  * Copyright (C) 2014	   Florian Henry			
+ * Copyright (C) 2015      Marcos García            
  *
  * 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
@@ -160,32 +161,14 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 				$object->date_echeance = $object->calculate_date_lim_reglement();
 
 			if ($_POST['origin'] && $_POST['originid']) {
-				$object->origin = $_POST['origin'];
-				$object->origin_id = $orders_id[$ii];
 				$object->linked_objects = $orders_id;
 				$id = $object->create($user);
 
 				if ($id > 0) {
 					foreach ( $orders_id as $origin => $origin_id ) {
-						$origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id);
-						$db->begin();
-						$sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
-						$sql .= "fk_source";
-						$sql .= ", sourcetype";
-						$sql .= ", fk_target";
-						$sql .= ", targettype";
-						$sql .= ") VALUES (";
-						$sql .= $origin_id;
-						$sql .= ", '" . $object->origin . "'";
-						$sql .= ", " . $id;
-						$sql .= ", '" . $object->element . "'";
-						$sql .= ")";
+						$origin_id = (! empty($origin_id) ? $origin_id : $orders_id[$ii]);
 
-						if ($db->query($sql)) {
-							$db->commit();
-						} else {
-							$db->rollback();
-						}
+						$object->add_object_linked($_POST['origin'], $origin_id);
 					}
 
 					while ( $ii < $nn ) {
@@ -577,7 +560,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		print '
';
 		print '';
 		print '';
-		print '
';
+		print '
';
 		// print ''.$langs->trans("GoBack").'';
 		print '';
 		print '
';
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 3a9d8f5bebe..3fb22d4a101 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -29,7 +29,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $langs->load("orders");
 echo '
';
-print_titre($langs->trans('RelatedOrders'));
+print_titre($langs->trans('RelatedSupplierOrders'));
 ?>
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index e93d06ad530..4c401c2c540 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -288,7 +288,7 @@ if (empty($reshook))
 	elseif ($action == 'deletepaiement' && $user->rights->fournisseur->facture->creer)
 	{
 	    $object->fetch($id);
-	    if ($object->statut == 1 && $object->paye == 0)
+	    if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0)
 	    {
 	    	$paiementfourn = new PaiementFourn($db);
 	        $result=$paiementfourn->fetch(GETPOST('paiement_id'));
@@ -547,27 +547,25 @@ if (empty($reshook))
 	    	{
 	    		$up = price2num(GETPOST('price_ht'));
 	    		$price_base_type = 'HT';
-	    		$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, 0, $type,'','', $date_start, $date_end);
 	    	}
 	    	else
 	    	{
 	    		$up = price2num(GETPOST('price_ttc'));
 	    		$price_base_type = 'TTC';
-	    		$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end);
 	    	}
 
-	        if (GETPOST('idprod'))
+	        if (GETPOST('productid'))
 	        {
 	            $prod = new Product($db);
-	            $prod->fetch($_POST['idprod']);
+	            $prod->fetch(GETPOST('productid'));
 	            $label = $prod->description;
-	            if (trim($_POST['desc']) != trim($label)) $label=$_POST['desc'];
+	            if (trim($_POST['product_desc']) != trim($label)) $label=$_POST['product_desc'];
 
 	            $type = $prod->type;
 	        }
 	        else
 	        {
-	            $label = $_POST['desc'];
+	            $label = $_POST['product_desc'];
 	            $type = $_POST["type"]?$_POST["type"]:0;
 	        }
 
@@ -589,7 +587,7 @@ if (empty($reshook))
 				}
 			}
 
-	        $result=$object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent, 0, $date_start, $date_end, $array_options);
+	        $result=$object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, 0, $type, $remise_percent, 0, $date_start, $date_end, $array_options);
 	        if ($result >= 0)
 	        {
 	            unset($_POST['label']);
@@ -867,8 +865,8 @@ if (empty($reshook))
 	elseif ($action == 'reopen' && $user->rights->fournisseur->facture->creer)
 	{
 	    $result = $object->fetch($id);
-	    if ($object->statut == 2
-	    || ($object->statut == 3 && $object->close_code != 'replaced'))
+	    if ($object->statut == FactureFournisseur::STATUS_CLOSED
+	    || ($object->statut == FactureFournisseur::STATUS_ABANDONED && $object->close_code != 'replaced'))
 	    {
 	        $result = $object->set_unpaid($user);
 	        if ($result > 0)
@@ -1139,7 +1137,7 @@ if (empty($reshook))
 		if (!$error)
 		{
 			// Actions on extra fields (by external module or standard code)
-			// FIXME le hook fait double emploi avec le trigger !!
+			// TODO le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('supplierinvoicedao'));
 			$parameters=array('id'=>$object->id);
 
@@ -1739,8 +1737,8 @@ else
         print "\n";
 
         // Ref supplier
-        print '';
 
         // Third party
@@ -1788,8 +1786,8 @@ else
         print '';
 
         // Label
-        print '';
-        print '';
+        print '';
+        print '';
 
         /*
          * List of payments
@@ -1853,7 +1851,7 @@ else
                     }
                     print '';
                     print '';
 
+	    $form_permission = $object->statutrights->fournisseur->facture->creer && $object->getSommePaiement() <= 0;
+
         // Date
-        print '';
 
         // Due date
-        print '';
 
 		// Conditions de reglement par defaut
@@ -1962,8 +1962,9 @@ else
         $alreadypaid=$object->getSommePaiement();
         print '';
 
-        print '';
-        print '';
+        print '';
-            print '';
-            print '';
+            print '';
+            print '';
         }
         if ($societe->localtax2_assuj=="1") //Localtax2
         {
             print '';
-            print '';
-            print '';
+            print '';
+            print '';
         }
-        print '';
+        print '';
 
         // Project
         if (! empty($conf->projet->enabled))
@@ -2081,7 +2082,7 @@ else
         
 		';
 
-		if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+		if (! empty($conf->use_javascript_ajax) && $object->statut == FactureFournisseur::STATUS_DRAFT) {
 			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 		}
 
@@ -2279,7 +2280,7 @@ else
         }
 */
 		// Form to add new line
-        if ($object->statut == 0 && $user->rights->fournisseur->facture->creer)
+        if ($object->statut == FactureFournisseur::STATUS_DRAFT && $user->rights->fournisseur->facture->creer)
 		{
 			if ($action != 'editline')
 			{
@@ -2310,7 +2311,7 @@ else
             print '
';
 
 		    // Modify a validated invoice with no payments
-			if ($object->statut == 1 && $action != 'edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer)
+			if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer)
 			{
 				print ''.$langs->trans('Modify').'';
 			}
@@ -2329,7 +2330,7 @@ else
             }
 
             // Send by mail
-            if (($object->statut == 1 || $object->statut == 2))
+            if (($object->statut == FactureFournisseur::STATUS_VALIDATED || $object->statut == FactureFournisseur::STATUS_CLOSED))
             {
                 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
                 {
@@ -2340,13 +2341,13 @@ else
 
 
             // Make payments
-            if ($action != 'edit' && $object->statut == 1 && $object->paye == 0  && $user->societe_id == 0)
+            if ($action != 'edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0  && $user->societe_id == 0)
             {
                 print ''.$langs->trans('DoPayment').'';	// must use facid because id is for payment id not invoice
             }
 
             // Classify paid
-            if ($action != 'edit' && $object->statut == 1 && $object->paye == 0  && $user->societe_id == 0)
+            if ($action != 'edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0  && $user->societe_id == 0)
             {
                 print ''.$langs->trans('ClassifyPaid').'';
@@ -2355,7 +2356,7 @@ else
             }
 
             // Validate
-            if ($action != 'edit' && $object->statut == 0)
+            if ($action != 'edit' && $object->statut == FactureFournisseur::STATUS_DRAFT)
             {
                 if (count($object->lines))
                 {
@@ -2498,6 +2499,9 @@ else
         /*
          * Show mail form
         */
+        if (GETPOST('modelselected')) {
+        	$action = 'presend';
+        }
         if ($action == 'presend')
         {
             $ref = dol_sanitizeFileName($object->ref);
@@ -2584,6 +2588,7 @@ else
             // Tableau des parametres complementaires
             $formmail->param['action']='send';
             $formmail->param['models']='invoice_supplier_send';
+            $formmail->param['models_id']=GETPOST('modelmailselected','int');
             $formmail->param['facid']=$object->id;
             $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index aaee42e9add..7348f3b7590 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -1,6 +1,6 @@
 
- * Copyright (C) 2005-2014	Laurent Destailleur	
+ * Copyright (C) 2005-2015	Laurent Destailleur	
  * Copyright (C) 2005-2012	Regis Houssin		
  *
  * This program is free software; you can redistribute it and/or modify
@@ -200,6 +200,30 @@ if ($id > 0 || ! empty($ref))
 		print $form->editfieldval("Label",'label',$object->label,$object,0);
 		print '';
 
+        // Status
+        $alreadypaid=$object->getSommePaiement();
+        print '
';
+
+        // Amount
+        print '';
+        print '';
+
+        // Amount Local Taxes
+        //TODO: Place into a function to control showing by country or study better option
+        if ($societe->localtax1_assuj=="1") //Localtax1
+        {
+            print '';
+            print '';
+            print '';
+        }
+        if ($societe->localtax2_assuj=="1") //Localtax2
+        {
+            print '';
+            print '';
+            print '';
+        }
+        print '';
+
 		print "

 
'.$form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).'';
-        print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer));
+        print '
'.$form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statutrights->fournisseur->facture->creer)).'';
+        print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statutrights->fournisseur->facture->creer));
         print '
'.$form->editfieldkey("Label",'label',$object->label,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).''.$form->editfieldval("Label",'label',$object->label,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).'
'.$form->editfieldkey("Label",'label',$object->label,$object,($object->statutrights->fournisseur->facture->creer)).''.$form->editfieldval("Label",'label',$object->label,$object,($object->statutrights->fournisseur->facture->creer)).''.price($objp->amount).'';
-                    if ($object->statut == 1 && $object->paye == 0 && $user->societe_id == 0)
+                    if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->societe_id == 0)
                     {
                         print 'rowid.'">';
                         print img_delete();
@@ -1891,15 +1889,17 @@ else
 
         print '
'.$form->editfieldkey("Date",'datef',$object->datep,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker').'';
-        print $form->editfieldval("Date",'datef',$object->datep,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker');
+        print '
'.$form->editfieldkey("Date",'datef',$object->datep,$object,$form_permission,'datepicker').'';
+        print $form->editfieldval("Date",'datef',$object->datep,$object,$form_permission,'datepicker');
         print '
'.$form->editfieldkey("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker').'';
-        print $form->editfieldval("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker');
-        if ($action != 'editdate_lim_reglement' && $object->statut < 2 && $object->date_echeance && $object->date_echeance < ($now - $conf->facture->fournisseur->warning_delay)) print img_warning($langs->trans('Late'));
+        print '
'.$form->editfieldkey("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,$form_permission,'datepicker').'';
+        print $form->editfieldval("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,$form_permission,'datepicker');
+        if ($action != 'editdate_lim_reglement' && $object->statut < FactureFournisseur::STATUS_CLOSED && $object->date_echeance && $object->date_echeance < ($now - $conf->facture->fournisseur->warning_delay)) print img_warning($langs->trans('Late'));
         print '
'.$langs->trans('Status').''.$object->getLibStatut(4,$alreadypaid).'
'.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).' 
'.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'';
+        // Amount
+        print '
'.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'';
         if (GETPOST('calculationrule')) $calculationrule=GETPOST('calculationrule','alpha');
         else $calculationrule=(empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)?'totalofround':'roundoftotal');
         if ($calculationrule == 'totalofround') $calculationrulenum=1;
@@ -1980,16 +1981,16 @@ else
         if ($societe->localtax1_assuj=="1") //Localtax1
         {
             print '
'.$langs->transcountry("AmountLT1",$societe->country_code).''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).' 
'.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->transcountry("AmountLT2",$societe->country_code).''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).' 
'.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).' 
'.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->trans('Status').''.$object->getLibStatut(4,$alreadypaid).'
'.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->transcountry("AmountLT1",$societe->country_code).''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->transcountry("AmountLT2",$societe->country_code).''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'
";
 
 		dol_fiche_end();
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index c7219c6e415..e6fed653421 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -168,6 +168,30 @@ if ($object->id > 0)
 	print $form->editfieldval("Label",'label',$object->label,$object,0);
 	print '
'.$langs->trans('Status').''.$object->getLibStatut(4,$alreadypaid).'
'.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->transcountry("AmountLT1",$societe->country_code).''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->transcountry("AmountLT2",$societe->country_code).''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'

';
 
 	print '';
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index e45833c53f1..7033d555c0e 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -31,11 +31,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 
 $langs->load('bills');
 
-$facid = isset($_GET["facid"])?$_GET["facid"]:'';
+$id = GETPOST("facid",'int');
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'fournisseur', $facid, 'facture_fourn', 'facture');
+$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 
 
@@ -45,22 +45,22 @@ $result = restrictedArea($user, 'fournisseur', $facid, 'facture_fourn', 'facture
 
 llxHeader();
 
-$fac = new FactureFournisseur($db);
-$fac->fetch($_GET["facid"]);
-$fac->info($_GET["facid"]);
+$object = new FactureFournisseur($db);
+$object->fetch($id);
+$object->info($id);
 $soc = new Societe($db);
-$soc->fetch($fac->socid);
+$soc->fetch($object->socid);
 
-$head = facturefourn_prepare_head($fac);
+$head = facturefourn_prepare_head($object);
 $titre=$langs->trans('SupplierInvoice');
 dol_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), 0, 'bill');
 
 print '
';
-dol_print_object_info($fac);
+dol_print_object_info($object);
 print '
';
 
 print '';
 
-$db->close();
-
 llxFooter();
+
+$db->close();
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 3c1b0f06cb6..836d214e19a 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -120,7 +120,7 @@ if ($mode == 'search')
 
 $now=dol_now();
 $form=new Form($db);
-$htmlother=new FormOther($db);
+$formother=new FormOther($db);
 $formfile = new FormFile($db);
 
 llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
@@ -245,7 +245,7 @@ if ($resql)
 	print '
 
';
@@ -259,10 +259,8 @@ if ($resql)
 	}
 	print '';
 	print '';
-	//print ' '.$langs->trans('Year').': ';
 	$syear = $year;
-	//if ($syear == '') $syear = date("Y");
-	$htmlother->select_year($syear?$syear:-1,'year',1, 20, 5);
+	$formother->select_year($syear?$syear:-1,'year',1, 20, 5);
 	print ' ';
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 7d68a3c5a95..3a4528d827e 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -139,6 +139,30 @@ if ($object->id > 0)
 	print $form->editfieldval("Label",'label',$object->label,$object,0);
 	print '
'.$langs->trans('Status').''.$object->getLibStatut(4,$alreadypaid).'
'.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->transcountry("AmountLT1",$societe->country_code).''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->transcountry("AmountLT2",$societe->country_code).''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'
'.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'
";
 
 	print '
';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index a2e6b9d22bc..e1b57b60c91 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -424,7 +424,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	        // Bouton Enregistrer
 	        if ($action != 'add_paiement')
 	        {
-				print '<
 '.$langs->trans("ClosePaidInvoicesAutomatically");
+				print '
 '.$langs->trans("ClosePaidInvoicesAutomatically");
 				print '
';
 	        }
 
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index a6d9164a91c..6bbee5a33fc 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -29,8 +29,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $langs->load("bills");
 echo '
';
-if ($num > 1) print_titre($langs->trans("RelatedBills"));
-else print_titre($langs->trans("RelatedBill"));
+print_titre($langs->trans("RelatedSupplierInvoices"));
 ?>
 
 
diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php
index b8bfcf58976..f9df3a51786 100644
--- a/htdocs/fourn/list.php
+++ b/htdocs/fourn/list.php
@@ -108,7 +108,7 @@ $result=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // No
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef ON ef.fk_object = s.rowid";
-if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cf ON s.rowid = cf.fk_societe"; // We need this table joined to the select in order to filter by categ
+if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cf ON s.rowid = cf.fk_soc"; // We need this table joined to the select in order to filter by categ
 $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id AND s.fournisseur = 1";
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 91d6aef388b..2ba73f0ee2a 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -138,7 +138,7 @@ $form=new Form($db);
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("FTPClientSetup"), $linkback, 'setup');
+print_fiche_titre($langs->trans("FTPClientSetup"), $linkback, 'title_setup');
 print '
';
 
 if (! function_exists('ftp_connect'))
diff --git a/htdocs/includes/nusoap/lib/Mail/PEAR.php b/htdocs/includes/nusoap/lib/Mail/PEAR.php
deleted file mode 100644
index 406ef9c23ba..00000000000
--- a/htdocs/includes/nusoap/lib/Mail/PEAR.php
+++ /dev/null
@@ -1,1100 +0,0 @@
-
- * @author     Stig Bakken 
- * @author     Tomas V.V.Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**#@+
- * ERROR constants
- */
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
-} else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
-}
-
-// instant backwards compatibility
-if (!defined('PATH_SEPARATOR')) {
-    if (OS_WINDOWS) {
-        define('PATH_SEPARATOR', ';');
-    } else {
-        define('PATH_SEPARATOR', ':');
-    }
-}
-
-$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs']         = array();
-$GLOBALS['_PEAR_error_handler_stack']    = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes.  Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix).  Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters.  Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded.  If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V.V. Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.11
- * @link       http://pear.php.net/package/PEAR
- * @see        PEAR_Error
- * @since      Class available since PHP 4.0.2
- * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
- */
-class PEAR
-{
-    // {{{ properties
-
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    // }}}
-    // {{{ getStaticProperty()
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        return $properties[$class][$var];
-    }
-
-    // }}}
-    // {{{ registerShutdownFunc()
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        // if we are called statically, there is a potential
-        // that no shutdown func is registered.  Bug #6445
-        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-            register_shutdown_function("_PEAR_call_destructors");
-            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    function isError($data, $code = null)
-    {
-        if (is_a($data, 'PEAR_Error')) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() == $code;
-            } else {
-                return $data->getCode() == $code;
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ setErrorHandling()
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ expectError()
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return sizeof($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ popExpect()
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ _checkDelExpect()
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-        return $deleted;
-    }
-
-    // }}}
-    // {{{ delExpect()
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
-            }
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-            }
-        } else {
-            // $error_code is empty
-            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-        }
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function &raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-        if ($skipmsg) {
-            $a = new $ec($code, $mode, $options, $userinfo);
-            return $a;
-        } else {
-            $a = new $ec($message, $code, $mode, $options, $userinfo);
-            return $a;
-        }
-    }
-
-    // }}}
-    // {{{ throwError()
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param string $message
-     *
-     */
-    function &throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        } else {
-            $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        }
-    }
-
-    // }}}
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    // {{{ pushErrorHandling()
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    // }}}
-    // {{{ popErrorHandling()
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ loadExtension()
-
-    /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-        }
-        return true;
-    }
-
-    // }}}
-}
-
-// {{{ _PEAR_call_destructors()
-
-function _PEAR_call_destructors()
-{
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (@PEAR::getStaticProperty('PEAR', 'destructlifo')) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
-}
-
-// }}}
-/**
- * Standard PEAR error class for PHP 4
- *
- * This class is supserseded by {@link PEAR_Exception} in PHP 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V.V. Cox 
- * @author     Gregory Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.11
- * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
- * @see        PEAR::raiseError(), PEAR::throwError()
- * @since      Class available since PHP 4.0.2
- */
-class PEAR_Error
-{
-    // {{{ properties
-
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-        if (function_exists("debug_backtrace")) {
-            if (@!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
-                $this->backtrace = debug_backtrace();
-            }
-        }
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-            $this->level = $options;
-            $this->callback = null;
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-            printf($format, $this->getMessage());
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
-        }
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);throw($e);');
-        }
-    }
-
-    // }}}
-    // {{{ getMode()
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode() {
-        return $this->mode;
-    }
-
-    // }}}
-    // {{{ getCallback()
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback() {
-        return $this->callback;
-    }
-
-    // }}}
-    // {{{ getMessage()
-
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-
-    // }}}
-    // {{{ getCode()
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    // }}}
-    // {{{ getUserInfo()
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    // }}}
-    // {{{ getDebugInfo()
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    // }}}
-    // {{{ getBacktrace()
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if (defined('PEAR_IGNORE_BACKTRACE')) {
-            return null;
-        }
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    // }}}
-    // {{{ addUserInfo()
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString() {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
-
-    // }}}
-}
-
-/*
- * Local Variables:
- * mode: php
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-?>
diff --git a/htdocs/includes/nusoap/lib/Mail/RFC822.php b/htdocs/includes/nusoap/lib/Mail/RFC822.php
deleted file mode 100644
index 51849fee4a1..00000000000
--- a/htdocs/includes/nusoap/lib/Mail/RFC822.php
+++ /dev/null
@@ -1,922 +0,0 @@
-                          |
-// |          Chuck Hagenbuch                             |
-// +-----------------------------------------------------------------------+
-
-/**
- * RFC 822 Email address list validation Utility
- *
- * What is it?
- *
- * This class will take an address string, and parse it into it's consituent
- * parts, be that either addresses, groups, or combinations. Nested groups
- * are not supported. The structure it returns is pretty straight forward,
- * and is similar to that provided by the imap_rfc822_parse_adrlist(). Use
- * print_r() to view the structure.
- *
- * How do I use it?
- *
- * $address_string = 'My Group: "Richard"  (A comment), ted@example.com (Ted Bloggs), Barney;';
- * $structure = Mail_RFC822::parseAddressList($address_string, 'example.com', true)
- * print_r($structure);
- *
- * @author  Richard Heyes 
- * @author  Chuck Hagenbuch 
- * @license BSD
- * @package Mail
- */
-class Mail_RFC822 {
-
-    /**
-     * The address being parsed by the RFC822 object.
-     * @var string $address
-     */
-    var $address = '';
-
-    /**
-     * The default domain to use for unqualified addresses.
-     * @var string $default_domain
-     */
-    var $default_domain = 'localhost';
-
-    /**
-     * Should we return a nested array showing groups, or flatten everything?
-     * @var boolean $nestGroups
-     */
-    var $nestGroups = true;
-
-    /**
-     * Whether or not to validate atoms for non-ascii characters.
-     * @var boolean $validate
-     */
-    var $validate = true;
-
-    /**
-     * The array of raw addresses built up as we parse.
-     * @var array $addresses
-     */
-    var $addresses = array();
-
-    /**
-     * The final array of parsed address information that we build up.
-     * @var array $structure
-     */
-    var $structure = array();
-
-    /**
-     * The current error message, if any.
-     * @var string $error
-     */
-    var $error = null;
-
-    /**
-     * An internal counter/pointer.
-     * @var integer $index
-     */
-    var $index = null;
-
-    /**
-     * The number of groups that have been found in the address list.
-     * @var integer $num_groups
-     * @access public
-     */
-    var $num_groups = 0;
-
-    /**
-     * A variable so that we can tell whether or not we're inside a
-     * Mail_RFC822 object.
-     * @var boolean $mailRFC822
-     */
-    var $mailRFC822 = true;
-
-    /**
-    * A limit after which processing stops
-    * @var int $limit
-    */
-    var $limit = null;
-
-    /**
-     * Sets up the object. The address must either be set here or when
-     * calling parseAddressList(). One or the other.
-     *
-     * @access public
-     * @param string  $address         The address(es) to validate.
-     * @param string  $default_domain  Default domain/host etc. If not supplied, will be set to localhost.
-     * @param boolean $nest_groups     Whether to return the structure with groups nested for easier viewing.
-     * @param boolean $validate        Whether to validate atoms. Turn this off if you need to run addresses through before encoding the personal names, for instance.
-     *
-     * @return object Mail_RFC822 A new Mail_RFC822 object.
-     */
-    function Mail_RFC822($address = null, $default_domain = null, $nest_groups = null, $validate = null, $limit = null)
-    {
-        if (isset($address))        $this->address        = $address;
-        if (isset($default_domain)) $this->default_domain = $default_domain;
-        if (isset($nest_groups))    $this->nestGroups     = $nest_groups;
-        if (isset($validate))       $this->validate       = $validate;
-        if (isset($limit))          $this->limit          = $limit;
-    }
-
-    /**
-     * Starts the whole process. The address must either be set here
-     * or when creating the object. One or the other.
-     *
-     * @access public
-     * @param string  $address         The address(es) to validate.
-     * @param string  $default_domain  Default domain/host etc.
-     * @param boolean $nest_groups     Whether to return the structure with groups nested for easier viewing.
-     * @param boolean $validate        Whether to validate atoms. Turn this off if you need to run addresses through before encoding the personal names, for instance.
-     *
-     * @return array A structured array of addresses.
-     */
-    function parseAddressList($address = null, $default_domain = null, $nest_groups = null, $validate = null, $limit = null)
-    {
-        if (!isset($this) || !isset($this->mailRFC822)) {
-            $obj = new Mail_RFC822($address, $default_domain, $nest_groups, $validate, $limit);
-            return $obj->parseAddressList();
-        }
-
-        if (isset($address))        $this->address        = $address;
-        if (isset($default_domain)) $this->default_domain = $default_domain;
-        if (isset($nest_groups))    $this->nestGroups     = $nest_groups;
-        if (isset($validate))       $this->validate       = $validate;
-        if (isset($limit))          $this->limit          = $limit;
-
-        $this->structure  = array();
-        $this->addresses  = array();
-        $this->error      = null;
-        $this->index      = null;
-
-        // Unfold any long lines in $this->address.
-        $this->address = preg_replace('/\r?\n/', "\r\n", $this->address);
-        $this->address = preg_replace('/\r\n(\t| )+/', ' ', $this->address);
-
-        while ($this->address = $this->_splitAddresses($this->address));
-
-        if ($this->address === false || isset($this->error)) {
-            require_once 'PEAR.php';
-            return PEAR::raiseError($this->error);
-        }
-
-        // Validate each address individually.  If we encounter an invalid
-        // address, stop iterating and return an error immediately.
-        foreach ($this->addresses as $address) {
-            $valid = $this->_validateAddress($address);
-
-            if ($valid === false || isset($this->error)) {
-                require_once 'PEAR.php';
-                return PEAR::raiseError($this->error);
-            }
-
-            if (!$this->nestGroups) {
-                $this->structure = array_merge($this->structure, $valid);
-            } else {
-                $this->structure[] = $valid;
-            }
-        }
-
-        return $this->structure;
-    }
-
-    /**
-     * Splits an address into separate addresses.
-     *
-     * @access private
-     * @param string $address The addresses to split.
-     * @return boolean Success or failure.
-     */
-    function _splitAddresses($address)
-    {
-        if (!empty($this->limit) && count($this->addresses) == $this->limit) {
-            return '';
-        }
-
-        if ($this->_isGroup($address) && !isset($this->error)) {
-            $split_char = ';';
-            $is_group   = true;
-        } elseif (!isset($this->error)) {
-            $split_char = ',';
-            $is_group   = false;
-        } elseif (isset($this->error)) {
-            return false;
-        }
-
-        // Split the string based on the above ten or so lines.
-        $parts  = explode($split_char, $address);
-        $string = $this->_splitCheck($parts, $split_char);
-
-        // If a group...
-        if ($is_group) {
-            // If $string does not contain a colon outside of
-            // brackets/quotes etc then something's fubar.
-
-            // First check there's a colon at all:
-            if (strpos($string, ':') === false) {
-                $this->error = 'Invalid address: ' . $string;
-                return false;
-            }
-
-            // Now check it's outside of brackets/quotes:
-            if (!$this->_splitCheck(explode(':', $string), ':')) {
-                return false;
-            }
-
-            // We must have a group at this point, so increase the counter:
-            $this->num_groups++;
-        }
-
-        // $string now contains the first full address/group.
-        // Add to the addresses array.
-        $this->addresses[] = array(
-                                   'address' => trim($string),
-                                   'group'   => $is_group
-                                   );
-
-        // Remove the now stored address from the initial line, the +1
-        // is to account for the explode character.
-        $address = trim(substr($address, strlen($string) + 1));
-
-        // If the next char is a comma and this was a group, then
-        // there are more addresses, otherwise, if there are any more
-        // chars, then there is another address.
-        if ($is_group && substr($address, 0, 1) == ','){
-            $address = trim(substr($address, 1));
-            return $address;
-
-        } elseif (strlen($address) > 0) {
-            return $address;
-
-        } else {
-            return '';
-        }
-
-        // If you got here then something's off
-        return false;
-    }
-
-    /**
-     * Checks for a group at the start of the string.
-     *
-     * @access private
-     * @param string $address The address to check.
-     * @return boolean Whether or not there is a group at the start of the string.
-     */
-    function _isGroup($address)
-    {
-        // First comma not in quotes, angles or escaped:
-        $parts  = explode(',', $address);
-        $string = $this->_splitCheck($parts, ',');
-
-        // Now we have the first address, we can reliably check for a
-        // group by searching for a colon that's not escaped or in
-        // quotes or angle brackets.
-        if (count($parts = explode(':', $string)) > 1) {
-            $string2 = $this->_splitCheck($parts, ':');
-            return ($string2 !== $string);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * A common function that will check an exploded string.
-     *
-     * @access private
-     * @param array $parts The exloded string.
-     * @param string $char  The char that was exploded on.
-     * @return mixed False if the string contains unclosed quotes/brackets, or the string on success.
-     */
-    function _splitCheck($parts, $char)
-    {
-        $string = $parts[0];
-
-        for ($i = 0; $i < count($parts); $i++) {
-            if ($this->_hasUnclosedQuotes($string)
-                || $this->_hasUnclosedBrackets($string, '<>')
-                || $this->_hasUnclosedBrackets($string, '[]')
-                || $this->_hasUnclosedBrackets($string, '()')
-                || substr($string, -1) == '\\') {
-                if (isset($parts[$i + 1])) {
-                    $string = $string . $char . $parts[$i + 1];
-                } else {
-                    $this->error = 'Invalid address spec. Unclosed bracket or quotes';
-                    return false;
-                }
-            } else {
-                $this->index = $i;
-                break;
-            }
-        }
-
-        return $string;
-    }
-
-    /**
-     * Checks if a string has an unclosed quotes or not.
-     *
-     * @access private
-     * @param string $string The string to check.
-     * @return boolean True if there are unclosed quotes inside the string, false otherwise.
-     */
-    function _hasUnclosedQuotes($string)
-    {
-        $string     = explode('"', $string);
-        $string_cnt = count($string);
-
-        for ($i = 0; $i < (count($string) - 1); $i++)
-            if (substr($string[$i], -1) == '\\')
-                $string_cnt--;
-
-        return ($string_cnt % 2 === 0);
-    }
-
-    /**
-     * Checks if a string has an unclosed brackets or not. IMPORTANT:
-     * This function handles both angle brackets and square brackets;
-     *
-     * @access private
-     * @param string $string The string to check.
-     * @param string $chars  The characters to check for.
-     * @return boolean True if there are unclosed brackets inside the string, false otherwise.
-     */
-    function _hasUnclosedBrackets($string, $chars)
-    {
-        $num_angle_start = substr_count($string, $chars[0]);
-        $num_angle_end   = substr_count($string, $chars[1]);
-
-        $this->_hasUnclosedBracketsSub($string, $num_angle_start, $chars[0]);
-        $this->_hasUnclosedBracketsSub($string, $num_angle_end, $chars[1]);
-
-        if ($num_angle_start < $num_angle_end) {
-            $this->error = 'Invalid address spec. Unmatched quote or bracket (' . $chars . ')';
-            return false;
-        } else {
-            return ($num_angle_start > $num_angle_end);
-        }
-    }
-
-    /**
-     * Sub function that is used only by hasUnclosedBrackets().
-     *
-     * @access private
-     * @param string $string The string to check.
-     * @param integer &$num    The number of occurences.
-     * @param string $char   The character to count.
-     * @return integer The number of occurences of $char in $string, adjusted for backslashes.
-     */
-    function _hasUnclosedBracketsSub($string, &$num, $char)
-    {
-        $parts = explode($char, $string);
-        for ($i = 0; $i < count($parts); $i++){
-            if (substr($parts[$i], -1) == '\\' || $this->_hasUnclosedQuotes($parts[$i]))
-                $num--;
-            if (isset($parts[$i + 1]))
-                $parts[$i + 1] = $parts[$i] . $char . $parts[$i + 1];
-        }
-
-        return $num;
-    }
-
-    /**
-     * Function to begin checking the address.
-     *
-     * @access private
-     * @param string $address The address to validate.
-     * @return mixed False on failure, or a structured array of address information on success.
-     */
-    function _validateAddress($address)
-    {
-        $is_group = false;
-        $addresses = array();
-
-        if ($address['group']) {
-            $is_group = true;
-
-            // Get the group part of the name
-            $parts     = explode(':', $address['address']);
-            $groupname = $this->_splitCheck($parts, ':');
-            $structure = array();
-
-            // And validate the group part of the name.
-            if (!$this->_validatePhrase($groupname)){
-                $this->error = 'Group name did not validate.';
-                return false;
-            } else {
-                // Don't include groups if we are not nesting
-                // them. This avoids returning invalid addresses.
-                if ($this->nestGroups) {
-                    $structure = new stdClass;
-                    $structure->groupname = $groupname;
-                }
-            }
-
-            $address['address'] = ltrim(substr($address['address'], strlen($groupname . ':')));
-        }
-
-        // If a group then split on comma and put into an array.
-        // Otherwise, Just put the whole address in an array.
-        if ($is_group) {
-            while (strlen($address['address']) > 0) {
-                $parts       = explode(',', $address['address']);
-                $addresses[] = $this->_splitCheck($parts, ',');
-                $address['address'] = trim(substr($address['address'], strlen(end($addresses) . ',')));
-            }
-        } else {
-            $addresses[] = $address['address'];
-        }
-
-        // Check that $addresses is set, if address like this:
-        // Groupname:;
-        // Then errors were appearing.
-        if (!count($addresses)){
-            $this->error = 'Empty group.';
-            return false;
-        }
-
-        // Trim the whitespace from all of the address strings.
-        array_map('trim', $addresses);
-
-        // Validate each mailbox.
-        // Format could be one of: name 
-        //                         geezer@domain.com
-        //                         geezer
-        // ... or any other format valid by RFC 822.
-        for ($i = 0; $i < count($addresses); $i++) {
-            if (!$this->validateMailbox($addresses[$i])) {
-                if (empty($this->error)) {
-                    $this->error = 'Validation failed for: ' . $addresses[$i];
-                }
-                return false;
-            }
-        }
-
-        // Nested format
-        if ($this->nestGroups) {
-            if ($is_group) {
-                $structure->addresses = $addresses;
-            } else {
-                $structure = $addresses[0];
-            }
-
-        // Flat format
-        } else {
-            if ($is_group) {
-                $structure = array_merge($structure, $addresses);
-            } else {
-                $structure = $addresses;
-            }
-        }
-
-        return $structure;
-    }
-
-    /**
-     * Function to validate a phrase.
-     *
-     * @access private
-     * @param string $phrase The phrase to check.
-     * @return boolean Success or failure.
-     */
-    function _validatePhrase($phrase)
-    {
-        // Splits on one or more Tab or space.
-        $parts = preg_split('/[ \\x09]+/', $phrase, -1, PREG_SPLIT_NO_EMPTY);
-
-        $phrase_parts = array();
-        while (count($parts) > 0){
-            $phrase_parts[] = $this->_splitCheck($parts, ' ');
-            for ($i = 0; $i < $this->index + 1; $i++)
-                array_shift($parts);
-        }
-
-        foreach ($phrase_parts as $part) {
-            // If quoted string:
-            if (substr($part, 0, 1) == '"') {
-                if (!$this->_validateQuotedString($part)) {
-                    return false;
-                }
-                continue;
-            }
-
-            // Otherwise it's an atom:
-            if (!$this->_validateAtom($part)) return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Function to validate an atom which from rfc822 is:
-     * atom = 1*
-     *
-     * If validation ($this->validate) has been turned off, then
-     * validateAtom() doesn't actually check anything. This is so that you
-     * can split a list of addresses up before encoding personal names
-     * (umlauts, etc.), for example.
-     *
-     * @access private
-     * @param string $atom The string to check.
-     * @return boolean Success or failure.
-     */
-    function _validateAtom($atom)
-    {
-        if (!$this->validate) {
-            // Validation has been turned off; assume the atom is okay.
-            return true;
-        }
-
-        // Check for any char from ASCII 0 - ASCII 127
-        if (!preg_match('/^[\\x00-\\x7E]+$/i', $atom, $matches)) {
-            return false;
-        }
-
-        // Check for specials:
-        if (preg_match('/[][()<>@,;\\:". ]/', $atom)) {
-            return false;
-        }
-
-        // Check for control characters (ASCII 0-31):
-        if (preg_match('/[\\x00-\\x1F]+/', $atom)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Function to validate quoted string, which is:
-     * quoted-string = <"> *(qtext/quoted-pair) <">
-     *
-     * @access private
-     * @param string $qstring The string to check
-     * @return boolean Success or failure.
-     */
-    function _validateQuotedString($qstring)
-    {
-        // Leading and trailing "
-        $qstring = substr($qstring, 1, -1);
-
-        // Perform check, removing quoted characters first.
-        return !preg_match('/[\x0D\\\\"]/', preg_replace('/\\\\./', '', $qstring));
-    }
-
-    /**
-     * Function to validate a mailbox, which is:
-     * mailbox =   addr-spec         ; simple address
-     *           / phrase route-addr ; name and route-addr
-     *
-     * @access public
-     * @param string &$mailbox The string to check.
-     * @return boolean Success or failure.
-     */
-    function validateMailbox(&$mailbox)
-    {
-        // A couple of defaults.
-        $phrase  = '';
-        $comment = '';
-        $comments = array();
-
-        // Catch any RFC822 comments and store them separately.
-        $_mailbox = $mailbox;
-        while (strlen(trim($_mailbox)) > 0) {
-            $parts = explode('(', $_mailbox);
-            $before_comment = $this->_splitCheck($parts, '(');
-            if ($before_comment != $_mailbox) {
-                // First char should be a (.
-                $comment    = substr(str_replace($before_comment, '', $_mailbox), 1);
-                $parts      = explode(')', $comment);
-                $comment    = $this->_splitCheck($parts, ')');
-                $comments[] = $comment;
-
-                // +1 is for the trailing )
-                $_mailbox   = substr($_mailbox, strpos($_mailbox, $comment)+strlen($comment)+1);
-            } else {
-                break;
-            }
-        }
-
-        foreach ($comments as $comment) {
-            $mailbox = str_replace("($comment)", '', $mailbox);
-        }
-
-        $mailbox = trim($mailbox);
-
-        // Check for name + route-addr
-        if (substr($mailbox, -1) == '>' && substr($mailbox, 0, 1) != '<') {
-            $parts  = explode('<', $mailbox);
-            $name   = $this->_splitCheck($parts, '<');
-
-            $phrase     = trim($name);
-            $route_addr = trim(substr($mailbox, strlen($name.'<'), -1));
-
-            if ($this->_validatePhrase($phrase) === false || ($route_addr = $this->_validateRouteAddr($route_addr)) === false) {
-                return false;
-            }
-
-        // Only got addr-spec
-        } else {
-            // First snip angle brackets if present.
-            if (substr($mailbox, 0, 1) == '<' && substr($mailbox, -1) == '>') {
-                $addr_spec = substr($mailbox, 1, -1);
-            } else {
-                $addr_spec = $mailbox;
-            }
-
-            if (($addr_spec = $this->_validateAddrSpec($addr_spec)) === false) {
-                return false;
-            }
-        }
-
-        // Construct the object that will be returned.
-        $mbox = new stdClass();
-
-        // Add the phrase (even if empty) and comments
-        $mbox->personal = $phrase;
-        $mbox->comment  = isset($comments) ? $comments : array();
-
-        if (isset($route_addr)) {
-            $mbox->mailbox = $route_addr['local_part'];
-            $mbox->host    = $route_addr['domain'];
-            $route_addr['adl'] !== '' ? $mbox->adl = $route_addr['adl'] : '';
-        } else {
-            $mbox->mailbox = $addr_spec['local_part'];
-            $mbox->host    = $addr_spec['domain'];
-        }
-
-        $mailbox = $mbox;
-        return true;
-    }
-
-    /**
-     * This function validates a route-addr which is:
-     * route-addr = "<" [route] addr-spec ">"
-     *
-     * Angle brackets have already been removed at the point of
-     * getting to this function.
-     *
-     * @access private
-     * @param string $route_addr The string to check.
-     * @return mixed False on failure, or an array containing validated address/route information on success.
-     */
-    function _validateRouteAddr($route_addr)
-    {
-        // Check for colon.
-        if (strpos($route_addr, ':') !== false) {
-            $parts = explode(':', $route_addr);
-            $route = $this->_splitCheck($parts, ':');
-        } else {
-            $route = $route_addr;
-        }
-
-        // If $route is same as $route_addr then the colon was in
-        // quotes or brackets or, of course, non existent.
-        if ($route === $route_addr){
-            unset($route);
-            $addr_spec = $route_addr;
-            if (($addr_spec = $this->_validateAddrSpec($addr_spec)) === false) {
-                return false;
-            }
-        } else {
-            // Validate route part.
-            if (($route = $this->_validateRoute($route)) === false) {
-                return false;
-            }
-
-            $addr_spec = substr($route_addr, strlen($route . ':'));
-
-            // Validate addr-spec part.
-            if (($addr_spec = $this->_validateAddrSpec($addr_spec)) === false) {
-                return false;
-            }
-        }
-
-        if (isset($route)) {
-            $return['adl'] = $route;
-        } else {
-            $return['adl'] = '';
-        }
-
-        $return = array_merge($return, $addr_spec);
-        return $return;
-    }
-
-    /**
-     * Function to validate a route, which is:
-     * route = 1#("@" domain) ":"
-     *
-     * @access private
-     * @param string $route The string to check.
-     * @return mixed False on failure, or the validated $route on success.
-     */
-    function _validateRoute($route)
-    {
-        // Split on comma.
-        $domains = explode(',', trim($route));
-
-        foreach ($domains as $domain) {
-            $domain = str_replace('@', '', trim($domain));
-            if (!$this->_validateDomain($domain)) return false;
-        }
-
-        return $route;
-    }
-
-    /**
-     * Function to validate a domain, though this is not quite what
-     * you expect of a strict internet domain.
-     *
-     * domain = sub-domain *("." sub-domain)
-     *
-     * @access private
-     * @param string $domain The string to check.
-     * @return mixed False on failure, or the validated domain on success.
-     */
-    function _validateDomain($domain)
-    {
-        // Note the different use of $subdomains and $sub_domains
-        $subdomains = explode('.', $domain);
-
-        while (count($subdomains) > 0) {
-            $sub_domains[] = $this->_splitCheck($subdomains, '.');
-            for ($i = 0; $i < $this->index + 1; $i++)
-                array_shift($subdomains);
-        }
-
-        foreach ($sub_domains as $sub_domain) {
-            if (!$this->_validateSubdomain(trim($sub_domain)))
-                return false;
-        }
-
-        // Managed to get here, so return input.
-        return $domain;
-    }
-
-    /**
-     * Function to validate a subdomain:
-     *   subdomain = domain-ref / domain-literal
-     *
-     * @access private
-     * @param string $subdomain The string to check.
-     * @return boolean Success or failure.
-     */
-    function _validateSubdomain($subdomain)
-    {
-        if (preg_match('|^\[(.*)]$|', $subdomain, $arr)){
-            if (!$this->_validateDliteral($arr[1])) return false;
-        } else {
-            if (!$this->_validateAtom($subdomain)) return false;
-        }
-
-        // Got here, so return successful.
-        return true;
-    }
-
-    /**
-     * Function to validate a domain literal:
-     *   domain-literal =  "[" *(dtext / quoted-pair) "]"
-     *
-     * @access private
-     * @param string $dliteral The string to check.
-     * @return boolean Success or failure.
-     */
-    function _validateDliteral($dliteral)
-    {
-        return !preg_match('/(.)[][\x0D\\\\]/', $dliteral, $matches) && $matches[1] != '\\';
-    }
-
-    /**
-     * Function to validate an addr-spec.
-     *
-     * addr-spec = local-part "@" domain
-     *
-     * @access private
-     * @param string $addr_spec The string to check.
-     * @return mixed False on failure, or the validated addr-spec on success.
-     */
-    function _validateAddrSpec($addr_spec)
-    {
-        $addr_spec = trim($addr_spec);
-
-        // Split on @ sign if there is one.
-        if (strpos($addr_spec, '@') !== false) {
-            $parts      = explode('@', $addr_spec);
-            $local_part = $this->_splitCheck($parts, '@');
-            $domain     = substr($addr_spec, strlen($local_part . '@'));
-
-        // No @ sign so assume the default domain.
-        } else {
-            $local_part = $addr_spec;
-            $domain     = $this->default_domain;
-        }
-
-        if (($local_part = $this->_validateLocalPart($local_part)) === false) return false;
-        if (($domain     = $this->_validateDomain($domain)) === false) return false;
-
-        // Got here so return successful.
-        return array('local_part' => $local_part, 'domain' => $domain);
-    }
-
-    /**
-     * Function to validate the local part of an address:
-     *   local-part = word *("." word)
-     *
-     * @access private
-     * @param string $local_part
-     * @return mixed False on failure, or the validated local part on success.
-     */
-    function _validateLocalPart($local_part)
-    {
-        $parts = explode('.', $local_part);
-        $words = array();
-
-        // Split the local_part into words.
-        while (count($parts) > 0){
-            $words[] = $this->_splitCheck($parts, '.');
-            for ($i = 0; $i < $this->index + 1; $i++) {
-                array_shift($parts);
-            }
-        }
-
-        // Validate each word.
-        foreach ($words as $word) {
-            // If this word contains an unquoted space, it is invalid. (6.2.4)
-            if (strpos($word, ' ') && $word[0] !== '"')
-            {
-                return false;
-            }
-
-            if ($this->_validatePhrase(trim($word)) === false) return false;
-        }
-
-        // Managed to get here, so return the input.
-        return $local_part;
-    }
-
-    /**
-     * Returns an approximate count of how many addresses are in the
-     * given string. This is APPROXIMATE as it only splits based on a
-     * comma which has no preceding backslash. Could be useful as
-     * large amounts of addresses will end up producing *large*
-     * structures when used with parseAddressList().
-     *
-     * @param  string $data Addresses to count
-     * @return int          Approximate count
-     */
-    function approximateCount($data)
-    {
-        return count(preg_split('/(?@. This can be sufficient for most
-     * people. Optional stricter mode can be utilised which restricts
-     * mailbox characters allowed to alphanumeric, full stop, hyphen
-     * and underscore.
-     *
-     * @param  string  $data   Address to check
-     * @param  boolean $strict Optional stricter mode
-     * @return mixed           False if it fails, an indexed array
-     *                         username/domain if it matches
-     */
-    function isValidInetAddress($data, $strict = false)
-    {
-        $regex = $strict ? '/^([.0-9a-z_-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,4})$/i' : '/^([*+!.&#$|\'\\%\/0-9a-z^_`{}=?~:-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,4})$/i';
-        if (preg_match($regex, trim($data), $matches)) {
-            return array($matches[1], $matches[2]);
-        } else {
-            return false;
-        }
-    }
-
-}
diff --git a/htdocs/includes/nusoap/lib/Mail/mail.php b/htdocs/includes/nusoap/lib/Mail/mail.php
deleted file mode 100644
index 58c01d95f33..00000000000
--- a/htdocs/includes/nusoap/lib/Mail/mail.php
+++ /dev/null
@@ -1,128 +0,0 @@
-                            |
-// +----------------------------------------------------------------------+
-//
-
-/**
- * internal PHP-mail() implementation of the PEAR Mail:: interface.
- * @package Mail
- */
-class Mail_mail extends Mail {
-
-    /**
-     * Any arguments to pass to the mail() function.
-     * @var string
-     */
-    var $_params = '';
-
-    /**
-     * Constructor.
-     *
-     * Instantiates a new Mail_mail:: object based on the parameters
-     * passed in.
-     *
-     * @param array $params Extra arguments for the mail() function.
-     */
-    function Mail_mail($params = null)
-    {
-        /* The other mail implementations accept parameters as arrays.
-         * In the interest of being consistent, explode an array into
-         * a string of parameter arguments. */
-        if (is_array($params)) {
-            $this->_params = join(' ', $params);
-        } else {
-            $this->_params = $params;
-        }
-
-        /* Because the mail() function may pass headers as command
-         * line arguments, we can't guarantee the use of the standard
-         * "\r\n" separator.  Instead, we use the system's native line
-         * separator. */
-        $this->sep = (strstr(PHP_OS, 'WIN')) ? "\r\n" : "\n";
-    }
-
-	/**
-     * Implements Mail_mail::send() function using php's built-in mail()
-     * command.
-     *
-     * @param mixed $recipients Either a comma-seperated list of recipients
-     *              (RFC822 compliant), or an array of recipients,
-     *              each RFC822 valid. This may contain recipients not
-     *              specified in the headers, for Bcc:, resending
-     *              messages, etc.
-     *
-     * @param array $headers The array of headers to send with the mail, in an
-     *              associative array, where the array key is the
-     *              header name (ie, 'Subject'), and the array value
-     *              is the header value (ie, 'test'). The header
-     *              produced from those values would be 'Subject:
-     *              test'.
-     *
-     * @param string $body The full text of the message body, including any
-     *               Mime parts, etc.
-     *
-     * @return mixed Returns true on success, or a PEAR_Error
-     *               containing a descriptive error message on
-     *               failure.
-     *
-     * @access public
-     */
-    function send($recipients, $headers, $body)
-    {
-        // If we're passed an array of recipients, implode it.
-        if (is_array($recipients)) {
-            $recipients = implode(', ', $recipients);
-        }
-
-        // Get the Subject out of the headers array so that we can
-        // pass it as a seperate argument to mail().
-        $subject = '';
-        if (isset($headers['Subject'])) {
-            $subject = $headers['Subject'];
-            unset($headers['Subject']);
-        }
-
-        // Flatten the headers out.
-        $headerElements = $this->prepareHeaders($headers);
-        if (PEAR::isError($headerElements)) {
-            return $headerElements;
-        }
-        list(, $text_headers) = $headerElements;
-
-        /*
-         * We only use mail()'s optional fifth parameter if the additional
-         * parameters have been provided and we're not running in safe mode.
-         */
-        if (empty($this->_params) || ini_get('safe_mode')) {
-            $result = mail($recipients, $subject, $body, $text_headers);
-        } else {
-            $result = mail($recipients, $subject, $body, $text_headers,
-                           $this->_params);
-        }
-
-        /*
-         * If the mail() function returned failure, we need to create a
-         * PEAR_Error object and return it instead of the boolean result.
-         */
-        if ($result === false) {
-            $result = PEAR::raiseError('mail() returned failure');
-        }
-
-        return $result;
-    }
-
-}
diff --git a/htdocs/includes/nusoap/lib/Mail/mime.php b/htdocs/includes/nusoap/lib/Mail/mime.php
index 3d44f050062..50297dd3e2f 100644
--- a/htdocs/includes/nusoap/lib/Mail/mime.php
+++ b/htdocs/includes/nusoap/lib/Mail/mime.php
@@ -1,135 +1,221 @@
                            |
-// |         Tomas V.V.Cox  (port to PEAR)                |
-// +-----------------------------------------------------------------------+
-//
+/**
+ * The Mail_Mime class is used to create MIME E-mail messages
+ *
+ * The Mail_Mime class provides an OO interface to create MIME
+ * enabled email messages. This way you can create emails that
+ * contain plain-text bodies, HTML bodies, attachments, inline
+ * images and specific headers.
+ *
+ * Compatible with PHP versions 4 and 5
+ *
+ * LICENSE: This LICENSE is in the BSD license style.
+ * Copyright (c) 2002-2003, Richard Heyes 
+ * Copyright (c) 2003-2006, PEAR 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of the authors, nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this 
+ *   software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  Mail
+ * @package   Mail_Mime
+ * @author    Richard Heyes  
+ * @author    Tomas V.V. Cox 
+ * @author    Cipriano Groenendal 
+ * @author    Sean Coates 
+ * @author    Aleksander Machniak 
+ * @copyright 2003-2006 PEAR 
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/Mail_mime
+ *
+ *            This class is based on HTML Mime Mail class from
+ *            Richard Heyes  which was based also
+ *            in the mime_mail.class by Tobias Ratschiller 
+ *            and Sascha Schumann 
+ */
 
-require_once('PEAR.php');
-require_once('Mail/mimePart.php');
 
 /**
- * Mime mail composer class. Can handle: text and html bodies, embedded html
- * images and attachments.
- * Documentation and examples of this class are avaible here:
- * http://pear.php.net/manual/
+ * require PEAR
  *
- * @notes This class is based on HTML Mime Mail class from
- *   Richard Heyes  which was based also
- *   in the mime_mail.class by Tobias Ratschiller  and
- *   Sascha Schumann 
+ * This package depends on PEAR to raise errors.
+ */
+require_once 'PEAR.php';
+
+/**
+ * require Mail_mimePart
  *
- * @author   Richard Heyes 
- * @author   Tomas V.V.Cox 
- * @package  Mail
- * @access   public
+ * Mail_mimePart contains the code required to
+ * create all the different parts a mail can
+ * consist of.
+ */
+require_once 'Mail/mimePart.php';
+
+
+/**
+ * The Mail_Mime class provides an OO interface to create MIME
+ * enabled email messages. This way you can create emails that
+ * contain plain-text bodies, HTML bodies, attachments, inline
+ * images and specific headers.
+ *
+ * @category  Mail
+ * @package   Mail_Mime
+ * @author    Richard Heyes  
+ * @author    Tomas V.V. Cox 
+ * @author    Cipriano Groenendal 
+ * @author    Sean Coates 
+ * @copyright 2003-2006 PEAR 
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/Mail_mime
  */
 class Mail_mime
 {
     /**
      * Contains the plain text part of the email
+     *
      * @var string
+     * @access private
      */
     var $_txtbody;
+
     /**
      * Contains the html part of the email
+     *
      * @var string
+     * @access private
      */
     var $_htmlbody;
-    /**
-     * contains the mime encoded text
-     * @var string
-     */
-    var $_mime;
-    /**
-     * contains the multipart content
-     * @var string
-     */
-    var $_multipart;
+
     /**
      * list of the attached images
+     *
      * @var array
+     * @access private
      */
     var $_html_images = array();
+
     /**
      * list of the attachements
+     *
      * @var array
+     * @access private
      */
     var $_parts = array();
-    /**
-     * Build parameters
-     * @var array
-     */
-    var $_build_params = array();
+
     /**
      * Headers for the mail
+     *
      * @var array
+     * @access private
      */
     var $_headers = array();
-    /**
-     * End Of Line sequence (for serialize)
-     * @var string
-     */
-    var $_eol;
 
+    /**
+     * Build parameters
+     *
+     * @var array
+     * @access private
+     */
+    var $_build_params = array(
+        // What encoding to use for the headers
+        // Options: quoted-printable or base64
+        'head_encoding' => 'quoted-printable',
+        // What encoding to use for plain text
+        // Options: 7bit, 8bit, base64, or quoted-printable
+        'text_encoding' => 'quoted-printable',
+        // What encoding to use for html
+        // Options: 7bit, 8bit, base64, or quoted-printable
+        'html_encoding' => 'quoted-printable',
+        // The character set to use for html
+        'html_charset'  => 'ISO-8859-1',
+        // The character set to use for text
+        'text_charset'  => 'ISO-8859-1',
+        // The character set to use for headers
+        'head_charset'  => 'ISO-8859-1',
+        // End-of-line sequence
+        'eol'           => "\r\n",
+        // Delay attachment files IO until building the message
+        'delay_file_io' => false
+    );
 
     /**
      * Constructor function
      *
+     * @param mixed $params Build parameters that change the way the email
+     *                      is built. Should be an associative array.
+     *                      See $_build_params.
+     *
+     * @return void
      * @access public
      */
-    function Mail_mime($crlf = "\r\n")
+    function Mail_mime($params = array())
     {
-        $this->_setEOL($crlf);
-        $this->_build_params = array(
-                                     'text_encoding' => '7bit',
-                                     'html_encoding' => 'quoted-printable',
-                                     '7bit_wrap'     => 998,
-                                     'html_charset'  => 'ISO-8859-1',
-                                     'text_charset'  => 'ISO-8859-1',
-                                     'head_charset'  => 'ISO-8859-1'
-                                    );
+        // Backward-compatible EOL setting
+        if (is_string($params)) {
+            $this->_build_params['eol'] = $params;
+        } else if (defined('MAIL_MIME_CRLF') && !isset($params['eol'])) {
+            $this->_build_params['eol'] = MAIL_MIME_CRLF;
+        }
+
+        // Update build parameters
+        if (!empty($params) && is_array($params)) {
+            while (list($key, $value) = each($params)) {
+                $this->_build_params[$key] = $value;
+            }
+        }
     }
 
     /**
-     * Wakeup (unserialize) - re-sets EOL constant
+     * Set build parameter value
      *
-     * @access private
+     * @param string $name  Parameter name
+     * @param string $value Parameter value
+     *
+     * @return void
+     * @access public
+     * @since 1.6.0
      */
-    function __wakeup()
+    function setParam($name, $value)
     {
-        $this->_setEOL($this->_eol);
+        $this->_build_params[$name] = $value;
+    }
+
+    /**
+     * Get build parameter value
+     *
+     * @param string $name Parameter name
+     *
+     * @return mixed Parameter value
+     * @access public
+     * @since 1.6.0
+     */
+    function getParam($name)
+    {
+        return isset($this->_build_params[$name]) ? $this->_build_params[$name] : null;
     }
 
     /**
@@ -138,14 +224,15 @@ class Mail_mime
      * text/plain part that emails clients who don't support
      * html should show.
      *
-     * @param  string  $data   Either a string or
-     *                         the file name with the contents
-     * @param  bool    $isfile If true the first param should be treated
-     *                         as a file name, else as a string (default)
-     * @param  bool    $append If true the text or file is appended to
-     *                         the existing body, else the old body is
-     *                         overwritten
-     * @return mixed   true on success or PEAR_Error object
+     * @param string $data   Either a string or
+     *                       the file name with the contents
+     * @param bool   $isfile If true the first param should be treated
+     *                       as a file name, else as a string (default)
+     * @param bool   $append If true the text or file is appended to
+     *                       the existing body, else the old body is
+     *                       overwritten
+     *
+     * @return mixed         True on success or PEAR_Error object
      * @access public
      */
     function setTXTBody($data, $isfile = false, $append = false)
@@ -158,7 +245,7 @@ class Mail_mime
             }
         } else {
             $cont = $this->_file2str($data);
-            if (PEAR::isError($cont)) {
+            if ($this->_isError($cont)) {
                 return $cont;
             }
             if (!$append) {
@@ -167,17 +254,31 @@ class Mail_mime
                 $this->_txtbody .= $cont;
             }
         }
+
         return true;
     }
 
     /**
-     * Adds a html part to the mail
+     * Get message text body
      *
-     * @param  string  $data   Either a string or the file name with the
-     *                         contents
-     * @param  bool    $isfile If true the first param should be treated
-     *                         as a file name, else as a string (default)
-     * @return mixed   true on success or PEAR_Error object
+     * @return string Text body
+     * @access public
+     * @since 1.6.0
+     */
+    function getTXTBody()
+    {
+        return $this->_txtbody;
+    }
+
+    /**
+     * Adds a html part to the mail.
+     *
+     * @param string $data   Either a string or the file name with the
+     *                       contents
+     * @param bool   $isfile A flag that determines whether $data is a
+     *                       filename, or a string(false, default)
+     *
+     * @return bool          True on success
      * @access public
      */
     function setHTMLBody($data, $isfile = false)
@@ -186,7 +287,7 @@ class Mail_mime
             $this->_htmlbody = $data;
         } else {
             $cont = $this->_file2str($data);
-            if (PEAR::isError($cont)) {
+            if ($this->_isError($cont)) {
                 return $cont;
             }
             $this->_htmlbody = $cont;
@@ -195,106 +296,193 @@ class Mail_mime
         return true;
     }
 
+    /**
+     * Get message HTML body
+     *
+     * @return string HTML body
+     * @access public
+     * @since 1.6.0
+     */
+    function getHTMLBody()
+    {
+        return $this->_htmlbody;
+    }
+
     /**
      * Adds an image to the list of embedded images.
      *
-     * @param  string  $file       The image file name OR image data itself
-     * @param  string  $c_type     The content type
-     * @param  string  $name       The filename of the image.
-     *                             Only use if $file is the image data
-     * @param  bool    $isfilename Whether $file is a filename or not
-     *                             Defaults to true
-     * @return mixed   true on success or PEAR_Error object
+     * @param string $file       The image file name OR image data itself
+     * @param string $c_type     The content type
+     * @param string $name       The filename of the image.
+     *                           Only used if $file is the image data.
+     * @param bool   $isfile     Whether $file is a filename or not.
+     *                           Defaults to true
+     * @param string $content_id Desired Content-ID of MIME part
+     *                           Defaults to generated unique ID
+     *
+     * @return bool          True on success
      * @access public
      */
-    function addHTMLImage($file, $c_type='application/octet-stream',
-                          $name = '', $isfilename = true)
-    {
-        $filedata = ($isfilename === true) ? $this->_file2str($file)
-                                           : $file;
-        if ($isfilename === true) {
-            $filename = ($name == '' ? basename($file) : basename($name));
+    function addHTMLImage($file,
+        $c_type='application/octet-stream',
+        $name = '',
+        $isfile = true,
+        $content_id = null
+    ) {
+        $bodyfile = null;
+
+        if ($isfile) {
+            // Don't load file into memory
+            if ($this->_build_params['delay_file_io']) {
+                $filedata = null;
+                $bodyfile = $file;
+            } else {
+                if ($this->_isError($filedata = $this->_file2str($file))) {
+                    return $filedata;
+                }
+            }
+            $filename = ($name ? $name : $file);
         } else {
-            $filename = basename($name);
+            $filedata = $file;
+            $filename = $name;
         }
-        if (PEAR::isError($filedata)) {
-            return $filedata;
+
+        if (!$content_id) {
+            $content_id = preg_replace('/[^0-9a-zA-Z]/', '', uniqid(time(), true));
         }
+
         $this->_html_images[] = array(
-                                      'body'   => $filedata,
-                                      'name'   => $filename,
-                                      'c_type' => $c_type,
-                                      'cid'    => md5(uniqid(time()))
-                                     );
+            'body'      => $filedata,
+            'body_file' => $bodyfile,
+            'name'      => $filename,
+            'c_type'    => $c_type,
+            'cid'       => $content_id
+        );
+
         return true;
     }
 
     /**
      * Adds a file to the list of attachments.
      *
-     * @param  string  $file       The file name of the file to attach
-     *                             OR the file data itself
-     * @param  string  $c_type     The content type
-     * @param  string  $name       The filename of the attachment
-     *                             Only use if $file is the file data
-     * @param  bool    $isFilename Whether $file is a filename or not
-     *                             Defaults to true
-     * @return mixed true on success or PEAR_Error object
+     * @param string $file        The file name of the file to attach
+     *                            or the file contents itself
+     * @param string $c_type      The content type
+     * @param string $name        The filename of the attachment
+     *                            Only use if $file is the contents
+     * @param bool   $isfile      Whether $file is a filename or not. Defaults to true
+     * @param string $encoding    The type of encoding to use. Defaults to base64.
+     *                            Possible values: 7bit, 8bit, base64 or quoted-printable.
+     * @param string $disposition The content-disposition of this file
+     *                            Defaults to attachment.
+     *                            Possible values: attachment, inline.
+     * @param string $charset     The character set of attachment's content.
+     * @param string $language    The language of the attachment
+     * @param string $location    The RFC 2557.4 location of the attachment
+     * @param string $n_encoding  Encoding of the attachment's name in Content-Type
+     *                            By default filenames are encoded using RFC2231 method
+     *                            Here you can set RFC2047 encoding (quoted-printable
+     *                            or base64) instead
+     * @param string $f_encoding  Encoding of the attachment's filename
+     *                            in Content-Disposition header.
+     * @param string $description Content-Description header
+     * @param string $h_charset   The character set of the headers e.g. filename
+     *                            If not specified, $charset will be used
+     * @param array  $add_headers Additional part headers. Array keys can be in form
+     *                            of :
+     *
+     * @return mixed              True on success or PEAR_Error object
      * @access public
      */
-    function addAttachment($file, $c_type = 'application/octet-stream',
-                           $name = '', $isfilename = true,
-                           $encoding = 'base64')
-    {
-        $filedata = ($isfilename === true) ? $this->_file2str($file)
-                                           : $file;
-        if ($isfilename === true) {
+    function addAttachment($file,
+        $c_type      = 'application/octet-stream',
+        $name        = '',
+        $isfile      = true,
+        $encoding    = 'base64',
+        $disposition = 'attachment',
+        $charset     = '',
+        $language    = '',
+        $location    = '',
+        $n_encoding  = null,
+        $f_encoding  = null,
+        $description = '',
+        $h_charset   = null,
+        $add_headers = array()
+    ) {
+        $bodyfile = null;
+
+        if ($isfile) {
+            // Don't load file into memory
+            if ($this->_build_params['delay_file_io']) {
+                $filedata = null;
+                $bodyfile = $file;
+            } else {
+                if ($this->_isError($filedata = $this->_file2str($file))) {
+                    return $filedata;
+                }
+            }
             // Force the name the user supplied, otherwise use $file
-            $filename = (!empty($name)) ? $name : $file;
+            $filename = ($name ? $name : $this->_basename($file));
         } else {
+            $filedata = $file;
             $filename = $name;
         }
-        if (empty($filename)) {
-            return PEAR::raiseError(
-              'The supplied filename for the attachment can\'t be empty'
-            );
-        }
-        $filename = basename($filename);
-        if (PEAR::isError($filedata)) {
-            return $filedata;
+
+        if (!strlen($filename)) {
+            $msg = "The supplied filename for the attachment can't be empty";
+            return $this->_raiseError($msg);
         }
 
         $this->_parts[] = array(
-                                'body'     => $filedata,
-                                'name'     => $filename,
-                                'c_type'   => $c_type,
-                                'encoding' => $encoding
-                               );
+            'body'        => $filedata,
+            'body_file'   => $bodyfile,
+            'name'        => $filename,
+            'c_type'      => $c_type,
+            'charset'     => $charset,
+            'encoding'    => $encoding,
+            'language'    => $language,
+            'location'    => $location,
+            'disposition' => $disposition,
+            'description' => $description,
+            'add_headers' => $add_headers,
+            'name_encoding'     => $n_encoding,
+            'filename_encoding' => $f_encoding,
+            'headers_charset'   => $h_charset,
+        );
+
         return true;
     }
 
     /**
      * Get the contents of the given file name as string
      *
-     * @param  string  $file_name  path of file to process
-     * @return string  contents of $file_name
+     * @param string $file_name Path of file to process
+     *
+     * @return string           Contents of $file_name
      * @access private
      */
-    function &_file2str($file_name)
+    function _file2str($file_name)
     {
+        // Check state of file and raise an error properly
+        if (!file_exists($file_name)) {
+            return $this->_raiseError('File not found: ' . $file_name);
+        }
+        if (!is_file($file_name)) {
+            return $this->_raiseError('Not a regular file: ' . $file_name);
+        }
         if (!is_readable($file_name)) {
-            return PEAR::raiseError('File is not readable ' . $file_name);
+            return $this->_raiseError('File is not readable: ' . $file_name);
         }
-        if (!$fd = fopen($file_name, 'rb')) {
-            return PEAR::raiseError('Could not open ' . $file_name);
+
+        // Temporarily reset magic_quotes_runtime and read file contents
+        if ($magic_quote_setting = get_magic_quotes_runtime()) {
+            @ini_set('magic_quotes_runtime', 0);
         }
-        $filesize = filesize($file_name);
-        if ($filesize == 0){
-            $cont =  "";
-        }else{
-            $cont = fread($fd, $filesize);
+        $cont = file_get_contents($file_name);
+        if ($magic_quote_setting) {
+            @ini_set('magic_quotes_runtime', $magic_quote_setting);
         }
-        fclose($fd);
+
         return $cont;
     }
 
@@ -302,31 +490,37 @@ class Mail_mime
      * Adds a text subpart to the mimePart object and
      * returns it during the build process.
      *
-     * @param mixed    The object to add the part to, or
-     *                 null if a new object is to be created.
-     * @param string   The text to add.
-     * @return object  The text mimePart object
+     * @param mixed  &$obj The object to add the part to, or
+     *                     anything else if a new object is to be created.
+     * @param string $text The text to add.
+     *
+     * @return object      The text mimePart object
      * @access private
      */
-    function &_addTextPart(&$obj, $text)
+    function &_addTextPart(&$obj, $text = '')
     {
         $params['content_type'] = 'text/plain';
         $params['encoding']     = $this->_build_params['text_encoding'];
         $params['charset']      = $this->_build_params['text_charset'];
+        $params['eol']          = $this->_build_params['eol'];
+
         if (is_object($obj)) {
-            return $obj->addSubpart($text, $params);
+            $ret = $obj->addSubpart($text, $params);
         } else {
-            return new Mail_mimePart($text, $params);
+            $ret = new Mail_mimePart($text, $params);
         }
+
+        return $ret;
     }
 
     /**
      * Adds a html subpart to the mimePart object and
      * returns it during the build process.
      *
-     * @param  mixed   The object to add the part to, or
-     *                 null if a new object is to be created.
-     * @return object  The html mimePart object
+     * @param mixed &$obj The object to add the part to, or
+     *                    anything else if a new object is to be created.
+     *
+     * @return object     The html mimePart object
      * @access private
      */
     function &_addHtmlPart(&$obj)
@@ -334,11 +528,15 @@ class Mail_mime
         $params['content_type'] = 'text/html';
         $params['encoding']     = $this->_build_params['html_encoding'];
         $params['charset']      = $this->_build_params['html_charset'];
+        $params['eol']          = $this->_build_params['eol'];
+
         if (is_object($obj)) {
-            return $obj->addSubpart($this->_htmlbody, $params);
+            $ret = $obj->addSubpart($this->_htmlbody, $params);
         } else {
-            return new Mail_mimePart($this->_htmlbody, $params);
+            $ret = new Mail_mimePart($this->_htmlbody, $params);
         }
+
+        return $ret;
     }
 
     /**
@@ -346,13 +544,17 @@ class Mail_mime
      * the initial content-type and returns it during the
      * build process.
      *
-     * @return object  The multipart/mixed mimePart object
+     * @return object The multipart/mixed mimePart object
      * @access private
      */
     function &_addMixedPart()
     {
         $params['content_type'] = 'multipart/mixed';
-        return new Mail_mimePart('', $params);
+        $params['eol']          = $this->_build_params['eol'];
+
+        // Create empty multipart/mixed Mail_mimePart object to return
+        $ret = new Mail_mimePart('', $params);
+        return $ret;
     }
 
     /**
@@ -360,19 +562,24 @@ class Mail_mime
      * object (or creates one), and returns it during
      * the build process.
      *
-     * @param  mixed   The object to add the part to, or
-     *                 null if a new object is to be created.
-     * @return object  The multipart/mixed mimePart object
+     * @param mixed &$obj The object to add the part to, or
+     *                    anything else if a new object is to be created.
+     *
+     * @return object     The multipart/mixed mimePart object
      * @access private
      */
     function &_addAlternativePart(&$obj)
     {
         $params['content_type'] = 'multipart/alternative';
+        $params['eol']          = $this->_build_params['eol'];
+
         if (is_object($obj)) {
-            return $obj->addSubpart('', $params);
+            $ret = $obj->addSubpart('', $params);
         } else {
-            return new Mail_mimePart('', $params);
+            $ret = new Mail_mimePart('', $params);
         }
+
+        return $ret;
     }
 
     /**
@@ -380,28 +587,34 @@ class Mail_mime
      * object (or creates one), and returns it during
      * the build process.
      *
-     * @param mixed    The object to add the part to, or
-     *                 null if a new object is to be created
-     * @return object  The multipart/mixed mimePart object
+     * @param mixed &$obj The object to add the part to, or
+     *                    anything else if a new object is to be created
+     *
+     * @return object     The multipart/mixed mimePart object
      * @access private
      */
     function &_addRelatedPart(&$obj)
     {
         $params['content_type'] = 'multipart/related';
+        $params['eol']          = $this->_build_params['eol'];
+
         if (is_object($obj)) {
-            return $obj->addSubpart('', $params);
+            $ret = $obj->addSubpart('', $params);
         } else {
-            return new Mail_mimePart('', $params);
+            $ret = new Mail_mimePart('', $params);
         }
+
+        return $ret;
     }
 
     /**
      * Adds an html image subpart to a mimePart object
      * and returns it during the build process.
      *
-     * @param  object  The mimePart to add the image to
-     * @param  array   The image information
-     * @return object  The image mimePart object
+     * @param object &$obj  The mimePart to add the image to
+     * @param array  $value The image information
+     *
+     * @return object       The image mimePart object
      * @access private
      */
     function &_addHtmlImagePart(&$obj, $value)
@@ -409,89 +622,281 @@ class Mail_mime
         $params['content_type'] = $value['c_type'];
         $params['encoding']     = 'base64';
         $params['disposition']  = 'inline';
-        $params['dfilename']    = $value['name'];
+        $params['filename']     = $value['name'];
         $params['cid']          = $value['cid'];
-        $obj->addSubpart($value['body'], $params);
+        $params['body_file']    = $value['body_file'];
+        $params['eol']          = $this->_build_params['eol'];
+
+        if (!empty($value['name_encoding'])) {
+            $params['name_encoding'] = $value['name_encoding'];
+        }
+        if (!empty($value['filename_encoding'])) {
+            $params['filename_encoding'] = $value['filename_encoding'];
+        }
+
+        $ret = $obj->addSubpart($value['body'], $params);
+        return $ret;
     }
 
     /**
      * Adds an attachment subpart to a mimePart object
      * and returns it during the build process.
      *
-     * @param  object  The mimePart to add the image to
-     * @param  array   The attachment information
-     * @return object  The image mimePart object
+     * @param object &$obj  The mimePart to add the image to
+     * @param array  $value The attachment information
+     *
+     * @return object       The image mimePart object
      * @access private
      */
     function &_addAttachmentPart(&$obj, $value)
     {
-        $params['content_type'] = $value['c_type'];
+        $params['eol']          = $this->_build_params['eol'];
+        $params['filename']     = $value['name'];
         $params['encoding']     = $value['encoding'];
-        $params['disposition']  = 'attachment';
-        $params['dfilename']    = $value['name'];
-        $obj->addSubpart($value['body'], $params);
+        $params['content_type'] = $value['c_type'];
+        $params['body_file']    = $value['body_file'];
+        $params['disposition']  = isset($value['disposition']) ? 
+                                  $value['disposition'] : 'attachment';
+
+        // content charset
+        if (!empty($value['charset'])) {
+            $params['charset'] = $value['charset'];
+        }
+        // headers charset (filename, description)
+        if (!empty($value['headers_charset'])) {
+            $params['headers_charset'] = $value['headers_charset'];
+        }
+        if (!empty($value['language'])) {
+            $params['language'] = $value['language'];
+        }
+        if (!empty($value['location'])) {
+            $params['location'] = $value['location'];
+        }
+        if (!empty($value['name_encoding'])) {
+            $params['name_encoding'] = $value['name_encoding'];
+        }
+        if (!empty($value['filename_encoding'])) {
+            $params['filename_encoding'] = $value['filename_encoding'];
+        }
+        if (!empty($value['description'])) {
+            $params['description'] = $value['description'];
+        }
+        if (is_array($value['add_headers'])) {
+            $params['headers'] = $value['add_headers'];
+        }
+
+        $ret = $obj->addSubpart($value['body'], $params);
+        return $ret;
+    }
+
+    /**
+     * Returns the complete e-mail, ready to send using an alternative
+     * mail delivery method. Note that only the mailpart that is made
+     * with Mail_Mime is created. This means that,
+     * YOU WILL HAVE NO TO: HEADERS UNLESS YOU SET IT YOURSELF 
+     * using the $headers parameter!
+     * 
+     * @param string $separation The separation between these two parts.
+     * @param array  $params     The Build parameters passed to the
+     *                           get() function. See get() for more info.
+     * @param array  $headers    The extra headers that should be passed
+     *                           to the headers() method.
+     *                           See that function for more info.
+     * @param bool   $overwrite  Overwrite the existing headers with new.
+     *
+     * @return mixed The complete e-mail or PEAR error object
+     * @access public
+     */
+    function getMessage($separation = null, $params = null, $headers = null,
+        $overwrite = false
+    ) {
+        if ($separation === null) {
+            $separation = $this->_build_params['eol'];
+        }
+
+        $body = $this->get($params);
+
+        if ($this->_isError($body)) {
+            return $body;
+        }
+
+        return $this->txtHeaders($headers, $overwrite) . $separation . $body;
+    }
+
+    /**
+     * Returns the complete e-mail body, ready to send using an alternative
+     * mail delivery method.
+     * 
+     * @param array $params The Build parameters passed to the
+     *                      get() method. See get() for more info.
+     *
+     * @return mixed The e-mail body or PEAR error object
+     * @access public
+     * @since 1.6.0
+     */
+    function getMessageBody($params = null)
+    {
+        return $this->get($params, null, true);
+    }
+
+    /**
+     * Writes (appends) the complete e-mail into file.
+     * 
+     * @param string $filename  Output file location
+     * @param array  $params    The Build parameters passed to the
+     *                          get() method. See get() for more info.
+     * @param array  $headers   The extra headers that should be passed
+     *                          to the headers() function.
+     *                          See that function for more info.
+     * @param bool   $overwrite Overwrite the existing headers with new.
+     *
+     * @return mixed True or PEAR error object
+     * @access public
+     * @since 1.6.0
+     */
+    function saveMessage($filename, $params = null, $headers = null, $overwrite = false)
+    {
+        // Check state of file and raise an error properly
+        if (file_exists($filename) && !is_writable($filename)) {
+            return $this->_raiseError('File is not writable: ' . $filename);
+        }
+
+        // Temporarily reset magic_quotes_runtime and read file contents
+        if ($magic_quote_setting = get_magic_quotes_runtime()) {
+            @ini_set('magic_quotes_runtime', 0);
+        }
+
+        if (!($fh = fopen($filename, 'ab'))) {
+            return $this->_raiseError('Unable to open file: ' . $filename);
+        }
+
+        // Write message headers into file (skipping Content-* headers)
+        $head = $this->txtHeaders($headers, $overwrite, true);
+        if (fwrite($fh, $head) === false) {
+            return $this->_raiseError('Error writing to file: ' . $filename);
+        }
+
+        fclose($fh);
+
+        if ($magic_quote_setting) {
+            @ini_set('magic_quotes_runtime', $magic_quote_setting);
+        }
+
+        // Write the rest of the message into file
+        $res = $this->get($params, $filename);
+
+        return $res ? $res : true;
+    }
+
+    /**
+     * Writes (appends) the complete e-mail body into file.
+     *
+     * @param string $filename Output file location
+     * @param array  $params   The Build parameters passed to the
+     *                         get() method. See get() for more info.
+     *
+     * @return mixed True or PEAR error object
+     * @access public
+     * @since 1.6.0
+     */
+    function saveMessageBody($filename, $params = null)
+    {
+        // Check state of file and raise an error properly
+        if (file_exists($filename) && !is_writable($filename)) {
+            return $this->_raiseError('File is not writable: ' . $filename);
+        }
+
+        // Temporarily reset magic_quotes_runtime and read file contents
+        if ($magic_quote_setting = get_magic_quotes_runtime()) {
+            @ini_set('magic_quotes_runtime', 0);
+        }
+
+        if (!($fh = fopen($filename, 'ab'))) {
+            return $this->_raiseError('Unable to open file: ' . $filename);
+        }
+
+        // Write the rest of the message into file
+        $res = $this->get($params, $filename, true);
+
+        return $res ? $res : true;
     }
 
     /**
      * Builds the multipart message from the list ($this->_parts) and
      * returns the mime content.
      *
-     * @param  array  Build parameters that change the way the email
-     *                is built. Should be associative. Can contain:
-     *                text_encoding  -  What encoding to use for plain text
-     *                                  Default is 7bit
-     *                html_encoding  -  What encoding to use for html
-     *                                  Default is quoted-printable
-     *                7bit_wrap      -  Number of characters before text is
-     *                                  wrapped in 7bit encoding
-     *                                  Default is 998
-     *                html_charset   -  The character set to use for html.
-     *                                  Default is iso-8859-1
-     *                text_charset   -  The character set to use for text.
-     *                                  Default is iso-8859-1
-     *                head_charset   -  The character set to use for headers.
-     *                                  Default is iso-8859-1
-     * @return string The mime content
+     * @param array    $params    Build parameters that change the way the email
+     *                            is built. Should be associative. See $_build_params.
+     * @param resource $filename  Output file where to save the message instead of
+     *                            returning it
+     * @param boolean  $skip_head True if you want to return/save only the message
+     *                            without headers
+     *
+     * @return mixed The MIME message content string, null or PEAR error object
      * @access public
      */
-    function &get($build_params = null)
+    function get($params = null, $filename = null, $skip_head = false)
     {
-        if (isset($build_params)) {
-            while (list($key, $value) = each($build_params)) {
+        if (isset($params)) {
+            while (list($key, $value) = each($params)) {
                 $this->_build_params[$key] = $value;
             }
         }
 
-        if (!empty($this->_html_images) AND isset($this->_htmlbody)) {
-            foreach ($this->_html_images as $value) {
-                $regex = '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' . preg_quote($value['name'], '#') .
-                         '\3#';
-                $rep = '\1\2=\3cid:' . $value['cid'] .'\3';
-                $this->_htmlbody = preg_replace($regex, $rep,
-                                       $this->_htmlbody
-                                   );
+        if (isset($this->_headers['From'])) {
+            // Bug #11381: Illegal characters in domain ID
+            if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
+                $domainID = $matches[1];
+            } else {
+                $domainID = '@localhost';
+            }
+            foreach ($this->_html_images as $i => $img) {
+                $cid = $this->_html_images[$i]['cid']; 
+                if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
+                    $this->_html_images[$i]['cid'] = $cid . $domainID;
+                }
             }
         }
 
-        $null        = null;
-        $attachments = !empty($this->_parts)                ? true : false;
-        $form_images = !empty($this->_html_images)          ? true : false;
-        $form        = !empty($this->_htmlbody)             ? true : false;
-        $text        = (!$form AND !empty($this->_txtbody)) ? true : false;
+        if (count($this->_html_images) && isset($this->_htmlbody)) {
+            foreach ($this->_html_images as $key => $value) {
+                $regex   = array();
+                $regex[] = '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' .
+                            preg_quote($value['name'], '#') . '\3#';
+                $regex[] = '#(?i)url(?-i)\(\s*(["\']?)' .
+                            preg_quote($value['name'], '#') . '\1\s*\)#';
+
+                $rep   = array();
+                $rep[] = '\1\2=\3cid:' . $value['cid'] .'\3';
+                $rep[] = 'url(\1cid:' . $value['cid'] . '\1)';
+
+                $this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
+                $this->_html_images[$key]['name']
+                    = $this->_basename($this->_html_images[$key]['name']);
+            }
+        }
+
+        $this->_checkParams();
+
+        $null        = -1;
+        $attachments = count($this->_parts) > 0;
+        $html_images = count($this->_html_images) > 0;
+        $html        = strlen($this->_htmlbody) > 0;
+        $text        = !$html && strlen($this->_txtbody);
 
         switch (true) {
-        case $text AND !$attachments:
+        case $text && !$attachments:
             $message =& $this->_addTextPart($null, $this->_txtbody);
             break;
 
-        case !$text AND !$form AND $attachments:
+        case !$text && !$html && $attachments:
             $message =& $this->_addMixedPart();
             for ($i = 0; $i < count($this->_parts); $i++) {
                 $this->_addAttachmentPart($message, $this->_parts[$i]);
             }
             break;
 
-        case $text AND $attachments:
+        case $text && $attachments:
             $message =& $this->_addMixedPart();
             $this->_addTextPart($message, $this->_txtbody);
             for ($i = 0; $i < count($this->_parts); $i++) {
@@ -499,7 +904,7 @@ class Mail_mime
             }
             break;
 
-        case $form AND !$attachments AND !$form_images:
+        case $html && !$attachments && !$html_images:
             if (isset($this->_txtbody)) {
                 $message =& $this->_addAlternativePart($null);
                 $this->_addTextPart($message, $this->_txtbody);
@@ -509,22 +914,53 @@ class Mail_mime
             }
             break;
 
-        case $form AND !$attachments AND $form_images:
+        case $html && !$attachments && $html_images:
+            // * Content-Type: multipart/alternative;
+            //    * text
+            //    * Content-Type: multipart/related;
+            //       * html
+            //       * image...
             if (isset($this->_txtbody)) {
                 $message =& $this->_addAlternativePart($null);
                 $this->_addTextPart($message, $this->_txtbody);
-                $related =& $this->_addRelatedPart($message);
+
+                $ht =& $this->_addRelatedPart($message);
+                $this->_addHtmlPart($ht);
+                for ($i = 0; $i < count($this->_html_images); $i++) {
+                    $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
+                }
             } else {
+                // * Content-Type: multipart/related;
+                //    * html
+                //    * image...
                 $message =& $this->_addRelatedPart($null);
-                $related =& $message;
+                $this->_addHtmlPart($message);
+                for ($i = 0; $i < count($this->_html_images); $i++) {
+                    $this->_addHtmlImagePart($message, $this->_html_images[$i]);
+                }
+            }
+            /*
+            // #13444, #9725: the code below was a non-RFC compliant hack
+            // * Content-Type: multipart/related;
+            //    * Content-Type: multipart/alternative;
+            //        * text
+            //        * html
+            //    * image...
+            $message =& $this->_addRelatedPart($null);
+            if (isset($this->_txtbody)) {
+                $alt =& $this->_addAlternativePart($message);
+                $this->_addTextPart($alt, $this->_txtbody);
+                $this->_addHtmlPart($alt);
+            } else {
+                $this->_addHtmlPart($message);
             }
-            $this->_addHtmlPart($related);
             for ($i = 0; $i < count($this->_html_images); $i++) {
-                $this->_addHtmlImagePart($related, $this->_html_images[$i]);
+                $this->_addHtmlImagePart($message, $this->_html_images[$i]);
             }
+            */
             break;
 
-        case $form AND $attachments AND !$form_images:
+        case $html && $attachments && !$html_images:
             $message =& $this->_addMixedPart();
             if (isset($this->_txtbody)) {
                 $alt =& $this->_addAlternativePart($message);
@@ -538,7 +974,7 @@ class Mail_mime
             }
             break;
 
-        case $form AND $attachments AND $form_images:
+        case $html && $attachments && $html_images:
             $message =& $this->_addMixedPart();
             if (isset($this->_txtbody)) {
                 $alt =& $this->_addAlternativePart($message);
@@ -555,17 +991,35 @@ class Mail_mime
                 $this->_addAttachmentPart($message, $this->_parts[$i]);
             }
             break;
-
         }
 
-        if (isset($message)) {
-            $output = $message->encode();
-            $this->_headers = array_merge($this->_headers,
-                                          $output['headers']);
-            return $output['body'];
+        if (!isset($message)) {
+            return null;
+        }
 
+        // Use saved boundary
+        if (!empty($this->_build_params['boundary'])) {
+            $boundary = $this->_build_params['boundary'];
         } else {
-            return false;
+            $boundary = null;
+        }
+
+        // Write output to file
+        if ($filename) {
+            // Append mimePart message headers and body into file
+            $headers = $message->encodeToFile($filename, $boundary, $skip_head);
+            if ($this->_isError($headers)) {
+                return $headers;
+            }
+            $this->_headers = array_merge($this->_headers, $headers);
+            return null;
+        } else {
+            $output = $message->encode($boundary, $skip_head);
+            if ($this->_isError($output)) {
+                return $output;
+            }
+            $this->_headers = array_merge($this->_headers, $output['headers']);
+            return $output['body'];
         }
     }
 
@@ -574,48 +1028,148 @@ class Mail_mime
      * (MIME-Version and Content-Type). Format of argument is:
      * $array['header-name'] = 'header-value';
      *
-     * @param  array $xtra_headers Assoc array with any extra headers.
-     *                             Optional.
-     * @return array Assoc array with the mime headers
+     * @param array $xtra_headers Assoc array with any extra headers (optional)
+     *                            (Don't set Content-Type for multipart messages here!)
+     * @param bool  $overwrite    Overwrite already existing headers.
+     * @param bool  $skip_content Don't return content headers: Content-Type,
+     *                            Content-Disposition and Content-Transfer-Encoding
+     * 
+     * @return array              Assoc array with the mime headers
      * @access public
      */
-    function &headers($xtra_headers = null)
+    function headers($xtra_headers = null, $overwrite = false, $skip_content = false)
     {
-        // Content-Type header should already be present,
-        // So just add mime version header
+        // Add mime version header
         $headers['MIME-Version'] = '1.0';
-        if (isset($xtra_headers)) {
+
+        // Content-Type and Content-Transfer-Encoding headers should already
+        // be present if get() was called, but we'll re-set them to make sure
+        // we got them when called before get() or something in the message
+        // has been changed after get() [#14780]
+        if (!$skip_content) {
+            $headers += $this->_contentHeaders();
+        }
+
+        if (!empty($xtra_headers)) {
             $headers = array_merge($headers, $xtra_headers);
         }
-        $this->_headers = array_merge($headers, $this->_headers);
 
-        return $this->_encodeHeaders($this->_headers);
+        if ($overwrite) {
+            $this->_headers = array_merge($this->_headers, $headers);
+        } else {
+            $this->_headers = array_merge($headers, $this->_headers);
+        }
+
+        $headers = $this->_headers;
+
+        if ($skip_content) {
+            unset($headers['Content-Type']);
+            unset($headers['Content-Transfer-Encoding']);
+            unset($headers['Content-Disposition']);
+        } else if (!empty($this->_build_params['ctype'])) {
+            $headers['Content-Type'] = $this->_build_params['ctype'];
+        }
+
+        $encodedHeaders = $this->_encodeHeaders($headers);
+        return $encodedHeaders;
     }
 
     /**
      * Get the text version of the headers
      * (usefull if you want to use the PHP mail() function)
      *
-     * @param  array   $xtra_headers Assoc array with any extra headers.
-     *                               Optional.
-     * @return string  Plain text headers
+     * @param array $xtra_headers Assoc array with any extra headers (optional)
+     *                            (Don't set Content-Type for multipart messages here!)
+     * @param bool  $overwrite    Overwrite the existing headers with new.
+     * @param bool  $skip_content Don't return content headers: Content-Type,
+     *                            Content-Disposition and Content-Transfer-Encoding
+     *
+     * @return string             Plain text headers
      * @access public
      */
-    function txtHeaders($xtra_headers = null)
+    function txtHeaders($xtra_headers = null, $overwrite = false, $skip_content = false)
     {
-        $headers = $this->headers($xtra_headers);
-        $ret = '';
-        foreach ($headers as $key => $val) {
-            $ret .= "$key: $val" . MAIL_MIME_CRLF;
+        $headers = $this->headers($xtra_headers, $overwrite, $skip_content);
+
+        // Place Received: headers at the beginning of the message
+        // Spam detectors often flag messages with it after the Subject: as spam
+        if (isset($headers['Received'])) {
+            $received = $headers['Received'];
+            unset($headers['Received']);
+            $headers = array('Received' => $received) + $headers;
         }
+
+        $ret = '';
+        $eol = $this->_build_params['eol'];
+
+        foreach ($headers as $key => $val) {
+            if (is_array($val)) {
+                foreach ($val as $value) {
+                    $ret .= "$key: $value" . $eol;
+                }
+            } else {
+                $ret .= "$key: $val" . $eol;
+            }
+        }
+
         return $ret;
     }
 
+    /**
+     * Sets message Content-Type header.
+     * Use it to build messages with various content-types e.g. miltipart/raport
+     * not supported by _contentHeaders() function.
+     *
+     * @param string $type   Type name
+     * @param array  $params Hash array of header parameters
+     *
+     * @return void
+     * @access public
+     * @since 1.7.0
+     */
+    function setContentType($type, $params = array())
+    {
+        $header = $type;
+
+        $eol = !empty($this->_build_params['eol'])
+            ? $this->_build_params['eol'] : "\r\n";
+
+        // add parameters
+        $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
+            . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
+        if (is_array($params)) {
+            foreach ($params as $name => $value) {
+                if ($name == 'boundary') {
+                    $this->_build_params['boundary'] = $value;
+                }
+                if (!preg_match($token_regexp, $value)) {
+                    $header .= ";$eol $name=$value";
+                } else {
+                    $value = addcslashes($value, '\\"');
+                    $header .= ";$eol $name=\"$value\"";
+                }
+            }
+        }
+
+        // add required boundary parameter if not defined
+        if (preg_match('/^multipart\//i', $type)) {
+            if (empty($this->_build_params['boundary'])) {
+                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
+            }
+
+            $header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
+        }
+
+        $this->_build_params['ctype'] = $header;
+    }
+
     /**
      * Sets the Subject header
      *
-     * @param  string $subject String to set the subject to
-     * access  public
+     * @param string $subject String to set the subject to.
+     *
+     * @return void
+     * @access public
      */
     function setSubject($subject)
     {
@@ -625,7 +1179,9 @@ class Mail_mime
     /**
      * Set an email to the From (the sender) header
      *
-     * @param  string $email The email direction to add
+     * @param string $email The email address to use
+     *
+     * @return void
      * @access public
      */
     function setFrom($email)
@@ -633,11 +1189,31 @@ class Mail_mime
         $this->_headers['From'] = $email;
     }
 
+    /**
+     * Add an email to the To header
+     * (multiple calls to this method are allowed)
+     *
+     * @param string $email The email direction to add
+     *
+     * @return void
+     * @access public
+     */
+    function addTo($email)
+    {
+        if (isset($this->_headers['To'])) {
+            $this->_headers['To'] .= ", $email";
+        } else {
+            $this->_headers['To'] = $email;
+        }
+    }
+
     /**
      * Add an email to the Cc (carbon copy) header
      * (multiple calls to this method are allowed)
      *
-     * @param  string $email The email direction to add
+     * @param string $email The email direction to add
+     *
+     * @return void
      * @access public
      */
     function addCc($email)
@@ -653,7 +1229,9 @@ class Mail_mime
      * Add an email to the Bcc (blank carbon copy) header
      * (multiple calls to this method are allowed)
      *
-     * @param  string $email The email direction to add
+     * @param string $email The email direction to add
+     *
+     * @return void
      * @access public
      */
     function addBcc($email)
@@ -666,61 +1244,251 @@ class Mail_mime
     }
 
     /**
-     * Encodes a header as per RFC2047
+     * Since the PHP send function requires you to specify
+     * recipients (To: header) separately from the other
+     * headers, the To: header is not properly encoded.
+     * To fix this, you can use this public method to 
+     * encode your recipients before sending to the send
+     * function
      *
-     * @param  string  $input The header data to encode
-     * @return string  Encoded data
+     * @param string $recipients A comma-delimited list of recipients
+     *
+     * @return string            Encoded data
+     * @access public
+     */
+    function encodeRecipients($recipients)
+    {
+        $input = array("To" => $recipients);
+        $retval = $this->_encodeHeaders($input);
+        return $retval["To"] ;
+    }
+
+    /**
+     * Encodes headers as per RFC2047
+     *
+     * @param array $input  The header data to encode
+     * @param array $params Extra build parameters
+     *
+     * @return array        Encoded data
      * @access private
      */
-    function _encodeHeaders($input)
+    function _encodeHeaders($input, $params = array())
     {
+        $build_params = $this->_build_params;
+        while (list($key, $value) = each($params)) {
+            $build_params[$key] = $value;
+        }
+
         foreach ($input as $hdr_name => $hdr_value) {
-            preg_match_all('/(\w*[\x80-\xFF]+\w*)/', $hdr_value, $matches);
-            foreach ($matches[1] as $value) {
-                /*
-                 * preg_replace /e modifier is deprecated in PHP 5.5
-                 * but anonymous functions for use in preg_replace_callback are only available from 5.3.0
-                 */
-                if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
-                    $replacement = preg_replace_callback(
-                        '/([\x80-\xFF])/',
-                        function ($m) {
-                            return "=" . strtoupper(dechex(ord($m[1])));
-                        },
-                        $value
+            if (is_array($hdr_value)) {
+                foreach ($hdr_value as $idx => $value) {
+                    $input[$hdr_name][$idx] = $this->encodeHeader(
+                        $hdr_name, $value,
+                        $build_params['head_charset'], $build_params['head_encoding']
                     );
-                } else {
-                    $replacement = preg_replace('/([\x80-\xFF])/e',
-                                                '"=" .
-                                                strtoupper(dechex(ord("\1")))',
-                                                $value);
                 }
-                $hdr_value = str_replace($value, '=?' .
-                                         $this->_build_params['head_charset'] .
-                                         '?Q?' . $replacement . '?=',
-                                         $hdr_value);
+            } else {
+                $input[$hdr_name] = $this->encodeHeader(
+                    $hdr_name, $hdr_value,
+                    $build_params['head_charset'], $build_params['head_encoding']
+                );
             }
-            $input[$hdr_name] = $hdr_value;
         }
 
         return $input;
     }
 
     /**
-     * Set the object's end-of-line and define the constant if applicable
+     * Encodes a header as per RFC2047
      *
-     * @param string $eol End Of Line sequence
+     * @param string $name     The header name
+     * @param string $value    The header data to encode
+     * @param string $charset  Character set name
+     * @param string $encoding Encoding name (base64 or quoted-printable)
+     *
+     * @return string          Encoded header data (without a name)
+     * @access public
+     * @since 1.5.3
+     */
+    function encodeHeader($name, $value, $charset, $encoding)
+    {
+        $mime_part = new Mail_mimePart;
+        return $mime_part->encodeHeader(
+            $name, $value, $charset, $encoding, $this->_build_params['eol']
+        );
+    }
+
+    /**
+     * Get file's basename (locale independent) 
+     *
+     * @param string $filename Filename
+     *
+     * @return string          Basename
      * @access private
      */
-    function _setEOL($eol)
+    function _basename($filename)
     {
-        $this->_eol = $eol;
-        if (!defined('MAIL_MIME_CRLF')) {
-            define('MAIL_MIME_CRLF', $this->_eol, true);
+        // basename() is not unicode safe and locale dependent
+        if (stristr(PHP_OS, 'win') || stristr(PHP_OS, 'netware')) {
+            return preg_replace('/^.*[\\\\\\/]/', '', $filename);
+        } else {
+            return preg_replace('/^.*[\/]/', '', $filename);
         }
     }
 
-    
+    /**
+     * Get Content-Type and Content-Transfer-Encoding headers of the message
+     *
+     * @return array Headers array
+     * @access private
+     */
+    function _contentHeaders()
+    {
+        $attachments = count($this->_parts)                 ? true : false;
+        $html_images = count($this->_html_images)           ? true : false;
+        $html        = strlen($this->_htmlbody)             ? true : false;
+        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
+        $headers     = array();
+
+        // See get()
+        switch (true) {
+        case $text && !$attachments:
+            $headers['Content-Type'] = 'text/plain';
+            break;
+
+        case !$text && !$html && $attachments:
+        case $text && $attachments:
+        case $html && $attachments && !$html_images:
+        case $html && $attachments && $html_images:
+            $headers['Content-Type'] = 'multipart/mixed';
+            break;
+
+        case $html && !$attachments && !$html_images && isset($this->_txtbody):
+        case $html && !$attachments && $html_images && isset($this->_txtbody):
+            $headers['Content-Type'] = 'multipart/alternative';
+            break;
+
+        case $html && !$attachments && !$html_images && !isset($this->_txtbody):
+            $headers['Content-Type'] = 'text/html';
+            break;
+
+        case $html && !$attachments && $html_images && !isset($this->_txtbody):
+            $headers['Content-Type'] = 'multipart/related';
+            break;
+
+        default:
+            return $headers;
+        }
+
+        $this->_checkParams();
+
+        $eol = !empty($this->_build_params['eol'])
+            ? $this->_build_params['eol'] : "\r\n";
+
+        if ($headers['Content-Type'] == 'text/plain') {
+            // single-part message: add charset and encoding
+            $charset = 'charset=' . $this->_build_params['text_charset'];
+            // place charset parameter in the same line, if possible
+            // 26 = strlen("Content-Type: text/plain; ")
+            $headers['Content-Type']
+                .= (strlen($charset) + 26 <= 76) ? "; $charset" : ";$eol $charset";
+            $headers['Content-Transfer-Encoding']
+                = $this->_build_params['text_encoding'];
+        } else if ($headers['Content-Type'] == 'text/html') {
+            // single-part message: add charset and encoding
+            $charset = 'charset=' . $this->_build_params['html_charset'];
+            // place charset parameter in the same line, if possible
+            $headers['Content-Type']
+                .= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
+            $headers['Content-Transfer-Encoding']
+                = $this->_build_params['html_encoding'];
+        } else {
+            // multipart message: and boundary
+            if (!empty($this->_build_params['boundary'])) {
+                $boundary = $this->_build_params['boundary'];
+            } else if (!empty($this->_headers['Content-Type'])
+                && preg_match('/boundary="([^"]+)"/', $this->_headers['Content-Type'], $m)
+            ) {
+                $boundary = $m[1];
+            } else {
+                $boundary = '=_' . md5(rand() . microtime());
+            }
+
+            $this->_build_params['boundary'] = $boundary;
+            $headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
+        }
+
+        return $headers;
+    }
+
+    /**
+     * Validate and set build parameters
+     *
+     * @return void
+     * @access private
+     */
+    function _checkParams()
+    {
+        $encodings = array('7bit', '8bit', 'base64', 'quoted-printable');
+
+        $this->_build_params['text_encoding']
+            = strtolower($this->_build_params['text_encoding']);
+        $this->_build_params['html_encoding']
+            = strtolower($this->_build_params['html_encoding']);
+
+        if (!in_array($this->_build_params['text_encoding'], $encodings)) {
+            $this->_build_params['text_encoding'] = '7bit';
+        }
+        if (!in_array($this->_build_params['html_encoding'], $encodings)) {
+            $this->_build_params['html_encoding'] = '7bit';
+        }
+
+        // text body
+        if ($this->_build_params['text_encoding'] == '7bit'
+            && !preg_match('/ascii/i', $this->_build_params['text_charset'])
+            && preg_match('/[^\x00-\x7F]/', $this->_txtbody)
+        ) {
+            $this->_build_params['text_encoding'] = 'quoted-printable';
+        }
+        // html body
+        if ($this->_build_params['html_encoding'] == '7bit'
+            && !preg_match('/ascii/i', $this->_build_params['html_charset'])
+            && preg_match('/[^\x00-\x7F]/', $this->_htmlbody)
+        ) {
+            $this->_build_params['html_encoding'] = 'quoted-printable';
+        }
+    }
+
+    /**
+     * PEAR::isError implementation
+     *
+     * @param mixed $data Object
+     *
+     * @return bool True if object is an instance of PEAR_Error
+     * @access private
+     */
+    function _isError($data)
+    {
+        // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473)
+        if (is_object($data) && is_a($data, 'PEAR_Error')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * PEAR::raiseError implementation
+     *
+     * @param $message A text error message
+     *
+     * @return PEAR_Error Instance of PEAR_Error
+     * @access private
+     */
+    function _raiseError($message)
+    {
+        // PEAR::raiseError() is not PHP 5.4 compatible
+        return new PEAR_Error($message);
+    }
 
 } // End of class
-?>
diff --git a/htdocs/includes/nusoap/lib/Mail/mimeDecode.php b/htdocs/includes/nusoap/lib/Mail/mimeDecode.php
deleted file mode 100644
index 7ac931c2fb4..00000000000
--- a/htdocs/includes/nusoap/lib/Mail/mimeDecode.php
+++ /dev/null
@@ -1,836 +0,0 @@
-                           |
-// +-----------------------------------------------------------------------+
-
-require_once 'PEAR.php';
-
-/**
-*  +----------------------------- IMPORTANT ------------------------------+
-*  | Usage of this class compared to native php extensions such as        |
-*  | mailparse or imap, is slow and may be feature deficient. If available|
-*  | you are STRONGLY recommended to use the php extensions.              |
-*  +----------------------------------------------------------------------+
-*
-* Mime Decoding class
-*
-* This class will parse a raw mime email and return
-* the structure. Returned structure is similar to
-* that returned by imap_fetchstructure().
-*
-* USAGE: (assume $input is your raw email)
-*
-* $decode = new Mail_mimeDecode($input, "\r\n");
-* $structure = $decode->decode();
-* print_r($structure);
-*
-* Or statically:
-*
-* $params['input'] = $input;
-* $structure = Mail_mimeDecode::decode($params);
-* print_r($structure);
-*
-* TODO:
-*  o Implement multipart/appledouble
-*  o UTF8: ???
-
-		> 4. We have also found a solution for decoding the UTF-8 
-		> headers. Therefore I made the following function:
-		> 
-		> function decode_utf8($txt) {
-		> $trans=array("�‘"=>"õ","ű"=>"û","Ő"=>"�•","Ű"
-		=>"�›");
-		> $txt=strtr($txt,$trans);
-		> return(utf8_decode($txt));
-		> }
-		> 
-		> And I have inserted the following line to the class:
-		> 
-		> if (strtolower($charset)=="utf-8") $text=decode_utf8($text);
-		> 
-		> ... before the following one in the "_decodeHeader" function:
-		> 
-		> $input = str_replace($encoded, $text, $input);
-		> 
-		> This way from now on it can easily decode the UTF-8 headers too.
-
-*
-* @author  Richard Heyes 
-* @package Mail
-*/
-class Mail_mimeDecode extends PEAR
-{
-    /**
-     * The raw email to decode
-     * @var    string
-     */
-    var $_input;
-
-    /**
-     * The header part of the input
-     * @var    string
-     */
-    var $_header;
-
-    /**
-     * The body part of the input
-     * @var    string
-     */
-    var $_body;
-
-    /**
-     * If an error occurs, this is used to store the message
-     * @var    string
-     */
-    var $_error;
-
-    /**
-     * Flag to determine whether to include bodies in the
-     * returned object.
-     * @var    boolean
-     */
-    var $_include_bodies;
-
-    /**
-     * Flag to determine whether to decode bodies
-     * @var    boolean
-     */
-    var $_decode_bodies;
-
-    /**
-     * Flag to determine whether to decode headers
-     * @var    boolean
-     */
-    var $_decode_headers;
-
-    /**
-     * Constructor.
-     *
-     * Sets up the object, initialise the variables, and splits and
-     * stores the header and body of the input.
-     *
-     * @param string The input to decode
-     * @access public
-     */
-    function Mail_mimeDecode($input)
-    {
-        list($header, $body)   = $this->_splitBodyHeader($input);
-
-        $this->_input          = $input;
-        $this->_header         = $header;
-        $this->_body           = $body;
-        $this->_decode_bodies  = false;
-        $this->_include_bodies = true;
-    }
-
-    /**
-     * Begins the decoding process. If called statically
-     * it will create an object and call the decode() method
-     * of it.
-     *
-     * @param array An array of various parameters that determine
-     *              various things:
-     *              include_bodies - Whether to include the body in the returned
-     *                               object.
-     *              decode_bodies  - Whether to decode the bodies
-     *                               of the parts. (Transfer encoding)
-     *              decode_headers - Whether to decode headers
-     *              input          - If called statically, this will be treated
-     *                               as the input
-     * @return object Decoded results
-     * @access public
-     */
-    function decode($params = null)
-    {
-        // determine if this method has been called statically
-        $isStatic = !(isset($this) && get_class($this) == __CLASS__);
-
-        // Have we been called statically?
-	// If so, create an object and pass details to that.
-        if ($isStatic AND isset($params['input'])) {
-
-            $obj = new Mail_mimeDecode($params['input']);
-            $structure = $obj->decode($params);
-
-        // Called statically but no input
-        } elseif ($isStatic) {
-            return PEAR::raiseError('Called statically and no input given');
-
-        // Called via an object
-        } else {
-            $this->_include_bodies = isset($params['include_bodies']) ?
-	                             $params['include_bodies'] : false;
-            $this->_decode_bodies  = isset($params['decode_bodies']) ?
-	                             $params['decode_bodies']  : false;
-            $this->_decode_headers = isset($params['decode_headers']) ?
-	                             $params['decode_headers'] : false;
-
-            $structure = $this->_decode($this->_header, $this->_body);
-            if ($structure === false) {
-                $structure = $this->raiseError($this->_error);
-            }
-        }
-
-        return $structure;
-    }
-
-    /**
-     * Performs the decoding. Decodes the body string passed to it
-     * If it finds certain content-types it will call itself in a
-     * recursive fashion
-     *
-     * @param string Header section
-     * @param string Body section
-     * @return object Results of decoding process
-     * @access private
-     */
-    function _decode($headers, $body, $default_ctype = 'text/plain')
-    {
-        $return = new stdClass;
-        $return->headers = array();
-        $headers = $this->_parseHeaders($headers);
-
-        foreach ($headers as $value) {
-            if (isset($return->headers[strtolower($value['name'])]) AND !is_array($return->headers[strtolower($value['name'])])) {
-                $return->headers[strtolower($value['name'])]   = array($return->headers[strtolower($value['name'])]);
-                $return->headers[strtolower($value['name'])][] = $value['value'];
-
-            } elseif (isset($return->headers[strtolower($value['name'])])) {
-                $return->headers[strtolower($value['name'])][] = $value['value'];
-
-            } else {
-                $return->headers[strtolower($value['name'])] = $value['value'];
-            }
-        }
-
-        reset($headers);
-        while (list($key, $value) = each($headers)) {
-            $headers[$key]['name'] = strtolower($headers[$key]['name']);
-            switch ($headers[$key]['name']) {
-
-                case 'content-type':
-                    $content_type = $this->_parseHeaderValue($headers[$key]['value']);
-
-                    if (preg_match('/([0-9a-z+.-]+)\/([0-9a-z+.-]+)/i', $content_type['value'], $regs)) {
-                        $return->ctype_primary   = $regs[1];
-                        $return->ctype_secondary = $regs[2];
-                    }
-
-                    if (isset($content_type['other'])) {
-                        while (list($p_name, $p_value) = each($content_type['other'])) {
-                            $return->ctype_parameters[$p_name] = $p_value;
-                        }
-                    }
-                    break;
-
-                case 'content-disposition':
-                    $content_disposition = $this->_parseHeaderValue($headers[$key]['value']);
-                    $return->disposition   = $content_disposition['value'];
-                    if (isset($content_disposition['other'])) {
-                        while (list($p_name, $p_value) = each($content_disposition['other'])) {
-                            $return->d_parameters[$p_name] = $p_value;
-                        }
-                    }
-                    break;
-
-                case 'content-transfer-encoding':
-                    $content_transfer_encoding = $this->_parseHeaderValue($headers[$key]['value']);
-                    break;
-            }
-        }
-
-        if (isset($content_type)) {
-            switch (strtolower($content_type['value'])) {
-                case 'text/plain':
-                    $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
-                    break;
-
-                case 'text/html':
-                    $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
-                    break;
-
-                case 'multipart/parallel':
-                case 'multipart/report': // RFC1892
-                case 'multipart/signed': // PGP
-                case 'multipart/digest':
-                case 'multipart/alternative':
-                case 'multipart/related':
-                case 'multipart/mixed':
-                    if(!isset($content_type['other']['boundary'])){
-                        $this->_error = 'No boundary found for ' . $content_type['value'] . ' part';
-                        return false;
-                    }
-
-                    $default_ctype = (strtolower($content_type['value']) === 'multipart/digest') ? 'message/rfc822' : 'text/plain';
-
-                    $parts = $this->_boundarySplit($body, $content_type['other']['boundary']);
-                    for ($i = 0; $i < count($parts); $i++) {
-                        list($part_header, $part_body) = $this->_splitBodyHeader($parts[$i]);
-                        $part = $this->_decode($part_header, $part_body, $default_ctype);
-                        if($part === false)
-                            $part = $this->raiseError($this->_error);
-                        $return->parts[] = $part;
-                    }
-                    break;
-
-                case 'message/rfc822':
-                    $obj = new Mail_mimeDecode($body);
-                    $return->parts[] = $obj->decode(array('include_bodies' => $this->_include_bodies,
-					                                      'decode_bodies'  => $this->_decode_bodies,
-														  'decode_headers' => $this->_decode_headers));
-                    unset($obj);
-                    break;
-
-                default:
-                    if(!isset($content_transfer_encoding['value']))
-                        $content_transfer_encoding['value'] = '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $content_transfer_encoding['value']) : $body) : null;
-                    break;
-            }
-
-        } else {
-            $ctype = explode('/', $default_ctype);
-            $return->ctype_primary   = $ctype[0];
-            $return->ctype_secondary = $ctype[1];
-            $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body) : $body) : null;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Given the output of the above function, this will return an
-     * array of references to the parts, indexed by mime number.
-     *
-     * @param  object $structure   The structure to go through
-     * @param  string $mime_number Internal use only.
-     * @return array               Mime numbers
-     */
-    function &getMimeNumbers(&$structure, $no_refs = false, $mime_number = '', $prepend = '')
-    {
-        $return = array();
-        if (!empty($structure->parts)) {
-            if ($mime_number != '') {
-                $structure->mime_id = $prepend . $mime_number;
-                $return[$prepend . $mime_number] = &$structure;
-            }
-            for ($i = 0; $i < count($structure->parts); $i++) {
-
-            
-                if (!empty($structure->headers['content-type']) AND substr(strtolower($structure->headers['content-type']), 0, 8) == 'message/') {
-                    $prepend      = $prepend . $mime_number . '.';
-                    $_mime_number = '';
-                } else {
-                    $_mime_number = ($mime_number == '' ? $i + 1 : sprintf('%s.%s', $mime_number, $i + 1));
-                }
-
-                $arr = &Mail_mimeDecode::getMimeNumbers($structure->parts[$i], $no_refs, $_mime_number, $prepend);
-                foreach ($arr as $key => $val) {
-                    $no_refs ? $return[$key] = '' : $return[$key] = &$arr[$key];
-                }
-            }
-        } else {
-            if ($mime_number == '') {
-                $mime_number = '1';
-            }
-            $structure->mime_id = $prepend . $mime_number;
-            $no_refs ? $return[$prepend . $mime_number] = '' : $return[$prepend . $mime_number] = &$structure;
-        }
-        
-        return $return;
-    }
-
-    /**
-     * Given a string containing a header and body
-     * section, this function will split them (at the first
-     * blank line) and return them.
-     *
-     * @param string Input to split apart
-     * @return array Contains header and body section
-     * @access private
-     */
-    function _splitBodyHeader($input)
-    {
-        if (preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $input, $match)) {
-            return array($match[1], $match[2]);
-        }
-        $this->_error = 'Could not split header and body';
-        return false;
-    }
-
-    /**
-     * Parse headers given in $input and return
-     * as assoc array.
-     *
-     * @param string Headers to parse
-     * @return array Contains parsed headers
-     * @access private
-     */
-    function _parseHeaders($input)
-    {
-
-        if ($input !== '') {
-            // Unfold the input
-            $input   = preg_replace("/\r?\n/", "\r\n", $input);
-            $input   = preg_replace("/\r\n(\t| )+/", ' ', $input);
-            $headers = explode("\r\n", trim($input));
-
-            foreach ($headers as $value) {
-                $hdr_name = substr($value, 0, $pos = strpos($value, ':'));
-                $hdr_value = substr($value, $pos+1);
-                if($hdr_value[0] == ' ')
-                    $hdr_value = substr($hdr_value, 1);
-
-                $return[] = array(
-                                  'name'  => $hdr_name,
-                                  'value' => $this->_decode_headers ? $this->_decodeHeader($hdr_value) : $hdr_value
-                                 );
-            }
-        } else {
-            $return = array();
-        }
-
-        return $return;
-    }
-
-    /**
-     * Function to parse a header value,
-     * extract first part, and any secondary
-     * parts (after ;) This function is not as
-     * robust as it could be. Eg. header comments
-     * in the wrong place will probably break it.
-     *
-     * @param string Header value to parse
-     * @return array Contains parsed result
-     * @access private
-     */
-    function _parseHeaderValue($input)
-    {
-
-        if (($pos = strpos($input, ';')) !== false) {
-
-            $return['value'] = trim(substr($input, 0, $pos));
-            $input = trim(substr($input, $pos+1));
-
-            if (strlen($input) > 0) {
-
-                // This splits on a semi-colon, if there's no preceeding backslash
-                // Now works with quoted values; had to glue the \; breaks in PHP
-                // the regex is already bordering on incomprehensible
-                $splitRegex = '/([^;\'"]*[\'"]([^\'"]*([^\'"]*)*)[\'"][^;\'"]*|([^;]+))(;|$)/';
-                preg_match_all($splitRegex, $input, $matches);
-                $parameters = array();
-                for ($i=0; $i_quotedPrintableDecode($input);
-                break;
-
-            case 'base64':
-                return base64_decode($input);
-                break;
-
-            default:
-                return $input;
-        }
-    }
-
-    /**
-     * Given a quoted-printable string, this
-     * function will decode and return it.
-     *
-     * @param  string Input body to decode
-     * @return string Decoded body
-     * @access private
-     */
-    function _quotedPrintableDecode($input)
-    {
-        // Remove soft line breaks
-        $input = preg_replace("/=\r?\n/", '', $input);
-
-        // Replace encoded characters
-		$input = preg_replace('/=([a-f0-9]{2})/ie', "chr(hexdec('\\1'))", $input);
-
-        return $input;
-    }
-
-    /**
-     * Checks the input for uuencoded files and returns
-     * an array of them. Can be called statically, eg:
-     *
-     * $files =& Mail_mimeDecode::uudecode($some_text);
-     *
-     * It will check for the begin 666 ... end syntax
-     * however and won't just blindly decode whatever you
-     * pass it.
-     *
-     * @param  string Input body to look for attahcments in
-     * @return array  Decoded bodies, filenames and permissions
-     * @access public
-     * @author Unknown
-     */
-    function &uudecode($input)
-    {
-        // Find all uuencoded sections
-        preg_match_all("/begin ([0-7]{3}) (.+)\r?\n(.+)\r?\nend/Us", $input, $matches);
-
-        for ($j = 0; $j < count($matches[3]); $j++) {
-
-            $str      = $matches[3][$j];
-            $filename = $matches[2][$j];
-            $fileperm = $matches[1][$j];
-
-            $file = '';
-            $str = preg_split("/\r?\n/", trim($str));
-            $strlen = count($str);
-
-            for ($i = 0; $i < $strlen; $i++) {
-                $pos = 1;
-                $d = 0;
-                $len=(int)(((ord(substr($str[$i],0,1)) -32) - ' ') & 077);
-
-                while (($d + 3 <= $len) AND ($pos + 4 <= strlen($str[$i]))) {
-                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
-                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
-                    $c2 = (ord(substr($str[$i],$pos+2,1)) ^ 0x20);
-                    $c3 = (ord(substr($str[$i],$pos+3,1)) ^ 0x20);
-                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
-
-                    $file .= chr(((($c1 - ' ') & 077) << 4) | ((($c2 - ' ') & 077) >> 2));
-
-                    $file .= chr(((($c2 - ' ') & 077) << 6) |  (($c3 - ' ') & 077));
-
-                    $pos += 4;
-                    $d += 3;
-                }
-
-                if (($d + 2 <= $len) && ($pos + 3 <= strlen($str[$i]))) {
-                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
-                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
-                    $c2 = (ord(substr($str[$i],$pos+2,1)) ^ 0x20);
-                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
-
-                    $file .= chr(((($c1 - ' ') & 077) << 4) | ((($c2 - ' ') & 077) >> 2));
-
-                    $pos += 3;
-                    $d += 2;
-                }
-
-                if (($d + 1 <= $len) && ($pos + 2 <= strlen($str[$i]))) {
-                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
-                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
-                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
-
-                }
-            }
-            $files[] = array('filename' => $filename, 'fileperm' => $fileperm, 'filedata' => $file);
-        }
-
-        return $files;
-    }
-
-    /**
-     * getSendArray() returns the arguments required for Mail::send()
-     * used to build the arguments for a mail::send() call 
-     *
-     * Usage:
-     * $mailtext = Full email (for example generated by a template)
-     * $decoder = new Mail_mimeDecode($mailtext);
-     * $parts =  $decoder->getSendArray();
-     * if (!PEAR::isError($parts) {
-     *     list($recipents,$headers,$body) = $parts;
-     *     $mail = Mail::factory('smtp');
-     *     $mail->send($recipents,$headers,$body);
-     * } else {
-     *     echo $parts->message;
-     * }
-     * @return mixed   array of recipeint, headers,body or Pear_Error
-     * @access public
-     * @author Alan Knowles 
-     */
-    function getSendArray()
-    {
-        // prevent warning if this is not set
-        $this->_decode_headers = FALSE;
-        $headerlist =$this->_parseHeaders($this->_header);
-        $to = "";
-        if (!$headerlist) {
-            return $this->raiseError("Message did not contain headers");
-        }
-        foreach($headerlist as $item) {
-            $header[$item['name']] = $item['value'];
-            switch (strtolower($item['name'])) {
-                case "to":
-                case "cc":
-                case "bcc":
-                    $to = ",".$item['value'];
-                default:
-                   break;
-            }
-        }
-        if ($to == "") {
-            return $this->raiseError("Message did not contain any recipents");
-        }
-        $to = substr($to,1);
-        return array($to,$header,$this->_body);
-    } 
-
-    /**
-     * Returns a xml copy of the output of
-     * Mail_mimeDecode::decode. Pass the output in as the
-     * argument. This function can be called statically. Eg:
-     *
-     * $output = $obj->decode();
-     * $xml    = Mail_mimeDecode::getXML($output);
-     *
-     * The DTD used for this should have been in the package. Or
-     * alternatively you can get it from cvs, or here:
-     * http://www.phpguru.org/xmail/xmail.dtd.
-     *
-     * @param  object Input to convert to xml. This should be the
-     *                output of the Mail_mimeDecode::decode function
-     * @return string XML version of input
-     * @access public
-     */
-    function getXML($input)
-    {
-        $crlf    =  "\r\n";
-        $output  = '' . $crlf .
-                   '' . $crlf .
-                   '' . $crlf .
-                   Mail_mimeDecode::_getXML($input) .
-                   '';
-
-        return $output;
-    }
-
-    /**
-     * Function that does the actual conversion to xml. Does a single
-     * mimepart at a time.
-     *
-     * @param  object  Input to convert to xml. This is a mimepart object.
-     *                 It may or may not contain subparts.
-     * @param  integer Number of tabs to indent
-     * @return string  XML version of input
-     * @access private
-     */
-    function _getXML($input, $indent = 1)
-    {
-        $htab    =  "\t";
-        $crlf    =  "\r\n";
-        $output  =  '';
-        $headers = @(array)$input->headers;
-
-        foreach ($headers as $hdr_name => $hdr_value) {
-
-            // Multiple headers with this name
-            if (is_array($headers[$hdr_name])) {
-                for ($i = 0; $i < count($hdr_value); $i++) {
-                    $output .= Mail_mimeDecode::_getXML_helper($hdr_name, $hdr_value[$i], $indent);
-                }
-
-            // Only one header of this sort
-            } else {
-                $output .= Mail_mimeDecode::_getXML_helper($hdr_name, $hdr_value, $indent);
-            }
-        }
-
-        if (!empty($input->parts)) {
-            for ($i = 0; $i < count($input->parts); $i++) {
-                $output .= $crlf . str_repeat($htab, $indent) . '' . $crlf .
-                           Mail_mimeDecode::_getXML($input->parts[$i], $indent+1) .
-                           str_repeat($htab, $indent) . '' . $crlf;
-            }
-        } elseif (isset($input->body)) {
-            $output .= $crlf . str_repeat($htab, $indent) . 'body . ']]>' . $crlf;
-        }
-
-        return $output;
-    }
-
-    /**
-     * Helper function to _getXML(). Returns xml of a header.
-     *
-     * @param  string  Name of header
-     * @param  string  Value of header
-     * @param  integer Number of tabs to indent
-     * @return string  XML version of input
-     * @access private
-     */
-    function _getXML_helper($hdr_name, $hdr_value, $indent)
-    {
-        $htab   = "\t";
-        $crlf   = "\r\n";
-        $return = '';
-
-        $new_hdr_value = ($hdr_name != 'received') ? Mail_mimeDecode::_parseHeaderValue($hdr_value) : array('value' => $hdr_value);
-        $new_hdr_name  = str_replace(' ', '-', ucwords(str_replace('-', ' ', $hdr_name)));
-
-        // Sort out any parameters
-        if (!empty($new_hdr_value['other'])) {
-            foreach ($new_hdr_value['other'] as $paramname => $paramvalue) {
-                $params[] = str_repeat($htab, $indent) . $htab . '' . $crlf .
-                            str_repeat($htab, $indent) . $htab . $htab . '' . htmlspecialchars($paramname) . '' . $crlf .
-                            str_repeat($htab, $indent) . $htab . $htab . '' . htmlspecialchars($paramvalue) . '' . $crlf .
-                            str_repeat($htab, $indent) . $htab . '' . $crlf;
-            }
-
-            $params = implode('', $params);
-        } else {
-            $params = '';
-        }
-
-        $return = str_repeat($htab, $indent) . '
' . $crlf .
-                  str_repeat($htab, $indent) . $htab . '' . htmlspecialchars($new_hdr_name) . '' . $crlf .
-                  str_repeat($htab, $indent) . $htab . '' . htmlspecialchars($new_hdr_value['value']) . '' . $crlf .
-                  $params .
-                  str_repeat($htab, $indent) . '
' . $crlf;
-
-        return $return;
-    }
-
-} // End of class
-?>
diff --git a/htdocs/includes/nusoap/lib/Mail/mimePart.php b/htdocs/includes/nusoap/lib/Mail/mimePart.php
index e44caa25570..93e891bc67c 100644
--- a/htdocs/includes/nusoap/lib/Mail/mimePart.php
+++ b/htdocs/includes/nusoap/lib/Mail/mimePart.php
@@ -1,196 +1,284 @@
                            |
-// +-----------------------------------------------------------------------+
+/**
+ * The Mail_mimePart class is used to create MIME E-mail messages
+ *
+ * This class enables you to manipulate and build a mime email
+ * from the ground up. The Mail_Mime class is a userfriendly api
+ * to this class for people who aren't interested in the internals
+ * of mime mail.
+ * This class however allows full control over the email.
+ *
+ * Compatible with PHP versions 4 and 5
+ *
+ * LICENSE: This LICENSE is in the BSD license style.
+ * Copyright (c) 2002-2003, Richard Heyes 
+ * Copyright (c) 2003-2006, PEAR 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of the authors, nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this 
+ *   software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  Mail
+ * @package   Mail_Mime
+ * @author    Richard Heyes  
+ * @author    Cipriano Groenendal 
+ * @author    Sean Coates 
+ * @author    Aleksander Machniak 
+ * @copyright 2003-2006 PEAR 
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/Mail_mime
+ */
+
 
 /**
-*
-*  Raw mime encoding class
-*
-* What is it?
-*   This class enables you to manipulate and build
-*   a mime email from the ground up.
-*
-* Why use this instead of mime.php?
-*   mime.php is a userfriendly api to this class for
-*   people who aren't interested in the internals of
-*   mime mail. This class however allows full control
-*   over the email.
-*
-* Eg.
-*
-* // Since multipart/mixed has no real body, (the body is
-* // the subpart), we set the body argument to blank.
-*
-* $params['content_type'] = 'multipart/mixed';
-* $email = new Mail_mimePart('', $params);
-*
-* // Here we add a text part to the multipart we have
-* // already. Assume $body contains plain text.
-*
-* $params['content_type'] = 'text/plain';
-* $params['encoding']     = '7bit';
-* $text = $email->addSubPart($body, $params);
-*
-* // Now add an attachment. Assume $attach is
-* the contents of the attachment
-*
-* $params['content_type'] = 'application/zip';
-* $params['encoding']     = 'base64';
-* $params['disposition']  = 'attachment';
-* $params['dfilename']    = 'example.zip';
-* $attach =& $email->addSubPart($body, $params);
-*
-* // Now build the email. Note that the encode
-* // function returns an associative array containing two
-* // elements, body and headers. You will need to add extra
-* // headers, (eg. Mime-Version) before sending.
-*
-* $email = $message->encode();
-* $email['headers'][] = 'Mime-Version: 1.0';
-*
-*
-* Further examples are available at http://www.phpguru.org
-*
-* TODO:
-*  - Set encode() to return the $obj->encoded if encode()
-*    has already been run. Unless a flag is passed to specifically
-*    re-build the message.
-*
-* @author  Richard Heyes 
-* @package Mail
-*/
-
-class Mail_mimePart {
-
-   /**
+ * The Mail_mimePart class is used to create MIME E-mail messages
+ *
+ * This class enables you to manipulate and build a mime email
+ * from the ground up. The Mail_Mime class is a userfriendly api
+ * to this class for people who aren't interested in the internals
+ * of mime mail.
+ * This class however allows full control over the email.
+ *
+ * @category  Mail
+ * @package   Mail_Mime
+ * @author    Richard Heyes  
+ * @author    Cipriano Groenendal 
+ * @author    Sean Coates 
+ * @author    Aleksander Machniak 
+ * @copyright 2003-2006 PEAR 
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/Mail_mime
+ */
+class Mail_mimePart
+{
+    /**
     * The encoding type of this part
+    *
     * @var string
+    * @access private
     */
     var $_encoding;
 
-   /**
+    /**
     * An array of subparts
+    *
     * @var array
+    * @access private
     */
     var $_subparts;
 
-   /**
+    /**
     * The output of this part after being built
+    *
     * @var string
+    * @access private
     */
     var $_encoded;
 
-   /**
+    /**
     * Headers for this part
+    *
     * @var array
+    * @access private
     */
     var $_headers;
 
-   /**
+    /**
     * The body of this part (not encoded)
+    *
     * @var string
+    * @access private
     */
     var $_body;
 
     /**
-     * Constructor.
-     *
-     * Sets up the object.
-     *
-     * @param $body   - The body of the mime part if any.
-     * @param $params - An associative array of parameters:
-     *                  content_type - The content type for this part eg multipart/mixed
-     *                  encoding     - The encoding to use, 7bit, 8bit, base64, or quoted-printable
-     *                  cid          - Content ID to apply
-     *                  disposition  - Content disposition, inline or attachment
-     *                  dfilename    - Optional filename parameter for content disposition
-     *                  description  - Content description
-     *                  charset      - Character set to use
-     * @access public
-     */
+    * The location of file with body of this part (not encoded)
+    *
+    * @var string
+    * @access private
+    */
+    var $_body_file;
+
+    /**
+    * The end-of-line sequence
+    *
+    * @var string
+    * @access private
+    */
+    var $_eol = "\r\n";
+
+
+    /**
+    * Constructor.
+    *
+    * Sets up the object.
+    *
+    * @param string $body   The body of the mime part if any.
+    * @param array  $params An associative array of optional parameters:
+    *     content_type      - The content type for this part eg multipart/mixed
+    *     encoding          - The encoding to use, 7bit, 8bit,
+    *                         base64, or quoted-printable
+    *     charset           - Content character set
+    *     cid               - Content ID to apply
+    *     disposition       - Content disposition, inline or attachment
+    *     filename          - Filename parameter for content disposition
+    *     description       - Content description
+    *     name_encoding     - Encoding of the attachment name (Content-Type)
+    *                         By default filenames are encoded using RFC2231
+    *                         Here you can set RFC2047 encoding (quoted-printable
+    *                         or base64) instead
+    *     filename_encoding - Encoding of the attachment filename (Content-Disposition)
+    *                         See 'name_encoding'
+    *     headers_charset   - Charset of the headers e.g. filename, description.
+    *                         If not set, 'charset' will be used
+    *     eol               - End of line sequence. Default: "\r\n"
+    *     headers           - Hash array with additional part headers. Array keys can be
+    *                         in form of :
+    *     body_file         - Location of file with part's body (instead of $body)
+    *
+    * @access public
+    */
     function Mail_mimePart($body = '', $params = array())
     {
-        if (!defined('MAIL_MIMEPART_CRLF')) {
-            define('MAIL_MIMEPART_CRLF', defined('MAIL_MIME_CRLF') ? MAIL_MIME_CRLF : "\r\n", TRUE);
+        if (!empty($params['eol'])) {
+            $this->_eol = $params['eol'];
+        } else if (defined('MAIL_MIMEPART_CRLF')) { // backward-copat.
+            $this->_eol = MAIL_MIMEPART_CRLF;
+        }
+
+        // Additional part headers
+        if (!empty($params['headers']) && is_array($params['headers'])) {
+            $headers = $params['headers'];
         }
 
         foreach ($params as $key => $value) {
             switch ($key) {
-                case 'content_type':
-                    $headers['Content-Type'] = $value . (isset($charset) ? '; charset="' . $charset . '"' : '');
-                    break;
+            case 'encoding':
+                $this->_encoding = $value;
+                $headers['Content-Transfer-Encoding'] = $value;
+                break;
 
-                case 'encoding':
-                    $this->_encoding = $value;
-                    $headers['Content-Transfer-Encoding'] = $value;
-                    break;
+            case 'cid':
+                $headers['Content-ID'] = '<' . $value . '>';
+                break;
 
-                case 'cid':
-                    $headers['Content-ID'] = '<' . $value . '>';
-                    break;
+            case 'location':
+                $headers['Content-Location'] = $value;
+                break;
 
-                case 'disposition':
-                    $headers['Content-Disposition'] = $value . (isset($dfilename) ? '; filename="' . $dfilename . '"' : '');
-                    break;
+            case 'body_file':
+                $this->_body_file = $value;
+                break;
 
-                case 'dfilename':
-                    if (isset($headers['Content-Disposition'])) {
-                        $headers['Content-Disposition'] .= '; filename="' . $value . '"';
-                    } else {
-                        $dfilename = $value;
-                    }
-                    break;
-
-                case 'description':
-                    $headers['Content-Description'] = $value;
-                    break;
-
-                case 'charset':
-                    if (isset($headers['Content-Type'])) {
-                        $headers['Content-Type'] .= '; charset="' . $value . '"';
-                    } else {
-                        $charset = $value;
-                    }
-                    break;
+            // for backward compatibility
+            case 'dfilename':
+                $params['filename'] = $value;
+                break;
             }
         }
 
         // Default content-type
-        if (!isset($headers['Content-Type'])) {
-            $headers['Content-Type'] = 'text/plain';
+        if (empty($params['content_type'])) {
+            $params['content_type'] = 'text/plain';
         }
 
-        //Default encoding
+        // Content-Type
+        $headers['Content-Type'] = $params['content_type'];
+        if (!empty($params['charset'])) {
+            $charset = "charset={$params['charset']}";
+            // place charset parameter in the same line, if possible
+            if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
+                $headers['Content-Type'] .= '; ';
+            } else {
+                $headers['Content-Type'] .= ';' . $this->_eol . ' ';
+            }
+            $headers['Content-Type'] .= $charset;
+
+            // Default headers charset
+            if (!isset($params['headers_charset'])) {
+                $params['headers_charset'] = $params['charset'];
+            }
+        }
+
+        // header values encoding parameters
+        $h_charset  = !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII';
+        $h_language = !empty($params['language']) ? $params['language'] : null;
+        $h_encoding = !empty($params['name_encoding']) ? $params['name_encoding'] : null;
+
+
+        if (!empty($params['filename'])) {
+            $headers['Content-Type'] .= ';' . $this->_eol;
+            $headers['Content-Type'] .= $this->_buildHeaderParam(
+                'name', $params['filename'], $h_charset, $h_language, $h_encoding
+            );
+        }
+
+        // Content-Disposition
+        if (!empty($params['disposition'])) {
+            $headers['Content-Disposition'] = $params['disposition'];
+            if (!empty($params['filename'])) {
+                $headers['Content-Disposition'] .= ';' . $this->_eol;
+                $headers['Content-Disposition'] .= $this->_buildHeaderParam(
+                    'filename', $params['filename'], $h_charset, $h_language,
+                    !empty($params['filename_encoding']) ? $params['filename_encoding'] : null
+                );
+            }
+
+            // add attachment size
+            $size = $this->_body_file ? filesize($this->_body_file) : strlen($body);
+            if ($size) {
+                $headers['Content-Disposition'] .= ';' . $this->_eol . ' size=' . $size;
+            }
+        }
+
+        if (!empty($params['description'])) {
+            $headers['Content-Description'] = $this->encodeHeader(
+                'Content-Description', $params['description'], $h_charset, $h_encoding,
+                $this->_eol
+            );
+        }
+
+        // Search and add existing headers' parameters
+        foreach ($headers as $key => $value) {
+            $items = explode(':', $key);
+            if (count($items) == 2) {
+                $header = $items[0];
+                $param  = $items[1];
+                if (isset($headers[$header])) {
+                    $headers[$header] .= ';' . $this->_eol;
+                }
+                $headers[$header] .= $this->_buildHeaderParam(
+                    $param, $value, $h_charset, $h_language, $h_encoding
+                );
+                unset($headers[$key]);
+            }
+        }
+
+        // Default encoding
         if (!isset($this->_encoding)) {
             $this->_encoding = '7bit';
         }
@@ -202,41 +290,60 @@ class Mail_mimePart {
     }
 
     /**
-     * encode()
-     *
      * Encodes and returns the email. Also stores
      * it in the encoded member variable
      *
+     * @param string $boundary Pre-defined boundary string
+     *
      * @return An associative array containing two elements,
      *         body and headers. The headers element is itself
-     *         an indexed array.
+     *         an indexed array. On error returns PEAR error object.
      * @access public
      */
-    function encode()
+    function encode($boundary=null)
     {
         $encoded =& $this->_encoded;
 
-        if (!empty($this->_subparts)) {
-            srand((double)microtime()*1000000);
-            $boundary = '=_' . md5(rand() . microtime());
-            $this->_headers['Content-Type'] .= ';' . MAIL_MIMEPART_CRLF . "\t" . 'boundary="' . $boundary . '"';
+        if (count($this->_subparts)) {
+            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
+            $eol = $this->_eol;
+
+            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
+
+            $encoded['body'] = ''; 
 
-            // Add body parts to $subparts
             for ($i = 0; $i < count($this->_subparts); $i++) {
-                $headers = array();
+                $encoded['body'] .= '--' . $boundary . $eol;
                 $tmp = $this->_subparts[$i]->encode();
-                foreach ($tmp['headers'] as $key => $value) {
-                    $headers[] = $key . ': ' . $value;
+                if ($this->_isError($tmp)) {
+                    return $tmp;
                 }
-                $subparts[] = implode(MAIL_MIMEPART_CRLF, $headers) . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF . $tmp['body'];
+                foreach ($tmp['headers'] as $key => $value) {
+                    $encoded['body'] .= $key . ': ' . $value . $eol;
+                }
+                $encoded['body'] .= $eol . $tmp['body'] . $eol;
             }
 
-            $encoded['body'] = '--' . $boundary . MAIL_MIMEPART_CRLF .
-                               implode('--' . $boundary . MAIL_MIMEPART_CRLF, $subparts) .
-                               '--' . $boundary.'--' . MAIL_MIMEPART_CRLF;
+            $encoded['body'] .= '--' . $boundary . '--' . $eol;
 
+        } else if ($this->_body) {
+            $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
+        } else if ($this->_body_file) {
+            // Temporarily reset magic_quotes_runtime for file reads and writes
+            if ($magic_quote_setting = get_magic_quotes_runtime()) {
+                @ini_set('magic_quotes_runtime', 0);
+            }
+            $body = $this->_getEncodedDataFromFile($this->_body_file, $this->_encoding);
+            if ($magic_quote_setting) {
+                @ini_set('magic_quotes_runtime', $magic_quote_setting);
+            }
+
+            if ($this->_isError($body)) {
+                return $body;
+            }
+            $encoded['body'] = $body;
         } else {
-            $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding) . MAIL_MIMEPART_CRLF;
+            $encoded['body'] = '';
         }
 
         // Add headers to $encoded
@@ -246,105 +353,908 @@ class Mail_mimePart {
     }
 
     /**
-     * &addSubPart()
+     * Encodes and saves the email into file. File must exist.
+     * Data will be appended to the file.
      *
-     * Adds a subpart to current mime part and returns
-     * a reference to it
+     * @param string  $filename  Output file location
+     * @param string  $boundary  Pre-defined boundary string
+     * @param boolean $skip_head True if you don't want to save headers
      *
-     * @param $body   The body of the subpart, if any.
-     * @param $params The parameters for the subpart, same
-     *                as the $params argument for constructor.
-     * @return A reference to the part you just added. It is
-     *         crucial if using multipart/* in your subparts that
-     *         you use =& in your script when calling this function,
-     *         otherwise you will not be able to add further subparts.
+     * @return array An associative array containing message headers
+     *               or PEAR error object
      * @access public
+     * @since 1.6.0
      */
-    function &addSubPart($body, $params)
+    function encodeToFile($filename, $boundary=null, $skip_head=false)
     {
-        $this->_subparts[] = new Mail_mimePart($body, $params);
-        return $this->_subparts[count($this->_subparts) - 1];
+        if (file_exists($filename) && !is_writable($filename)) {
+            $err = $this->_raiseError('File is not writeable: ' . $filename);
+            return $err;
+        }
+
+        if (!($fh = fopen($filename, 'ab'))) {
+            $err = $this->_raiseError('Unable to open file: ' . $filename);
+            return $err;
+        }
+
+        // Temporarily reset magic_quotes_runtime for file reads and writes
+        if ($magic_quote_setting = get_magic_quotes_runtime()) {
+            @ini_set('magic_quotes_runtime', 0);
+        }
+
+        $res = $this->_encodePartToFile($fh, $boundary, $skip_head);
+
+        fclose($fh);
+
+        if ($magic_quote_setting) {
+            @ini_set('magic_quotes_runtime', $magic_quote_setting);
+        }
+
+        return $this->_isError($res) ? $res : $this->_headers;
     }
 
     /**
-     * _getEncodedData()
+     * Encodes given email part into file
      *
+     * @param string  $fh        Output file handle
+     * @param string  $boundary  Pre-defined boundary string
+     * @param boolean $skip_head True if you don't want to save headers
+     *
+     * @return array True on sucess or PEAR error object
+     * @access private
+     */
+    function _encodePartToFile($fh, $boundary=null, $skip_head=false)
+    {
+        $eol = $this->_eol;
+
+        if (count($this->_subparts)) {
+            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
+            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
+        }
+
+        if (!$skip_head) {
+            foreach ($this->_headers as $key => $value) {
+                fwrite($fh, $key . ': ' . $value . $eol);
+            }
+            $f_eol = $eol;
+        } else {
+            $f_eol = '';
+        }
+
+        if (count($this->_subparts)) {
+            for ($i = 0; $i < count($this->_subparts); $i++) {
+                fwrite($fh, $f_eol . '--' . $boundary . $eol);
+                $res = $this->_subparts[$i]->_encodePartToFile($fh);
+                if ($this->_isError($res)) {
+                    return $res;
+                }
+                $f_eol = $eol;
+            }
+
+            fwrite($fh, $eol . '--' . $boundary . '--' . $eol);
+
+        } else if ($this->_body) {
+            fwrite($fh, $f_eol . $this->_getEncodedData($this->_body, $this->_encoding));
+        } else if ($this->_body_file) {
+            fwrite($fh, $f_eol);
+            $res = $this->_getEncodedDataFromFile(
+                $this->_body_file, $this->_encoding, $fh
+            );
+            if ($this->_isError($res)) {
+                return $res;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Adds a subpart to current mime part and returns
+     * a reference to it
+     *
+     * @param string $body   The body of the subpart, if any.
+     * @param array  $params The parameters for the subpart, same
+     *                       as the $params argument for constructor.
+     *
+     * @return Mail_mimePart A reference to the part you just added. In PHP4, it is
+     *                       crucial if using multipart/* in your subparts that
+     *                       you use =& in your script when calling this function,
+     *                       otherwise you will not be able to add further subparts.
+     * @access public
+     */
+    function &addSubpart($body, $params)
+    {
+        $this->_subparts[] = $part = new Mail_mimePart($body, $params);
+        return $part;
+    }
+
+    /**
      * Returns encoded data based upon encoding passed to it
      *
-     * @param $data     The data to encode.
-     * @param $encoding The encoding type to use, 7bit, base64,
-     *                  or quoted-printable.
+     * @param string $data     The data to encode.
+     * @param string $encoding The encoding type to use, 7bit, base64,
+     *                         or quoted-printable.
+     *
+     * @return string
      * @access private
      */
     function _getEncodedData($data, $encoding)
     {
         switch ($encoding) {
-            case '8bit':
-            case '7bit':
-                return $data;
-                break;
+        case 'quoted-printable':
+            return $this->_quotedPrintableEncode($data);
+            break;
 
-            case 'quoted-printable':
-                return $this->_quotedPrintableEncode($data);
-                break;
+        case 'base64':
+            return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
+            break;
 
-            case 'base64':
-                return rtrim(chunk_split(base64_encode($data), 76, MAIL_MIMEPART_CRLF));
-                break;
-
-            default:
-                return $data;
+        case '8bit':
+        case '7bit':
+        default:
+            return $data;
         }
     }
 
     /**
-     * quoteadPrintableEncode()
+     * Returns encoded data based upon encoding passed to it
      *
+     * @param string   $filename Data file location
+     * @param string   $encoding The encoding type to use, 7bit, base64,
+     *                           or quoted-printable.
+     * @param resource $fh       Output file handle. If set, data will be
+     *                           stored into it instead of returning it
+     *
+     * @return string Encoded data or PEAR error object
+     * @access private
+     */
+    function _getEncodedDataFromFile($filename, $encoding, $fh=null)
+    {
+        if (!is_readable($filename)) {
+            $err = $this->_raiseError('Unable to read file: ' . $filename);
+            return $err;
+        }
+
+        if (!($fd = fopen($filename, 'rb'))) {
+            $err = $this->_raiseError('Could not open file: ' . $filename);
+            return $err;
+        }
+
+        $data = '';
+
+        switch ($encoding) {
+        case 'quoted-printable':
+            while (!feof($fd)) {
+                $buffer = $this->_quotedPrintableEncode(fgets($fd));
+                if ($fh) {
+                    fwrite($fh, $buffer);
+                } else {
+                    $data .= $buffer;
+                }
+            }
+            break;
+
+        case 'base64':
+            while (!feof($fd)) {
+                // Should read in a multiple of 57 bytes so that
+                // the output is 76 bytes per line. Don't use big chunks
+                // because base64 encoding is memory expensive
+                $buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
+                $buffer = base64_encode($buffer);
+                $buffer = chunk_split($buffer, 76, $this->_eol);
+                if (feof($fd)) {
+                    $buffer = rtrim($buffer);
+                }
+
+                if ($fh) {
+                    fwrite($fh, $buffer);
+                } else {
+                    $data .= $buffer;
+                }
+            }
+            break;
+
+        case '8bit':
+        case '7bit':
+        default:
+            while (!feof($fd)) {
+                $buffer = fread($fd, 1048576); // 1 MB
+                if ($fh) {
+                    fwrite($fh, $buffer);
+                } else {
+                    $data .= $buffer;
+                }
+            }
+        }
+
+        fclose($fd);
+
+        if (!$fh) {
+            return $data;
+        }
+    }
+
+    /**
      * Encodes data to quoted-printable standard.
      *
-     * @param $input    The data to encode
-     * @param $line_max Optional max line length. Should
-     *                  not be more than 76 chars
+     * @param string $input    The data to encode
+     * @param int    $line_max Optional max line length. Should
+     *                         not be more than 76 chars
+     *
+     * @return string Encoded data
      *
      * @access private
      */
     function _quotedPrintableEncode($input , $line_max = 76)
     {
+        $eol = $this->_eol;
+        /*
+        // imap_8bit() is extremely fast, but doesn't handle properly some characters
+        if (function_exists('imap_8bit') && $line_max == 76) {
+            $input = preg_replace('/\r?\n/', "\r\n", $input);
+            $input = imap_8bit($input);
+            if ($eol != "\r\n") {
+                $input = str_replace("\r\n", $eol, $input);
+            }
+            return $input;
+        }
+        */
         $lines  = preg_split("/\r?\n/", $input);
-        $eol    = MAIL_MIMEPART_CRLF;
         $escape = '=';
         $output = '';
 
-        while(list(, $line) = each($lines)){
-
-            $linlen     = strlen($line);
+        while (list($idx, $line) = each($lines)) {
             $newline = '';
+            $i = 0;
 
-            for ($i = 0; $i < $linlen; $i++) {
-                $char = substr($line, $i, 1);
+            while (isset($line[$i])) {
+                $char = $line[$i];
                 $dec  = ord($char);
+                $i++;
 
-                if (($dec == 32) AND ($i == ($linlen - 1))){    // convert space at eol only
+                if (($dec == 32) && (!isset($line[$i]))) {
+                    // convert space at eol only
                     $char = '=20';
-
-                } elseif(($dec == 9) AND ($i == ($linlen - 1))) {  // convert tab at eol only
-                    $char = '=09';
-                } elseif($dec == 9) {
-                    ; // Do nothing if a tab.
-                } elseif(($dec == 61) OR ($dec < 32 ) OR ($dec > 126)) {
-                    $char = $escape . strtoupper(sprintf('%02s', dechex($dec)));
+                } elseif ($dec == 9 && isset($line[$i])) {
+                    ; // Do nothing if a TAB is not on eol
+                } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) {
+                    $char = $escape . sprintf('%02X', $dec);
+                } elseif (($dec == 46) && (($newline == '')
+                    || ((strlen($newline) + strlen("=2E")) >= $line_max))
+                ) {
+                    // Bug #9722: convert full-stop at bol,
+                    // some Windows servers need this, won't break anything (cipri)
+                    // Bug #11731: full-stop at bol also needs to be encoded
+                    // if this line would push us over the line_max limit.
+                    $char = '=2E';
                 }
 
-                if ((strlen($newline) + strlen($char)) >= $line_max) {        // MAIL_MIMEPART_CRLF is not counted
-                    $output  .= $newline . $escape . $eol;                    // soft line break; " =\r\n" is okay
+                // Note, when changing this line, also change the ($dec == 46)
+                // check line, as it mimics this line due to Bug #11731
+                // EOL is not counted
+                if ((strlen($newline) + strlen($char)) >= $line_max) {
+                    // soft line break; " =\r\n" is okay
+                    $output  .= $newline . $escape . $eol;
                     $newline  = '';
                 }
                 $newline .= $char;
             } // end of for
             $output .= $newline . $eol;
+            unset($lines[$idx]);
         }
-        $output = substr($output, 0, -1 * strlen($eol)); // Don't want last crlf
+        // Don't want last crlf
+        $output = substr($output, 0, -1 * strlen($eol));
         return $output;
     }
+
+    /**
+     * Encodes the parameter of a header.
+     *
+     * @param string $name      The name of the header-parameter
+     * @param string $value     The value of the paramter
+     * @param string $charset   The characterset of $value
+     * @param string $language  The language used in $value
+     * @param string $encoding  Parameter encoding. If not set, parameter value
+     *                          is encoded according to RFC2231
+     * @param int    $maxLength The maximum length of a line. Defauls to 75
+     *
+     * @return string
+     *
+     * @access private
+     */
+    function _buildHeaderParam($name, $value, $charset=null, $language=null,
+        $encoding=null, $maxLength=75
+    ) {
+        // RFC 2045:
+        // value needs encoding if contains non-ASCII chars or is longer than 78 chars
+        if (!preg_match('#[^\x20-\x7E]#', $value)) {
+            $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
+                . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
+            if (!preg_match($token_regexp, $value)) {
+                // token
+                if (strlen($name) + strlen($value) + 3 <= $maxLength) {
+                    return " {$name}={$value}";
+                }
+            } else {
+                // quoted-string
+                $quoted = addcslashes($value, '\\"');
+                if (strlen($name) + strlen($quoted) + 5 <= $maxLength) {
+                    return " {$name}=\"{$quoted}\"";
+                }
+            }
+        }
+
+        // RFC2047: use quoted-printable/base64 encoding
+        if ($encoding == 'quoted-printable' || $encoding == 'base64') {
+            return $this->_buildRFC2047Param($name, $value, $charset, $encoding);
+        }
+
+        // RFC2231:
+        $encValue = preg_replace_callback(
+            '/([^\x21\x23\x24\x26\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E])/',
+            array($this, '_encodeReplaceCallback'), $value
+        );
+        $value = "$charset'$language'$encValue";
+
+        $header = " {$name}*={$value}";
+        if (strlen($header) <= $maxLength) {
+            return $header;
+        }
+
+        $preLength = strlen(" {$name}*0*=");
+        $maxLength = max(16, $maxLength - $preLength - 3);
+        $maxLengthReg = "|(.{0,$maxLength}[^\%][^\%])|";
+
+        $headers = array();
+        $headCount = 0;
+        while ($value) {
+            $matches = array();
+            $found = preg_match($maxLengthReg, $value, $matches);
+            if ($found) {
+                $headers[] = " {$name}*{$headCount}*={$matches[0]}";
+                $value = substr($value, strlen($matches[0]));
+            } else {
+                $headers[] = " {$name}*{$headCount}*={$value}";
+                $value = '';
+            }
+            $headCount++;
+        }
+
+        $headers = implode(';' . $this->_eol, $headers);
+        return $headers;
+    }
+
+    /**
+     * Encodes header parameter as per RFC2047 if needed
+     *
+     * @param string $name      The parameter name
+     * @param string $value     The parameter value
+     * @param string $charset   The parameter charset
+     * @param string $encoding  Encoding type (quoted-printable or base64)
+     * @param int    $maxLength Encoded parameter max length. Default: 76
+     *
+     * @return string Parameter line
+     * @access private
+     */
+    function _buildRFC2047Param($name, $value, $charset,
+        $encoding='quoted-printable', $maxLength=76
+    ) {
+        // WARNING: RFC 2047 says: "An 'encoded-word' MUST NOT be used in
+        // parameter of a MIME Content-Type or Content-Disposition field",
+        // but... it's supported by many clients/servers
+        $quoted = '';
+
+        if ($encoding == 'base64') {
+            $value = base64_encode($value);
+            $prefix = '=?' . $charset . '?B?';
+            $suffix = '?=';
+
+            // 2 x SPACE, 2 x '"', '=', ';'
+            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
+            $len = $add_len + strlen($value);
+
+            while ($len > $maxLength) { 
+                // We can cut base64-encoded string every 4 characters
+                $real_len = floor(($maxLength - $add_len) / 4) * 4;
+                $_quote = substr($value, 0, $real_len);
+                $value = substr($value, $real_len);
+
+                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
+                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
+                $len = strlen($value) + $add_len;
+            }
+            $quoted .= $prefix . $value . $suffix;
+
+        } else {
+            // quoted-printable
+            $value = $this->encodeQP($value);
+            $prefix = '=?' . $charset . '?Q?';
+            $suffix = '?=';
+
+            // 2 x SPACE, 2 x '"', '=', ';'
+            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
+            $len = $add_len + strlen($value);
+
+            while ($len > $maxLength) {
+                $length = $maxLength - $add_len;
+                // don't break any encoded letters
+                if (preg_match("/^(.{0,$length}[^\=][^\=])/", $value, $matches)) {
+                    $_quote = $matches[1];
+                }
+
+                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
+                $value = substr($value, strlen($_quote));
+                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
+                $len = strlen($value) + $add_len;
+            }
+
+            $quoted .= $prefix . $value . $suffix;
+        }
+
+        return " {$name}=\"{$quoted}\"";
+    }
+
+    /**
+     * Encodes a header as per RFC2047
+     *
+     * @param string $name     The header name
+     * @param string $value    The header data to encode
+     * @param string $charset  Character set name
+     * @param string $encoding Encoding name (base64 or quoted-printable)
+     * @param string $eol      End-of-line sequence. Default: "\r\n"
+     *
+     * @return string          Encoded header data (without a name)
+     * @access public
+     * @since 1.6.1
+     */
+    function encodeHeader($name, $value, $charset='ISO-8859-1',
+        $encoding='quoted-printable', $eol="\r\n"
+    ) {
+        // Structured headers
+        $comma_headers = array(
+            'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
+            'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
+            'resent-sender', 'resent-reply-to',
+            'mail-reply-to', 'mail-followup-to',
+            'return-receipt-to', 'disposition-notification-to',
+        );
+        $other_headers = array(
+            'references', 'in-reply-to', 'message-id', 'resent-message-id',
+        );
+
+        $name = strtolower($name);
+
+        if (in_array($name, $comma_headers)) {
+            $separator = ',';
+        } else if (in_array($name, $other_headers)) {
+            $separator = ' ';
+        }
+
+        if (!$charset) {
+            $charset = 'ISO-8859-1';
+        }
+
+        // Structured header (make sure addr-spec inside is not encoded)
+        if (!empty($separator)) {
+            // Simple e-mail address regexp
+            $email_regexp = '([^\s<]+|("[^\r\n"]+"))@\S+';
+
+            $parts = Mail_mimePart::_explodeQuotedString("[\t$separator]", $value);
+            $value = '';
+
+            foreach ($parts as $part) {
+                $part = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $part);
+                $part = trim($part);
+
+                if (!$part) {
+                    continue;
+                }
+                if ($value) {
+                    $value .= $separator == ',' ? $separator . ' ' : ' ';
+                } else {
+                    $value = $name . ': ';
+                }
+
+                // let's find phrase (name) and/or addr-spec
+                if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
+                    $value .= $part;
+                } else if (preg_match('/^' . $email_regexp . '$/', $part)) {
+                    // address without brackets and without name
+                    $value .= $part;
+                } else if (preg_match('/<*' . $email_regexp . '>*$/', $part, $matches)) {
+                    // address with name (handle name)
+                    $address = $matches[0];
+                    $word = str_replace($address, '', $part);
+                    $word = trim($word);
+                    // check if phrase requires quoting
+                    if ($word) {
+                        // non-ASCII: require encoding
+                        if (preg_match('#([^\s\x21-\x7E]){1}#', $word)) {
+                            if ($word[0] == '"' && $word[strlen($word)-1] == '"') {
+                                // de-quote quoted-string, encoding changes
+                                // string to atom
+                                $search = array("\\\"", "\\\\");
+                                $replace = array("\"", "\\");
+                                $word = str_replace($search, $replace, $word);
+                                $word = substr($word, 1, -1);
+                            }
+                            // find length of last line
+                            if (($pos = strrpos($value, $eol)) !== false) {
+                                $last_len = strlen($value) - $pos;
+                            } else {
+                                $last_len = strlen($value);
+                            }
+                            $word = Mail_mimePart::encodeHeaderValue(
+                                $word, $charset, $encoding, $last_len, $eol
+                            );
+                        } else if (($word[0] != '"' || $word[strlen($word)-1] != '"')
+                            && preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $word)
+                        ) {
+                            // ASCII: quote string if needed
+                            $word = '"'.addcslashes($word, '\\"').'"';
+                        }
+                    }
+                    $value .= $word.' '.$address;
+                } else {
+                    // addr-spec not found, don't encode (?)
+                    $value .= $part;
+                }
+
+                // RFC2822 recommends 78 characters limit, use 76 from RFC2047
+                $value = wordwrap($value, 76, $eol . ' ');
+            }
+
+            // remove header name prefix (there could be EOL too)
+            $value = preg_replace(
+                '/^'.$name.':('.preg_quote($eol, '/').')* /', '', $value
+            );
+        } else {
+            // Unstructured header
+            // non-ASCII: require encoding
+            if (preg_match('#([^\s\x21-\x7E]){1}#', $value)) {
+                if ($value[0] == '"' && $value[strlen($value)-1] == '"') {
+                    // de-quote quoted-string, encoding changes
+                    // string to atom
+                    $search = array("\\\"", "\\\\");
+                    $replace = array("\"", "\\");
+                    $value = str_replace($search, $replace, $value);
+                    $value = substr($value, 1, -1);
+                }
+                $value = Mail_mimePart::encodeHeaderValue(
+                    $value, $charset, $encoding, strlen($name) + 2, $eol
+                );
+            } else if (strlen($name.': '.$value) > 78) {
+                // ASCII: check if header line isn't too long and use folding
+                $value = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $value);
+                $tmp = wordwrap($name.': '.$value, 78, $eol . ' ');
+                $value = preg_replace('/^'.$name.':\s*/', '', $tmp);
+                // hard limit 998 (RFC2822)
+                $value = wordwrap($value, 998, $eol . ' ', true);
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Explode quoted string
+     *
+     * @param string $delimiter Delimiter expression string for preg_match()
+     * @param string $string    Input string
+     *
+     * @return array            String tokens array
+     * @access private
+     */
+    function _explodeQuotedString($delimiter, $string)
+    {
+        $result = array();
+        $strlen = strlen($string);
+
+        for ($q=$p=$i=0; $i < $strlen; $i++) {
+            if ($string[$i] == "\""
+                && (empty($string[$i-1]) || $string[$i-1] != "\\")
+            ) {
+                $q = $q ? false : true;
+            } else if (!$q && preg_match("/$delimiter/", $string[$i])) {
+                $result[] = substr($string, $p, $i - $p);
+                $p = $i + 1;
+            }
+        }
+
+        $result[] = substr($string, $p);
+        return $result;
+    }
+
+    /**
+     * Encodes a header value as per RFC2047
+     *
+     * @param string $value      The header data to encode
+     * @param string $charset    Character set name
+     * @param string $encoding   Encoding name (base64 or quoted-printable)
+     * @param int    $prefix_len Prefix length. Default: 0
+     * @param string $eol        End-of-line sequence. Default: "\r\n"
+     *
+     * @return string            Encoded header data
+     * @access public
+     * @since 1.6.1
+     */
+    function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
+    {
+        // #17311: Use multibyte aware method (requires mbstring extension)
+        if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
+            return $result;
+        }
+
+        // Generate the header using the specified params and dynamicly
+        // determine the maximum length of such strings.
+        // 75 is the value specified in the RFC.
+        $encoding = $encoding == 'base64' ? 'B' : 'Q';
+        $prefix = '=?' . $charset . '?' . $encoding .'?';
+        $suffix = '?=';
+        $maxLength = 75 - strlen($prefix . $suffix);
+        $maxLength1stLine = $maxLength - $prefix_len;
+
+        if ($encoding == 'B') {
+            // Base64 encode the entire string
+            $value = base64_encode($value);
+
+            // We can cut base64 every 4 characters, so the real max
+            // we can get must be rounded down.
+            $maxLength = $maxLength - ($maxLength % 4);
+            $maxLength1stLine = $maxLength1stLine - ($maxLength1stLine % 4);
+
+            $cutpoint = $maxLength1stLine;
+            $output = '';
+
+            while ($value) {
+                // Split translated string at every $maxLength
+                $part = substr($value, 0, $cutpoint);
+                $value = substr($value, $cutpoint);
+                $cutpoint = $maxLength;
+                // RFC 2047 specifies that any split header should
+                // be separated by a CRLF SPACE.
+                if ($output) {
+                    $output .= $eol . ' ';
+                }
+                $output .= $prefix . $part . $suffix;
+            }
+            $value = $output;
+        } else {
+            // quoted-printable encoding has been selected
+            $value = Mail_mimePart::encodeQP($value);
+
+            // This regexp will break QP-encoded text at every $maxLength
+            // but will not break any encoded letters.
+            $reg1st = "|(.{0,$maxLength1stLine}[^\=][^\=])|";
+            $reg2nd = "|(.{0,$maxLength}[^\=][^\=])|";
+
+            if (strlen($value) > $maxLength1stLine) {
+                // Begin with the regexp for the first line.
+                $reg = $reg1st;
+                $output = '';
+                while ($value) {
+                    // Split translated string at every $maxLength
+                    // But make sure not to break any translated chars.
+                    $found = preg_match($reg, $value, $matches);
+
+                    // After this first line, we need to use a different
+                    // regexp for the first line.
+                    $reg = $reg2nd;
+
+                    // Save the found part and encapsulate it in the
+                    // prefix & suffix. Then remove the part from the
+                    // $value_out variable.
+                    if ($found) {
+                        $part = $matches[0];
+                        $len = strlen($matches[0]);
+                        $value = substr($value, $len);
+                    } else {
+                        $part = $value;
+                        $value = '';
+                    }
+
+                    // RFC 2047 specifies that any split header should
+                    // be separated by a CRLF SPACE
+                    if ($output) {
+                        $output .= $eol . ' ';
+                    }
+                    $output .= $prefix . $part . $suffix;
+                }
+                $value = $output;
+            } else {
+                $value = $prefix . $value . $suffix;
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Encodes the given string using quoted-printable
+     *
+     * @param string $str String to encode
+     *
+     * @return string     Encoded string
+     * @access public
+     * @since 1.6.0
+     */
+    function encodeQP($str)
+    {
+        // Bug #17226 RFC 2047 restricts some characters
+        // if the word is inside a phrase, permitted chars are only:
+        // ASCII letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
+
+        // "=",  "_",  "?" must be encoded
+        $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
+        $str = preg_replace_callback(
+            $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $str
+        );
+
+        return str_replace(' ', '_', $str);
+    }
+
+    /**
+     * Encodes the given string using base64 or quoted-printable.
+     * This method makes sure that encoded-word represents an integral
+     * number of characters as per RFC2047.
+     *
+     * @param string $str        String to encode
+     * @param string $charset    Character set name
+     * @param string $encoding   Encoding name (base64 or quoted-printable)
+     * @param int    $prefix_len Prefix length. Default: 0
+     * @param string $eol        End-of-line sequence. Default: "\r\n"
+     *
+     * @return string     Encoded string
+     * @access public
+     * @since 1.8.0
+     */
+    function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
+    {
+        if (!function_exists('mb_substr') || !function_exists('mb_strlen')) {
+            return;
+        }
+
+        $encoding = $encoding == 'base64' ? 'B' : 'Q';
+        // 75 is the value specified in the RFC
+        $prefix = '=?' . $charset . '?'.$encoding.'?';
+        $suffix = '?=';
+        $maxLength = 75 - strlen($prefix . $suffix);
+
+        // A multi-octet character may not be split across adjacent encoded-words
+        // So, we'll loop over each character
+        // mb_stlen() with wrong charset will generate a warning here and return null
+        $length      = mb_strlen($str, $charset);
+        $result      = '';
+        $line_length = $prefix_len;
+
+        if ($encoding == 'B') {
+            // base64
+            $start = 0;
+            $prev  = '';
+
+            for ($i=1; $i<=$length; $i++) {
+                // See #17311
+                $chunk = mb_substr($str, $start, $i-$start, $charset);
+                $chunk = base64_encode($chunk);
+                $chunk_len = strlen($chunk);
+
+                if ($line_length + $chunk_len == $maxLength || $i == $length) {
+                    if ($result) {
+                        $result .= "\n";
+                    }
+                    $result .= $chunk;
+                    $line_length = 0;
+                    $start = $i;
+                } else if ($line_length + $chunk_len > $maxLength) {
+                    if ($result) {
+                        $result .= "\n";
+                    }
+                    if ($prev) {
+                        $result .= $prev;
+                    }
+                    $line_length = 0;
+                    $start = $i - 1;
+                } else {
+                    $prev = $chunk;
+                }
+            }
+        } else {
+            // quoted-printable
+            // see encodeQP()
+            $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
+
+            for ($i=0; $i<=$length; $i++) {
+                $char = mb_substr($str, $i, 1, $charset);
+                // RFC recommends underline (instead of =20) in place of the space
+                // that's one of the reasons why we're not using iconv_mime_encode()
+                if ($char == ' ') {
+                    $char = '_';
+                    $char_len = 1;
+                } else {
+                    $char = preg_replace_callback(
+                        $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $char
+                    );
+                    $char_len = strlen($char);
+                }
+
+                if ($line_length + $char_len > $maxLength) {
+                    if ($result) {
+                        $result .= "\n";
+                    }
+                    $line_length = 0;
+                }
+
+                $result      .= $char;
+                $line_length += $char_len;
+            }
+        }
+
+        if ($result) {
+            $result = $prefix
+                .str_replace("\n", $suffix.$eol.' '.$prefix, $result).$suffix;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Callback function to replace extended characters (\x80-xFF) with their
+     * ASCII values (RFC2047: quoted-printable)
+     *
+     * @param array $matches Preg_replace's matches array
+     *
+     * @return string        Encoded character string
+     * @access private
+     */
+    function _qpReplaceCallback($matches)
+    {
+        return sprintf('=%02X', ord($matches[1]));
+    }
+
+    /**
+     * Callback function to replace extended characters (\x80-xFF) with their
+     * ASCII values (RFC2231)
+     *
+     * @param array $matches Preg_replace's matches array
+     *
+     * @return string        Encoded character string
+     * @access private
+     */
+    function _encodeReplaceCallback($matches)
+    {
+        return sprintf('%%%02X', ord($matches[1]));
+    }
+
+    /**
+     * PEAR::isError implementation
+     *
+     * @param mixed $data Object
+     *
+     * @return bool True if object is an instance of PEAR_Error
+     * @access private
+     */
+    function _isError($data)
+    {
+        // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473)
+        if (is_object($data) && is_a($data, 'PEAR_Error')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * PEAR::raiseError implementation
+     *
+     * @param $message A text error message
+     *
+     * @return PEAR_Error Instance of PEAR_Error
+     * @access private
+     */
+    function _raiseError($message)
+    {
+        // PEAR::raiseError() is not PHP 5.4 compatible
+        return new PEAR_Error($message);
+    }
+
 } // End of class
-?>
diff --git a/htdocs/includes/nusoap/lib/Mail/null.php b/htdocs/includes/nusoap/lib/Mail/null.php
deleted file mode 100644
index 5e220a5a39c..00000000000
--- a/htdocs/includes/nusoap/lib/Mail/null.php
+++ /dev/null
@@ -1,58 +0,0 @@
-                            |
-// +----------------------------------------------------------------------+
-//
-//
-
-/**
- * Null implementation of the PEAR Mail:: interface.
- * @access public
- * @package Mail
- */
-class Mail_null extends Mail {
-
-    /**
-     * Implements Mail_null::send() function. Silently discards all
-     * mail.
-     *
-     * @param mixed $recipients Either a comma-seperated list of recipients
-     *              (RFC822 compliant), or an array of recipients,
-     *              each RFC822 valid. This may contain recipients not
-     *              specified in the headers, for Bcc:, resending
-     *              messages, etc.
-     *
-     * @param array $headers The array of headers to send with the mail, in an
-     *              associative array, where the array key is the
-     *              header name (ie, 'Subject'), and the array value
-     *              is the header value (ie, 'test'). The header
-     *              produced from those values would be 'Subject:
-     *              test'.
-     *
-     * @param string $body The full text of the message body, including any
-     *               Mime parts, etc.
-     *
-     * @return mixed Returns true on success, or a PEAR_Error
-     *               containing a descriptive error message on
-     *               failure.
-     * @access public
-     */
-    function send($recipients, $headers, $body)
-    {
-        return true;
-    }
-
-}
diff --git a/htdocs/includes/nusoap/lib/Mail/sendmail.php b/htdocs/includes/nusoap/lib/Mail/sendmail.php
deleted file mode 100644
index fc492489a90..00000000000
--- a/htdocs/includes/nusoap/lib/Mail/sendmail.php
+++ /dev/null
@@ -1,144 +0,0 @@
-                            |
-// +----------------------------------------------------------------------+
-
-/**
- * Sendmail implementation of the PEAR Mail:: interface.
- * @access public
- * @package Mail
- */
-class Mail_sendmail extends Mail {
-
-	/**
-     * The location of the sendmail or sendmail wrapper binary on the
-     * filesystem.
-     * @var string
-     */
-    var $sendmail_path = '/usr/sbin/sendmail';
-
-	/**
-     * Any extra command-line parameters to pass to the sendmail or
-     * sendmail wrapper binary.
-     * @var string
-     */
-    var $sendmail_args = '';
-
-	/**
-     * Constructor.
-     *
-     * Instantiates a new Mail_sendmail:: object based on the parameters
-     * passed in. It looks for the following parameters:
-     *     sendmail_path    The location of the sendmail binary on the
-     *                      filesystem. Defaults to '/usr/sbin/sendmail'.
-     *
-     *     sendmail_args    Any extra parameters to pass to the sendmail
-     *                      or sendmail wrapper binary.
-     *
-     * If a parameter is present in the $params array, it replaces the
-     * default.
-     *
-     * @param array $params Hash containing any parameters different from the
-     *              defaults.
-     * @access public
-     */
-    function Mail_sendmail($params)
-    {
-        if (isset($params['sendmail_path'])) $this->sendmail_path = $params['sendmail_path'];
-        if (isset($params['sendmail_args'])) $this->sendmail_args = $params['sendmail_args'];
-
-        /*
-         * Because we need to pass message headers to the sendmail program on
-         * the commandline, we can't guarantee the use of the standard "\r\n"
-         * separator.  Instead, we use the system's native line separator.
-         */
-        $this->sep = (strstr(PHP_OS, 'WIN')) ? "\r\n" : "\n";
-    }
-
-	/**
-     * Implements Mail::send() function using the sendmail
-     * command-line binary.
-     *
-     * @param mixed $recipients Either a comma-seperated list of recipients
-     *              (RFC822 compliant), or an array of recipients,
-     *              each RFC822 valid. This may contain recipients not
-     *              specified in the headers, for Bcc:, resending
-     *              messages, etc.
-     *
-     * @param array $headers The array of headers to send with the mail, in an
-     *              associative array, where the array key is the
-     *              header name (ie, 'Subject'), and the array value
-     *              is the header value (ie, 'test'). The header
-     *              produced from those values would be 'Subject:
-     *              test'.
-     *
-     * @param string $body The full text of the message body, including any
-     *               Mime parts, etc.
-     *
-     * @return mixed Returns true on success, or a PEAR_Error
-     *               containing a descriptive error message on
-     *               failure.
-     * @access public
-     */
-    function send($recipients, $headers, $body)
-    {
-        $recipients = $this->parseRecipients($recipients);
-        if (PEAR::isError($recipients)) {
-            return $recipients;
-        }
-        $recipients = escapeShellCmd(implode(' ', $recipients));
-
-        $headerElements = $this->prepareHeaders($headers);
-        if (PEAR::isError($headerElements)) {
-            return $headerElements;
-        }
-        list($from, $text_headers) = $headerElements;
-
-        if (!isset($from)) {
-            return PEAR::raiseError('No from address given.');
-        } elseif (strstr($from, ' ') ||
-                  strstr($from, ';') ||
-                  strstr($from, '&') ||
-                  strstr($from, '`')) {
-            return PEAR::raiseError('From address specified with dangerous characters.');
-        }
-
-        $result = 0;
-        if (@is_file($this->sendmail_path)) {
-            $from = escapeShellCmd($from);
-            $mail = popen($this->sendmail_path . (!empty($this->sendmail_args) ? ' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w');
-            fputs($mail, $text_headers);
-            fputs($mail, $this->sep);  // newline to end the headers section
-            fputs($mail, $body);
-            $result = pclose($mail);
-            if (version_compare(phpversion(), '4.2.3') == -1) {
-                // With older php versions, we need to shift the
-                // pclose result to get the exit code.
-                $result = $result >> 8 & 0xFF;
-            }
-        } else {
-            return PEAR::raiseError('sendmail [' . $this->sendmail_path . '] is not a valid file');
-        }
-
-        if ($result != 0) {
-            return PEAR::raiseError('sendmail returned error code ' . $result,
-                                    $result);
-        }
-
-        return true;
-    }
-
-}
diff --git a/htdocs/includes/nusoap/lib/Mail/smtp.php b/htdocs/includes/nusoap/lib/Mail/smtp.php
deleted file mode 100644
index 200d5dacaa9..00000000000
--- a/htdocs/includes/nusoap/lib/Mail/smtp.php
+++ /dev/null
@@ -1,222 +0,0 @@
-                           |
-// |          Jon Parise                                     |
-// +----------------------------------------------------------------------+
-
-/**
- * SMTP implementation of the PEAR Mail:: interface. Requires the PEAR
- * Net_SMTP:: class.
- * @access public
- * @package Mail
- */
-class Mail_smtp extends Mail {
-
-    /**
-     * The SMTP host to connect to.
-     * @var string
-     */
-    var $host = 'localhost';
-
-    /**
-     * The port the SMTP server is on.
-     * @var integer
-     */
-    var $port = 25;
-
-    /**
-     * Should SMTP authentication be used?
-     *
-     * This value may be set to true, false or the name of a specific
-     * authentication method.
-     *
-     * If the value is set to true, the Net_SMTP package will attempt to use
-     * the best authentication method advertised by the remote SMTP server.
-     *
-     * @var mixed
-     */
-    var $auth = false;
-
-    /**
-     * The username to use if the SMTP server requires authentication.
-     * @var string
-     */
-    var $username = '';
-
-    /**
-     * The password to use if the SMTP server requires authentication.
-     * @var string
-     */
-    var $password = '';
-
-    /**
-     * Hostname or domain that will be sent to the remote SMTP server in the
-     * HELO / EHLO message.
-     *
-     * @var string
-     */
-    var $localhost = 'localhost';
-
-    /**
-     * SMTP connection timeout value.  NULL indicates no timeout.
-     *
-     * @var integer
-     */
-    var $timeout = null;
-
-    /**
-     * Whether to use VERP or not. If not a boolean, the string value
-     * will be used as the VERP separators.
-     *
-     * @var mixed boolean or string
-     */
-    var $verp = false;
-
-    /**
-     * Turn on Net_SMTP debugging?
-     *
-     * @var boolean $debug
-     */
-    var $debug = false;
-
-    /**
-     * Constructor.
-     *
-     * Instantiates a new Mail_smtp:: object based on the parameters
-     * passed in. It looks for the following parameters:
-     *     host        The server to connect to. Defaults to localhost.
-     *     port        The port to connect to. Defaults to 25.
-     *     auth        SMTP authentication.  Defaults to none.
-     *     username    The username to use for SMTP auth. No default.
-     *     password    The password to use for SMTP auth. No default.
-     *     localhost   The local hostname / domain. Defaults to localhost.
-     *     timeout     The SMTP connection timeout. Defaults to none.
-     *     verp        Whether to use VERP or not. Defaults to false.
-     *     debug       Activate SMTP debug mode? Defaults to false.
-     *
-     * If a parameter is present in the $params array, it replaces the
-     * default.
-     *
-     * @param array Hash containing any parameters different from the
-     *              defaults.
-     * @access public
-     */
-    function Mail_smtp($params)
-    {
-        if (isset($params['host'])) $this->host = $params['host'];
-        if (isset($params['port'])) $this->port = $params['port'];
-        if (isset($params['auth'])) $this->auth = $params['auth'];
-        if (isset($params['username'])) $this->username = $params['username'];
-        if (isset($params['password'])) $this->password = $params['password'];
-        if (isset($params['localhost'])) $this->localhost = $params['localhost'];
-        if (isset($params['timeout'])) $this->timeout = $params['timeout'];
-        if (isset($params['verp'])) $this->verp = $params['verp'];
-        if (isset($params['debug'])) $this->debug = (boolean)$params['debug'];
-    }
-
-    /**
-     * Implements Mail::send() function using SMTP.
-     *
-     * @param mixed $recipients Either a comma-seperated list of recipients
-     *              (RFC822 compliant), or an array of recipients,
-     *              each RFC822 valid. This may contain recipients not
-     *              specified in the headers, for Bcc:, resending
-     *              messages, etc.
-     *
-     * @param array $headers The array of headers to send with the mail, in an
-     *              associative array, where the array key is the
-     *              header name (e.g., 'Subject'), and the array value
-     *              is the header value (e.g., 'test'). The header
-     *              produced from those values would be 'Subject:
-     *              test'.
-     *
-     * @param string $body The full text of the message body, including any
-     *               Mime parts, etc.
-     *
-     * @return mixed Returns true on success, or a PEAR_Error
-     *               containing a descriptive error message on
-     *               failure.
-     * @access public
-     */
-    function send($recipients, $headers, $body)
-    {
-        include_once 'Net/SMTP.php';
-
-        if (!($smtp = &new Net_SMTP($this->host, $this->port, $this->localhost))) {
-            return PEAR::raiseError('unable to instantiate Net_SMTP object');
-        }
-
-        if ($this->debug) {
-            $smtp->setDebug(true);
-        }
-
-        if (PEAR::isError($smtp->connect($this->timeout))) {
-            return PEAR::raiseError('unable to connect to smtp server ' .
-                                    $this->host . ':' . $this->port);
-        }
-
-        if ($this->auth) {
-            $method = is_string($this->auth) ? $this->auth : '';
-
-            if (PEAR::isError($smtp->auth($this->username, $this->password,
-                              $method))) {
-                return PEAR::raiseError('unable to authenticate to smtp server');
-            }
-        }
-
-        $headerElements = $this->prepareHeaders($headers);
-        if (PEAR::isError($headerElements)) {
-            return $headerElements;
-        }
-        list($from, $text_headers) = $headerElements;
-
-        /* Since few MTAs are going to allow this header to be forged
-         * unless it's in the MAIL FROM: exchange, we'll use
-         * Return-Path instead of From: if it's set. */
-        if (!empty($headers['Return-Path'])) {
-            $from = $headers['Return-Path'];
-        }
-
-        if (!isset($from)) {
-            return PEAR::raiseError('No from address given');
-        }
-
-        $args['verp'] = $this->verp;
-        if (PEAR::isError($smtp->mailFrom($from, $args))) {
-            return PEAR::raiseError('unable to set sender to [' . $from . ']');
-        }
-
-        $recipients = $this->parseRecipients($recipients);
-        if (PEAR::isError($recipients)) {
-            return $recipients;
-        }
-
-        foreach ($recipients as $recipient) {
-            if (PEAR::isError($res = $smtp->rcptTo($recipient))) {
-                return PEAR::raiseError('unable to add recipient [' .
-                                        $recipient . ']: ' . $res->getMessage());
-            }
-        }
-
-        if (PEAR::isError($smtp->data($text_headers . "\r\n" . $body))) {
-            return PEAR::raiseError('unable to send data');
-        }
-
-        $smtp->disconnect();
-        return true;
-    }
-
-}
diff --git a/htdocs/includes/nusoap/lib/Mail/xmail.dtd b/htdocs/includes/nusoap/lib/Mail/xmail.dtd
deleted file mode 100755
index 9f42ca8b331..00000000000
--- a/htdocs/includes/nusoap/lib/Mail/xmail.dtd
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/htdocs/includes/nusoap/lib/Mail/xmail.xsl b/htdocs/includes/nusoap/lib/Mail/xmail.xsl
deleted file mode 100755
index 0b948913f84..00000000000
--- a/htdocs/includes/nusoap/lib/Mail/xmail.xsl
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-	
-
-		
-				
-					
-						
-							
-								
-							
-						
-					
-				
-		
-
-		
-
-			
-			: 
-			
-
-			
-				

-			
-
-			
-				;
	
-				
-				="
-				
-				"
-			
-
-			
-				

-			
-
-		
-
-		

-
-		
-		
-			
-				
-				

-			
-
-			
-				
-					--

-					
-				
-
-				----

-
-			
-		
-	
-
-
-	
-		
-	
-
-
\ No newline at end of file
diff --git a/htdocs/index.php b/htdocs/index.php
index 70950fb0b26..d0056d0bbda 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -1,9 +1,9 @@
 
- * Copyright (C) 2004-2013	Laurent Destailleur		
- * Copyright (C) 2005-2012	Regis Houssin			
- * Copyright (C) 2011-2012 	Juanjo Menent			
- * Copyright (C) 2015       Marcos García           
+/* Copyright (C) 2001-2004 Rodolphe Quiedeville	
+ * Copyright (C) 2004-2013 Laurent Destailleur	
+ * Copyright (C) 2005-2012 Regis Houssin	
+ * Copyright (C) 2011-2012 Juanjo Menent	
+ * Copyright (C) 2015      Marcos García        
  *
  * 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
@@ -60,6 +60,7 @@ if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax dis
 
 
 
+
 /*
  * View
  */
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 29adb70c46e..1dde6d5d37c 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/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);
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 7b42efdae0e..7ad3fd91443 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -49,7 +49,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (41
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (412, 41,  '10','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (413, 41,   '0','0','VAT Rate 0',1);
 
--- BRASIL (id country=59)
+-- BRASIL (id country=56)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (561, 56,  '0','0','VAT reduced rate',1);
 
 -- BULGARIA (id country=59)
@@ -139,6 +139,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (83
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (84,     8,    '9','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (85,     8,  '4.8','0','VAT reduced rate',1);
 
+-- IVORY COST (id country=21)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21,  '0','0',0,0,0,0,'IVA Rate 0',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21,  '18','0',7.5,2,0,0,'IVA standard rate',1);
+
 -- JAPAN (id country=123)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1231, 123, '0','0','VAT Rate 0',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1232, 123, '5','0','VAT Rate 5',1);
@@ -215,6 +219,11 @@ INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES ( 2
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (861, 86, '13', '0', 'IVA 13', 1);
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (862, 86,  '0', '0', 'SIN IVA', 1);
 
+-- SENEGAL (id country=22)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (221, 22, '18', '0', 'VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (222, 22, '10', '0', 'VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (223, 22, '0', '0', 'VAT Rate 0', 1);
+
 -- SLOVAKIA (id country=201)
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2011, 201, '19', '0', 'VAT standard rate', 1);
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2012, 201, '10', '0', 'VAT reduced rate', 1);
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 73312c6c613..0c44708c6db 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/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;
@@ -1171,3 +1174,8 @@ ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INT
 ALTER TABLE llx_extrafields ADD COLUMN perms varchar(255) after fieldrequired;
 ALTER TABLE llx_extrafields ADD COLUMN list integer DEFAULT 0 after perms;
 
+-- IVORY COST (id country=21)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21,  '0','0',0,0,0,0,'IVA Rate 0',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21,  '18','0',7.5,2,0,0,'IVA standard rate',1);
+
+ALTER TABLE llx_livraison MODIFY COLUMN date_delivery DATETIME NULL DEFAULT NULL;
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 390f4fae016..cc3d91812ab 100644
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -64,6 +64,7 @@ create table llx_payment_loan
   fk_user_modif		integer
 )ENGINE=innodb;
 
+ALTER TABLE llx_extrafields ADD COLUMN fieldrequired integer DEFAULT 0;
 ALTER TABLE llx_extrafields ADD COLUMN perms varchar(255) after fieldrequired;
 ALTER TABLE llx_extrafields ADD COLUMN list integer DEFAULT 0 after perms;
 
@@ -180,6 +181,8 @@ ALTER TABLE llx_stock_mouvement ADD COLUMN batch varchar(30) DEFAULT NULL;
 ALTER TABLE llx_stock_mouvement ADD COLUMN eatby date DEFAULT NULL;
 ALTER TABLE llx_stock_mouvement ADD COLUMN sellby date DEFAULT NULL;
 
+UPDATE llx_product_batch SET batch = 'unknown' WHERE batch IS NULL;
+ALTER TABLE llx_product_batch MODIFY COLUMN batch varchar(30) NOT NULL;
 
 
 CREATE TABLE llx_expensereport (
@@ -378,6 +381,9 @@ CREATE TABLE llx_askpricesupplierdet_extrafields (
 -- End Module AskPriceSupplier --
 
 
+ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime after date_approve;
+ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer after fk_user_approve;
+
 ALTER TABLE llx_societe ADD COLUMN fk_incoterms integer;
 ALTER TABLE llx_societe ADD COLUMN location_incoterms varchar(255);
 ALTER TABLE llx_propal ADD COLUMN fk_incoterms integer;
@@ -424,7 +430,7 @@ ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_
 ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL after country;
 ALTER TABLE llx_don CHANGE COLUMN fk_paiement fk_payment integer;
 ALTER TABLE llx_don ADD COLUMN paid smallint default 0 NOT NULL after fk_payment;
-ALTER TABLE llx_don CHANGE COLUMN fk_don_projet fk_project integer NULL;
+ALTER TABLE llx_don CHANGE COLUMN fk_don_projet fk_projet integer NULL;
 
 create table llx_don_extrafields
 (
@@ -511,3 +517,24 @@ create table llx_c_price_global_variable_updater
 	next_update			integer DEFAULT 0,
 	last_status			text DEFAULT NULL
 )ENGINE=innodb;
+
+ALTER TABLE llx_adherent CHANGE COLUMN note note_private text DEFAULT NULL;
+ALTER TABLE llx_adherent ADD COLUMN note_public text DEFAULT NULL after note_private;
+
+CREATE TABLE IF NOT EXISTS llx_propal_merge_pdf_product (
+  rowid integer NOT NULL auto_increment PRIMARY KEY,
+  fk_product integer NOT NULL,
+  file_name varchar(200) NOT NULL,
+  lang 	varchar(5) DEFAULT NULL,
+  fk_user_author integer DEFAULT NULL,
+  fk_user_mod integer NOT NULL,
+  datec datetime NOT NULL,
+  tms timestamp NOT NULL,
+  import_key varchar(14) DEFAULT NULL
+) ENGINE=InnoDB;
+
+
+-- Feature request: A page to merge two thirdparties into one #2613
+ALTER TABLE llx_categorie_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL;
+ALTER TABLE llx_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL;
+ALTER TABLE llx_user CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL;
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index e7f9c246834..493d5b1124d 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -54,7 +54,8 @@ create table llx_adherent
   statut           smallint NOT NULL DEFAULT 0,
   public           smallint NOT NULL DEFAULT 0, -- certain champ de la fiche sont ils public ou pas ?
   datefin          datetime,  -- date de fin de validite de la cotisation
-  note             text,
+  note_private     text DEFAULT NULL,
+  note_public      text DEFAULT NULL,
   datevalid        datetime,  -- date de validation
   datec            datetime,  -- date de creation
   tms              timestamp, -- date de modification
diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
index d8e84769cf0..7293c152b9a 100644
--- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
+++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
@@ -17,9 +17,9 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_categorie_fournisseur ADD PRIMARY KEY pk_categorie_fournisseur (fk_categorie, fk_societe);
+ALTER TABLE llx_categorie_fournisseur ADD PRIMARY KEY pk_categorie_fournisseur (fk_categorie, fk_soc);
 ALTER TABLE llx_categorie_fournisseur ADD INDEX idx_categorie_fournisseur_fk_categorie (fk_categorie);
-ALTER TABLE llx_categorie_fournisseur ADD INDEX idx_categorie_fournisseur_fk_societe (fk_societe);
+ALTER TABLE llx_categorie_fournisseur ADD INDEX idx_categorie_fournisseur_fk_societe (fk_soc);
 
 ALTER TABLE llx_categorie_fournisseur ADD CONSTRAINT fk_categorie_fournisseur_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
-ALTER TABLE llx_categorie_fournisseur ADD CONSTRAINT fk_categorie_fournisseur_fk_soc   FOREIGN KEY (fk_societe) REFERENCES llx_societe (rowid);
+ALTER TABLE llx_categorie_fournisseur ADD CONSTRAINT fk_categorie_fournisseur_fk_soc   FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
index 90df0e6f969..5a270b1fad9 100644
--- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
@@ -22,6 +22,6 @@
 create table llx_categorie_fournisseur
 (
   fk_categorie  integer NOT NULL,
-  fk_societe    integer NOT NULL,
+  fk_soc    integer NOT NULL,
   import_key    varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql
index 6c912acb4c4..17605fc3520 100644
--- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql
+++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql
@@ -16,9 +16,9 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_categorie_societe ADD PRIMARY KEY pk_categorie_societe (fk_categorie, fk_societe);
+ALTER TABLE llx_categorie_societe ADD PRIMARY KEY pk_categorie_societe (fk_categorie, fk_soc);
 ALTER TABLE llx_categorie_societe ADD INDEX idx_categorie_societe_fk_categorie (fk_categorie);
-ALTER TABLE llx_categorie_societe ADD INDEX idx_categorie_societe_fk_societe (fk_societe);
+ALTER TABLE llx_categorie_societe ADD INDEX idx_categorie_societe_fk_societe (fk_soc);
 
 ALTER TABLE llx_categorie_societe ADD CONSTRAINT fk_categorie_societe_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
-ALTER TABLE llx_categorie_societe ADD CONSTRAINT fk_categorie_societe_fk_soc   FOREIGN KEY (fk_societe) REFERENCES llx_societe (rowid);
+ALTER TABLE llx_categorie_societe ADD CONSTRAINT fk_categorie_societe_fk_soc   FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql
index 6543fc52bc8..c347d40c372 100644
--- a/htdocs/install/mysql/tables/llx_categorie_societe.sql
+++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql
@@ -20,6 +20,6 @@
 create table llx_categorie_societe
 (
   fk_categorie  integer NOT NULL,
-  fk_societe    integer NOT NULL,
+  fk_soc    integer NOT NULL,
   import_key    varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 7bf22df1a1d..3511aa7ec78 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -62,10 +62,12 @@ create table llx_commande
   fk_mode_reglement		integer,						-- mode de reglement
   
   date_livraison		date 	  default NULL,
-  fk_shipping_method    integer,                        -- shipping method id
+  fk_shipping_method    integer,                       -- shipping method id
   fk_availability		integer NULL,
   fk_input_reason		integer,						-- id coming from c_input_reason, '0' if no defined
   fk_delivery_address	integer,						-- delivery address (deprecated)
+  fk_incoterms          integer,						-- for incoterms
+  location_incoterms    varchar(255),					-- for incoterms
   import_key			varchar(14),
   extraparams			varchar(255)					-- for stock other parameters with json format
   
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 17027e16960..33588d8bf66 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -36,11 +36,13 @@ create table llx_commande_fournisseur
   date_creation			datetime,                      -- date de creation 
   date_valid			datetime,                      -- date de validation
   date_approve			datetime,                      -- date de approve
+  date_approve2			datetime,                      -- date de approve 2 (when double approving is accivated)
   date_commande			date,                          -- date de la commande
   fk_user_author		integer,                       -- user making creation
   fk_user_modif         integer,                       -- user making last change
   fk_user_valid			integer,                       -- user validating
   fk_user_approve		integer,                       -- user approving
+  fk_user_approve2		integer,                       -- user approving 2 (when double approving is accivated)
   source				smallint NOT NULL,			-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
   amount_ht				real      default 0,
@@ -60,6 +62,8 @@ create table llx_commande_fournisseur
   fk_cond_reglement		integer,                       -- condition de reglement
   fk_mode_reglement		integer,                       -- mode de reglement
   fk_input_method	    integer default 0,            -- id coming from c_input_reason, '0' if no defined
+  fk_incoterms          integer,						-- for incoterms
+  location_incoterms    varchar(255),					-- for incoterms
   import_key			varchar(14),
   extraparams			varchar(255)					-- for stock other parameters with json format
   
diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql
index 0e75c50305b..73e29e8bdd4 100644
--- a/htdocs/install/mysql/tables/llx_contrat.sql
+++ b/htdocs/install/mysql/tables/llx_contrat.sql
@@ -23,12 +23,12 @@ create table llx_contrat
   rowid						integer AUTO_INCREMENT PRIMARY KEY,
   ref						varchar(30),		            -- contrat reference
   ref_supplier				varchar(30),		            -- suplier contract ref
-  ref_ext				varchar(30),		            -- external contract ref
-  entity					integer DEFAULT 1 NOT NULL,	-- multi company id
+  ref_ext					varchar(30),		            -- external contract ref
+  entity					integer DEFAULT 1 NOT NULL,		-- multi company id
   tms						timestamp,
-  datec						datetime,                   -- creation date
+  datec						datetime,                   	-- creation date
   date_contrat				datetime,
-  statut					smallint DEFAULT 0,
+  statut					smallint DEFAULT 0,				-- not used. deprecated
   mise_en_service			datetime,
   fin_validite				datetime,
   date_cloture				datetime,
diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql
index 61036c3bd4b..a7ed4858024 100644
--- a/htdocs/install/mysql/tables/llx_cronjob.sql
+++ b/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,
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index d33467f9a7b..f2aa52f073d 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -27,8 +27,8 @@ create table llx_don
   entity          integer DEFAULT 1 NOT NULL,	-- multi company id
   tms             timestamp,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
-  datec           datetime,                     -- date de creation de l'enregistrement
-  datedon         datetime,                     -- date du don/promesse
+  datec           datetime,                     -- Create date
+  datedon         datetime,                     -- Date of the donation/promise
   amount          real DEFAULT 0,
   fk_payment      integer,
   paid            smallint default 0 NOT NULL,
@@ -44,7 +44,7 @@ create table llx_don
   phone           varchar(24),
   phone_mobile    varchar(24),
   public          smallint DEFAULT 1 NOT NULL,   -- Donation is public ? (0,1)
-  fk_project      integer NULL,                  -- Donation is given for a project ?
+  fk_projet       integer NULL,                  -- Donation is given for a project ?
   fk_user_author  integer NOT NULL,
   fk_user_valid   integer NULL,
   note_private    text,
diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql
index 0a152b13069..d142a5cc628 100644
--- a/htdocs/install/mysql/tables/llx_expedition.sql
+++ b/htdocs/install/mysql/tables/llx_expedition.sql
@@ -50,6 +50,8 @@ create table llx_expedition
   weight                float,							-- weight
   note_private          text,
   note_public           text,
-  model_pdf             varchar(255)
+  model_pdf             varchar(255),
+  fk_incoterms          integer,						-- for incoterms
+  location_incoterms    varchar(255)					-- for incoterms
   
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index eada5b46c2e..93a376c599c 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -75,6 +75,9 @@ create table llx_facture
   note_private			text,
   note_public			text,
   model_pdf				varchar(255),
+
+  fk_incoterms          integer,								-- for incoterms
+  location_incoterms    varchar(255),							-- for incoterms
   import_key			varchar(14),
   extraparams			varchar(255),							-- for stock other parameters with json format
 
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql
index 33773b7a9cb..703b86841f9 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql
@@ -60,12 +60,14 @@ create table llx_facture_fourn
   fk_projet				integer,                       -- projet auquel est associee la facture
 
   fk_account            integer,                       -- bank account
-  fk_cond_reglement		integer,   	                   -- condition de reglement (30 jours, fin de mois ...)
-  fk_mode_reglement		integer,                	   -- mode de reglement (CHQ, VIR, ...)
-  date_lim_reglement 	date,                          -- date limite de reglement
+  fk_cond_reglement		integer,   	                   	-- condition de reglement (30 jours, fin de mois ...)
+  fk_mode_reglement		integer,                	   	-- mode de reglement (CHQ, VIR, ...)
+  date_lim_reglement 	date,                          	-- date limite de reglement
 
   note_private			text,
   note_public			text,
+  fk_incoterms          integer,						-- for incoterms
+  location_incoterms    varchar(255),					-- for incoterms
   model_pdf				varchar(255),
   import_key			varchar(14),
   extraparams			varchar(255)					-- for stock other parameters with json format
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index cba4b580cf0..7c1151f36ca 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -50,9 +50,9 @@ create table llx_facture_rec
   note_private       text,
   note_public        text,
 
-  usenewprice        integer DEFAULT 0,
-  frequency          integer,
-  unit_frequency     varchar(2) DEFAULT 'd',
+  usenewprice        integer DEFAULT 0,			-- update invoice with current price of product instead of recorded price
+  frequency          integer,						-- frequency (for example: 3 for every 3 month)
+  unit_frequency     varchar(2) DEFAULT 'm',		-- 'm' for month (date_when must be a day <= 28), 'y' for year, ... 
   
   date_when          datetime DEFAULT NULL,		-- date for next gen (when an invoice is generated, this field must be updated with next date)
   date_last_gen      datetime DEFAULT NULL,		-- date for last gen (date with last successfull generation of invoice)
diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql
index 486212158aa..c999cfdb3c2 100644
--- a/htdocs/install/mysql/tables/llx_livraison.sql
+++ b/htdocs/install/mysql/tables/llx_livraison.sql
@@ -33,12 +33,14 @@ create table llx_livraison
   fk_user_author        integer,						-- createur du bon de livraison
   date_valid            datetime,						-- date de validation
   fk_user_valid         integer,						-- valideur du bon de livraison
-  date_delivery 	    date		DEFAULT NULL,		-- delivery date
+  date_delivery 	    datetime		DEFAULT NULL,	-- delivery date
   fk_address  			integer,						-- delivery address (deprecated)
   fk_statut             smallint     DEFAULT 0,
   total_ht              double(24,8) DEFAULT 0,
   note_private          text,
   note_public           text,
-  model_pdf             varchar(255)
+  model_pdf             varchar(255),
+  fk_incoterms          integer,						-- for incoterms
+  location_incoterms    varchar(255)					-- for incoterms
   
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_batch.key.sql b/htdocs/install/mysql/tables/llx_product_batch.key.sql
index f1f24c8b81a..d022beac743 100644
--- a/htdocs/install/mysql/tables/llx_product_batch.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_batch.key.sql
@@ -16,5 +16,6 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_product_batch ADD INDEX idx_fk_product_stock (fk_product_stock);
+ALTER TABLE llx_product_batch ADD INDEX idx_fk_product_stock(fk_product_stock);
+ALTER TABLE llx_product_batch ADD INDEX idx_batch(batch);
 ALTER TABLE llx_product_batch ADD CONSTRAINT fk_product_batch_fk_product_stock FOREIGN KEY (fk_product_stock) REFERENCES llx_product_stock (rowid);
diff --git a/htdocs/install/mysql/tables/llx_product_batch.sql b/htdocs/install/mysql/tables/llx_product_batch.sql
index cbcca4ecacd..1cf72151304 100644
--- a/htdocs/install/mysql/tables/llx_product_batch.sql
+++ b/htdocs/install/mysql/tables/llx_product_batch.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_product_batch (
   fk_product_stock integer NOT NULL,
   eatby datetime DEFAULT NULL,
   sellby datetime DEFAULT NULL,
-  batch varchar(30) DEFAULT NULL,
+  batch varchar(30) NOT NULL,
   qty double NOT NULL DEFAULT 0,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index 90996073021..8090b1fcb4d 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -65,6 +65,8 @@ create table llx_propal
   fk_shipping_method    integer,                        -- shipping method id
   fk_availability		integer NULL,
   fk_input_reason		integer,
+  fk_incoterms          integer,										-- for incoterms
+  location_incoterms    varchar(255),								-- for incoterms
   import_key			varchar(14),
   extraparams			varchar(255),					-- for stock other parameters with json format
   fk_delivery_address	integer							-- delivery address (deprecated)
diff --git a/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
new file mode 100644
index 00000000000..93af93c9190
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
@@ -0,0 +1,28 @@
+-- 
+-- Copyright (C) 2013	Florian HENRY 
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see .
+
+CREATE TABLE IF NOT EXISTS llx_propal_merge_pdf_product (
+  rowid integer NOT NULL auto_increment PRIMARY KEY,
+  fk_product integer NOT NULL,
+  file_name varchar(200) NOT NULL,
+  lang 	varchar(5) DEFAULT NULL,
+  fk_user_author integer DEFAULT NULL,
+  fk_user_mod integer NOT NULL,
+  datec datetime NOT NULL,
+  tms timestamp NOT NULL,
+  import_key varchar(14) DEFAULT NULL
+) ENGINE=InnoDB;
+
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 801df8439b5..61af3997020 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -72,6 +72,8 @@ create table llx_societe
   fournisseur              tinyint        DEFAULT 0,            		-- fournisseur 0/1
   supplier_account         varchar(32),                         		-- compte client chez un fournisseur
   fk_prospectlevel         varchar(12),                         		-- prospect level (in llx_c_prospectlevel)
+  fk_incoterms             integer,										-- for incoterms
+  location_incoterms       varchar(255),								-- for incoterms
   customer_bad             tinyint        DEFAULT 0,            		-- mauvais payeur 0/1
   customer_rate            real           DEFAULT 0,            		-- taux fiabilite client (0 a 1)
   supplier_rate            real           DEFAULT 0,            		-- taux fiabilite fournisseur (0 a 1)
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
index 22f95455b31..0b66e7984d9 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
@@ -29,8 +29,8 @@ ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_fac
 
 
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_user    FOREIGN KEY (fk_user)    REFERENCES llx_user (rowid);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_soc     FOREIGN KEY (fk_soc)     REFERENCES llx_societe (rowid);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture_line   FOREIGN KEY (fk_facture_line) REFERENCES llx_facturedet (rowid);
+ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_soc     FOREIGN KEY (fk_soc)     REFERENCES llx_societe (rowid);
+ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_facture_line   FOREIGN KEY (fk_facture_line) REFERENCES llx_facturedet (rowid);
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture        FOREIGN KEY (fk_facture)        REFERENCES llx_facture (rowid);
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture_source FOREIGN KEY (fk_facture_source) REFERENCES llx_facture (rowid);
 
diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql
index 897228a9c43..8232e7cacb7 100644
--- a/htdocs/install/mysql/tables/llx_user.key.sql
+++ b/htdocs/install/mysql/tables/llx_user.key.sql
@@ -21,7 +21,7 @@
 
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity);
 
-ALTER TABLE llx_user ADD INDEX uk_user_fk_societe   (fk_societe);
+ALTER TABLE llx_user ADD INDEX uk_user_fk_societe   (fk_soc);
 
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_socpeople (fk_socpeople);
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_member    (fk_member);
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index 28385298125..a4c04f4e864 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -52,7 +52,7 @@ create table llx_user
   admin             smallint DEFAULT 0,
   module_comm       smallint DEFAULT 1,
   module_compta     smallint DEFAULT 1,
-  fk_societe        integer,
+  fk_soc			integer,
   fk_socpeople      integer,
   fk_member         integer,
   fk_user           integer,               -- Hierarchic parent
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 3bf5255a5fc..37d5630fbea 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -119,7 +119,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user FOR EACH ROW EX
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_usergroup FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_cronjob FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_printer_ipp FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_printing FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 
 CREATE OR REPLACE FUNCTION update_modified_column_date_m()	RETURNS TRIGGER AS $$ BEGIN NEW.date_m = now(); RETURN NEW; END; $$ LANGUAGE plpgsql;
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_directories FOR EACH ROW EXECUTE PROCEDURE update_modified_column_date_m();
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index e75b7d8389c..8d63f02ddc8 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3391,7 +3391,7 @@ function migrate_mode_reglement($db,$langs,$conf)
 
 				if ($resqla && $resql)
 				{
-					foreach($elements['tables'] as $table)		// FIXME We must not update tables if oldid is not renamed
+					foreach($elements['tables'] as $table)
 					{
 						$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 						$sql.= "fk_mode_reglement = ".$elements['new_id'][$key];
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 2777d5fac6a..e96b095b5d0 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 0f766d6beaa..1e1bc134583 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/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
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 1ca60a487d1..103f8dc779d 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -294,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
 
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index 77ec72df825..967a8906157 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/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=ق ٪ أضيفت بنجاح.
-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
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index c3c9b446364..45f695fa7dc 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/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. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang
index a6bc12ad61a..fe30adb3cee 100644
--- a/htdocs/langs/ar_SA/donations.lang
+++ b/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
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 4635ed9b4be..7a6c5c79081 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/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
diff --git a/htdocs/langs/ar_SA/loan.lang b/htdocs/langs/ar_SA/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/ar_SA/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
 This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.

+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 03b8db4771f..676e1e8aba6 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 45649f61d53..ed51c527393 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/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=الثلاثاء
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index 24a7db59d86..2424a0118b4 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/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=هل أنت متأكد من أن هذا الأمر استنساخ ٪ ق؟
 DispatchSupplierOrder=%s استقبال النظام مورد
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=ممثل العميل متابعة النظام
 TypeContact_commande_internal_SHIPPING=ممثل الشحن متابعة
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 8154a44c9ea..4af940e2fdf 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/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=من أجل أن ترفض ٪ ق ق ٪
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index e79c928e86b..945757cd0ef 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 61d3720906e..511c52cdfe0 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/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=نشاط المشروع هذا الشهر
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index ba8a8febbad..56b60af94b8 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=المرجع. إرسال
 Sending=إرسال
 Sendings=الإرسال
+AllSendings=All Shipments
 Shipment=إرسال
 Shipments=شحنات
 ShowSending=Show Sending
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 622c3c5575d..2220fa67658 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/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)
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index e1d603d5a23..42ca0f9cb57 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Счетоводството код зависи от код на трето лице. Код се състои от буквата "C" на първа позиция, следван от първите 5 символа на код на трета страна.
 UseNotifications=Използвайте уведомления
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index 803c9a2ba95..3c0497e6c70 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/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
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index afa18f81cac..eacfbd69a02 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -294,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
 
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 9e969cad703..c38713bb228 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/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=%s е добавен успешно.
-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
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index 9bd0fcaa449..39c37094ded 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/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. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=Системния команден ред за стартиране.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Информация
 # Common
diff --git a/htdocs/langs/bg_BG/donations.lang b/htdocs/langs/bg_BG/donations.lang
index e64cf417e46..e81fdc8da28 100644
--- a/htdocs/langs/bg_BG/donations.lang
+++ b/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
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 6231717fdd5..aba2303da23 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/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=Задължителни параметри на настройката все още не са определени
diff --git a/htdocs/langs/bg_BG/loan.lang b/htdocs/langs/bg_BG/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/bg_BG/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
 This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.

+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 186205e9b8b..003c2d40637 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 579a2d355a3..e441743cfd0 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/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=Вторник
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index b68ed897256..6033e574571 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/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=Сигурен ли сте, че искате да клонирате за този %s?
 DispatchSupplierOrder=Получаване %s доставчика ред
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Представител проследяване поръчка на клиента
 TypeContact_commande_internal_SHIPPING=Представител проследяване доставка
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 4e636a028f0..adb385d5a47 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/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.
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index b742caded2a..a4a601493bd 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 7fda3412b19..bedf0a7b8f6 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/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=Дейност по проект, този месец
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index 5b7e942d65e..71f689c32dd 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Реф. пратка
 Sending=Пратка
 Sendings=Превозите
+AllSendings=All Shipments
 Shipment=Пратка
 Shipments=Превозите
 ShowSending=Show Sending
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index b98cea1ccfe..b737c270035 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/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)
diff --git a/htdocs/langs/bn_BD/loan.lang b/htdocs/langs/bn_BD/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/bn_BD/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
 This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.

+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index d882817a90b..5f59ffde1f2 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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. 
 Primjeri: 
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index d6a5c96ae01..614ec124570 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/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
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 9555ed5ea91..2ccb041fd4f 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -294,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
 
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 76e3aeecdc3..1e2151b4945 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/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=%s 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
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index db866d27f75..c3144314bef 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/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. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=Sistemska komanda za izvršenje
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Inromacije
 # Common
diff --git a/htdocs/langs/bs_BA/donations.lang b/htdocs/langs/bs_BA/donations.lang
index 53b847f7c5a..59840a6662e 100644
--- a/htdocs/langs/bs_BA/donations.lang
+++ b/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
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/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
diff --git a/htdocs/langs/bs_BA/loan.lang b/htdocs/langs/bs_BA/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/bs_BA/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
 This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.

+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 6ce54e5dbd9..b2ea4f11995 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 8ccf22d049a..7b8d50fd9ef 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/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
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/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 %s ?
 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
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/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.
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index b0ee1036827..79debdf06b8 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 7bbafa2fa64..c8f591a7262 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/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
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index 0324d02b664..4957b903f6b 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/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
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 2a329c91d10..7a367073af7 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/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)
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 239694fc251..cacc980f0e3 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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.
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
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index f0912920d56..09836162cf5 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/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
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index ec60df3dd2d..d1078e9f3ce 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -294,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
 
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index c6e5221d79e..4de38bfe254 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/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
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index eb350eaaaa9..584698000fd 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/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. 
 Por ejemplo para llamar el mé
 CronMethodHelp=El método a lanzar. 
 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 fecth
 CronArgsHelp=Los argumentos del método. 
 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 0, RefProduit
 CronCommandHelp=El comando del sistema a executar
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informació
 # Common
diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang
index 66d683b5b62..e17aaece32f 100644
--- a/htdocs/langs/ca_ES/donations.lang
+++ b/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
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 927b9a3af1e..8377ca7b49c 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/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
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
 This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.

+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 5983e04c208..5305476affb 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 80bf6b6e547..bafdc982e29 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/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
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 2749007c0ce..5088cabc352 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/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 %s?
 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
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 316704111fa..b8b1dcf2992 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/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
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 5c3a7e7b2d1..3714e0bff6a 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 593de6fcc1c..4aae30221f4 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/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
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 21562f914cc..3fafdaa9e63 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/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
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index d0b6422c8e8..a06046334e5 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/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)
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index e857b9ee394..3233222e753 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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: 
 %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 "C" 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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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. 
 Příklady: 
 / Usr / local / share / GeoIP / GeoIP.dat 
 / 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
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 8a2d630df34..4d1d71528a4 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/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
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 0317d44870a..56e82e77ef4 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -294,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
 
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index fe5121d4974..f4249b7c085 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/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=%s 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
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 83947327da5..b9411cbeda2 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/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. 
 Např načíst metody objektu výro
 CronMethodHelp=Objekt způsob startu. 
 Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, hodnota metody je fecth
 CronArgsHelp=Metoda argumenty. 
 Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, může být hodnota paramters být 0, ProductRef
 CronCommandHelp=Systém příkazového řádku spustit.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informace
 # Common
diff --git a/htdocs/langs/cs_CZ/donations.lang b/htdocs/langs/cs_CZ/donations.lang
index ac953ea4487..609c56121a8 100644
--- a/htdocs/langs/cs_CZ/donations.lang
+++ b/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
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index d2570c905ce..9443bb8c683 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/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
diff --git a/htdocs/langs/cs_CZ/loan.lang b/htdocs/langs/cs_CZ/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/cs_CZ/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
 This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.

+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 443430caaea..43b66651949 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 17e4c56569f..a712b705f4b 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/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ý
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index 6aa596baa1b..860d43d75b6 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/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 %s?
 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
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index f0e4b814a04..475e40fdbad 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/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.
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 7fc24c7a1a3..ac390130cb1 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 5655c05549e..515e20fac14 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Seznam dodavatelských faktur souvisejíc
 ListContractAssociatedProject=Seznam zakázek souvisejících s projektem
 ListFichinterAssociatedProject=Seznam zákroků spojených s projektem
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Seznam událostí spojených s projektem
 ActivityOnProjectThisWeek=Týdenní projektová aktivita
 ActivityOnProjectThisMonth=Měsíční projektová aktivita
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index f794bceaa84..31a10e77e1b 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. náklad
 Sending=Náklad
 Sendings=Zásilky
+AllSendings=All Shipments
 Shipment=Náklad
 Shipments=Zásilky
 ShowSending=Show Sending
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index 99a629ba847..2c56c9da67f 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/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)
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 8cbc1e17779..50aff90a32d 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Adviséringer
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donationer
@@ -508,14 +511,14 @@ Module1400Name=Regnskabsmæssig ekspert
 Module1400Desc=Regnskabsmæssig forvaltning for eksperter (dobbelt parterne)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorier
-Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG 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=Handlinger / opgaver og dagsorden forvaltning
 Module2500Name=Elektronisk 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=Læs tjenester
 Permission532=Opret / ændre tjenester
 Permission534=Slet tjenester
@@ -746,6 +754,7 @@ Permission1185=Godkend leverandør ordrer
 Permission1186=Bestil leverandør ordrer
 Permission1187=Anerkende modtagelsen af leverandør ordrer
 Permission1188=Luk leverandør ordrer
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Få resultatet af en eksport
 Permission1202=Opret / Modify en eksport
 Permission1231=Læs leverandør fakturaer
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Kør massen import af eksterne data i databasen (data belastning)
 Permission1321=Eksporter kunde fakturaer, attributter og betalinger
 Permission1421=Eksporter kundens ordrer og attributter
-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=Læs aktioner (begivenheder eller opgaver) i tilknytning til hans konto
 Permission2402=Opret / ændre / slette handlinger (begivenheder eller opgaver) i tilknytning til hans konto
 Permission2403=Læs aktioner (begivenheder eller opgaver) af andre
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Retur en regnskabspool kode bygget af %s efterfulgt af
 ModuleCompanyCodePanicum=Retur tom regnskabspool kode.
 ModuleCompanyCodeDigitaria=Regnskabsmæssig kode afhænger tredjepart kode. Koden er sammensat af tegnet "C" i første position efterfulgt af de første 5 bogstaver af tredjepart kode.
 UseNotifications=Brug anmeldelser
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Dokumenter skabeloner
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vandmærke på udkast til et dokument
@@ -1557,6 +1566,7 @@ SuppliersSetup=Leverandør modul opsætning
 SuppliersCommandModel=Komplet template af leverandør orden (logo. ..)
 SuppliersInvoiceModel=Komplet template leverandør faktura (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 modul opsætning
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index b8b1c1005f1..66276978bdf 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura valideret
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktura %s gå tilbage til udkast til status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Bestil valideret
+OrderValidatedInDolibarr=Bestil valideret
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Bestil %s annulleret
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Bestil %s godkendt
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Bestil %s gå tilbage til udkast til status
@@ -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
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 94c961167d3..25e0c915ce1 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total af to nye rabatten skal svare til de
 ConfirmRemoveDiscount=Er du sikker på du vil fjerne denne rabat?
 RelatedBill=Relaterede faktura
 RelatedBills=Relaterede fakturaer
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index ec63e24aba0..caa830e7065 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategori
-Categories=Kategorier
-Rubrique=Kategori
-Rubriques=Kategorier
-categories=kategorier
-TheCategorie=Kategorien
-NoCategoryYet=Ingen kategori af denne type skabt
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=I
 AddIn=Tilføj i
 modify=modificere
 Classify=Klassificere
-CategoriesArea=Kategorier område
-ProductsCategoriesArea=Produkter / Tjenester 'kategorier område
-SuppliersCategoriesArea=Suppliers' kategorier område
-CustomersCategoriesArea=Kundernes kategorier område
-ThirdPartyCategoriesArea=Tredjeparters kategorier område
-MembersCategoriesArea=Medlemmer kategorier område
-ContactsCategoriesArea=Contacts categories area
-MainCats=Hovedkategorier
+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=Underkategorier
 CatStatistics=Statistik
-CatList=Liste over kategorier
-AllCats=Alle kategorier
-ViewCat=Vis kategori
-NewCat=Tilføj kategori
-NewCategory=Ny kategori
-ModifCat=Modify kategori
-CatCreated=Kategori skabt
-CreateCat=Opret kategori
-CreateThisCat=Opret denne kategori
+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=Valider felterne
 NoSubCat=Nr. underkategori.
 SubCatOf=Underkategori
-FoundCats=Fundet kategorier
-FoundCatsForName=Kategorier fundet for navnet:
-FoundSubCatsIn=Underkategorier fundet i kategorien
-ErrSameCatSelected=Du har valgt samme kategori flere gange
-ErrForgotCat=Du glemte at vælge den kategori
+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=Du har glemt at informere de områder
 ErrCatAlreadyExists=Dette navn bruges allerede
-AddProductToCat=Tilføj dette produkt til en kategori?
-ImpossibleAddCat=Umuligt at tilføje kategori
-ImpossibleAssociateCategory=Umuligt at tilknytte den kategori,
+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 blev tilføjet med succes.
-ObjectAlreadyLinkedToCategory=Element er allerede knyttet til denne kategori.
-CategorySuccessfullyCreated=Denne kategori %s er blevet tilføjet med succes.
-ProductIsInCategories=Produkt / service ejer til følgende kategorier
-SupplierIsInCategories=Tredjemand ejer til følgende leverandører kategorier
-CompanyIsInCustomersCategories=Denne tredjepart ejer til følgende kunder / udsigter kategorier
-CompanyIsInSuppliersCategories=Denne tredjepart ejer til følgende leverandører kategorier
-MemberIsInCategories=Dette medlem ejer til følgende medlemmer kategorier
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Dette produkt / service er ikke i alle kategorier
-SupplierHasNoCategory=Denne leverandør er ikke i alle kategorier
-CompanyHasNoCategory=Dette selskab er ikke i alle kategorier
-MemberHasNoCategory=Dette medlem er ikke på nogen kategorier
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Klassificering i kategori
+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=Ingen
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denne kategori allerede findes på samme sted
 ReturnInProduct=Tilbage til produkt / service kortet
 ReturnInSupplier=Tilbage til leverandøren kortet
@@ -66,22 +64,22 @@ ReturnInCompany=Tilbage til kunde / udsigt kortet
 ContentsVisibleByAll=Indholdet vil være synlige fra alle
 ContentsVisibleByAllShort=Indhold synlige fra alle
 ContentsNotVisibleByAllShort=Indholdet ikke er synligt fra alle
-CategoriesTree=Categories tree
-DeleteCategory=Slet kategori
-ConfirmDeleteCategory=Er du sikker på du vil slette denne kategori?
-RemoveFromCategory=Fjern link med Categorie
-RemoveFromCategoryConfirm=Er du sikker på du vil fjerne forbindelsen mellem transaktionen og den kategori?
-NoCategoriesDefined=Ingen kategori defineret
-SuppliersCategoryShort=Leverandører kategori
-CustomersCategoryShort=Kunder kategori
-ProductsCategoryShort=Produkter kategori
-MembersCategoryShort=Medlemmer kategori
-SuppliersCategoriesShort=Leverandører kategorier
-CustomersCategoriesShort=Kunder kategorier
+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. kategorier
-ProductsCategoriesShort=Produkter kategorier
-MembersCategoriesShort=Medlemmer kategorier
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Denne kategori indeholder ingen produkt.
 ThisCategoryHasNoSupplier=Denne kategori indeholder ingen leverandør.
 ThisCategoryHasNoCustomer=Denne kategori indeholder ingen kunde.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Henføres til en kunde
 AssignedToTheCustomer=Henføres til kundens
 InternalCategory=Inernal kategori
-CategoryContents=Kategori indhold
-CategId=Kategori-id
-CatSupList=Liste over leverandør kategorier
-CatCusList=Liste over kunde / udsigt kategorier
-CatProdList=Liste over produkter kategorier
-CatMemberList=Liste over medlemmer kategorier
-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
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index 8ea7f4353fa..9c968794352 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/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= Ingen
+CronNone=Ingen
 CronDtStart=Startdato
 CronDtEnd=Slutdato
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/da_DK/donations.lang b/htdocs/langs/da_DK/donations.lang
index 64929d78199..470a7a0de84 100644
--- a/htdocs/langs/da_DK/donations.lang
+++ b/htdocs/langs/da_DK/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donorer
 AddDonation=Create a donation
 NewDonation=Ny donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gave løfte
 PromisesNotValid=Ikke valideret løfter
@@ -21,6 +23,8 @@ DonationStatusPaid=Donationen er modtaget
 DonationStatusPromiseNotValidatedShort=Udkast
 DonationStatusPromiseValidatedShort=Valideret
 DonationStatusPaidShort=Modtaget
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validér løfte
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build modtagelse
@@ -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
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index f69f42d1a6f..3a988907211 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/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
diff --git a/htdocs/langs/da_DK/loan.lang b/htdocs/langs/da_DK/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/da_DK/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
 This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.

+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 3a8d4d24d72..507d8277dc7 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List alle e-mail meddelelser
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 91070a4d2ce..a905c89c749 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. leverandør
 RefPayment=Ref. betaling
 CommercialProposalsShort=Kommerciel forslag
@@ -394,8 +395,8 @@ Available=Tilgængelig
 NotYetAvailable=Endnu ikke tilgængelig
 NotAvailable=Ikke til rådighed
 Popularity=Popularitet
-Categories=Kategorier
-Category=Kategori
+Categories=Tags/categories
+Category=Tag/category
 By=Ved
 From=Fra
 to=til
@@ -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=Mandag
 Tuesday=Tirsdag
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index c5cb6c9dc56..9bc52e0047b 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Skib produkt
 Discount=Discount
 CreateOrder=Opret Order
 RefuseOrder=Nægte at
-ApproveOrder=Acceptere for
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Valider orden
 UnvalidateOrder=Unvalidate rækkefølge
 DeleteOrder=Slet orden
@@ -102,6 +103,8 @@ ClassifyBilled=Klassificere "Billed"
 ComptaCard=Regnskabsmæssig kortet
 DraftOrders=Udkast til ordrer
 RelatedOrders=Relaterede ordrer
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Den proces ordrer
 RefOrder=Ref. rækkefølge
 RefCustomerOrder=Ref. kunde for
@@ -118,6 +121,7 @@ PaymentOrderRef=Betaling af for %s
 CloneOrder=Klon orden
 ConfirmCloneOrder=Er du sikker på at du vil klone denne ordre %s?
 DispatchSupplierOrder=Modtagelse leverandør for %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Repræsentant opfølgning kundeordre
 TypeContact_commande_internal_SHIPPING=Repræsentant opfølgning shipping
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index ec7a5a1fc9f..334c5cfe289 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Valider intervention
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Valider regningen
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverandør for godkendt
 Notify_ORDER_SUPPLIER_REFUSE=Leverandør For nægtes
 Notify_ORDER_VALIDATE=Kundeordre valideret
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kommercielle forslaget, som sendes med posten
 Notify_BILL_PAYED=Kundens faktura betales
 Notify_BILL_CANCEL=Kundefaktura aflyst
 Notify_BILL_SENTBYMAIL=Kundens faktura sendes med posten
-Notify_ORDER_SUPPLIER_VALIDATE=Leverandør valideret orden
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverandør orden sendt med posten
 Notify_BILL_SUPPLIER_VALIDATE=Leverandør faktura valideret
 Notify_BILL_SUPPLIER_PAYED=Leverandør faktura betales
@@ -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=Antal vedhæftede filer / dokumenter
 TotalSizeOfAttachedFiles=Samlede størrelse på vedhæftede filer / dokumenter
 MaxSize=Maksimumstørrelse
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Faktura %s valideret
 EMailTextProposalValidated=Forslaget %s er blevet valideret.
 EMailTextOrderValidated=Ordren %s er blevet valideret.
 EMailTextOrderApproved=Bestil %s godkendt
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Bestil %s er godkendt af %s
 EMailTextOrderRefused=Bestil %s nægtet
 EMailTextOrderRefusedBy=Bestil %s afvises af %s
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index e66913ef4fc..d87ebdd1741 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 91e45f99006..8cb189e42f1 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Liste over leverandører fakturaer forbund
 ListContractAssociatedProject=Liste over kontrakter i forbindelse med projektet
 ListFichinterAssociatedProject=Liste over interventioner i forbindelse med projektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Liste over aktioner i forbindelse med projektet
 ActivityOnProjectThisWeek=Aktivitet på projektet i denne uge
 ActivityOnProjectThisMonth=Aktivitet på projektet i denne måned
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index 0b1d722f494..5c2efe5957b 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. afsendelse
 Sending=Sender
 Sendings=Sendings
+AllSendings=All Shipments
 Shipment=Sender
 Shipments=Forsendelser
 ShowSending=Show Sending
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index aae6a4917a0..8702698b604 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Liste over leverandør ordrer
 MenuOrdersSupplierToBill=Leverandør ordrer der kan faktureres
 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)
diff --git a/htdocs/langs/de_AT/other.lang b/htdocs/langs/de_AT/other.lang
index 3504dd431ff..5d348ab99b6 100644
--- a/htdocs/langs/de_AT/other.lang
+++ b/htdocs/langs/de_AT/other.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - other
 ToolsDesc=Dieser Bereich ist zur Gruppe diverse Werkzeuge nicht verfügbar in andere Menüeinträge gewidmet. 

 Diese Tools können aus dem Menü auf der Seite zu erreichen.
 DateToBirth=Geburtstdatum
+Notify_ORDER_SUPPLIER_VALIDATE=Lieferanten, um validierte
 Notify_WITHDRAW_TRANSMIT=Transmission Rückzug
 Notify_WITHDRAW_CREDIT=Kreditkarten Rückzug
 Notify_WITHDRAW_EMIT=Isue Rückzug
@@ -10,7 +11,6 @@ Notify_PROPAL_SENTBYMAIL=Gewerbliche Vorschlag per Post
 Notify_BILL_PAYED=Kunden Rechnung bezahlt
 Notify_BILL_CANCEL=Kunden Rechnung storniert
 Notify_BILL_SENTBYMAIL=Kunden Rechnung per Post geschickt
-Notify_ORDER_SUPPLIER_VALIDATE=Lieferanten, um validierte
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferant Bestellung per Post geschickt
 Notify_BILL_SUPPLIER_VALIDATE=Lieferantenrechnung validiert
 Notify_BILL_SUPPLIER_SENTBYMAIL=Lieferant Rechnung per Post geschickt
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 45611a61a57..0cfe4d3443d 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Trennzeichen
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameterlisten müssen das Format Schlüssel,Wert haben

 zum Beispiel:
1,Wert1
2,Wert2
3,Wert3
...

Um die Liste in Abhängigkeit zu einer anderen zu haben:
1,Wert1|parent_list_code:parent_key
2,Wert2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameterlisten müssen das Format Schlüssel,Wert haben

 zum Beispiel:
1,Wert1
2,Wert2
3,Wert3
...
 ExtrafieldParamHelpradio=Parameterlisten müssen das Format Schlüssel,Wert haben

 zum Beispiel:
1,Wert1
2,Wert2
3,Wert3
...
@@ -494,6 +495,8 @@ Module500Name=Sonderausgaben (Steuern, Sozialbeiträge und Dividenden)
 Module500Desc=Steuer-, Sozialbeitrags-, Dividenden- und Lohnverwaltung
 Module510Name=Löhne
 Module510Desc=Verwaltung der Angestellten-Gehälter und -Zahlungen
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Benachrichtigungen
 Module600Desc=Senden Sie Benachrichtigungen zu einigen Dolibarr-Events per E-Mail an Partner (wird pro Partner definiert)
 Module700Name=Spenden
@@ -508,14 +511,14 @@ Module1400Name=Buchhaltung
 Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorien
-Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-Editor
 Module2200Name=Dynamische Preise
 Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
 Module2300Name=Cron
-Module2300Desc=Verwaltung geplanter Aufgaben
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Maßnahmen/Aufgaben und Agendaverwaltung
 Module2500Name=Inhaltsverwaltung(ECM)
@@ -714,6 +717,11 @@ Permission510=Löhne einsehen
 Permission512=Löhne erstellen/bearbeiten
 Permission514=Löhne löschen
 Permission517=Löhne exportieren
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Leistungen einsehen
 Permission532=Leistungen erstellen/bearbeiten
 Permission534=Leistungen löschen
@@ -746,6 +754,7 @@ Permission1185=Lieferantenbestellungen bestätigen
 Permission1186=Lieferantenbestellungen übermitteln
 Permission1187=Eingang von Lieferantenbestellungen bestätigen
 Permission1188=Lieferantenbestellungen schließen
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Exportresultate einsehen
 Permission1202=Export erstellen/bearbeiten
 Permission1231=Lieferantenrechnungen einsehen
@@ -758,10 +767,10 @@ Permission1237=Lieferantenbestellungen mit Details exportieren
 Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1421=Kundenbestellungen und Attribute exportieren
-Permission23001 = Lese geplante Aufgabe
-Permission23002 = Erstelle/aktualisiere geplante Aufgabe
-Permission23003 = Lösche geplante Aufgabe
-Permission23004 = Führe geplante Aufgabe aus
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Maßnahmen (Termine/Aufgaben) in Verbindung mit eigenem Konto einsehen
 Permission2402=Maßnahmen (Termine/Aufgaben) in Verbindung mit eigenem Konto erstellen/bearbeiten
 Permission2403=Maßnahmen (Termine/Aufgaben) in Verbindung mit eigenem Konto löschen
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Li
 ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen.
 UseNotifications=Benachrichtigungen verwenden
-NotificationsDesc=E-Mail-Benachrichtigungsfunktionen erlauben Ihnen den stillschweigenden Versand automatischer Benachrichtigungen zu einigen Dolibarr-Ereignissen. Ziele dafür können definiert werden:
* pro Partner-Kontakt (Kunden oder Lieferanten), ein Partner zur Zeit.
* durch das Setzen einer globalen Ziel-Mail-Adresse in den Modul-Einstellungen
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Dokumentvorlagenmodul
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Wasserzeichen auf Entwurf
@@ -1557,6 +1566,7 @@ SuppliersSetup=Lieferantenmoduleinstellungen
 SuppliersCommandModel=Vollständige Vorlage für Lieferantenbestellungen (Logo, ...)
 SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung (logo. ..)
 SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP-Maxmind Moduleinstellungen
 PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP-zu-Land Übersetzung. 
Beispiele:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoOP.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
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 02209a06808..080a83dc998 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -9,14 +9,14 @@ Calendars=Kalender
 LocalAgenda=Internetkalender
 ActionsOwnedBy=Maßnahme gehört
 AffectedTo=Zugewiesen an
-DoneBy=Erldedigt von
+DoneBy=Erledigt von
 Event=Aktion
 Events=Termine
 EventsNb=Anzahl der Termine
 MyEvents=Meine Termine
 OtherEvents=Weitere Termine
 ListOfActions=Terminliste
-Location=Ort
+Location=Standort
 EventOnFullDay=Ganztägig
 SearchAnAction= Suche Maßnahme / Aufgabe
 MenuToDoActions=Alle unvollständigen Termine
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Rechnung freigegeben
 InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert
 InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen
 InvoiceDeleteDolibarr=Rechnung %s gelöscht
-OrderValidatedInDolibarr= Bestellung %s freigegeben
+OrderValidatedInDolibarr=Bestellung %s freigegeben
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Auftrag storniert %s
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Bestellen %s genehmigt
 OrderRefusedInDolibarr=Bestellung %s abgelehnt
 OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status
@@ -91,3 +94,5 @@ WorkingTimeRange=Arbeitszeit-Bereich
 WorkingDaysRange=Arbeitstag-Bereich
 AddEvent=Maßnahme erstellen
 MyAvailability=Meine Verfügbarkeit
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index d882f33b034..eebbf4aa13b 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Insgesamt zwei neue Rabatt muss gleich zu d
 ConfirmRemoveDiscount=Sind Sie sicher, dass Sie diesen Rabatt entfernen möchten?
 RelatedBill=Ähnliche Rechnung
 RelatedBills=Ähnliche Rechnungen
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Letzte ähnliche Rechnung
 WarningBillExist=Achtung, es existiert bereits mindestens eine Rechnung
 
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index a558ee04ff6..c558a8436a5 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorie
-Categories=Kategorien
-Rubrique=Kategorie
-Rubriques=Kategorien
-categories=Kategorien
-TheCategorie=Die Kategorie
-NoCategoryYet=Keine Kategorie dieser Art erstellt
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Einfügen in
 modify=Ändern
 Classify=Einordnen
-CategoriesArea=Kategorien
-ProductsCategoriesArea=Produktkategorien
-SuppliersCategoriesArea=Lieferantenkategorien
-CustomersCategoriesArea=Kundenkategorien
-ThirdPartyCategoriesArea=Organisationskategorien
-MembersCategoriesArea=Kategoriemitglieder-Bereich
-ContactsCategoriesArea=Kontaktkategorien
-MainCats=Hauptkategorien
+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=Unterkategorien
 CatStatistics=Statistik
-CatList=Kategorieliste
-AllCats=Alle Kategorien
-ViewCat=Kategorie
-NewCat=Kategorie hinzufügen
-NewCategory=Neue Kategorie
-ModifCat=Kategorie bearbeiten
-CatCreated=Kategorie erstellt
-CreateCat=Kategorie erstellen
-CreateThisCat=Kategorie anlegen
+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=Überprüfen Sie die Felder
 NoSubCat=Keine Unterkategorie
 SubCatOf=Unterkategorie von
-FoundCats=Kategorien gefunden
-FoundCatsForName=Treffer für den Namen:
-FoundSubCatsIn=Kategorie besitzt Unterkategorien
-ErrSameCatSelected=Sie haben die gleiche Kategorie mehrmals ausgewählt
-ErrForgotCat=Sie haben vergessen eine Kategorie zu wählen
+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=Sie haben ein oder mehrere Felder nicht ausgefüllt
 ErrCatAlreadyExists=Dieser Name wird bereits verwendet
-AddProductToCat=Dieses Produkt einer Kategorie zuweisen?
-ImpossibleAddCat=Das Hinzufügen dieser Kategorie ist nicht möglich
-ImpossibleAssociateCategory=Kann die Kategorie nicht zuweisen zu
+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 wurde erfolgreich hinzugefügt.
-ObjectAlreadyLinkedToCategory=Element ist bereits mit dieser Kategorie verknüpft.
-CategorySuccessfullyCreated=Die Kategorie %s wurde erfolgreich hinzugefügt.
-ProductIsInCategories=Produkt gehört zu folgenden Kategorien
-SupplierIsInCategories=Dieser Lieferant ist folgenden Kategorien zugewiesen
-CompanyIsInCustomersCategories=Diese Organisation ist folgenden Lead-/Kundenkategorien zugewiesen
-CompanyIsInSuppliersCategories=Diese Organisation ist folgenden Lieferantenkategorien zugewiesen
-MemberIsInCategories=Dieses Mitglied ist Mitglied folgender Kategorien
-ContactIsInCategories=Dieser Kontakt ist folgenden Kontaktkategorien zugewiesen
-ProductHasNoCategory=Dieses Produkt / Dienstleistung ist nicht in allen Kategorien
-SupplierHasNoCategory=Dieser Lieferant ist keiner Kategorie zugewiesen
-CompanyHasNoCategory=Diese Organisation ist keiner Kategorie zugewiesen
-MemberHasNoCategory=Dieses Mitglied ist in keiner Kategorie
-ContactHasNoCategory=Dieser Kontakt ist keiner Kategorie zugewiesen
-ClassifyInCategory=Folgender Kategorie zuweisen
+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=Keine
-NotCategorized=Ohne Kategorie
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Diese Kategorie existiert bereits auf diesem Level
 ReturnInProduct=Zurück zur Produktkarte
 ReturnInSupplier=Zurück zur Anbieterkarte
@@ -66,22 +64,22 @@ ReturnInCompany=Zurück zur Kunden-/Lead-Karte
 ContentsVisibleByAll=Für alle sichtbarer Inhalt
 ContentsVisibleByAllShort=Öffentl. Inhalt
 ContentsNotVisibleByAllShort=Privater Inhalt
-CategoriesTree=Kategoriebaum
-DeleteCategory=Kategorie
-ConfirmDeleteCategory=Möchten Sie diese Kategorie wirklich löschen?
-RemoveFromCategory=Aus Kategorie entfernen
-RemoveFromCategoryConfirm=Zuordnung zu dieser Kategorie wirklich entfernen?
-NoCategoriesDefined=Keine Kategorie definiert
-SuppliersCategoryShort=Kategorielieferanten
-CustomersCategoryShort=Kategoriekunden
-ProductsCategoryShort=Kategorieprodukte
-MembersCategoryShort=Kategoriemitglieder
-SuppliersCategoriesShort=Lieferantenkategorien
-CustomersCategoriesShort=Kundenkategorien
+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=Lead- / Kundenkategorien
-ProductsCategoriesShort=Produktkategorien
-MembersCategoriesShort=Mitgliedergruppen
-ContactCategoriesShort=Kontaktkategorien
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Diese Kategorie enthält keine Produkte.
 ThisCategoryHasNoSupplier=Diese Kategorie enthält keine Lieferanten.
 ThisCategoryHasNoCustomer=Diese Kategorie enthält keine Kunden.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Diese Kategorie enthält keine Kontakte.
 AssignedToCustomer=Einem Kunden zugeordnet
 AssignedToTheCustomer=An den Kunden
 InternalCategory=Interne Kategorie
-CategoryContents=Kategorieinhalte
-CategId=Kategorie-ID
-CatSupList=Liste der Lieferantenkategorien
-CatCusList=Liste der Kunden-/ Leadkategorien
-CatProdList=Liste der Produktkategorien
-CatMemberList=Liste der Kategoriemitglieder
-CatContactList=Liste der Kontaktkategorien und Kontakte
-CatSupLinks=Verbindung zwischen Lieferanten und Kategorien
-CatCusLinks=Verbindung zwischen Kunden-/Lead und Kategorien
-CatProdLinks=Verbindungen zwischen Produkten/Services und Kategorien
-CatMemberLinks=Verbindung zwischen Mitgliedern und Kategorien
-DeleteFromCat=Aus Kategorie entfernen
+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=Bild löschen
 ConfirmDeletePicture=Bild wirklich löschen?
 ExtraFieldsCategories=Ergänzende Attribute
-CategoriesSetup=Kategorien Setup
-CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Wenn aktiviert, wird das Produkt auch zur übergeordneten Kategorie zugewiesen, wenn es einer Unterkategorie zugewiesen wird
 AddProductServiceIntoCategory=Folgendes Produkt/Dienstleistungen hinzufügen
-ShowCategory=Zeige Kategorie
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 740a928cb51..c752a4840dd 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Firmenname %s bereits vorhanden. Bitte wählen Sie einen anderen.
-ErrorPrefixAlreadyExists=Präfix %s bereits vorhanden. Bitte wählen Sie einen anderen.
-ErrorSetACountryFirst=Wählen sie zuerst das Land
-SelectThirdParty=Wählen Sie einen Partner
+ErrorPrefixAlreadyExists=Präfix %s bereits vorhanden. Wählen Sie einen anderen.
+ErrorSetACountryFirst=Wähle zuerst das Land
+SelectThirdParty=Wähle einen Partner
 DeleteThirdParty=Lösche einen Partner
 ConfirmDeleteCompany=Möchten Sie diesen Partner und alle verbundenen Informationen wirklich löschen?
 DeleteContact=Löschen Sie einen Kontakt
@@ -17,9 +17,9 @@ MenuSocGroup=Gruppen
 NewCompany=Neues Unternehmen (Leads, Kunden, Lieferanten)
 NewThirdParty=Neuer Partner (Leads, Kunden, Lieferanten)
 NewSocGroup=Neue Firmengruppe
-NewPrivateIndividual=Neue Privatperson (Leads, Kunden, Lieferanten)
+NewPrivateIndividual=Neue Privatperson (Lead, Kunde, Lieferant)
 CreateDolibarrThirdPartySupplier=Neuen Partner erstellen (Lieferant)
-ProspectionArea=Bereich
+ProspectionArea=Übersicht Geschäftsanbahnung
 SocGroup=Gruppe von Unternehmen
 IdThirdParty=Partner ID
 IdCompany=Unternehmens ID
@@ -82,7 +82,7 @@ Poste= Posten
 DefaultLang=Standardsprache
 VATIsUsed=MwSt.-pflichtig
 VATIsNotUsed=Nicht MwSt-pflichtig
-CopyAddressFromSoc=geben sie hier die Adressen Dritter ein
+CopyAddressFromSoc=Übernehme die Adresse vom Partner
 NoEmailDefined=Es ist keine Mail-Adresse definiert
 ##### Local Taxes #####
 LocalTax1IsUsedES= RE wird verwendet
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Verfügbare absolute Ermäßigungen
 DiscountNone=Keine
 Supplier=Lieferant
 CompanyList=Firmen-Liste
-AddContact=Kontakt hinzufügen
-AddContactAddress=Hinzufügen Kontakt/Anschrift
+AddContact=Kontakt erstellen
+AddContactAddress=Kontakt/Adresse erstellen
 EditContact=Kontakt bearbeiten
 EditContactAddress=Kontakt/Adresse bearbeiten
 Contact=Kontakt
@@ -268,8 +268,8 @@ ContactsAddresses=Kontakte/Adressen
 NoContactDefinedForThirdParty=Für diesen Kunden ist keine Adresse angegeben
 NoContactDefined=Kein Kontakt für diesen Partner
 DefaultContact=Standardkontakt
-AddCompany=Firma hinzufügen
-AddThirdParty=Partner hinzufügen
+AddCompany=Firma erstellen
+AddThirdParty=Partner erstellen
 DeleteACompany=Löschen eines Unternehmens
 PersonalInformations=Persönliche Daten
 AccountancyCode=Kontierungs-Code
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Lieferadressen-Label
 DeleteDeliveryAddress=Lieferadresse löschen
 ConfirmDeleteDeliveryAddress=Möchten Sie diese Lieferadresse wirklich löschen?
 NewDeliveryAddress=Neue Lieferadresse
-AddDeliveryAddress=Adresse hinzufügen
-AddAddress=Adresse hinzufügen
+AddDeliveryAddress=Adresse erstellen
+AddAddress=Adresse erstellen
 NoOtherDeliveryAddress=Keine alternative Lieferadresse definiert
 SupplierCategory=Lieferantenkategorie
 JuridicalStatus200=Unabhängige
@@ -397,8 +397,8 @@ YouMustCreateContactFirst=Sie müssen erst E-Mail-Kontakte für einen Partner an
 ListSuppliersShort=Liste der Lieferanten
 ListProspectsShort=Liste der Leads
 ListCustomersShort=Liste der Kunden
-ThirdPartiesArea=Third parties and contact area
-LastModifiedThirdParties=Letzten 15 bearbeiteten Partner
+ThirdPartiesArea=Partner- und Kontaktbereich
+LastModifiedThirdParties=Letzte %s bearbeitete Partner
 UniqueThirdParties=Gesamte Anzahl der Kontakte
 InActivity=Aktiv
 ActivityCeased=Inaktiv
@@ -410,5 +410,5 @@ OutstandingBillReached=Maximum für ausstehende Rechnung erreicht
 MonkeyNumRefModelDesc=Zurück NUMERO mit Format %syymm-nnnn für den Kunden-Code und syymm%-nnnn für die Lieferanten-Code ist, wenn JJ Jahr, MM Monat und nnnn ist eine Folge ohne Pause und kein Zurück mehr gibt, auf 0 gesetzt.
 LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jederzeit geändert werden.
 ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+SearchThirdparty=Partner suchen
+SearchContact=Kontakt suchen
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 77060539e1b..21c56d1a707 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Ausgabe der letzten Ausführung
 CronLastResult=Letzter Resultatcode
 CronListOfCronJobs=Liste der geplanten Jobs
 CronCommand=Befehl
-CronList=Jobliste
-CronDelete= Lösche Cronjobs
-CronConfirmDelete= Möchten Sie diesen Cronjob wirklich löschen?
-CronExecute=Starte Job
-CronConfirmExecute= Sind Sie sicher, dass Sie diesen Job jetzt ausführen wollen
-CronInfo= Jobs, die eine geplante Aufgabe ausführen dürfen
-CronWaitingJobs=Wartende 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= Keine
+CronNone=Keine
 CronDtStart=Startdatum
 CronDtEnd=Vertragsende
 CronDtNextLaunch=Nächste Ausführung
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=Die auszuführende System-Kommandozeile
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/de_DE/donations.lang b/htdocs/langs/de_DE/donations.lang
index 7242670c414..4299cb5025c 100644
--- a/htdocs/langs/de_DE/donations.lang
+++ b/htdocs/langs/de_DE/donations.lang
@@ -6,6 +6,8 @@ Donor=Spender
 Donors=Spender
 AddDonation=Spende erstellen
 NewDonation=Neue Spende
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Spenden anzeigen
 DonationPromise=Zugesagte Spende
 PromisesNotValid=Ungültige Zusage
@@ -21,6 +23,8 @@ DonationStatusPaid=Spende bezahlt
 DonationStatusPromiseNotValidatedShort=Entwurf
 DonationStatusPromiseValidatedShort=Freigegeben
 DonationStatusPaidShort=Bezahlt
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Zusage freigeben
 DonationReceipt=Spendenbescheinigung
 BuildDonationReceipt=Erzeuge Spendenbeleg
@@ -36,3 +40,4 @@ FrenchOptions=Optionen für Frankreich
 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
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index a78fe0da64a..0dc32476d55 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unbekannter Fehler '%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=Zwingend notwendige Parameter sind noch nicht definiert
diff --git a/htdocs/langs/de_DE/loan.lang b/htdocs/langs/de_DE/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/de_DE/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
 This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.

+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 8a91a8911c4..01ce0719804 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen
 MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für Massen-Mails verwendet werden.
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sHome - Einstellungen - EMails%s den Parameter '%s' auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die Masse-E-Mail-Funktion nutzen.
 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 3f51e500253..1fccacfd60b 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorit
 ShortInfo=Info.
 Ref=Nummer
+ExternalRef=Ref. extern
 RefSupplier=Lieferanten-Nr.
 RefPayment=Zahlungs-Nr.
 CommercialProposalsShort=Angebote
@@ -394,8 +395,8 @@ Available=Verfügbar
 NotYetAvailable=Noch nicht verfügbar
 NotAvailable=Nicht verfügbar
 Popularity=Beliebtheit
-Categories=Kategorien
-Category=Kategorie
+Categories=Tags/categories
+Category=Tag/category
 By=Von
 From=Von
 to=An
@@ -694,6 +695,7 @@ AddBox=Box zufügen
 SelectElementAndClickRefresh=Wählen Sie ein Element und clicken Sie Aktualisieren
 PrintFile=Drucke Datei %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Montag
 Tuesday=Dienstag
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index afddbf7e1b7..5253f9dccc7 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Kundenbestellungsübersicht
-SuppliersOrdersArea=Lieferantenbestellungsübersicht
+OrdersArea=Übersicht Kundenbestellungen
+SuppliersOrdersArea=Übersicht Lieferantenbestellungen
 OrderCard=Bestell-Karte
 OrderId=Bestell-ID
 Order=Bestellung
@@ -21,15 +21,15 @@ CustomersOrdersRunning=Aktuelle Kundenbestellungen
 CustomersOrdersAndOrdersLines=Kundenbestellungen und Bestellpositionen
 OrdersToValid=Freizugebende Bestellungen
 OrdersToBill=Gelieferte Kundenbestellungen
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
+OrdersInProcess=Bestellungen in Bearbeitung
+OrdersToProcess=Zu bearbeitende Bestellungen
 SuppliersOrdersToProcess=Lieferantenbestellung in Bearbeitung
 StatusOrderCanceledShort=Storniert
 StatusOrderDraftShort=Entwurf
 StatusOrderValidatedShort=Freigegeben
 StatusOrderSentShort=In Bearbeitung
 StatusOrderSent=Versand in Bearbeitung
-StatusOrderOnProcessShort=Ordered
+StatusOrderOnProcessShort=Bestellt
 StatusOrderProcessedShort=Bearbeitet
 StatusOrderToBillShort=Zu verrechnen
 StatusOrderToBill2Short=Zu verrechnen
@@ -41,8 +41,8 @@ StatusOrderReceivedAllShort=Komplett erhalten
 StatusOrderCanceled=Storniert
 StatusOrderDraft=Entwurf (freizugeben)
 StatusOrderValidated=Freigegeben
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=Bestellt - wartet auf Eingang
+StatusOrderOnProcessWithValidation=Bestellt - wartet auf Eingang/Bestätigung 
 StatusOrderProcessed=Bearbeitet
 StatusOrderToBill=Zu verrechnen
 StatusOrderToBill2=Zu verrechnen
@@ -51,7 +51,7 @@ StatusOrderRefused=Abgelehnt
 StatusOrderReceivedPartially=Teilweise erhalten
 StatusOrderReceivedAll=Komplett erhalten
 ShippingExist=Eine Sendung ist vorhanden
-ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraft=Produktmenge in Bestellentwurf
 ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
 DraftOrWaitingApproved=Entwurf oder genehmigt, noch nicht bestellt
 DraftOrWaitingShipped=Entwurf oder bestätigt, noch nicht versandt
@@ -59,12 +59,13 @@ MenuOrdersToBill=Bestellverrechnung
 MenuOrdersToBill2=Billable orders
 SearchOrder=Suche Bestellung
 SearchACustomerOrder=Kundenauftrag suchen
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Suche Lieferantenbestellung
 ShipProduct=Produkt versenden
 Discount=Rabatt
 CreateOrder=Erzeuge Bestellung
 RefuseOrder=Bestellung ablehnen
-ApproveOrder=Bestellung bestätigen
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Bestellung freigeben
 UnvalidateOrder=Unbestätigte Bestellung
 DeleteOrder=Bestellung löschen
@@ -102,6 +103,8 @@ ClassifyBilled=Als verrechnet markieren
 ComptaCard=Buchhaltungskarte
 DraftOrders=Bestellentwürfe
 RelatedOrders=Verknüpfte Bestellungen
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Bestellungen in Bearbeitung
 RefOrder=Bestell-Nr.
 RefCustomerOrder=Kunden-Bestellung-Nr.
@@ -118,6 +121,7 @@ PaymentOrderRef=Zahlung zur Bestellung %s
 CloneOrder=Bestellung duplizieren
 ConfirmCloneOrder=Möchten Sie die Bestellung %s wirklich duplizieren?
 DispatchSupplierOrder=Lieferantenbestellung %s erhalten
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Kundenauftrag-Nachverfolgung durch Vertreter
 TypeContact_commande_internal_SHIPPING=Versand-Nachverfolgung durch Vertreter
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 4b2f4a52bea..64ab0a6e45a 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Eingriff freigegeben
 Notify_FICHINTER_SENTBYMAIL=Service per E-Mail versendet
 Notify_BILL_VALIDATE=Rechnung freigegeben
 Notify_BILL_UNVALIDATE=Rechnung nicht freigegeben
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Lieferantenbestellung freigegeben
 Notify_ORDER_SUPPLIER_REFUSE=Lieferantenbestellung abgelehnt
 Notify_ORDER_VALIDATE=Kundenbestellung freigegeben
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Angebot mit E-Mail gesendet
 Notify_BILL_PAYED=Kundenrechnung bezahlt
 Notify_BILL_CANCEL=Kundenrechnung storniert
 Notify_BILL_SENTBYMAIL=Kundenrechnung per E-Mail zugestellt
-Notify_ORDER_SUPPLIER_VALIDATE=Lieferantenbestellung bestätigt
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferantenbestellung per E-Mail zugestellt
 Notify_BILL_SUPPLIER_VALIDATE=Lieferantenrechnung bestätigen
 Notify_BILL_SUPPLIER_PAYED=Lieferantenrechnung bezahlt
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Projekt-Erstellung
 Notify_TASK_CREATE=Aufgabe erstellt
 Notify_TASK_MODIFY=Aufgabe geändert
 Notify_TASK_DELETE=Aufgabe gelöscht
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Anzahl der angehängten Dateien/okumente
 TotalSizeOfAttachedFiles=Gesamtgröße der angehängten Dateien/Dokumente
 MaxSize=Maximalgröße
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Rechnung %s wurde freigegeben
 EMailTextProposalValidated=Angebot %s wurde freigegeben
 EMailTextOrderValidated=Bestellung %s wurde freigegeben
 EMailTextOrderApproved=Bestellung %s genehmigt
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Bestellung %s wurde von %s genehmigt
 EMailTextOrderRefused=Bestellung %s wurde abgelehnt
 EMailTextOrderRefusedBy=Bestellung %s wurde von %s abgelehnt
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 8816eff2614..35033adced3 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -26,11 +26,11 @@ ProductsAndServicesOnSell=Products and Services for sale or for purchase
 ProductsAndServicesNotOnSell=Products and Services out of sale
 ProductsAndServicesStatistics=Produkt- und Dienstleistungs-Statistik
 ProductsStatistics=Produktstatistik
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Produkte für Ein- oder Verkauf
+ProductsNotOnSell=Produkte weder für Ein- noch Verkauf
 ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesOnSell=Service für Verkauf oder für Einkauf
+ServicesNotOnSell=Service weder für Ein- noch Verkauf
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Interne Referenz
 LastRecorded=Zuletzt erfasste, verfügbare Produkte/Dienstleistungen
@@ -118,7 +118,7 @@ MultiPricesAbility=Mehrere Preisstufen pro Produkt/Dienstleistung
 MultiPricesNumPrices=Anzahl Preise
 MultiPriceLevelsName=Preiskategorien
 AssociatedProductsAbility=Untergeordnete Produkte aktivieren
-AssociatedProducts=Package product
+AssociatedProducts=verknüpfte Produkte
 AssociatedProductsNumber=Anzahl der Unterprodukte
 ParentProductsNumber=Anzahl der übergeordneten Produkte
 IfZeroItIsNotAVirtualProduct=Falls 0 ist das Produkt kein Unterprodukt
@@ -234,7 +234,7 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert bei Partner
 BarCodeDataForProduct=Barcode-Information von Produkt %s:
 BarCodeDataForThirdparty=Barcode-Information von Partner %s:
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different price for each customer
+PriceByCustomer=Verschiedene Kundenpreise
 PriceCatalogue=Einzigartiger Preis pro Produkt/Dienstleistung
 PricingRule=Rules for customer prices
 AddCustomerPrice=Preis je Kunde hinzufügen
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimaler empfohlener Preis: %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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Nummer
-DefaultPrice=Default price
+DefaultPrice=Standardpreis
 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
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index b32d37c2026..94a6592d4eb 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Liste der mit diesem Projekt verbundenen L
 ListContractAssociatedProject=Liste der mit diesem Projekt verbundenen Verträge
 ListFichinterAssociatedProject=Liste der mit diesem Projekt verknüpften Services
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Liste der mit diesem Projekt verknüpften Maßnahmen
 ActivityOnProjectThisWeek=Projektaktivitäten dieser Woche
 ActivityOnProjectThisMonth=Projektaktivitäten dieses Monats
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 93da292748d..549d40885e0 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Versand Nr.
 Sending=Sendung
 Sendings=Sendungen
+AllSendings=All Shipments
 Shipment=Sendung
 Shipments=Lieferungen
 ShowSending=Zeige Sendung
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index d560920f048..ec7c2010c6a 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -128,7 +128,7 @@ StockMustBeEnoughForShipment= Ausreichender Lagerbestand ist erforderlich, um da
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
+ShowWarehouse=Zeige Lager
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index 58f83d6a3d5..390acc8f134 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Liste der Lieferantenbestellungen
 MenuOrdersSupplierToBill=Zu berechnende Lieferantenbestellungen
 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)
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index d8f7036b628..815220b1324 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -263,11 +263,11 @@ EMailsSetup=Διαχείριση E-mails
 EMailsDesc=Αυτή η σελίδα σας επιτρέπει να αλλάξετε τις παραμέτρους PHP για την αποστολή email.  Στις περισσότερες περιπτώσεις σε λειτουργικά συστήματα Unix/Linux, η διαμόρφωση της PHP σας είναι σωστή και αυτές οι παράμετροι είναι άχρηστες.
 MAIN_MAIL_SMTP_PORT=Θύρα SMTP/SMTPS (Προεπιλογή στο php.ini: %s)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Προεπιλογή στο php.ini: %s)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Θύρα SMTP/SMTPS (Δεν καθορίζεταιστην PHP σε συστήματα Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Δεν καθορίζεταιστην PHP σε συστήματα Unix)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Θύρα SMTP/SMTPS (Δεν καθορίζεται στην PHP σε συστήματα Unix)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Δεν καθορίζεται στην PHP σε συστήματα Unix)
 MAIN_MAIL_EMAIL_FROM=E-mail αποστολέα για αυτόματα e-mails (Προεπιλογή στο php.ini: %s)
 MAIN_MAIL_ERRORS_TO=E-mail αποστολέα που χρησιμοποιούνται για την επιστροφή λάθος μηνυμάτων που στέλνονται
-MAIN_MAIL_AUTOCOPY_TO= Να αποστέλονται κρυφά αντίγραφα των απεσταλμένων emails στο
+MAIN_MAIL_AUTOCOPY_TO= Να αποστέλλονται κρυφά αντίγραφα των απεσταλμένων emails στο
 MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των προσφορών που αποστέλλονται μέσω email στο
 MAIN_MAIL_AUTOCOPY_ORDER_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου των παραγγελιών που αποστέλλονται μέσω email στο
 MAIN_MAIL_AUTOCOPY_INVOICE_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου τιμολογίου που αποστέλλεται μέσω email στο
@@ -280,7 +280,7 @@ MAIN_DISABLE_ALL_SMS=Απενεργοποίηση όλων των αποστολ
 MAIN_SMS_SENDMODE=Μέθοδος που θέλετε να χρησιμοποιηθεί για την αποστολή SMS
 MAIN_MAIL_SMS_FROM=Προεπιλεγμένος αριθμός τηλεφώνου αποστολέα για την αποστολή SMS
 FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι διαθέσιμη σε συστήματα Unix like. Δοκιμάστε το πρόγραμμα sendmail τοπικά.
-SubmitTranslation=Αν η μετάφραση για αυτή την γλώσσα δεν είναι ολοκληρωμένη λη βρίσκετε λάθη, μπορείτε να τα διορθώσετε με επεξεργασία των αρχείων στο φάκελο langs/%s και να στείλετε τα επεξεργασμένα αρχεία στο forum www.dolibarr.org.
+SubmitTranslation=Αν η μετάφραση για αυτή την γλώσσα δεν είναι ολοκληρωμένη και βρίσκετε λάθη, μπορείτε να τα διορθώσετε με επεξεργασία των αρχείων στο φάκελο langs/%s και να στείλετε τα επεξεργασμένα αρχεία στο forum www.dolibarr.org.
 ModuleSetup=Διαχείριση Αρθρώματος
 ModulesSetup=Διαχείριση Αρθρωμάτων
 ModuleFamilyBase=Σύστημα
@@ -289,14 +289,14 @@ ModuleFamilyProducts=Διαχείριση Προϊόντων
 ModuleFamilyHr=Διαχείριση Ανθρώπινου Δυναμικού
 ModuleFamilyProjects=Projects/Συμμετοχικές εργασίες
 ModuleFamilyOther=Άλλο
-ModuleFamilyTechnic=Εργαλεία πολλαπλών αρθρωμάτων
-ModuleFamilyExperimental=Πειραματικά αρθρώματα
-ModuleFamilyFinancial=Χρηματοοικονομικά αρθρώματα (Λογιστική/Χρηματοοικονομικά)
+ModuleFamilyTechnic=Εργαλεία πολλαπλών modules
+ModuleFamilyExperimental=Πειραματικά modules
+ModuleFamilyFinancial=Χρηματοοικονομικά Modules (Λογιστική/Χρηματοοικονομικά)
 ModuleFamilyECM=Διαχείριση Ηλεκτρονικού Περιεχομένου (ECM)
 MenuHandlers=Διαχειριστές μενού
 MenuAdmin=Επεξεργαστής μενού
 DoNotUseInProduction=Να μην χρησιμοποιείται για παραγωγή
-ThisIsProcessToFollow=Αυτό έχει ρυθμιστεί για να κατεργαστεί:
+ThisIsProcessToFollow=Αυτό έχει ρυθμιστεί για να επεξεργαστεί:
 StepNb=Βήμα %s
 FindPackageFromWebSite=Βρείτε ένα πακέτο που να παρέχει την λειτουργία που επιθυμείτε (για παράδειγμα στο επίσημο %s).
 DownloadPackageFromWebSite=Μεταφόρτωση πακέτου %s.
@@ -305,20 +305,20 @@ SetupIsReadyForUse=Η εγκατάσταση τελείωσε και το Doliba
 NotExistsDirect=Ο εναλλακτικός ριζικός φάκελος δεν έχει ρυθμιστεί.

 InfDirAlt=Από την έκδοση 3 είναι δυνατός ο ορισμός ενός εναλλακτικού ριζικού φακέλου.  Αυτό σας επιτρέπει να αποθηκεύσετε στο ίδιο μέρος πρόσθετες εφαρμογές και μη τυπικά templates.
Απλά δημιουργήστε ένα φάκελο στο ριζικό φάκελο του Dolibarr (π.χ.: custom).

 InfDirExample=
Κατόπιν δηλώστε το στο αρχείο conf.php
 $dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*Αυτές οι γραμμές είναι απενεργοποιημένες με χρήση του χαρακτήρα "#", για να της ενεργοποιήσετε απλά αφαιρέστε το χαρακτήρα.
-YouCanSubmitFile=Επιλογή αρθρώματος:
+YouCanSubmitFile=Επιλογή module:
 CurrentVersion=Έκδοση Dolibarr
 CallUpdatePage=Πηγαίνετε στην σελίδα που ενημερώνει την δομή της βάσης δεδομένων και τα δεδομένα: %s.
 LastStableVersion=Τελευταία σταθερή έκδοση
 UpdateServerOffline=Ο διακομιστής ενημερώσεων είναι εκτός σύνδεσης
-GenericMaskCodes=Μπορείτε να χρησιμοποιήσετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτή τη μάσκα  μπορούν να χρησιμοποιηθούν τις παρακάτω ετικέτες:
Το {000000} αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε όσα μηδεν επιθυμείτε ως το επιθυμητό μέγεθος για τον μετρητή. Ο μετρητής θα συμπληρωθεί με μηδενικά από τα αριστερά για να έχει όσα μηδενικά υπάρχουν στην μάσκα. 
Η μάσκα {000000+000} είναι η ίδια όπως προηγουμένως αλλά ένα αντιστάθμισμα που αντιστοιχεί στον αριθμό στα δεξιά του + θα προστεθεί αρχίζοντας από το πρώτο %s. 
Η μάσκα {000000@x} είναι η ίδια όπως προηγουμένως αλλά ο μετρητής επανέρχεται στο μηδέν όταν έρθει ο μήνας x  (το x είναι μεταξύ του 1 και του 12). Αν αυτή η επιλογή χρησιμοποιηθεί και το x είναι 2 ή μεγαλύτερο, τότε η ακολουθία {yy}{mm} ή {yyyy}{mm} είναι επίσης απαιραίτητη. 
Η μάσκα {dd} ημέρα (01 έως 31).
{mm} μήνας (01 έως 12).
{yy}, {yyyy} ή {y} έτος με χρήση 2, 4 ή 1 αριθμού. 

+GenericMaskCodes=Μπορείτε να χρησιμοποιήσετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτή τη μάσκα  μπορούν να χρησιμοποιηθούν τις παρακάτω ετικέτες:
Το {000000} αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε όσα μηδέν επιθυμείτε ως το επιθυμητό μέγεθος για τον μετρητή. Ο μετρητής θα συμπληρωθεί με μηδενικά από τα αριστερά για να έχει όσα μηδενικά υπάρχουν στην μάσκα. 
Η μάσκα {000000+000} είναι η ίδια όπως προηγουμένως αλλά ένα αντιστάθμισμα που αντιστοιχεί στον αριθμό στα δεξιά του + θα προστεθεί αρχίζοντας από το πρώτο %s. 
Η μάσκα {000000@x} είναι η ίδια όπως προηγουμένως αλλά ο μετρητής επανέρχεται στο μηδέν όταν έρθει ο μήνας x  (το x είναι μεταξύ του 1 και του 12). Αν αυτή η επιλογή χρησιμοποιηθεί και το x είναι 2 ή μεγαλύτερο, τότε η ακολουθία {yy}{mm} ή {yyyy}{mm} είναι επίσης απαιραίτητη. 
Η μάσκα {dd} ημέρα (01 έως 31).
{mm} μήνας (01 έως 12).
{yy}, {yyyy} ή {y} έτος με χρήση 2, 4 ή 1 αριθμού. 

 GenericMaskCodes2={cccc} ο κωδικός πελάτη σε n χαρακτήρες 
 {cccc000} ο κωδικός πελάτη σε n χαρακτήρες ακολουθείται από ένα μετρητή αφιερωμένο για τον πελάτη. Αυτός ο μετρητής ειναι αφιερωμένος στον πελάτη μηδενίζεται ταυτόχρονα από την γενικό μετρητή. 
 {tttt} Ο κωδικός των Πελ./Προμ. σε n χαρακτήρες (βλέπε λεξικό-thirdparty types). 

 GenericMaskCodes3=Όλοι οι άλλοι χαρακτήρες στην μάσκα θα παραμείνουν ίδιοι.
Κενά διαστήματα δεν επιτρέπονται.

 GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:

 GenericMaskCodes4b=Το παράδειγμα του τρίτου μέρους δημιουργήθηκε στις 2007-03-01:

-GenericMaskCodes4c=Το παράδειγμα προϊόντος δημιουργήθηκε στις 2007-03-01:

+GenericMaskCodes4c=Παράδειγμα το προϊόν δημιουργήθηκε στις 2007-03-01:

 GenericMaskCodes5=Η μάσκα ABC{yy}{mm}-{000000} θα δώσει ABC0701-000099
Η μάσκα{0000+100}-ZZZ/{dd}/XXX θα δώσει 0199-ZZZ/31/XXX
 GenericNumRefModelDesc=Επιστρέφει έναν παραμετροποιήσημο αριθμό σύμφωνα με μία ορισμένη μάσκα.
-ServerAvailableOnIPOrPort=Ο διακομιστής είναι διαθέσιμο στην διεύθυνση %s στην θύρα %s
+ServerAvailableOnIPOrPort=Ο διακομιστής είναι διαθέσιμος στην διεύθυνση %s στην θύρα %s
 ServerNotAvailableOnIPOrPort=Ο διακομιστής δεν είναι διαθέσιμος στην διεύθυνση %s στην θύρα %s
 DoTestServerAvailability=Έλεγχος διασύνδεσης server
 DoTestSend=Δοκιμή Αποστολής
@@ -327,19 +327,19 @@ ErrorCantUseRazIfNoYearInMask=Σφάλμα, δεν μπορείτε να χρη
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ αν η ακολουθία {yy}{mm} ή {yyyy}{mm} δεν είναι στην μάσκα.
 UMask=Παράμετρος UMask για νέα αρχεία σε συστήματα αρχείων συστημάτων Unix/Linux/BSD/Mac.
 UMaskExplanation=Αυτή η παράμετρος σας επιτρέπει να ορίσετε προεπιλεγμένα δικαιώματα αρχείων για αρχεία που δημιουργεί το Dolibarr στον διακομιστή (κατά την διάρκεια μεταφόρτωσης π.χ.).
Πρέπει να είναι οκταδικής μορφής (για παράδειγμα, 0666 σημαίνει εγγραφή και ανάγνωση για όλους).
Αυτή η παράμετρος είναι άχρηστη σε διακομιστές Windows.
-SeeWikiForAllTeam=Ρίξτε μια ματία στην σελίδα wiki για μια πλήρη λίστα όλων των actors και της οργάνωσής τους
+SeeWikiForAllTeam=Ρίξτε μια ματιά στην σελίδα wiki για μια πλήρη λίστα όλων των actors και της οργάνωσής τους
 UseACacheDelay= Καθυστέρηση για την τοποθέτηση απόκρισης εξαγωγής στην προσωρινή μνήμη σε δευτερόλεπτα (0 ή άδεια για μη χρήση προσωρινής μνήμης)
 DisableLinkToHelpCenter=Αποκρύψτε τον σύνδεσμο "Αναζητήστε βοήθεια ή υποστήριξη" στην σελίδα σύνδεσης
 DisableLinkToHelp=Αποκρύψτε το σύνδεσμο "%s Online βοήθεια" στο αριστερό μενού
-AddCRIfTooLong=Δεν υπάρχει αυτόματη αναδίπλωση κειμένου.  Αν η γραμμή σας σας δεν χωράει στην σελίδα των εγγράφων επειδή είναι πολύ μεγάλη, θα πρέπει να προσθέσετε μόνοι σας χαρακτήρες αλλαγής γραμμής (carriage return) στην περιοχή κειμένου.
+AddCRIfTooLong=Δεν υπάρχει αυτόματη αναδίπλωση κειμένου.  Αν η γραμμή σας δεν χωράει στην σελίδα των εγγράφων επειδή είναι πολύ μεγάλη, θα πρέπει να προσθέσετε μόνοι σας χαρακτήρες αλλαγής γραμμής carriage return στην περιοχή κειμένου.
 ModuleDisabled=Απενεργοποιημένο Άρθρωμα
-ModuleDisabledSoNoEvent=Το άρθρωμα είναι απενεργοποιημένο και έτσι δεν έχει δημιουργηθεί τέτοιο γεγονός
+ModuleDisabledSoNoEvent=Το module είναι απενεργοποιημένο και έτσι δεν έχει δημιουργηθεί τέτοιο γεγονός
 ConfirmPurge=Είστε σίγουροι πως θέλετε να εκτελέσετε αυτή τη διαγραφή;
Αυτό θα διαγράψει όλα σας τα δεδομένα με καμία δυνατότητα ανάκτησης (αρχεία ECM, συνημμένα αρχεία...).
 MinLength=Ελάχιστο μήκος
 LanguageFilesCachedIntoShmopSharedMemory=Τα αρχεία τύπου .lang έχουν φορτωθεί στην κοινόχρηστη μνήμη
 ExamplesWithCurrentSetup=Παραδείγματα με την τωρινή διαμόρφωση
 ListOfDirectories=Λίστα φακέλων προτύπων OpenDocument
-ListOfDirectoriesForModelGenODT=Λίστα φακέλων που περιέχουν αρχεία προτύπων τύπου OpenDocument.

Τοποθετείστε εδώ ολόκληρη την διαδρομή των φακέλων.
Εισάγετε ένα χαρακτήρα αλλαγής γραμμής ανάμεσα σε κάθε φάκελο.
Για να προσθέσετε ένα φάκελο του αρθρώματος GED, προσθέστε εδώ DOL_DATA_ROOT/ecm/yourdirectoryname.

Τα αρχεία σε αυτούς τους φακέλους πρέπει να έχουν την επέκταση .odt.
+ListOfDirectoriesForModelGenODT=Λίστα φακέλων που περιέχουν αρχεία προτύπων τύπου OpenDocument.

Τοποθετείστε εδώ ολόκληρη την διαδρομή των φακέλων.
Εισάγετε ένα χαρακτήρα αλλαγής γραμμής ανάμεσα σε κάθε φάκελο.
Για να προσθέσετε ένα φάκελο του module GED, προσθέστε εδώ DOL_DATA_ROOT/ecm/yourdirectoryname.

Τα αρχεία σε αυτούς τους φακέλους πρέπει να έχουν την επέκταση .odt.
 NumberOfModelFilesFound=Αριθμός αρχείων προτύπων ODT/ODS που βρέθηκαν σε αυτούς τους φακέλους
 ExampleOfDirectoriesForModelGen=Παραδείγματα σύνταξης:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=
Για να μάθετε πως να δημιουργήσετε τα δικά σας αρχεία προτύπων, πριν τα αποθηκεύσετε σε αυτούς τους φακέλους, διαβάστε την τεκμηρίωση στο wiki:
@@ -348,21 +348,21 @@ FirstnameNamePosition=Θέση ονόματος/επιθέτου
 DescWeather=Οι παρακάτω εικόνες θα εμφανιστούν στο ταμπλό όταν ο αριθμός των τελευταίων ενεργειών φτάσει τις παρακάτω τιμές:
 KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
 TestSubmitForm=Φόρμα δοκιμής εισαγωγής δεδομένων
-ThisForceAlsoTheme=Αυτός ο τροποποιητής μενού χρησιμοποιεί το δικό του θέμα όποιο θέμα και να έχει επιλέξει ο χρήστης.  Επίσης, αυτό το πρόγραμμα διαχείρισης μενου που ειδικεύετεαι στις κινητές συσκευές δεν δουλεύει σε όλα τα smartphone. Χρησιμοποιήσετε κάποιον άλλο διαχειριστή μενού αν αντιμετωπίζετε προβλήματα στο δικό σας.
+ThisForceAlsoTheme=Αυτός ο τροποποιητής μενού χρησιμοποιεί το δικό του θέμα όποιο θέμα και να έχει επιλέξει ο χρήστης.  Επίσης, αυτό το πρόγραμμα διαχείρισης μενού που ειδικεύεται στις κινητές συσκευές δεν δουλεύει σε όλα τα smartphone. Χρησιμοποιήσετε κάποιον άλλο διαχειριστή μενού αν αντιμετωπίζετε προβλήματα στο δικό σας.
 ThemeDir=Φάκελος skins
 ConnectionTimeout=Λήξη σύνδεσης
 ResponseTimeout=Λήξη χρόνου αναμονής απάντησης
 SmsTestMessage=Δοκιμαστικό μήνυμα από __PHONEFROM__ να __PHONETO__
 ModuleMustBeEnabledFirst=%s Ενότητα πρέπει να είναι ενεργοποιημένα πρώτη φορά πριν τη χρήση αυτής της δυνατότητας.
 SecurityToken=Security Token
-NoSmsEngine=Δεν υπάρχει πρόγραμμα αποστολής SMS διαθέσιμο. Τα προγράμματα αποστολής SMS δεν εγκαθίστανται με την διανομή από προεπιλογή (επειδή εξαρτόνται από εξωτερικούς προμηθευτές) αλλά μπορείτε να βρείτε κάποια διαθέσιμα προγράμματα στο %s
+NoSmsEngine=Δεν υπάρχει πρόγραμμα αποστολής SMS διαθέσιμο. Τα προγράμματα αποστολής SMS δεν εγκαθίστανται με την διανομή από προεπιλογή (επειδή εξαρτώνται από εξωτερικούς προμηθευτές) αλλά μπορείτε να βρείτε κάποια διαθέσιμα προγράμματα στο %s
 PDF=PDF
 PDFDesc=Μπορείτε να ρυθμίσετε κάθε κεντρική επιλογή που σχετίζεται με τη δημιουργία PDF
 PDFAddressForging=Κανόνες για να δημιουργηθούν διευθύνσεις
 HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με τον ΦΠΑ στα δημιουργηθέντα PDF
 HideDescOnPDF=Απόκρυψη περιγραφών προϊόντων στα δημιουργηθέντα PDF
 HideRefOnPDF=Απόκρυψη αναφοράς προϊόντος στα δημιουργηθέντα PDF
-HideDetailsOnPDF=Απόκρυψη λεπτομεριών προϊόντων στα δημιουργηθέντα PDF
+HideDetailsOnPDF=Απόκρυψη λεπτομερειών προϊόντων στα δημιουργηθέντα PDF
 Library=Βιβλιοθήκη
 UrlGenerationParameters=Παράμετροι για δημιουργία ασφαλών URL
 SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο securekey για κάθε διεύθυνση URL
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Διαχωριστικό
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Πλαίσιο ελέγχου από τον πίνακα
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value

 για παράδειγμα : 
1,value1
2,value2
3,value3
...

Προκειμένου να έχει τη λίστα εξαρτώμενη με μια άλλη: 
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value

 για παράδειγμα : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value

 για παράδειγμα : 
1,value1
2,value2
3,value3
...
@@ -400,7 +401,7 @@ LocalTaxDesc=Σε κάποιες χώρες επιβάλλονται 2 ή 3 φό
 SMS=SMS
 LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμό για να δημιουργηθεί ένας σύνδεσμος που θα σας επιτρέπει να κάνετε κλήση με το ClickToDial για τον χρήστη %s
 RefreshPhoneLink=Ανανέωση συνδέσμου
-LinkToTest=Σημιουργήθηκε σύνδεσμος για τον χρήστη %s (κάντε κλικ στον αριθμό τηλεφώνου για να τον δοκιμάσετε)
+LinkToTest=Δημιουργήθηκε σύνδεσμος για τον χρήστη %s (κάντε κλικ στον αριθμό τηλεφώνου για να τον δοκιμάσετε)
 KeepEmptyToUseDefault=Αφήστε κενό για να χρησιμοποιήσετε την προεπιλεγμένη τιμή
 DefaultLink=Προεπιλεγμένος σύνδεσμος
 ValueOverwrittenByUserSetup=Προσοχή, αυτή η τιμή μπορεί να αντικατασταθεί από επιλογή του χρήστη (ο κάθε χρήστης μπορεί να κάνει τον δικό του σύνδεσμο clicktodial)
@@ -423,9 +424,9 @@ Module1Desc=Διαχείριση εταιρειών και επαφών (πελ
 Module2Name=Εμπορικό
 Module2Desc=Εμπορική διαχείριση
 Module10Name=Λογιστική
-Module10Desc=Απλές αναφορές λογιστικής (journals, turnover) βασισμένα στα περιοχόμενα της βάσης δεδομένων. Χωρίς αποστολές.
+Module10Desc=Απλές αναφορές λογιστικής (ημερολόγια, τζίρος) βασισμένα στα περιεχόμενο της βάσης δεδομένων. Χωρίς αποστολές.
 Module20Name=Προτάσεις
-Module20Desc=Διαχείριση εμπορικών προτάσεων
+Module20Desc=Διαχείριση προσφορών
 Module22Name=Μαζική αποστολή e-mail
 Module22Desc=Διαχείριση μαζικής αποστολής e-mail
 Module23Name= Ενέργεια
@@ -442,8 +443,8 @@ Module49Name=Επεξεργαστές κειμένου
 Module49Desc=Διαχείριση επεξεργαστών κειμένου
 Module50Name=Προϊόντα
 Module50Desc=Διαχείριση προϊόντων
-Module51Name=Μαζικές αποστολές επιστολών
-Module51Desc=Διαχείριση μαζικών αποστολών επιστολών
+Module51Name=Μαζικές αποστολές e-mail
+Module51Desc=Διαχείριση μαζικών αποστολών e-mail
 Module52Name=Αποθέματα
 Module52Desc=Διαχείριση αποθεμάτων (προϊόντων)
 Module53Name=Υπηρεσίες
@@ -467,9 +468,9 @@ Module75Desc=Διαχείριση σημειώσεων εξόδων και τα
 Module80Name=Αποστολές
 Module80Desc=Διαχείριση αποστολών και εντολών παράδοσης
 Module85Name=Τράπεζες και μετρητά
-Module85Desc=Διαχείριση τραπεζικών και λογαριασμών μετρητών
+Module85Desc=Διαχείριση τραπεζών και λογαριασμών μετρητών
 Module100Name=Εξωτερική ιστοσελίδα
-Module100Desc=Αυτό το άρθρωμα περιέχει μία εξωτερική ιστοσελίδα ή site μέσα από το μενού του Dolibarr  για να προβληθεί μέσω ενός παραθύρου Dolibarr
+Module100Desc=Αυτό το module περιέχει μία εξωτερική ιστοσελίδα ή site μέσα από το μενού του Dolibarr  για να προβληθεί μέσω ενός παραθύρου Dolibarr
 Module105Name=Mailman και SIP
 Module105Desc=Mailman ή SPIP διεπαφή για ενότητα μέλος
 Module200Name=LDAP
@@ -477,9 +478,9 @@ Module200Desc=Συγχρονισμός LDAP directory
 Module210Name=PostNuke
 Module210Desc=Διεπαφή PostNuke
 Module240Name=Εξαγωγές δεδομένων
-Module240Desc=Εργαλείο για την εξαγωγή δεδομέων του Dolibarr (με βοηθούς)
+Module240Desc=Εργαλείο για την εξαγωγή δεδομένων του Dolibarr (με βοηθούς)
 Module250Name=Εισαγωγές δεδομένων
-Module250Desc=Εργαλείο για την εισαγωγή δεδομένω στο Dolibarr (με βοηθούς)
+Module250Desc=Εργαλείο για την εισαγωγή δεδομένων στο Dolibarr (με βοηθούς)
 Module310Name=Μέλη
 Module310Desc=Διαχείριση μελών οργανισμού
 Module320Name=RSS Feed
@@ -494,6 +495,8 @@ Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινων
 Module500Desc=Διαχείριση των ειδικών δαπανών, όπως οι φόροι, κοινωνικές εισφορές, μερίσματα και μισθούς
 Module510Name=Μισθοί
 Module510Desc=Διαχείριση υπαλλήλων, μισθών και πληρωμών
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου σχετικά με ορισμένες Dolibarr επαγγελματικές συναντήσεις σε Πελ./Προμ. (η ρύθμιση ορίζεται από κάθε Πελ./Προμ.)
 Module700Name=Δωρεές
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Κατηγορίες
-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=Δυναμικές Τιμές
 Module2200Desc=Ενεργοποιήστε τη χρήση των μαθηματικών εκφράσεων για τις τιμές
 Module2300Name=Μενού
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Ατζέντα
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -642,7 +645,7 @@ Permission181=Read supplier orders
 Permission182=Create/modify supplier orders
 Permission183=Validate supplier orders
 Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
+Permission185=Ολοκλήρωση ή ακύρωση παραγγελίας προμηθευτή
 Permission186=Receive supplier orders
 Permission187=Close supplier orders
 Permission188=Cancel supplier orders
@@ -714,6 +717,11 @@ Permission510=Διαβάστε τους μισθούς
 Permission512=Δημιουργία/Τροποποίηση μισθών
 Permission514=Διαγραφή μισθών
 Permission517=Εξαγωγή μισθών
+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:
%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 ειδοποιήσεις η λειτουργία αυτή σας επιτρέπει να στείλετε σιωπηλά αυτόματο μήνυμα, για ορισμένες εκδηλώσεις Dolibarr. Οι στόχοι των κοινοποιήσεων μπορούν να οριστούν:
* ανά Πελ./Προμ. (πελάτες ή προμηθευτές), ανά ένα Πελ./Προμ. την φορά.
* ή με τον καθορισμό ενός γενικού e-mail στη σελίδα εγκατάστασης του module.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 5e8f1ffdcaf..f77c296ab81 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Το τιμολόγιο %s επικυρώθηκε
 InvoiceValidatedInDolibarrFromPos=Το τιμολόγιο επικυρώθηκε από το  POS
 InvoiceBackToDraftInDolibarr=Τιμολόγιο %s θα επιστρέψει στην κατάσταση του σχεδίου
 InvoiceDeleteDolibarr=Τιμολόγιο %s διαγράφεται
-OrderValidatedInDolibarr= Η παραγγελία %s επικυρώθηκε
+OrderValidatedInDolibarr=Η παραγγελία %s επικυρώθηκε
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Παραγγελία %s ακυρώθηκε
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Παραγγελία %s εγκρίθηκε
 OrderRefusedInDolibarr=Παραγγελία %s απορριφθεί
 OrderBackToDraftInDolibarr=Παραγγελία %s θα επιστρέψει στην κατάσταση σχέδιο
@@ -91,3 +94,5 @@ WorkingTimeRange=Εύρος χρόνου εργασίας
 WorkingDaysRange=Εύρος ημερών εργασίας
 AddEvent=Δημιουργία συμβάντος
 MyAvailability=Η διαθεσιμότητα μου
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 7c143b155f1..726182bd6ee 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -33,11 +33,11 @@ AllTime=Από την αρχή
 Reconciliation=Πραγματοποίηση Συναλλαγών
 RIB=Αριθμός Τραπ. Λογαριασμού
 IBAN=IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=Το ΙΒΑΝ είναι έγκυρο
+IbanNotValid=Το ΙΒΑΝ δεν είναι έγκυρο
 BIC=Αριθμός BIC/SWIFT
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=Το BIC/SWIFT είναι έγκυρο
+SwiftNotValid=Το BIC/SWIFT δεν είναι έγκυρο
 StandingOrders=Πάγιες εντολές
 StandingOrder=Πάγια εντολή
 Withdrawals=Αναλήψεις
@@ -152,7 +152,7 @@ BackToAccount=Επιστροφή στον λογαριασμό
 ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών
 FutureTransaction=Συναλλαγή στο μέλλον. Δεν υπάρχει τρόπος συμβιβασμού.
 SelectChequeTransactionAndGenerate=Επιλέξτε/φίλτρο ελέγχου για να συμπεριληφθεί στην απόδειξη κατάθεσης και κάντε κλικ στο "Δημιουργία".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
 ToConciliate=Να συμβιβάσει;
 ThenCheckLinesAndConciliate=Στη συνέχεια, ελέγξτε τις γραμμές που υπάρχουν στο αντίγραφο κίνησης του τραπεζικού λογαριασμού και κάντε κλικ
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index b7981cb6906..ee85738b276 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Το σύνολο των δύο νέων τ
 ConfirmRemoveDiscount=Είστε σίγουροι ότι θέλετε να αφαιρέσετε την έκπτωση;
 RelatedBill=Σχετιζόμενο τιμολόγιο
 RelatedBills=Σχετιζόμενα τιμολόγια
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Τελευταίο σχετικό τιμολόγιο
 WarningBillExist=Προσοχή, ένα ή περισσότερα τιμολόγια υπάρχουν ήδη
 
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 542fb2cf04f..44b883b8a0f 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/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=%s προστέθηκε με επιτυχία.
-ObjectAlreadyLinkedToCategory=Το στοιχείο είναι ήδη συνδεδεμένο σε αυτή την κατηγορία.
-CategorySuccessfullyCreated=Αυτή η κατηγορία %s έχει προστεθεί με επιτυχία.
-ProductIsInCategories=Το Προϊόν/Υπηρεσία ανήκει στις παρακάτω κατηγορίες
-SupplierIsInCategories=Το στοιχείο ανήκει στις παρακάτω κατηγορίες προμηθευτών
-CompanyIsInCustomersCategories=Αυτό το στοιχείο ανήκει στις παρακάτω κατηγορίες πελατών/προοπτικών
-CompanyIsInSuppliersCategories=Αυτό το στοιχείο ανήκει στις παρακάτω κατηγορίες προμηθευτών
-MemberIsInCategories=Αυτό το μέλος ανήκει στις παρακάτω κατηγορίες μελών
-ContactIsInCategories=Αυτή η επαφή ανήκει στις ακόλουθες κατηγορίες επαφών
-ProductHasNoCategory=This product/service is not in any categories
-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=Πίσω στην καρτέλα πελάτη/προοπτική
 ContentsVisibleByAll=Τα περιεχόμενα θα είναι ορατά από όλους
 ContentsVisibleByAllShort=Περιεχόμενα ορατά από όλους
 ContentsNotVisibleByAllShort=Περιεχόμενα μη ορατά από όλους
-CategoriesTree=Δέντρο κατηγοριών
-DeleteCategory=Διαγραφή Κατηγορίας
-ConfirmDeleteCategory=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την κατηγορία;
-RemoveFromCategory=Αφαιρέστε το σύνδεσμο από την κατηγορία
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-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=Κατηγορίες Πελατών/Προοπτ
-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=Κωδικός Κατηγορίας
-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=Προσθέστε το ακόλουθο προϊόν/υπηρεσία
-ShowCategory=Εμφάνιση κατηγορίας
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 114c0169055..1f1bc892da0 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Η επικοινωνία έγινε
 DateActionPlanned=Ημερ. προγραμματισμού
 DateActionDone=Ημερ. ολοκλήρωσης
 ActionAskedBy=Η ενέργεια ζητήθηκε από
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Η ενέργεια αφορά τον/την
 ActionDoneBy=Η ενέργεια έγινε από τον/την
 ActionUserAsk=Καταγράφηκε από τον/την
 ErrorStatusCantBeZeroIfStarted=Εάν το πεδίο 'Date done' είναι γεμάτο, η ενέργεια έχει αρχίσει (ή έχει τελειώσει), οπότε το πεδίο 'Status' δεν μπορεί να είναι 0%%.
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index c8e4c7b1cb5..1ff660913a1 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Έληξε
 ServiceStatusClosed=Τερματισμένη
 ServicesLegend=Services legend
 Contracts=Συμβόλαια
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Συμβόλαια και η γραμμή των συμβολαίων
 Contract=Συμβόλαιο
 NoContracts=Κανένα Συμβόλαιο
 MenuServices=Υπηρεσίες
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 9f94c994725..738ac49580c 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Τελευταία εκτέλεση εξόδου
 CronLastResult=Τελευταίος κωδικός αποτελέσματος
 CronListOfCronJobs=Κατάλογος προγραμματισμένων εργασιών
 CronCommand=Εντολή
-CronList=Λίστα εργασιών
-CronDelete= Διαγραφή εργασιών cron
-CronConfirmDelete= Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την περιοδική εργασία;
-CronExecute=Έναρξη εργασίας
-CronConfirmExecute= Είστε σίγουροι για την εκτελέσει αυτής τις εργασίας τώρα;
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Αναμονή εργασίας
+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=Εργασία
-CronNone= Καμία
+CronNone=Καμία
 CronDtStart=Ημερ. έναρξης
 CronDtEnd=Ημερ. τέλους
 CronDtNextLaunch=Επόμενη εκτέλεση
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=Γραμμή εντολών του συστήματος προς εκτέλεση.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Πληροφορίες
 # Common
@@ -84,4 +85,4 @@ CronType_command=Εντολή Shell
 CronMenu=Μενού
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Πηγαίνετε στο μενού "Home - Modules εργαλεία - Λίστα εργασιών" για να δείτε και να επεξεργαστείτε τις προγραμματισμένες εργασίες.
-TaskDisabled=Task disabled
+TaskDisabled=Η εργασία απενεργοποιήθηκε
diff --git a/htdocs/langs/el_GR/donations.lang b/htdocs/langs/el_GR/donations.lang
index c35ee1cbc55..2230375c4db 100644
--- a/htdocs/langs/el_GR/donations.lang
+++ b/htdocs/langs/el_GR/donations.lang
@@ -6,6 +6,8 @@ Donor=Δωρεά
 Donors=Δωρεές
 AddDonation=Δημιουργία δωρεάς
 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=Επιλογές για Γαλλία
 DONATION_ART200=Δείτε το άρθρο 200 από το CGI αν ανησυχείτε
 DONATION_ART238=Δείτε το άρθρο 238 από το CGI αν ανησυχείτε
 DONATION_ART885=Δείτε το άρθρο 885 από το CGI αν ανησυχείτε
+DonationPayment=Donation payment
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 1361707a862..ee989554734 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Άγνωστο σφάλμα '%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
diff --git a/htdocs/langs/el_GR/loan.lang b/htdocs/langs/el_GR/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/el_GR/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
 This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.

+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index debe768f46e..37654134875 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Λίστα όλων των ειδοποιήσεων ηλ
 MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο '%s' για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Τρέχων αριθμός των στοχευμένων ηλεκτρονικών μηνυμάτων της επαφής
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 50211a1e084..f16111aaa06 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -141,7 +141,7 @@ Cancel=Άκυρο
 Modify=Τροποποίηση
 Edit=Επεξεργασία
 Validate=Επικύρωση
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Επικύρωση και Έγκριση
 ToValidate=Προς Επικύρωση
 Save=Αποθήκευση
 SaveAs=Αποθήκευση Ως
@@ -159,7 +159,7 @@ Search=Αναζήτηση
 SearchOf=Αναζήτηση
 Valid=Έγκυρο
 Approve=Έγκριση
-Disapprove=Disapprove
+Disapprove=Δεν εγκρίνεται
 ReOpen=Εκ νέου άνοιγμα
 Upload=Αποστολή Αρχείου
 ToLink=Σύνδεσμος
@@ -221,7 +221,7 @@ Cards=Καρτέλες
 Card=Καρτέλα
 Now=Τώρα
 Date=Ημερομηνία
-DateAndHour=Date and hour
+DateAndHour=Ημερομηνία και ώρα
 DateStart=Ημερομηνία Έναρξης
 DateEnd=Ημερομηνία Τέλους
 DateCreation=Ημερομηνία Δημιουργίας
@@ -298,7 +298,7 @@ UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α)
 UnitPriceTTC=Τιμή Μονάδος
 PriceU=Τιμή μον.
 PriceUHT=Τιμή μον.
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=PU ΗΤ Ζητούμενες
 PriceUTTC=Τιμή μον.
 Amount=Ποσό
 AmountInvoice=Ποσό Τιμολογίου
@@ -352,6 +352,7 @@ Status=Κατάσταση
 Favorite=Αγαπημένα
 ShortInfo=Info.
 Ref=Κωδ.
+ExternalRef=Κωδ. extern
 RefSupplier=Αριθ. Τιμολογίου
 RefPayment=Κωδ. πληρωμής
 CommercialProposalsShort=Εμπορικές προτάσεις
@@ -394,8 +395,8 @@ Available=Σε διάθεση
 NotYetAvailable=Δεν είναι ακόμη σε διάθεση
 NotAvailable=Χωρίς διάθεση
 Popularity=Δημοτικότητα
-Categories=Κατηγορίες
-Category=Κατηγορία
+Categories=Ετικέτες/Κατηγορίες
+Category=Ετικέτα/Κατηγορία
 By=Από
 From=Από
 to=πρός
@@ -525,7 +526,7 @@ DateFromTo=Από %s μέχρι %s
 DateFrom=Από %s
 DateUntil=Μέχρι %s
 Check=Έλεγχος
-Uncheck=Uncheck
+Uncheck=Αποεπιλογή
 Internal=Internal
 External=External
 Internals=Internal
@@ -693,7 +694,8 @@ PublicUrl=Δημόσια URL
 AddBox=Προσθήκη πεδίου
 SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κάντε κλικ στο κουμπί Ανανέωση
 PrintFile=Εκτύπωση του αρχείου %s
-ShowTransaction=Show transaction
+ShowTransaction=Εμφάνιση συναλλαγών
+GoIntoSetupToChangeLogo=Πηγαίνετε Αρχική - Ρυθμίσεις - Εταιρία να αλλάξει το λογότυπο ή πηγαίνετε Αρχική - Ρυθμίσεις - Προβολή για απόκρυψη.
 # Week day
 Monday=Δευτέρα
 Tuesday=Τρίτη
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index e6cedcee375..2759e5ab7ba 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -42,7 +42,7 @@ StatusOrderCanceled=Ακυρωμένη
 StatusOrderDraft=Προσχέδιο (χρειάζεται επικύρωση)
 StatusOrderValidated=Επικυρωμένη
 StatusOrderOnProcess=Παραγγέλθηκε - Αναμονή παραλαβής
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Παραγγέλθηκε - Αναμονή παραλαβής ή επικύρωσης
 StatusOrderProcessed=Ολοκληρωμένη
 StatusOrderToBill=Προς πληρωμή
 StatusOrderToBill2=Προς τιμολόγηση
@@ -59,12 +59,13 @@ MenuOrdersToBill=Παραγγελίες προς χρέωση
 MenuOrdersToBill2=Χρεώσιμες παραγγελίες
 SearchOrder=Εύρεση παραγγελίας
 SearchACustomerOrder=Αναζητήστε μία παραγγελία πελάτη
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Αναζήτηση παραγγελίας προμηθευτή
 ShipProduct=Ship product
 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=Payment of order %s
 CloneOrder=Κλωνοποίηση παραγγελίας
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 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
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 449d5bc6fac..bcc1ade3821 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Παρέμβαση αποστέλλεται μέσω ταχυδρομείου
 Notify_BILL_VALIDATE=Το τιμολόγιο πελάτη επικυρώθηκε
 Notify_BILL_UNVALIDATE=Τιμολόγιο του Πελάτη μη επικυρωμένο
+Notify_ORDER_SUPPLIER_VALIDATE=Παραγγελία του προμηθευτή καταγράφηκε
 Notify_ORDER_SUPPLIER_APPROVE=Η παραγγελία προμηθευτή εγγρίθηκε
 Notify_ORDER_SUPPLIER_REFUSE=Η παραγγελία προμηθευτή απορρίφθηκε
 Notify_ORDER_VALIDATE=Η παραγγελία πελάτη επικυρώθηκε
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Εμπορικές προτάσεις που αποστ
 Notify_BILL_PAYED=Τιμολογίου Πελατών payed
 Notify_BILL_CANCEL=Τιμολογίου Πελατών ακυρώσεις
 Notify_BILL_SENTBYMAIL=Τιμολογίου Πελατών σταλούν ταχυδρομικώς
-Notify_ORDER_SUPPLIER_VALIDATE=Για επικυρωθεί Προμηθευτής
+Notify_ORDER_SUPPLIER_VALIDATE=Παραγγελία του προμηθευτή καταγράφηκε
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Για Προμηθευτής σταλούν ταχυδρομικώς
 Notify_BILL_SUPPLIER_VALIDATE=Τιμολόγιο Προμηθευτή επικυρωθεί
 Notify_BILL_SUPPLIER_PAYED=Τιμολόγιο Προμηθευτή payed
@@ -47,20 +48,20 @@ Notify_PROJECT_CREATE=Δημιουργία έργου
 Notify_TASK_CREATE=Η εργασία δημιουργήθηκε
 Notify_TASK_MODIFY=Η εργασία τροποποιήθηκε
 Notify_TASK_DELETE=Η εργασία διαγράφηκε
-SeeModuleSetup=Προβολή ρύθμισης του module
+SeeModuleSetup=Δείτε την ρύθμιση του module %s
 NbOfAttachedFiles=Πλήθος επισυναπτώμενων αρχείων/εγγράφων
 TotalSizeOfAttachedFiles=Συνολικό μέγεθος επισυναπτώμενων αρχείων/εγγράφων
 MaxSize=Μέγιστο μέγεθος
 AttachANewFile=Επισύναψη νέου αρχείου/εγγράφου
 LinkedObject=Συνδεδεμένα αντικείμενα
 Miscellaneous=Διάφορα
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Αριθμός κοινοποιήσεων (Αριθμός emails παραλήπτη)
 PredefinedMailTest=Δοκιμαστικο mail.\nΟι δύο γραμμές είναι χωρισμένες με carriage return.
 PredefinedMailTestHtml=Αυτό είναι ένα μήνυμα δοκιμής (η δοκιμή λέξη πρέπει να είναι με έντονα γράμματα). 
 Οι δύο γραμμές που χωρίζονται με ένα χαρακτήρα επαναφοράς.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nΘα ήθελα να σας προειδοποιήσω ότι το τιμολόγιο  __FACREF__ φαίνεται να μην έχει πληρωθεί. Στο συνημμένο βρίσκεται το τιμολόγιο που φαίνεται να μην έχει πληρωθεί.\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την προσφορά __PROPREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το αίτημα των τιμών __ASKREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε τη παραγγελία __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παραγγελία μας __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Το τιμολόγιο %s έχει επικυρωθε
 EMailTextProposalValidated=Η %s πρόταση έχει επικυρωθεί.
 EMailTextOrderValidated=Η σειρά %s έχει επικυρωθεί.
 EMailTextOrderApproved=Η %s παραγγελία έχει εγκριθεί.
+EMailTextOrderValidatedBy=Η παραγγελία %s έχει καταγραφεί από %s.
 EMailTextOrderApprovedBy=Η σειρά %s έχει εγκριθεί από %s.
 EMailTextOrderRefused=Η σειρά %s έχει απορριφθεί.
 EMailTextOrderRefusedBy=Η σειρά %s έχει απορριφθεί από %s.
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index cc6e312db0e..400c52b0d5c 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Παρτίδα/Σειριακός αριθμός
 l_eatby=Φάτε ημερομηνία λήξης
 l_sellby=Ημερομηνία πώλησης
 DetailBatchNumber=Παρτίδα/Λεπτομέρειες σειριακού
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+DetailBatchFormat=Παρτίδα/Σειριακός: %s - Αφαιρέθηκε από: %s - Πώληση από: %s (Ποσ. : %d)
 printBatch=Παρτίδα: %s
 printEatby=Eat-by: %s
 printSellby=Πώληση ανά: %s
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index eebb6c5060b..873cc94308a 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Ελάχιστη συνιστώμενη τιμή είν
 PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
 PriceExpressionSelected=Επιλογή συνάρτησης τιμών
 PriceExpressionEditorHelp1="τιμή = 2 + 2" ή "2 + 2" για τον καθορισμό της τιμής. Χρησιμοποιήστε ; για να διαχωρίσετε τις εκφράσεις
-PriceExpressionEditorHelp2=Μπορείτε να αποκτήσετε πρόσβαση στα Συμπληρωματικά χαρακτηριστικά με μεταβλητές όπως #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=Στο προϊόν/υπηρεσία και στις τιμές του προμηθευτή υπάρχουν αυτές οι μεταβλητές διαθέσιμες:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Μόνο σε τιμές προϊόντων/υπηρεσιών: #supplier_min_price#
Μόνο τιμές Προμηθευτών: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Λειτουργία Τιμής
 PriceNumeric=Αριθμός
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+DefaultPrice=Προεπιλεγμένη τιμή
+ComposedProductIncDecStock=Αύξηση/Μείωση αποθεμάτων στην μητρική
+ComposedProduct=Υποπροϊόν
+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
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 4758fb8c27a..71c1c7e7cdb 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -8,10 +8,10 @@ SharedProject=Όλοι
 PrivateProject=Αντιπρόσωποι του έργου
 MyProjectsDesc=Η άποψη αυτή περιορίζονται σε έργα που είναι σε μια επαφή για την (όποια είναι ο τύπος).
 ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να δείτε.
 ProjectsDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 MyTasksDesc=Η άποψη αυτή περιορίζονται σε έργα ή εργασίες που έχουν μια επαφή για την (όποια είναι ο τύπος).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Μόνο τα έργα που είναι ανοιχτά είναι ορατά (έργα που είναι σχέδιο ή κλειστά δεν είναι ορατά)
 TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να διαβάζουν.
 TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 ProjectsArea=Περιοχή Έργων
@@ -31,8 +31,8 @@ NoProject=No project defined or owned
 NbOpenTasks=Αριθμός ανοιχτών εργασιών
 NbOfProjects=Αριθμός έργων
 TimeSpent=Χρόνος που δαπανήθηκε
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Χρόνος που δαπανάται από εσάς
+TimeSpentByUser=Χρόνος που δαπανάται από τον χρήστη
 TimesSpent=Ο χρόνος που δαπανάται
 RefTask=Αναφ. εργασίας
 LabelTask=Ετικέτα εργασίας
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Κατάλογος των ενταλμάτω
 ListSupplierInvoicesAssociatedProject=Κατάλογος των τιμολογίων του προμηθευτή που συνδέονται με το έργο
 ListContractAssociatedProject=Κατάλογος των συμβάσεων που συνδέονται με το έργο
 ListFichinterAssociatedProject=Κατάλογος των παρεμβάσεων που σχετίζονται με το έργο
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Λίστα αναφορών των δαπανών που σχετίζονται με το έργο
+ListDonationsAssociatedProject=Λίστα των δωρεών που σχετίζονται με το έργο
 ListActionsAssociatedProject=Κατάλογος των εκδηλώσεων που σχετίζονται με το έργο
 ActivityOnProjectThisWeek=Δραστηριότητα στο έργο αυτή την εβδομάδα
 ActivityOnProjectThisMonth=Δραστηριότητα στο έργο αυτό το μήνα
@@ -131,14 +132,14 @@ UnlinkElement=Αποσύνδεση στοιχείου
 # Documents models
 DocumentModelBaleine=Μοντέλο έκθεση Μια πλήρης έργου (logo. ..)
 PlannedWorkload=Σχέδιο φόρτου εργασίας
-PlannedWorkloadShort=Workload
-WorkloadOccupation=Workload assignation
+PlannedWorkloadShort=Φόρτος εργασίας
+WorkloadOccupation=Ανάθεση φόρτου εργασίας
 ProjectReferers=Αναφορές από αντικείμενα
 SearchAProject=Αναζήτηση ένα έργο
 ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα
 ProjectDraft=Πρόχειρα έργα
 FirstAddRessourceToAllocateTime=Συσχετίστε έναν πόρο για την κατανομή του χρόνου
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+InputPerDay=Εισαγωγή ανά ημέρα
+InputPerWeek=Εισαγωγή ανά εβδομάδα
+InputPerAction=Εισαγωγή ανά ενέργεια
+TimeAlreadyRecorded=Ο χρόνος που δαπανάται έχει ήδη καταγραφεί για το έργο/ημέρα και ο χρήστης %s
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index 58f0b819a6e..2f920102746 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -10,4 +10,4 @@ SalariesPayments=Πληρωμές μισθών
 ShowSalaryPayment=Εμφάνιση μισθοδοσίας
 THM=Η μέση ωριαία τιμή
 TJM=Η μέση ημερήσια τιμή
-CurrentSalary=Current salary
+CurrentSalary=Τρέχον μισθός
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index 8a0733e2515..64667754277 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. αποστολή
 Sending=Αποστολή
 Sendings=Αποστολές
+AllSendings=All Shipments
 Shipment=Αποστολή
 Shipments=Αποστολές
 ShowSending=Προβολή αποστολής
@@ -23,7 +24,7 @@ QtyOrdered=Ποσότητα παραγγελιών
 QtyShipped=Ποσότητα που αποστέλλεται
 QtyToShip=Ποσότητα προς αποστολή
 QtyReceived=Ποσότητα παραλαβής
-KeepToShip=Remain to ship
+KeepToShip=Αναμένει για αποστολή
 OtherSendingsForSameOrder=Άλλες αποστολές για αυτό το σκοπό
 DateSending=Ημερομηνία αποστολή της παραγγελίας
 DateSendingShort=Ημερομηνία αποστολή της παραγγελίας
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 34b5a692b6f..fef618b1300 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Τιμολόγια και πληρωμές προμ
 ExportDataset_fournisseur_3=Παραγγελίες σε προμηθευτές και σειρά γραμμών
 ApproveThisOrder=Έγκριση της παραγγελίας
 ConfirmApproveThisOrder=Είστε σίγουροι ότι θέλετε να εγκρίνετε την παραγγελία %s ;
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Απόρριψη παραγγελίας
 ConfirmDenyingThisOrder=Είστε σίγουροι ότι θέλετε να αρνηθείτε την παραγγελία %s ;
 ConfirmCancelThisOrder=Είστε σίγουροι ότι θέλετε να ακυρώσετε την παραγγελία %s ;
 AddCustomerOrder=Δημιουργία παραγγελίας πελάτη
@@ -42,4 +42,5 @@ SentToSuppliers=Αποστολή σε προμηθευτές
 ListOfSupplierOrders=Λίστα παραγγελιών των προμηθευτών
 MenuOrdersSupplierToBill=Παραγγελίες προμηθευτών για τιμολόγηση
 NbDaysToDelivery=Καθυστέρηση παράδοσης σε ημέρες
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=Η μεγαλύτερη καθυστέρηση εμφανίζετε μεταξύ παραγγελίας και τη λίστα των προϊόντων
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index df2ba95700a..22f8dbb928b 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -79,7 +79,7 @@ CreditDate=Πιστωτικές με
 WithdrawalFileNotCapable=Αδύνατο να δημιουργηθεί το αρχείο παραλαβή απόσυρση για τη χώρα σας %s (η χώρα σας δεν υποστηρίζεται)
 ShowWithdraw=Εμφάνιση Ανάληψη
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Μόλις γίνει αυτό, πηγαίνετε στο μενού Τράπεζα->Withdrawal για τη διαχείριση της πάγιας εντολής. Όταν η πάγια εντολή κλείνει, η πληρωμή στο τιμολόγιο θα καταγραφεί αυτόματα, και το τιμολόγιο κλείνει εάν το υπόλοιπο είναι μηδενικό.
 WithdrawalFile=Απόσυρση αρχείο
 SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
 ThisWillAlsoAddPaymentOnInvoice=Αυτό θα ισχύει επίσης για τις πληρωμές προς τα τιμολόγια και θα τα χαρακτηρίσουν ως "Πληρωμένα"
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
deleted file mode 100644
index d2ceaa175f8..00000000000
--- a/htdocs/langs/en_GB/admin.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-DictionaryVAT=VAT Rates
diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
index 289acc55386..e58cf5e72b5 100644
--- a/htdocs/langs/en_GB/banks.lang
+++ b/htdocs/langs/en_GB/banks.lang
@@ -1,10 +1,2 @@
 # Dolibarr language file - Source file is en_US - banks
-ValidateCheckReceipt=Validate this cheque receipt ?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt, no change will be possible once this is done ?
-DeleteCheckReceipt=Delete this cheque receipt ?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this cheque receipt ?
-BankChecks=Bank cheques
-BankChecksToReceipt=Cheques waiting for deposit
-ShowCheckReceipt=Show cheque deposit receipt
-NumberOfCheques=Nb of cheque
-SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
new file mode 100644
index 00000000000..f1e67a676c3
--- /dev/null
+++ b/htdocs/langs/en_GB/bills.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - bills
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang
deleted file mode 100644
index 8bd70a68704..00000000000
--- a/htdocs/langs/en_GB/compta.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-CheckReceipt=Cheque deposit
-CheckReceiptShort=Cheque deposit
-NewCheckDeposit=New cheque deposit
-NoWaitingChecks=No cheques waiting for deposit.
-DateChequeReceived=Cheque reception date
-NbOfCheques=Nb of cheques
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index 0d2a37aa449..de585d75dc2 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -16,7 +16,7 @@ FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
 FormatDateHourShort=%d/%m/%Y %H:%M
-FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourSecShort=%d/%m/%Y  %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 AmountVAT=Amount VAT
diff --git a/htdocs/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang
new file mode 100644
index 00000000000..2efc33c6c5b
--- /dev/null
+++ b/htdocs/langs/en_GB/orders.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - orders
+StatusOrderOnProcessShort=Ordered
+StatusOrderOnProcess=Ordered - Standby reception
+ApproveOrder=Approve order
diff --git a/htdocs/langs/en_GB/other.lang b/htdocs/langs/en_GB/other.lang
deleted file mode 100644
index 5c827f1c4ed..00000000000
--- a/htdocs/langs/en_GB/other.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - other
-VolumeUnitdm3=dm3 (l)
-VolumeUnitcm3=cm3 (ml)
-VolumeUnitmm3=mm3 (µl)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 21b008b1d0e..06b18dfbc27 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -297,10 +297,11 @@ MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package %s.
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s
+UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.

 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).

@@ -389,6 +390,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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -396,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value 
 if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter  
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'   
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s
 RefreshPhoneLink=Refresh link
@@ -510,8 +512,8 @@ 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
@@ -539,8 +541,8 @@ Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module39000Name=Product lot
+Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -557,8 +559,6 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
 Permission13=Unvalidate customer invoices
@@ -753,6 +753,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
@@ -851,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices,
 LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2=Purchases
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
@@ -1016,14 +1017,14 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
 NoEventFoundWithCriteria=No security event has been found for such search criterias.
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
-BackupDesc2=* Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant.
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc3=Save content of your database (%s) into a dump file. For this, you can use following assistant.
 BackupDescX=Archived directory should be stored in a secure place.
 BackupDescY=The generated dump file should be stored in a secure place.
 BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
 RestoreDesc=To restore a Dolibarr backup, you must:
-RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s).
-RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
+RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s).
+RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (%s). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
 ForcedToByAModule= This rule is forced to %s by an activated module
 PreviousDumpFiles=Available database backup dump files
@@ -1076,7 +1077,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: %s 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
@@ -1538,7 +1542,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
 BookmarkSetup=Bookmark module setup
@@ -1564,6 +1568,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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat
@@ -1590,7 +1595,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
@@ -1613,3 +1618,8 @@ 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
+BackupDumpWizard=Wizard to build database backup dump file
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do. 
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature.
+ConfFileMuseContainCustom=Installing an external module from application save the module files into directory %s. To have this directory processed by Dolibarr, you must setup your conf/conf.php to have option
- $dolibarr_main_url_root_alt enabled to value $dolibarr_main_url_root_alt="/custom"
- $dolibarr_main_document_root_alt enabled to value "%s/custom" 
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 48c284e2022..dd485291e73 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -48,11 +48,13 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -92,4 +94,4 @@ WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
 ActionType=Event type
-DateActionBegin=Start event date
\ No newline at end of file
+DateActionBegin=Start event date
diff --git a/htdocs/langs/en_US/askpricesupplier.lang b/htdocs/langs/en_US/askpricesupplier.lang
index b75a3284146..882b2fc2290 100644
--- a/htdocs/langs/en_US/askpricesupplier.lang
+++ b/htdocs/langs/en_US/askpricesupplier.lang
@@ -9,7 +9,7 @@ CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
 LastModifiedRequests=Last %s modified price requests
-RequestsOpened=Opened price requests
+RequestsOpened=Open price requests
 AskPriceSupplierArea=Area price requests suppliers
 Askpricesupplier=Price request supplier
 NewAskPrice=New price request
@@ -26,7 +26,7 @@ DeleteAsk=Delete request
 ValidateAsk=Validate request
 AddAsk=Create a request
 AskpricesupplierDraft=Drafts
-AskpricesupplierOpened=Opened
+AskpricesupplierOpened=Open
 AskpricesupplierStatusDraft=Draft (needs to be validated)
 AskpricesupplierStatusValidated=Validated (request is open)
 AskpricesupplierStatusOpened=Validated (request is open)
@@ -35,7 +35,7 @@ AskpricesupplierStatusSigned=Accepted
 AskpricesupplierStatusNotSigned=Refused
 AskpricesupplierStatusDraftShort=Draft
 AskpricesupplierStatusValidatedShort=Validated
-AskpricesupplierStatusOpenedShort=Opened
+AskpricesupplierStatusOpenedShort=Open
 AskpricesupplierStatusClosedShort=Closed
 AskpricesupplierStatusSignedShort=Accepted
 AskpricesupplierStatusNotSignedShort=Refused
@@ -54,4 +54,4 @@ CommercialAsk=Price request
 DefaultModelAskPriceSupplierCreate=Default model creation
 DefaultModelAskPriceSupplierToBill=Default template when closing a price request (accepted)
 DefaultModelAskPriceSupplierClosed=Default template when closing a price request (refused)
-ListOfAskPriceSupplier=Liste des demandes de prix fournisseurs
\ No newline at end of file
+ListOfAskPriceSupplier=Liste des demandes de prix fournisseurs
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index a2306950fb4..f363ffa56c6 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record
@@ -163,3 +163,5 @@ LabelRIB=BAN Label
 NoBANRecord=No BAN record
 DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+StartDate=Start date
+EndDate=End date
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index bcc3baadc45..3e645e84834 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -294,8 +294,11 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
+MergingPDFTool=Merging PDF tool
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -427,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index bf118b9b88e..b61cf77019f 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
@@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
+LastXMonthRolling=The last %s month rolling
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 7a3c7f0c288..a73526ca08a 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.  
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories 
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
+ProductIsInCategories=Product/service is linked to following tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This 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=Add to tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/category
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
\ No newline at end of file
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 7bfaf799f3a..e700271368d 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -411,4 +411,9 @@ MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code an
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 SearchThirdparty=Search thirdparty
-SearchContact=Search contact
\ No newline at end of file
+SearchContact=Search contact
+MergeOriginThirdparty=Origin thirdparty
+MergeThirdparties=Merge thirdparties
+ConfirmMergeThirdparties=Are you sure you want to merge this thirdparty? All linked objects (invoices...) will be linked with the destination thirdparty
+ThirdpartiesMergeSuccess=Thirdparties have been merged
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
\ No newline at end of file
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index cf5e1a6198c..5d7abf732ab 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronFrequency=Frequency
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,7 +55,7 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
+CronHourStart= Start hour and date of task
 CronEvery= And execute task each
 CronObject= Instance/Object to create
 CronArgs=Parameters
@@ -79,10 +79,10 @@ CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 37670b7f003..4266107d8a3 100755
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -159,14 +159,17 @@ ErrorPriceExpression22=Negative result '%s'
 ErrorPriceExpressionInternal=Internal error '%s'
 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
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) 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
+ErrorFieldMustBeANumeric=Field %s must be a numeric value
+ErrorFieldMustBeAnInteger=Field %s must be an integer
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index c79da05364e..67d4f61d9f1 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -50,4 +50,4 @@ ArcticNumRefModelError=Failed to activate
 PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
 PrintProductsOnFichinter=Print products on intervention card
-PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinterDetails=interventions generated from orders
diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
index 4aba2de625c..e082f166959 100644
--- a/htdocs/langs/en_US/loan.lang
+++ b/htdocs/langs/en_US/loan.lang
@@ -4,6 +4,7 @@ Loans=Loans
 NewLoan=New Loan
 ShowLoan=Show Loan
 PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
 Capital=Capital
 Insurance=Insurance
 Interest=Interest
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 36fbd6c659b..7ef4c291d2a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -220,6 +220,7 @@ Next=Next
 Cards=Cards
 Card=Card
 Now=Now
+HourStart=Start hour
 Date=Date
 DateAndHour=Date and hour
 DateStart=Date start
@@ -242,6 +243,8 @@ DatePlanShort=Date planed
 DateRealShort=Date real.
 DateBuild=Report build date
 DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -298,7 +301,7 @@ UnitPriceHT=Unit price (net)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=U.P. net Requested
 PriceUTTC=U.P.
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -395,8 +398,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
@@ -408,6 +411,8 @@ OtherInformations=Other informations
 Quantity=Quantity
 Qty=Qty
 ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
@@ -416,7 +421,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -696,6 +701,8 @@ 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.
+Deny=Deny
+Denied=Denied
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -725,3 +732,4 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+SelectMailModel=Select email template
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 602bd1bda59..7f2902a96e6 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -16,14 +16,14 @@ SupplierOrder=Supplier order
 SuppliersOrders=Suppliers orders
 SuppliersOrdersRunning=Current suppliers orders
 CustomerOrder=Customer order
-CustomersOrders=Customers orders
-CustomersOrdersRunning=Current customer's orders
-CustomersOrdersAndOrdersLines=Customer orders and order's lines
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
-SuppliersOrdersToProcess=Supplier's orders to process
+CustomersOrders=Customer orders
+CustomersOrdersRunning=Current customer orders
+CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersToValid=Customer orders to validate
+OrdersToBill=Customer orders delivered
+OrdersInProcess=Customer orders in process
+OrdersToProcess=Customer orders to process
+SuppliersOrdersToProcess=Supplier orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -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
@@ -74,11 +75,13 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
-NoOtherOpenedOrders=No other opened orders
+NoOpenedOrders=No open orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
-LastOrders=Last %s orders
+LastOrders=Last %s customer orders
+LastCustomerOrders=Last %s customer orders
+LastSupplierOrders=Last %s supplier orders
 LastModifiedOrders=Last %s modified orders
 LastClosedOrders=Last %s closed orders
 AllOrders=All orders
@@ -102,6 +105,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 +123,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 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
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index e3de07b3d5d..5cb000408da 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -203,6 +203,7 @@ NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than %s
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index f0cd2a40292..d86e998cf50 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 45263681965..37ceaa49b38 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -1,21 +1,22 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusNotOnBatch=No (lot/serial not used)
 ProductStatusOnBatchShort=Yes
 ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
 l_eatby=Eat-by date
 l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
+DetailBatchNumber=Lot/Serial details
+DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Lot/Serial: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 1b9a49b559d..8e3402bf8b0 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -23,14 +23,14 @@ ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
 ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Product for sale or for purchase
+ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesNotOnSell=Services not for sale
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
@@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
 PublicPrice=Public price
 CurrentPrice=Current price
 NewPrice=New price
-MinPrice=Minim. selling price
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPrice=Min. selling price
+MinPriceHT=Min. selling price (net of tax)
+MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatus=Contract status
 ContractStatusClosed=Closed
-ContractStatusRunning=Running
+ContractStatusRunning=Ongoing
 ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=To get running
-ContractNotRunning=This contract is not running
+ContractStatusOnHold=On hold
+ContractStatusToRun=Make ongoing
+ContractNotRunning=This contract is not ongoing
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProductsAbility=Activate the package feature
 AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+AssociatedProductsNumber=Number of products composing this package product
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -179,12 +179,12 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service %s ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone packaged product/service
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+CustomerPrices=Customer prices
+SuppliersPrices=Supplier prices
+SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
@@ -214,7 +214,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Production completed
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1st. Quarter
@@ -237,10 +237,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
 PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
+MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
@@ -266,4 +266,6 @@ GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifi
 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
\ No newline at end of file
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is 
+PropalMergePdfProductChooseFile=Select PDF files
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 40b1c2e308d..dde2aa7d469 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -11,9 +11,10 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
@@ -28,7 +29,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -40,7 +41,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -94,7 +95,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -138,7 +139,7 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day 
 InputPerWeek=Input per week 
 InputPerAction=Input per action
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index 2b6d12870a1..c57e9c38324 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -4,7 +4,7 @@ Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 CommercialProposals=Commercial proposals
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalsNotBilled=Closed not billed
 PropalStatusDraft=Draft (needs to be validated)
 PropalStatusValidated=Validated (proposal is open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
 PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -51,8 +51,8 @@ PropalsToClose=Commercial proposals to close
 PropalsToBill=Signed commercial proposals to bill
 ListOfProposals=List of commercial proposals
 ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
+NoOpenedPropals=No open commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
 AssociatedDocuments=Documents associated with the proposal:
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 84088c3e023..1dc182c6fdc 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -53,7 +53,7 @@ DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
+DateDeliveryPlanned=Planned date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
 SendShippingRef=Submission of shipment %s
@@ -67,7 +67,7 @@ SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
 ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 
 # Sending methods
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 9019240490b..924878973bb 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -16,6 +16,7 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
+StocksByLotSerial=Stock by lot/serial
 Movement=Movement
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
@@ -78,6 +79,7 @@ IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average input price
 AverageUnitPricePMP=Weighted average input price
 SellPriceMin=Selling Unit Price
@@ -97,11 +99,11 @@ DesiredStock=Desired stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
 UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
@@ -110,8 +112,8 @@ AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse %s will be used for stock decrease
 WarehouseForStockIncrease=The warehouse %s will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -122,13 +124,16 @@ RecordMovement=Record transfert
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice 
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice 
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
+MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index 53b0618c7b1..39b3ee8c3d9 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -42,4 +42,5 @@ SentToSuppliers=Sent to suppliers
 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
\ No newline at end of file
+DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index c84b8905562..d4e4e8c4359 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports
 TripsAndExpensesStatistics=Expense reports statistics
 TripCard=Expense report card
 AddTrip=Create expense report
-ListOfTrips=List of expense report
+ListOfTrips=List of expense reports
 ListOfFees=List of fees
 NewTrip=New expense report
 CompanyVisited=Company/foundation visited
@@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripSalarie=Informations user
 TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
+DeleteLine=Delete a line of the expense report
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -40,11 +40,10 @@ TF_BUS=Bus
 TF_CAR=Car
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line
@@ -56,12 +55,12 @@ ModePaiement=Payment mode
 Note=Note
 Project=Project
 
-VALIDATOR=User to inform for approbation
+VALIDATOR=User responsible for approval
 VALIDOR=Approved by
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
+AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+CANCEL_USER=Deleted by
 
 MOTIF_REFUS=Reason
 MOTIF_CANCEL=Reason
@@ -69,14 +68,12 @@ MOTIF_CANCEL=Reason
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_VALIDE=Validation date
-DateApprove=Approving date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
 TO_PAID=Pay
 BROUILLONNER=Reopen
-SendToValid=Sent to approve
+SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
 
@@ -95,32 +92,10 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 CancelTrip=Cancel an expense report
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
+BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
 SaveTrip=Validate expense report
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
-Synchro_Compta=NDF <-> Compte
-
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
-
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration 
-
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait 
-
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
-
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
-
 NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index e08c88a9170..82af8e6c903 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin 
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
-ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. 
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+ThereIsNoWorkflowToModify=There is no workflow to modify for the activated module.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated 
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 8161a7a8e7c..7233ad928c4 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-Module30Name=Facturas y notas de crédito
-Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión facturas de proveedores
-BillsNumberingModule=Módulo de numeración de facturas y notas de crédito
-CreditNoteSetup=Configuración del módulo notas de crédito
-CreditNotePDFModules=Modelo de documento de notas de crédito
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
diff --git a/htdocs/langs/es_AR/banks.lang b/htdocs/langs/es_AR/banks.lang
new file mode 100644
index 00000000000..e58cf5e72b5
--- /dev/null
+++ b/htdocs/langs/es_AR/banks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - banks
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/es_AR/commercial.lang b/htdocs/langs/es_AR/commercial.lang
new file mode 100644
index 00000000000..18d8db06801
--- /dev/null
+++ b/htdocs/langs/es_AR/commercial.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - commercial
+ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/es_AR/suppliers.lang b/htdocs/langs/es_AR/suppliers.lang
new file mode 100644
index 00000000000..5213cec4e07
--- /dev/null
+++ b/htdocs/langs/es_AR/suppliers.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - suppliers
+DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
deleted file mode 100644
index 1c53b65c99c..00000000000
--- a/htdocs/langs/es_CO/admin.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Example for ClamAv: /usr/bin/clamscan
-AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
new file mode 100644
index 00000000000..e58cf5e72b5
--- /dev/null
+++ b/htdocs/langs/es_CO/banks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - banks
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/es_CO/commercial.lang b/htdocs/langs/es_CO/commercial.lang
new file mode 100644
index 00000000000..18d8db06801
--- /dev/null
+++ b/htdocs/langs/es_CO/commercial.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - commercial
+ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index b4e3fdd0dcf..d7e57388dcc 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -42,3 +42,11 @@ Currency=Moneda
 SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar
 PrintFile=Imprimir archivo %s
 ShowTransaction=Mostrar transacción
+NoUserGroupDefined=No hay grupo de usuario definido
+DateModificationShort=Fecha modificación
+UseLocalTax=Incluir impuestos
+CommercialProposalsShort=Cotizaciones
+RequestAlreadyDone=La solicitud ya ha sido procesada
+NbOfReferers=Número de remitentes
+Currency=Moneda
+SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar
diff --git a/htdocs/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang
index a0ff0166a6d..3bdb607f2f9 100644
--- a/htdocs/langs/es_CO/salaries.lang
+++ b/htdocs/langs/es_CO/salaries.lang
@@ -3,4 +3,4 @@ SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código contable para pagos de salarios
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código contable para cargo financiero
 THM=Valor de hora promedio
 TJM=Valor día promedio
-CurrentSalary=Salario actual
+CurrentSalary=Salario actual
\ No newline at end of file
diff --git a/htdocs/langs/es_CO/suppliers.lang b/htdocs/langs/es_CO/suppliers.lang
new file mode 100644
index 00000000000..5213cec4e07
--- /dev/null
+++ b/htdocs/langs/es_CO/suppliers.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - suppliers
+DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 45dc1e4858b..526f47dc0ce 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -8,11 +8,11 @@ VersionExperimental=Experimental
 VersionDevelopment=Desarrollo
 VersionUnknown=Desconocida
 VersionRecommanded=Recomendada
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Integridad archivos
+FilesMissing=Archivos no encontrados
+FilesUpdated=Archivos actualizados
+FileCheckDolibarr=Comprobar la integridad de los Archivos Dolibarr
+XmlNotFound=Archivo xml de Integridad Dolibarr no encontrado
 SessionId=ID sesión
 SessionSaveHandler=Modalidad de salvaguardado de sesiones
 SessionSavePath=Localización salvaguardado de sesiones
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separador
 ExtrafieldCheckBox=Casilla de verificación
 ExtrafieldRadio=Botón de selección excluyente
 ExtrafieldCheckBoxFromList= Casilla de selección de tabla
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=El listado de parámetros tiene que ser key,valor

 por ejemplo:\n
1,value1
2,value2
3,value3
...

Para tener la lista en función de otra:
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=El listado de parámetros tiene que ser key,valor

 por ejemplo:\n
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=El listado de parámetros tiene que ser key,valor

 por ejemplo:\n
1,value1
2,value2
3,value3
...
@@ -494,28 +495,30 @@ Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
 Module500Desc=Gestión de los gastos especiales como impuestos, gastos sociales, dividendos y salarios
 Module510Name=Salarios
 Module510Desc=Gestión de salarios y pagos
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notificaciones
 Module600Desc=Envío de notificaciones por e-mail en algunos eventos de negocio de Dolibarr a contactos de terceros (configurado en cada tercero)
 Module700Name=Donaciones
 Module700Desc=Gestión de donaciones
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Informe de gastos
+Module770Desc=Gestión de informes de gastos (transporte, dietas, etc.)
+Module1120Name=Presupuesto de proveedor
+Module1120Desc=Solicitud presupuesto y precios a proveedor
 Module1200Name=Mantis
 Module1200Desc=Interfaz con el sistema de seguimiento de incidencias Mantis
 Module1400Name=Contabilidad experta
 Module1400Desc=Gestión experta de la contabilidad (doble partida)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Categorías
-Module1780Desc=Gestión de categorías (productos, proveedores y clientes)
+Module1520Name=Generación Documento
+Module1520Desc=Generación de documentos de correo masivo
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permite la edición de ciertas zonas de texto mediante un editor avanzado
 Module2200Name=Precios dinámicos
 Module2200Desc=Activar el uso de expresiones matemáticas para precios
 Module2300Name=Programador
-Module2300Desc=Tareas programadas
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Gestión de la agenda y de las acciones
 Module2500Name=Gestión Electrónica de Documentos
@@ -642,7 +645,7 @@ Permission181=Consultar pedidos a proveedores
 Permission182=Crear/modificar pedidos a proveedores
 Permission183=Validar pedidos a proveedores
 Permission184=Aprobar pedidos a proveedores
-Permission185=Order or cancel supplier orders
+Permission185=Realizar o cancelar pedidos a proveedores
 Permission186=Recibir pedidos de proveedores
 Permission187=Cerrar pedidos a proveedores
 Permission188=Anular pedidos a proveedores
@@ -714,6 +717,11 @@ Permission510=Consultar salarios
 Permission512=Crear/modificar salarios
 Permission514=Eliminar salarios
 Permission517=Exportar salarios
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Consultar servicios
 Permission532=Crear/modificar servicios
 Permission534=Eliminar servicios
@@ -722,13 +730,13 @@ Permission538=Exportar servicios
 Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Leer informes de gastos (propios y de sus subordinados)
+Permission772=Crear/modificar informe de gastos
+Permission773=Eliminar informe de gastos
+Permission774=Leer todos los informes de gastos (incluidos los no subordinados)
+Permission775=Aprobar informe de gastos
+Permission776=Pagar informe de gastos
+Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar almacenes
 Permission1003=Eliminar almacenes
@@ -746,6 +754,7 @@ Permission1185=Aprobar pedidos a proveedores
 Permission1186=Enviar pedidos a proveedores
 Permission1187=Recibir pedidos de proveedores
 Permission1188=Cerrar pedidos a proveedores
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Obtener resultado de una exportación
 Permission1202=Crear/codificar exportaciones
 Permission1231=Consultar facturas de proveedores
@@ -758,10 +767,10 @@ Permission1237=Exportar pedidos de proveedores junto con sus detalles
 Permission1251=Lanzar las importaciones en masa a la base de datos (carga de datos)
 Permission1321=Exportar facturas a clientes, atributos y cobros
 Permission1421=Exportar pedidos de clientes y atributos
-Permission23001 = Ver tareas programadas
-Permission23002 = Crear/actualizar tareas programadas
-Permission23003 = Borrar tareas programadas
-Permission23004 = Ejecutar tareas programadas
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Leer acciones (eventos o tareas) vinculadas a su cuenta
 Permission2402=Crear/eliminar acciones (eventos o tareas) vinculadas a su cuenta
 Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta
@@ -1043,8 +1052,8 @@ MAIN_PROXY_PASS=Contraseña del servidor proxy
 DefineHereComplementaryAttributes=Defina aquí la lista de atributos adicionales, no disponibles por defecto, y que desea gestionar para %s.
 ExtraFields=Atributos adicionales
 ExtraFieldsLines=Atributos adicionales (líneas)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Atributos complementarios (líneas de pedido)
+ExtraFieldsSupplierInvoicesLines=Atributos complementarios (líneas de factura)
 ExtraFieldsThirdParties=Atributos adicionales (terceros)
 ExtraFieldsContacts=Atributos adicionales (contactos/direcciones)
 ExtraFieldsMember=Atributos adicionales (miembros)
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Devuelve un código contable compuesto de
%s seguid
 ModuleCompanyCodePanicum=Devuelve un código contable vacío.
 ModuleCompanyCodeDigitaria=Devuelve un código contable compuesto siguiendo el código de tercero. El código está formado por carácter ' C ' en primera posición seguido de los 5 primeros caracteres del código tercero.
 UseNotifications=Usar notificaciones
-NotificationsDesc=La función de las notificaciones permite enviar automáticamente un e-mail para algunos eventos de Dolibarr. Los destinatarios de las notificaciones pueden definirse:
* por contactos de terceros (clientes o proveedores), un tercero a la vez.
* o configurando un destinatario global en la configuración del módulo.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Modelos de documentos
 DocumentModelOdt=Generación desde los documentos OpenDocument (Archivo .ODT OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Marca de agua en los documentos borrador
@@ -1173,12 +1182,12 @@ FreeLegalTextOnProposal=Texto libre en presupuestos
 WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=Configuración del módulo Solicitudes a proveedor
+AskPriceSupplierNumberingModules=Modelos de numeración de solicitud de precios a proveedor
+AskPriceSupplierPDFModules=Modelos de documentos de solicitud de precios a proveedores
+FreeLegalTextOnAskPriceSupplier=Texto libre en solicitudes de precios a proveedores
+WatermarkOnDraftAskPriceSupplier=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Preguntar por cuenta bancaria a usar en el presupuesto
 ##### Orders #####
 OrdersSetup=Configuración del módulo pedidos
 OrdersNumberingModules=Módulos de numeración de los pedidos
@@ -1410,7 +1419,7 @@ BarcodeDescUPC=Códigos de barras tipo UPC
 BarcodeDescISBN=Códigos de barras tipo ISBN
 BarcodeDescC39=Códigos de barras tipo C39
 BarcodeDescC128=Códigos de barras tipo C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode
+GenbarcodeLocation=Herramienta de generación de códigos de barras en consola (usad por el motor interno para determinados tipos de códigos de barras). Debe de ser compatible con "genbarcode".
Por ejemplo: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor interno
 BarCodeNumberManager=Gestor para auto definir números de código de barras 
 ##### Prelevements #####
@@ -1528,10 +1537,10 @@ CashDeskThirdPartyForSell=Tercero genérico a usar para las ventas
 CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
 CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques
 CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+CashDeskDoNotDecreaseStock=Desactivar decremento de stock si una venta es realizada desde un Punto de Venta (si "no", el decremento de stock es realizado desde el TPV,  cualquiera que sea la opción indicada en el módulo Stock).
 CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock
 StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=El decremento de stock en TPV no es compatible con la gestión de lotes
 CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén.
 ##### Bookmark #####
 BookmarkSetup=Configuración del módulo Marcadores
@@ -1557,6 +1566,7 @@ SuppliersSetup=Configuración del módulo Proveedores
 SuppliersCommandModel=Modelo de pedidos a proveedores completo (logo...)
 SuppliersInvoiceModel=Modelo de facturas de proveedores completo (logo...)
 SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedor
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuración del módulo GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Ruta del archivo Maxmind que contiene las conversiones IP->País.
Ejemplo: /usr/local/share/GeoIP/GeoIP.dat
@@ -1597,7 +1607,12 @@ SortOrder=Ordenación
 Format=Formatear 
 TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
 IncludePath=Include path (definida en la variable %s)
-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.
+ExpenseReportsSetup=Configuración del módulo Informe de Gastos
+TemplatePDFExpenseReports=Modelos de documento para generar informes de gastos
+NoModueToManageStockDecrease=No hay activado módulo para gestionar automáticamente el decremento de stock. El decremento de stock se realizará solamente con entrada manual
+NoModueToManageStockIncrease=No hay activado módulo para gestionar automáticamente el incremento de stock. El incremento de stock se realizará solamente con entrada manual
+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
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 64836535194..fe2acb4ff8a 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factura %s validada
 InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV
 InvoiceBackToDraftInDolibarr=Factura %s devuelta a borrador
 InvoiceDeleteDolibarr=Factura %s eliminada
-OrderValidatedInDolibarr= Pedido %s validado
+OrderValidatedInDolibarr=Pedido %s validado
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Pedido %s anulado
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Pedido %s aprobado
 OrderRefusedInDolibarr=Pedido %s rechazado
 OrderBackToDraftInDolibarr=Pedido %s devuelto a borrador
@@ -91,3 +94,5 @@ WorkingTimeRange=Rango temporal
 WorkingDaysRange=Rango diario
 AddEvent=Crear evento
 MyAvailability=Mi disponibilidad
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 3117ecc1f15..7366655c7a7 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -33,11 +33,11 @@ AllTime=Mostrar saldo desde el inicio
 Reconciliation=Conciliación
 RIB=Cuenta bancaria
 IBAN=Identificador IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=IBAN Válido
+IbanNotValid=IBAN No Válido
 BIC=Identificador BIC/SWIFT
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=BIC/SWIFT Válido
+SwiftNotValid=BIC/SWIFT No Válido
 StandingOrders=Domiciliaciones
 StandingOrder=Domiciliación
 Withdrawals=Reintregros
@@ -152,7 +152,7 @@ BackToAccount=Volver a la cuenta
 ShowAllAccounts=Mostrar para todas las cuentas
 FutureTransaction=Transacción futura. No es posible conciliar.
 SelectChequeTransactionAndGenerate=Seleccione/filtre los cheques a incluir en la remesa y haga clic en "Crear".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Indique el extracto bancario relacionado con la conciliación. Utilice un valor numérico ordenable: YYYYMM o YYYYMMDD
 EventualyAddCategory=Eventualmente, indique una categoría en la que clasificar los registros
 ToConciliate=¿A conciliar?
 ThenCheckLinesAndConciliate=A continuación, compruebe las líneas presentes en el extracto bancario y haga clic
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index dc4aa2e3948..c63fe576b56 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -74,9 +74,9 @@ PaymentsAlreadyDone=Pagos efectuados
 PaymentsBackAlreadyDone=Reembolsos ya efectuados
 PaymentRule=Forma de pago
 PaymentMode=Forma de pago
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentTerm=Condición de pago
+PaymentConditions=Condiciones de pago
+PaymentConditionsShort=Condiciones de pago
 PaymentAmount=Importe pago
 ValidatePayment=Validar este pago
 PaymentHigherThanReminderToPay=Pago superior al resto a pagar
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La suma del importe de los 2 nuevos descuen
 ConfirmRemoveDiscount=¿Está seguro de querer eliminar este descuento?
 RelatedBill=Factura asociada
 RelatedBills=Facturas asociadas
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Última factura relacionada
 WarningBillExist=Atención, ya existe al menos una factura
 
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index e4d86be11bd..1825a9c57c9 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categoría
-Categories=Categorías
-Rubrique=Categoría
-Rubriques=Categorías
-categories=categoría(s)
-TheCategorie=La categoría
-NoCategoryYet=Ninguna categoría de este tipo 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=Añadir en
 modify=Modificar
 Classify=Clasificar
-CategoriesArea=Área categorías
-ProductsCategoriesArea=Área categorías de productos y servicios
-SuppliersCategoriesArea=Área categorías de proveedores
-CustomersCategoriesArea=Área categorías de clientes
-ThirdPartyCategoriesArea=Área categorías de terceros
-MembersCategoriesArea=Área categorías de miembros
-ContactsCategoriesArea=Área categorías de contactos
-MainCats=Categorías principales
+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=Subcategorías
 CatStatistics=Estadísticas
-CatList=Listado de categorías
-AllCats=Todas las categorías
-ViewCat=Ver la categoría
-NewCat=Nueva categoría
-NewCategory=Nueva categoría
-ModifCat=Modificar una categoría
-CatCreated=Categoría creada
-CreateCat=Añadir una categoría
-CreateThisCat=Añadir esta categoría
+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 los campos
 NoSubCat=Esta categoría no contiene ninguna subcategoría.
 SubCatOf=Subcategoría
-FoundCats=Categorías encontradas
-FoundCatsForName=Categorías encontradas con el nombre:
-FoundSubCatsIn=Subcategorías encontradas en la categoría
-ErrSameCatSelected=Ha seleccionado la misma categoría varias veces
-ErrForgotCat=Ha olvidado escoger la categoría
+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 olvidado reasignar un campo
 ErrCatAlreadyExists=Este nombre esta siendo utilizado
-AddProductToCat=¿Añadir este producto a una categoría?
-ImpossibleAddCat=Imposible añadir la categoría
-ImpossibleAssociateCategory=Imposible asociar la categoría
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=La categoría se ha añadido con éxito.
-ObjectAlreadyLinkedToCategory=El elemento ya está enlazado a esta categoría
-CategorySuccessfullyCreated=La categoría %s se insertado correctamente.
-ProductIsInCategories=Este producto/servicio se encuentra en las siguientes categorías
-SupplierIsInCategories=Este proveedor se encuentra en las siguientes categorías
-CompanyIsInCustomersCategories=Esta empresa se encuentra en las siguientes categorías
-CompanyIsInSuppliersCategories=Esta empresa se encuentra en las siguientes categorías de proveedores
-MemberIsInCategories=Este miembro se encuentra en las siguientes categorías de miembros
-ContactIsInCategories=Este contacto se encuentra en las siguientes categorías de contactos
-ProductHasNoCategory=Este producto/servicio no se encuentra en ninguna categoría en particular
-SupplierHasNoCategory=Este proveedor no se encuentra en ninguna categoría en particular
-CompanyHasNoCategory=Esta empresa no se encuentra en ninguna categoría en particular
-MemberHasNoCategory=Este miembro no se encuentra en ninguna categoría en particular
-ContactHasNoCategory=Este contacto no se encuentra en ninguna categoría
-ClassifyInCategory=Clasificar en la categoría
+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=Ninguna
-NotCategorized=Sin categoría
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Esta categoría ya existe para esta referencia
 ReturnInProduct=Volver a la ficha producto/servicio
 ReturnInSupplier=Volver a la ficha proveedor
@@ -66,22 +64,22 @@ ReturnInCompany=Volver a la ficha cliente/cliente potencial
 ContentsVisibleByAll=El contenido será visible por todos
 ContentsVisibleByAllShort=Contenido visible por todos
 ContentsNotVisibleByAllShort=Contenido no visible por todos
-CategoriesTree=Árbol de categorías
-DeleteCategory=Eliminar categoría
-ConfirmDeleteCategory=¿Está seguro de querer eliminar esta categoría?
-RemoveFromCategory=Eliminar vínculo con categoría
-RemoveFromCategoryConfirm=¿Está seguro de querer eliminar el vínculo entre la transacción y la categoría?
-NoCategoriesDefined=Ninguna categoría definida
-SuppliersCategoryShort=Categoría proveedores
-CustomersCategoryShort=Categoría clientes
-ProductsCategoryShort=Categoría productos
-MembersCategoryShort=Categoría miembro
-SuppliersCategoriesShort=Categorías proveedores
-CustomersCategoriesShort=Categorías clientes
+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=Categorías clientes
-ProductsCategoriesShort=Categorías productos
-MembersCategoriesShort=Categorías miembros
-ContactCategoriesShort=Categorías contactos
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Esta categoría no contiene ningún producto.
 ThisCategoryHasNoSupplier=Esta categoría no contiene ningún proveedor.
 ThisCategoryHasNoCustomer=Esta categoría no contiene ningún cliente.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Esta categoría no contiene contactos
 AssignedToCustomer=Asignar a un cliente
 AssignedToTheCustomer=Asigado a un cliente
 InternalCategory=Categoría interna
-CategoryContents=Contenido de la categoría
-CategId=Id categoría
-CatSupList=Listado categorías de proveedores
-CatCusList=Listado categorías de clientes/potenciales
-CatProdList=Listado categorías de productos
-CatMemberList=Listado categorías de miembros
-CatContactList=Listado de categorías de contactos y contactos
-CatSupLinks=Proveedores
-CatCusLinks=Clientes/Clientes potenciales
-CatProdLinks=Productos
-CatMemberLinks=Miembros
-DeleteFromCat=Eliminar de la categoría
+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=Eliminar imagen
 ConfirmDeletePicture=¿Confirma la eliminación de la imagen?
 ExtraFieldsCategories=Atributos complementarios
-CategoriesSetup=Configuración de categorías
-CategorieRecursiv=Enlazar con la categoría padre automáticamente
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Si está activado, el producto se enlazará a la categoría padre si lo añadimos a una subcategoría
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
-ShowCategory=Mostrar categoría
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/es_ES/commercial.lang b/htdocs/langs/es_ES/commercial.lang
index 51de60229c8..47607cdb605 100644
--- a/htdocs/langs/es_ES/commercial.lang
+++ b/htdocs/langs/es_ES/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Clientes potenciales contactados
 DateActionPlanned=Fecha planificación
 DateActionDone=Fecha realización
 ActionAskedBy=Acción preguntada por
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Evento asignado a
 ActionDoneBy=Acción realizada por
 ActionUserAsk=Registrada por
 ErrorStatusCantBeZeroIfStarted=Si el campo 'Fecha de realización' contiene datos la acción está en curso , por lo que el campo ' Estado ' no puede ser 0%.
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 654a55badde..10438b1ef76 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Expirado
 ServiceStatusClosed=Cerrado
 ServicesLegend=Leyenda para los servicios
 Contracts=Contratos
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Contratos y líneas de contratos
 Contract=Contrato
 NoContracts=Sin contratos
 MenuServices=Servicios
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index d436847a411..e7a2d5c9098 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Res. ult. ejec.
 CronLastResult=Últ. cód. res.
 CronListOfCronJobs=Lista de tareas programadas
 CronCommand=Comando
-CronList=Lista de tareas Cron
-CronDelete= Borrar tareas Cron
-CronConfirmDelete= ¿Está seguro de querer eliminar estas tareas?
-CronExecute=Ejecutar Tarea
-CronConfirmExecute= ¿Está seguro de querer ejecutar esta tarea ahora?
-CronInfo= Cron le permite ejecutar tareas que han sido programadas
-CronWaitingJobs=Trabajos 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=Tarea
-CronNone= Ninguna
+CronNone=Ninguna
 CronDtStart=Fecha inicio
 CronDtEnd=Fecha fin
 CronDtNextLaunch=Sig. ejec.
@@ -75,6 +75,7 @@ CronObjectHelp=El nombre del objeto a cargar. 
 Por ejemplo para realizar un
 CronMethodHelp=El métpdp a lanzar. 
 Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, el valor del método es fecth
 CronArgsHelp=Los argumentos del método. 
 Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, los valores pueden ser 0, ProductRef
 CronCommandHelp=El comando en línea del sistema a ejecutar.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Información
 # Common
@@ -84,4 +85,4 @@ CronType_command=Comando Shell
 CronMenu=Programador
 CronCannotLoadClass=No se puede cargar la clase %s u objeto %s
 UseMenuModuleToolsToAddCronJobs=Ir a "Inicio - Utilidades módulos - Lista de tareas Cron" para ver y editar tareas programadas.
-TaskDisabled=Task disabled
+TaskDisabled=Tarea deshabilitada
diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang
index dda4508af8a..ca7df9cc00a 100644
--- a/htdocs/langs/es_ES/donations.lang
+++ b/htdocs/langs/es_ES/donations.lang
@@ -6,6 +6,8 @@ Donor=Donante
 Donors=Donantes
 AddDonation=Crear una donación
 NewDonation=Nueva donación
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Mostrar donación
 DonationPromise=Promesa de donación
 PromisesNotValid=Promesas no validadas
@@ -21,6 +23,8 @@ DonationStatusPaid=Donación pagada
 DonationStatusPromiseNotValidatedShort=No validada
 DonationStatusPromiseValidatedShort=Validada
 DonationStatusPaidShort=Pagada
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validar promesa
 DonationReceipt=Recibo de donación
 BuildDonationReceipt=Crear recibo
@@ -36,3 +40,4 @@ FrenchOptions=Opciones para Francia
 DONATION_ART200=Mostrar artículo 200 del CGI si se está interesado
 DONATION_ART238=Mostrar artículo 238 del CGI si se está interesado
 DONATION_ART885=Mostrar artículo 885 del CGI si se está interesado
+DonationPayment=Donation payment
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index f8506d6e27b..25da88ffde1 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=La cuenta origen y destino deben ser diferentes.
 ErrorBadThirdPartyName=Nombre de tercero incorrecto
 ErrorProdIdIsMandatory=El %s es obligatorio
 ErrorBadCustomerCodeSyntax=La sintaxis del código cliente es incorrecta
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Sintaxis errónea para el código de barras. Es posible que haya asignado un tipo de código de barras o definido una máscara de código de barras para numerar que no coincide con el valor escaneado
 ErrorCustomerCodeRequired=Código cliente obligatorio
 ErrorBarCodeRequired=Código de barras requerido
 ErrorCustomerCodeAlreadyUsed=Código de cliente ya utilizado
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript no debe estar desactivado para que esta
 ErrorPasswordsMustMatch=Las 2 contraseñas indicadas deben corresponderse
 ErrorContactEMail=Se ha producido un error técnico. Contacte con el administrador al e-mail %s, indicando el código de error %s en su mensaje, o puede también adjuntar una copia de pantalla de esta página.
 ErrorWrongValueForField=Valor incorrecto para el campo número %s (el valor '%s' no cumple con la regla %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
+ErrorFieldValueNotIn=Valor incorrecto para el campo número %s (el valor '%s' no es un valor en el campo %s de la tabla %s = %s)
 ErrorFieldRefNotIn=Valor incorrecto para el campo número %s (el valor '%s' no es una referencia existente en %s)
 ErrorsOnXLines=Errores en %s líneas fuente
 ErrorFileIsInfectedWithAVirus=¡El antivirus no ha podido validar este archivo (es probable que esté infectado por un virus)!
@@ -160,7 +160,13 @@ ErrorPriceExpressionInternal=Error interno '%s'
 ErrorPriceExpressionUnknown=Error desconocido '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Los almacenes de origen y destino deben de ser diferentes
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, intenta hacer un movimiento de stock sin indicar lote/serie, en un producto que requiere de lote/serie
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas las recepciones deben verificarse primero antes para poder reallizar esta acción
+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=Los parámetros obligatorios de configuración no están todavía definidos
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 6c154537764..575d03acabc 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Listado de notificaciones enviadas
 MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos.
 MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro '%s' para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet.
 MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 300e17729fe..8298465c933 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -141,7 +141,7 @@ Cancel=Anular
 Modify=Modificar
 Edit=Editar
 Validate=Validar
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Validar y Aprobar
 ToValidate=A validar
 Save=Grabar
 SaveAs=Grabar como
@@ -159,7 +159,7 @@ Search=Buscar
 SearchOf=Búsqueda de
 Valid=Validar
 Approve=Aprobar
-Disapprove=Disapprove
+Disapprove=Desaprobar
 ReOpen=Reabrir
 Upload=Enviar archivo
 ToLink=Enlace
@@ -221,7 +221,7 @@ Cards=Fichas
 Card=Ficha
 Now=Ahora
 Date=Fecha
-DateAndHour=Date and hour
+DateAndHour=Fecha y hora
 DateStart=Fecha inicio
 DateEnd=Fecha fin
 DateCreation=Fecha de creación
@@ -298,7 +298,7 @@ UnitPriceHT=Precio base
 UnitPriceTTC=Precio unitario total
 PriceU=P.U.
 PriceUHT=P.U.
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=P.U. solicitado
 PriceUTTC=P.U. Total
 Amount=Importe
 AmountInvoice=Importe factura
@@ -352,6 +352,7 @@ Status=Estado
 Favorite=Favorito
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. proveedor
 RefPayment=Ref. pago
 CommercialProposalsShort=Presupuestos
@@ -394,8 +395,8 @@ Available=Disponible
 NotYetAvailable=Aún no disponible
 NotAvailable=No disponible
 Popularity=Popularidad
-Categories=Categorías
-Category=Categoría
+Categories=Tags/categories
+Category=Tag/category
 By=Por
 From=De
 to=a
@@ -525,7 +526,7 @@ DateFromTo=De %s a %s
 DateFrom=A partir de %s
 DateUntil=Hasta %s
 Check=Verificar
-Uncheck=Uncheck
+Uncheck=Deseleccionar
 Internal=Interno
 External=Externo
 Internals=Internos
@@ -693,7 +694,8 @@ PublicUrl=URL pública
 AddBox=Añadir caja
 SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Refrescar
 PrintFile=Imprimir Archivo %s
-ShowTransaction=Show transaction
+ShowTransaction=Ver transacción
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Lunes
 Tuesday=Martes
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 46e87bd4dc7..76b17328889 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -42,7 +42,7 @@ StatusOrderCanceled=Anulado
 StatusOrderDraft=Borrador (a validar)
 StatusOrderValidated=Validado
 StatusOrderOnProcess=Pedido - En espera de recibir
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Pedido - A la espera de recibir o validar
 StatusOrderProcessed=Procesado
 StatusOrderToBill=Emitido
 StatusOrderToBill2=A facturar
@@ -59,12 +59,13 @@ MenuOrdersToBill=Pedidos a facturar
 MenuOrdersToBill2=Pedidos facturables
 SearchOrder=Buscar un pedido
 SearchACustomerOrder=Buscar un pedido de cliente
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Buscar un pedido a proveedor
 ShipProduct=Enviar producto
 Discount=Descuento
 CreateOrder=Crear pedido
 RefuseOrder=Rechazar el pedido
-ApproveOrder=Aceptar el pedido
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validar el pedido
 UnvalidateOrder=Desvalidar el pedido
 DeleteOrder=Eliminar el pedido
@@ -102,6 +103,8 @@ ClassifyBilled=Clasificar facturado
 ComptaCard=Ficha contable
 DraftOrders=Pedidos borrador
 RelatedOrders=Pedidos adjuntos
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Pedidos en proceso
 RefOrder=Ref. pedido
 RefCustomerOrder=Ref. pedido cliente
@@ -118,6 +121,7 @@ PaymentOrderRef=Pago pedido %s
 CloneOrder=Clonar pedido
 ConfirmCloneOrder=¿Está seguro de querer clonar este pedido %s?
 DispatchSupplierOrder=Recepción del pedido a proveedor %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable seguimiento pedido cliente
 TypeContact_commande_internal_SHIPPING=Responsable envío pedido cliente
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 01d97afcc34..8a724494efc 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validación ficha intervención
 Notify_FICHINTER_SENTBYMAIL=Envío ficha de intervención por e-mail
 Notify_BILL_VALIDATE=Validación factura
 Notify_BILL_UNVALIDATE=Devalidación factura a cliente
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Aprobación pedido a proveedor
 Notify_ORDER_SUPPLIER_REFUSE=Rechazo pedido a proveedor
 Notify_ORDER_VALIDATE=Validación pedido cliente
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Envío presupuesto por e-mail
 Notify_BILL_PAYED=Cobro factura a cliente
 Notify_BILL_CANCEL=Cancelación factura a cliente
 Notify_BILL_SENTBYMAIL=Envío factura a cliente por e-mail
-Notify_ORDER_SUPPLIER_VALIDATE=Validación pedido a proveedor
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envío pedido a proveedor por e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Validación factura de proveedor
 Notify_BILL_SUPPLIER_PAYED=Pago factura de proveedor
@@ -47,20 +48,20 @@ Notify_PROJECT_CREATE=Creación de proyecto
 Notify_TASK_CREATE=Tarea creada
 Notify_TASK_MODIFY=Tarea modificada
 Notify_TASK_DELETE=Tarea eliminada
-SeeModuleSetup=Consulte la configuración del módulo
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Número archivos/documentos adjuntos
 TotalSizeOfAttachedFiles=Tamaño total de los archivos/documentos adjuntos
 MaxSize=Tamaño máximo
 AttachANewFile=Adjuntar nuevo archivo/documento
 LinkedObject=Objeto adjuntado
 Miscellaneous=Miscelánea
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Número de notificaciones (nº de destinatarios)
 PredefinedMailTest=Esto es un correo de prueba.\nLas 2 líneas están separadas por un retorno de carro a la línea.
 PredefinedMailTestHtml=Esto es un e-mail de prueba(la palabra prueba debe de estar en negrita).
Las 2 líneas están separadas por un retorno de carro en la línea
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nQueremos recordarle que su factura __FACREF__ parece estar pendiente de pago. Le adjuntamos la factura en cuestión, como recordatorio.\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLe adjuntamos el presupuesto __PROPREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nLe adjuntamos la solicitud de precios __ASKREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLe adjuntamos el pedido __ORDERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLe adjuntamos nuestro pedido __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Factura %s validada
 EMailTextProposalValidated=El presupuesto %s que le concierne ha sido validado.
 EMailTextOrderValidated=El pedido %s que le concierne ha sido validado.
 EMailTextOrderApproved=Pedido %s aprobado
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Pedido %s aprobado por %s
 EMailTextOrderRefused=Pedido %s rechazado
 EMailTextOrderRefusedBy=Pedido %s rechazado por %s
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 8540dfd80c9..6fa46be9db5 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Número Lote/Serie
 l_eatby=Fecha de caducidad
 l_sellby=Fecha límite de venta
 DetailBatchNumber=Detalles del lote/serie
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d)
 printBatch=Lote: %s
 printEatby=Caducidad: %s
 printSellby=Límite venta: %s
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index ab2875577b0..d375d856198 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=El precio mínimo recomendado es: %s
 PriceExpressionEditor=Editor de expresión de precios
 PriceExpressionSelected=Expresión de precios seleccionada
 PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" para configurar un precio. Use ; para separar expresiones
-PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como #options_clavedemiatributoadicional#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=En productos y servicios, y precios de proveedor están disponibles las siguientes variables
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Solamente en los precios de productos y servicios: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Modo precio
 PriceNumeric=Número
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+DefaultPrice=Precio por defecto
+ComposedProductIncDecStock=Incrementar/Decrementar stock al cambiar su padre
+ComposedProduct=Sub-producto
+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
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index da3e7c8b288..02b13e916e7 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -8,10 +8,10 @@ SharedProject=Proyecto compartido
 PrivateProject=Contactos del proyecto
 MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo).
 ProjectsPublicDesc=Esta vista muestra todos los proyectos a los que usted tiene derecho a visualizar.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Esta vista muestra todos los proyectos a los que tiene derecho a visualizar.
 ProjectsDesc=Esta vista muestra todos los proyectos (sus permisos de usuario le permiten tener una visión completa).
 MyTasksDesc=Esta vista se limita a los proyectos y tareas en los que usted es un contacto afectado en al menos una tarea (cualquier tipo).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Solamente son visibles los proyectos abiertos (los proyectos con estado borrador o cerrado no son visibles)
 TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted tiene derecho a tener visibilidad.
 TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuario le permiten tener una visión completa).
 ProjectsArea=Área proyectos
@@ -31,8 +31,8 @@ NoProject=Ningún proyecto definido
 NbOpenTasks=Nº tareas abiertas
 NbOfProjects=Nº de proyectos
 TimeSpent=Tiempo dedicado
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Tiempo dedicado por usted
+TimeSpentByUser=Tiempo dedicado por usuario
 TimesSpent=Tiempos dedicados
 RefTask=Ref. tarea
 LabelTask=Etiqueta tarea
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Listado de pedidos a proveedores asociados a
 ListSupplierInvoicesAssociatedProject=Listado de facturas de proveedor asociados al proyecto
 ListContractAssociatedProject=Listado de contratos asociados al proyecto
 ListFichinterAssociatedProject=Listado de intervenciones asociadas al proyecto
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Listado de informes de gastos asociados al proyecto
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista de eventos asociados al proyecto
 ActivityOnProjectThisWeek=Actividad en el proyecto esta semana
 ActivityOnProjectThisMonth=Actividad en el proyecto este mes
@@ -131,14 +132,14 @@ UnlinkElement=Desvincular elemento
 # Documents models
 DocumentModelBaleine=Modelo de informe de proyecto completo (logo...)
 PlannedWorkload=Carga de trabajo prevista
-PlannedWorkloadShort=Workload
-WorkloadOccupation=Workload assignation
+PlannedWorkloadShort=Carga de trabajo
+WorkloadOccupation=Asignación carga de trabajo 
 ProjectReferers=Objetos vinculados
 SearchAProject=Buscar un proyecto
 ProjectMustBeValidatedFirst=El proyecto debe validarse primero
 ProjectDraft=Proyectos borrador
 FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempo consumido
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+InputPerDay=Entrada por día
+InputPerWeek=Entrada por semana
+InputPerAction=Entrada por acción
+TimeAlreadyRecorded=Tiempo dedicado ya registrado para esta tarea/día y usuario %s
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index 6995284079c..80cc3e0d91c 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -10,4 +10,4 @@ SalariesPayments=Pagos de salarios
 ShowSalaryPayment=Ver pago
 THM=Precio medio por hora
 TJM=Precio medio por día
-CurrentSalary=Current salary
+CurrentSalary=Salario actual
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index c119cd363d2..898041a1398 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. envío
 Sending=Envío
 Sendings=Envíos
+AllSendings=All Shipments
 Shipment=Envío
 Shipments=Envíos
 ShowSending=Mostrar envío
@@ -23,7 +24,7 @@ QtyOrdered=Cant. pedida
 QtyShipped=Cant. enviada
 QtyToShip=Cant. a enviar
 QtyReceived=Cant. recibida
-KeepToShip=Remain to ship
+KeepToShip=Resto a enviar
 OtherSendingsForSameOrder=Otros envíos de este pedido
 DateSending=Fecha de expedición
 DateSendingShort=Fecha de expedición
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index bb9f7423361..845239bba15 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -47,7 +47,7 @@ PMPValue=Valor (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Stock del producto y stock del subproducto son independientes
 QtyDispatched=Cantidad recibida
 QtyDispatchedShort=Cant. recibida
 QtyToDispatchShort=Cant. a enviar
@@ -111,7 +111,7 @@ WarehouseForStockDecrease=Para el decremento de stock se usará el almacén %
 WarehouseForStockIncrease=Para el incremento de stock se usará el almacén %s
 ForThisWarehouse=Para este almacén
 ReplenishmentStatusDesc=Esta es la lista de todos los productos con un stock menor que el stock deseado (o menor que el valor de alerta si el checkbox "sólo alertas" está marcado) y que sugiere crear pedidos de proveedor para rellenar la diferencia.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentOrdersDesc=Este es el listado de todos los pedidos a proveedor con productos predefinidos. Solo son visibles pedidos abiertos con productos que puedan afectar al stock.
 Replenishments=Reaprovisionamiento
 NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s)
 NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo seleccionado (> %s)
@@ -131,4 +131,4 @@ IsInPackage=Contenido en el paquete
 ShowWarehouse=Mostrar almacén
 MovementCorrectStock=Corrección de stock del producto %s
 MovementTransferStock=Transferencia de stock del producto %s a otro almacén
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Debe definirse aquí un almacén origen cuando el módulo de lotes está activado. Se utiliza para enumerar lotes/series disponibles del producto para realizar un movimiento. Si desea enviar productos de diferentes almacenes, simplemente haga el envío en varios pasos.
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index 7e0f2718572..85648f97f12 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Facturas proveedores y pagos
 ExportDataset_fournisseur_3=Pedidos de proveedores y líneas de pedido
 ApproveThisOrder=Aprobar este pedido
 ConfirmApproveThisOrder=¿Está seguro de querer aprobar el pedido a proveedor %s?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Denegar este pedido
 ConfirmDenyingThisOrder=¿Está seguro de querer denegar el pedido a proveedor %s?
 ConfirmCancelThisOrder=¿Está seguro de querer cancelar el pedido a proveedor %s?
 AddCustomerOrder=Crear pedido de cliente
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Listado de pedidos a proveedor
 MenuOrdersSupplierToBill=Pedidos a proveedor a facturar
 NbDaysToDelivery=Tiempo de entrega en días
 DescNbDaysToDelivery=El plazo mayor se visualiza el el listado de pedidos de productos
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 0ab2363364b..057367cc7a2 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Eraldaja
 ExtrafieldCheckBox=Märkeruut
 ExtrafieldRadio=Raadionupp
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameetrite nimekiri peab olema kujul võti,väärtus

Näiteks:
1,väärtus1
2,väärtus2
3,väärtus3
jne

Nimekirja teisest nimekirjast sõltuvaks muutmiseks:
1,väärtus1|ema_nimekirja_kood:ema_võti
2,väärtus2|ema_nimekirja_kood:ema_võti
 ExtrafieldParamHelpcheckbox=Parameetrite nimekiri peab olema kujul võti,väärtus

Näiteks:
1,väärtus1
2,väärtus2
3,väärtus3
...
 ExtrafieldParamHelpradio=Parameetrite nimekiri peab olema kujul võti,väärtus

Näiteks:
1,väärtus1
2,väärtus2
3,väärtus3
...
@@ -494,6 +495,8 @@ Module500Name=Erikulud (maksud, sotsiaalmaks, dividendid)
 Module500Desc=Erikulude: nt maksude, sotsiaalmaksude, dividendide ja palkade haldamine
 Module510Name=Palgad
 Module510Desc=Töötajate palkade ja palkade maksmise haldamine
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Teated
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Annetused
@@ -508,14 +511,14 @@ Module1400Name=Raamatupidamine
 Module1400Desc=Raamatupidamise haldamine (topelt isikud)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategooriad
-Module1780Desc=Kategooriate haldamine (tooted, hankijad ja kliendid)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG toimeti
 Module2000Desc=Luba mõnede tekstialade toimetamist võimsama toimetiga
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cro
-Module2300Desc=Ajastatud tegevuste haldamine
+Module2300Desc=Scheduled job management
 Module2400Name=Päevakava
 Module2400Desc=Tegevuste/ülesannete ja päevakava haldamine
 Module2500Name=Dokumendihaldus
@@ -714,6 +717,11 @@ Permission510=Palkade vaatamine
 Permission512=Palkade loomine/muutmine
 Permission514=Palkade kustutamine
 Permission517=Palkade eksportimine
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Teenuste vaatamine
 Permission532=Teenuste loomine/muutmine
 Permission534=Teenuste kustutamine
@@ -746,6 +754,7 @@ Permission1185=Ostutellimuste heaks kiitmine
 Permission1186=Ostutellimuste tellimine
 Permission1187=Ostutellimuste kinnitamise kviitung
 Permission1188=Ostutellimuste kustutamine
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Eksportimise tulemuse kätte saamine
 Permission1202=Ekspordi loomine/muutmine
 Permission1231=Ostuarvete vaatamine
@@ -758,10 +767,10 @@ Permission1237=Ostutellimuste ja ostuinfo eksport
 Permission1251=Väliste andmete massiline import andmebaasi (andmete laadimine)
 Permission1321=Müügiarvete, atribuutide ja maksete eksport
 Permission1421=Müügitellimuste ja atribuutide eksport
-Permission23001 = Ajastatud tegevuste vaatamine
-Permission23002 = Ajastatud tegevuste loomine/muutmine
-Permission23003 = Ajastatud tegevuste kustutamine
-Permission23004 = Ajastatud tegevuste käivitamine
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Oma kontoga seotud juhtumite (tegevuste või ülesannete) vaatamine
 Permission2402=Oma kontoga seotud juhtumite (tegevuste või ülesannete) loomine/muutmine
 Permission2403=Oma kontoga seotud juhtumite (tegevuste või ülesannete) kustutamine
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Tagasta raamatupidamise kood kujul:
%s millele jär
 ModuleCompanyCodePanicum=Tagasta tühi raamatupidamise kood.
 ModuleCompanyCodeDigitaria=Raamatupidamine kood sõltub kolmanda isiku koodist. Kood algab tähega "C", millele järgnevad kolmanda isiku koodi esimesed 5 tähte.
 UseNotifications=Kasuta teateid
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Dokumendimallid
 DocumentModelOdt=Loo dokumendid OpenDocument mallidest (.ODT või .ODS failid OpenOffices, KOffices, TextEditis jne)
 WatermarkOnDraft=Mustandi vesimärk
@@ -1557,6 +1566,7 @@ SuppliersSetup=Hankijate mooduli seadistamine
 SuppliersCommandModel=Täielik ostutellimuse mall (logo jne)
 SuppliersInvoiceModel=Täielik ostuarve mall (logo jne)
 SuppliersInvoiceNumberingModel=Ostuarvete numeratsiooni mudel
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind mooduli seadistamine
 PathToGeoIPMaxmindCountryDataFile=Maxmind IP->maa tõlkimise faili rada.
Näited:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 2a229dded16..1d95135c3c3 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Arve %s on kinnitatud
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Arve %s on tagasi mustandi staatuses
 InvoiceDeleteDolibarr=Arve %s on kustutatud
-OrderValidatedInDolibarr= Tellimus %s on kinnitatud
+OrderValidatedInDolibarr=Tellimus %s on kinnitatud
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Tellimus %s on tühistatud
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Tellimus %s on heaks kiidetud
 OrderRefusedInDolibarr=Tellimus %s on tagasi lükatud
 OrderBackToDraftInDolibarr=Tellimus %s on muudetud mustandiks
@@ -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
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 4ebfb5ad8ec..bc5ccc57a44 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Kahe uue allahindluse summa peab olema võr
 ConfirmRemoveDiscount=Kas oled täiesti kindel, et soovid selle allahindluse eemaldada?
 RelatedBill=Seotud arve
 RelatedBills=Seotud arved
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index 328c06c3a03..441c62cb002 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategooria
-Categories=Kategooriad
-Rubrique=Kategooria
-Rubriques=Kategooriad
-categories=kategooriad
-TheCategorie=Kategooria
-NoCategoryYet=Sellist tüüpi kategooriaid pole veel loodud
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Kategoorias
 AddIn=Lisa kategooriasse
 modify=muuda
 Classify=Liigita
-CategoriesArea=Kategooriate ala
-ProductsCategoriesArea=Toote-/teenuse kategooriate ala
-SuppliersCategoriesArea=Hankijakategooriate ala
-CustomersCategoriesArea=Kliendikategooriate ala
-ThirdPartyCategoriesArea=Kolmandate isikute kategooriate ala
-MembersCategoriesArea=Liikmekategooriate ala
-ContactsCategoriesArea=Kontaktikategooriate ala
-MainCats=Juurkategooriad
+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=Alamkategooriad
 CatStatistics=Statistika
-CatList=Kategooriate nimekiri
-AllCats=Kõik kategooriad
-ViewCat=Vaata kategooriat
-NewCat=Lisa kategooria
-NewCategory=Uus kategooria
-ModifCat=Muuda kategooriat
-CatCreated=Kategooria loodud
-CreateCat=Loo kategooria
-CreateThisCat=Loo selles kategoorias
+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=Valideeri väljad
 NoSubCat=Alamkategooriaid ei ole.
 SubCatOf=Alamkategooria
-FoundCats=Leitud kategooriad
-FoundCatsForName=Leiti kategooriad, mis on seotud nimega:
-FoundSubCatsIn=Kategoorias leidus alamkategooriaid
-ErrSameCatSelected=Valisid sama kategooria mitu korda
-ErrForgotCat=Unustasid kategooria valida
+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=Unustasid väljad täita
 ErrCatAlreadyExists=See nimi on juba kasutuses
-AddProductToCat=Lisa see toode mõnesse kategooriasse?
-ImpossibleAddCat=Ei suutnud kategooriat lisada
-ImpossibleAssociateCategory=Ei suutnud kategooriat seostada elemendiga
+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 edukalt lisatud.
-ObjectAlreadyLinkedToCategory=Element on juba selle kategooriaga seostatud.
-CategorySuccessfullyCreated=Kategooria %s lisati edukalt.
-ProductIsInCategories=Toode/teenus kuulub järgmistesse kategooriatesse
-SupplierIsInCategories=Kolmas isik kuulub järgnevatesse hankijakategooriatesse
-CompanyIsInCustomersCategories=Antud kolmas isik kuulub järgnevatesse kliendi-/huviliste kategooriatesse
-CompanyIsInSuppliersCategories=Antud kolmas isik kuulub järgnevatesse hankijakategooriatesse
-MemberIsInCategories=Antud liige kuulub järgnevatesse liikmekategooriatesse
-ContactIsInCategories=Antud kontakt kuulub järgnevatesse kontaktikategooriatesse
-ProductHasNoCategory=Antud toode/teenus pole üheski kategoorias
-SupplierHasNoCategory=Antud hankija ei ole üheski kategoorias
-CompanyHasNoCategory=Antud ettevõte ei ole üheski kategoorias
-MemberHasNoCategory=Antud liige ei ole üheski kategoorias
-ContactHasNoCategory=Antud kontakt ei kuulu ühtegi kategooriasse
-ClassifyInCategory=Liigita kategooriasse
+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=Puudub
-NotCategorized=Kategooriata
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Sellise viitega kategooria on juba olemas
 ReturnInProduct=Tagasi toote/teenuse kaardile
 ReturnInSupplier=Tagasi hankija kaardile
@@ -66,22 +64,22 @@ ReturnInCompany=Tagasi kliendi/huvilise kaardile
 ContentsVisibleByAll=Antud sisu on kõigile nähtav
 ContentsVisibleByAllShort=Sisu on kõigile nähtav
 ContentsNotVisibleByAllShort=Sisu ei ole kõigile nähtav
-CategoriesTree=Kategooriate puu
-DeleteCategory=Kustuta kategooria
-ConfirmDeleteCategory=Kas oled kindel, et soovid antud kategooria kustutada?
-RemoveFromCategory=Eemalda seos kategooriaga
-RemoveFromCategoryConfirm=Kas oled kindel, et soovid eemaldada seose tehingu ja kategooria vahel?
-NoCategoriesDefined=Kategooriaid pole määratletud
-SuppliersCategoryShort=Hankijakategooria
-CustomersCategoryShort=Kliendikategooria
-ProductsCategoryShort=Tootekategooria
-MembersCategoryShort=Liikmekategooria
-SuppliersCategoriesShort=Hankijakategooriad
-CustomersCategoriesShort=Kliendikategooriad
+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=Kliendi-/Huvil kategooriad
-ProductsCategoriesShort=Tootekategooriad
-MembersCategoriesShort=Liikmekategooriad
-ContactCategoriesShort=Kontaktikategooriad
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Antud kategooria ei sisalda ühtki toodet.
 ThisCategoryHasNoSupplier=Antud kategooria ei sisalda ühtki hankijat.
 ThisCategoryHasNoCustomer=Antud kategooria ei sisalda ühtki klienti
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Antud kategooria ei sisalda ühtki kontakti
 AssignedToCustomer=Määratud kliendile
 AssignedToTheCustomer=Määratud kliendile nimega
 InternalCategory=Sisemine kategooria
-CategoryContents=Kategooria sisu
-CategId=Kategooria ID
-CatSupList=Hankijakategooriate nimekiri
-CatCusList=Kliendi-/huviliste kategooriate nimekiri
-CatProdList=Tootekategooriate nimekiri
-CatMemberList=Liikmekategooriate nimekiri
-CatContactList=Kontaktikategooriate ja kontaktide nimekiri
-CatSupLinks=Hankijate ja kategooriate vahelised seosed
-CatCusLinks=Klientide/huviliste ja kategooriate vahelised sosed
-CatProdLinks=Toodete/teenuste ja kategooriate vahelised seosed
-CatMemberLinks=Liikmete ja kategooriate vahelised seosed
-DeleteFromCat=Eemalda kategooriast
+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=Pildi kustutamine
 ConfirmDeletePicture=Kinnitada pildi kustutamine?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Kategooriate seadistamine
-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
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index a8b2473acb2..477e601a0d6 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Viimase käivituse väljund
 CronLastResult=Viimane vastuse kood
 CronListOfCronJobs=Käivitatavate tööde nimekiri
 CronCommand=Käsk
-CronList=Programmide nimekiri
-CronDelete= Kustuta programme
-CronConfirmDelete= Kas oled kindel, et soovid selle käivituse kustutada?
-CronExecute=Käivita tegevus
-CronConfirmExecute= Kas oled kindel, et soovid seda programmi praegu käivitada
-CronInfo= Programmid, mis lubavad käivitada planeeritud tegevusi
-CronWaitingJobs=Ootel programmid
+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=Tegevus
-CronNone= Mitte ükski
+CronNone=Mitte ükski
 CronDtStart=Alguskuupäev
 CronDtEnd=Lõppkuupäev
 CronDtNextLaunch=Järgmine käivitus
@@ -75,6 +75,7 @@ CronObjectHelp=Laetava objekti nimi. 
 Näiteks Dolibarri Product objekti /ht
 CronMethodHelp=Kasutatava objekti korral käivitatav meetod. 
 Näiteks Dolibarr Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel on meetodi väärtuseks fetch
 CronArgsHelp=Meetodile antavad argumendid. 
 Näiteks Dolibarri Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel võivad parameetrite väärtusteks olla 0, ProductRef.
 CronCommandHelp=Käivitatav süsteemi käsk.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informatsioon
 # Common
diff --git a/htdocs/langs/et_EE/donations.lang b/htdocs/langs/et_EE/donations.lang
index ed140f372d8..40a9bf9f770 100644
--- a/htdocs/langs/et_EE/donations.lang
+++ b/htdocs/langs/et_EE/donations.lang
@@ -6,6 +6,8 @@ Donor=Annetaja
 Donors=Annetajad
 AddDonation=Create a donation
 NewDonation=Uus annetus
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Kuva annetus
 DonationPromise=Annetuse lubadus
 PromisesNotValid=Kinnitamata annetused
@@ -21,6 +23,8 @@ DonationStatusPaid=Annetus vastu võetud
 DonationStatusPromiseNotValidatedShort=Mustand
 DonationStatusPromiseValidatedShort=KInnitatud
 DonationStatusPaidShort=Vastu võetud
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Kinnita lubadus
 DonationReceipt=Annetuse kviitung
 BuildDonationReceipt=Loo kviitung
@@ -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
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 92f2ead7679..7e9d9f3cba8 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/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=Kohustuslikud seadistusparameetrid on määratlemata
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index ec69991524d..2098f500988 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Loetle kõik saadetud e-posti teated
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 98632e2e74e..e767a115d75 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -352,6 +352,7 @@ Status=Staatus
 Favorite=Favorite
 ShortInfo=Inform
 Ref=Viide
+ExternalRef=Ref. extern
 RefSupplier=Hankija viide
 RefPayment=Makse viide
 CommercialProposalsShort=Pakkumised
@@ -394,8 +395,8 @@ Available=Saadaval
 NotYetAvailable=Pole veel saadaval
 NotAvailable=Pole saadaval
 Popularity=Populaarsus
-Categories=Kategooriad
-Category=Kategooria
+Categories=Tags/categories
+Category=Tag/category
 By=Isik
 From=Kellelt
 to=kellele
@@ -694,6 +695,7 @@ AddBox=Lisa kast
 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=Esmaspäev
 Tuesday=Teisipäev
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index 7c4e9a9b1d8..74e61e45396 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Saada toode
 Discount=Allahindlus
 CreateOrder=Loo tellimus
 RefuseOrder=Keeldu tellimusest
-ApproveOrder=Kiida tellimus heaks
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Kinnita tellimus
 UnvalidateOrder=Ava tellimus
 DeleteOrder=Kustuta tellimus
@@ -102,6 +103,8 @@ ClassifyBilled=Liigita arve esitatud
 ComptaCard=Raamatupidamise kaart
 DraftOrders=Tellimuste mustandid
 RelatedOrders=Seotud tellimused
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Töötlemisel tellimused
 RefOrder=Tellimuse viide
 RefCustomerOrder=Müügitellimuse viide
@@ -118,6 +121,7 @@ PaymentOrderRef=Tellimuse %s makse
 CloneOrder=Klooni tellimus
 ConfirmCloneOrder=Kas oled täiesti kindel, et soovid kloonida tellimuse %s ?
 DispatchSupplierOrder=Ostutellimuse %s vastu võtmine
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Müügitellimuse järelkajaga tegelev müügiesindaja
 TypeContact_commande_internal_SHIPPING=Saatmise järelkajaga tegelev müügiesindaja
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 1670ba75c7a..dc8d17da656 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Sekkumine kinnitatud
 Notify_FICHINTER_SENTBYMAIL=Sekkumine saadetud postiga
 Notify_BILL_VALIDATE=Müügiarve kinnitatud
 Notify_BILL_UNVALIDATE=Müügiarve avatud
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Ostutellimus heaks kiidetud
 Notify_ORDER_SUPPLIER_REFUSE=Ostutellimus tagasi lükatud
 Notify_ORDER_VALIDATE=Müügitellimus kinnitatud
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Müügipakkumine saadetud postiga
 Notify_BILL_PAYED=Müügiarve tasutud
 Notify_BILL_CANCEL=Müügiarve tühistatud
 Notify_BILL_SENTBYMAIL=Müügiarve saadetud postiga
-Notify_ORDER_SUPPLIER_VALIDATE=Ostutellimus kinnitatud
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Ostutellimus saadetud postiga
 Notify_BILL_SUPPLIER_VALIDATE=Ostuarve kinnitatud
 Notify_BILL_SUPPLIER_PAYED=Ostuarve makstud
@@ -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=Manusena lisatud faile/dokumente
 TotalSizeOfAttachedFiles=Manusena lisatud failide/dokumentide kogusuurus
 MaxSize=Maksimaalne suurus
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Arve %s on kinnitatud.
 EMailTextProposalValidated=Pakkumine %s on kinnitatud.
 EMailTextOrderValidated=Tellimus %s on kinnitatud.
 EMailTextOrderApproved=Tellimus %s on heaks kiidetud.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Tellimuse %s kiitis %s heaks
 EMailTextOrderRefused=Tellimus %s on tagasi lükatud.
 EMailTextOrderRefusedBy=Tellimuse %s lükkas %s tagasi
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 2d64e8c5345..49b37b138c2 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 86d8f546767..38a2c9c6d37 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Antud projektiga seotud ostuarvete nimekir
 ListContractAssociatedProject=Antud projektiga seotud lepingute nimekiri
 ListFichinterAssociatedProject=Antud projektiga seotud sekkumiste nimekiri
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Antud projektiga seotud tegevuste nimekiri
 ActivityOnProjectThisWeek=Projekti aktiivsus sellel nädalal
 ActivityOnProjectThisMonth=Projekti aktiivsus sellel kuul
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index e343a62f82d..9daa227665a 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Saadetise viide
 Sending=Saadetis
 Sendings=Saadetised
+AllSendings=All Shipments
 Shipment=Saadetis
 Shipments=Saadetised
 ShowSending=Show Sending
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index be8bd178d54..bba811e26e9 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/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)
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 283b7d567cf..1955826bb03 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Bereizlea
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio botoia
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Jakinarazpenak
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Diru-emateak
@@ -508,14 +511,14 @@ Module1400Name=Kontabilitatea
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategoriak
-Module1780Desc=Kategoriak kudeatzea (produktuak, hornitzaileak eta bezeroak)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editorea
 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=Gertaera/Atazak eta agenda kudeatzea
 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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index fb870bcd019..a0a43605c44 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 4eb42a057b5..b0f031dd02a 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index c55f6c923ce..c9f25039854 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informazioa
 # Common
diff --git a/htdocs/langs/eu_ES/donations.lang b/htdocs/langs/eu_ES/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/eu_ES/donations.lang
+++ b/htdocs/langs/eu_ES/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_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=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 697b6e3bc97..1c18ac46f16 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 5913029999d..64a77ffde27 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/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 %s ?
 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
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/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.
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_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)
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index c9304d083b0..76814c7ae0b 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -10,7 +10,7 @@ VersionUnknown=ناشناخته
 VersionRecommanded=توصیه شده
 FileCheck=Files Integrity
 FilesMissing=Missing Files
-FilesUpdated=Updated Files
+FilesUpdated=بروزرسانی فایلها
 FileCheckDolibarr=Check Dolibarr Files Integrity
 XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=جلسه ID
@@ -142,7 +142,7 @@ Box=جعبه
 Boxes=جعبه
 MaxNbOfLinesForBoxes=حداکثر تعداد خطوط برای جعبه
 PositionByDefault=به طور پیش فرض منظور
-Position=Position
+Position=موقعیت
 MenusDesc=مدیران منوها محتوا از 2 میله منو (نوار افقی و نوار عمودی) را تعریف کنیم.
 MenusEditorDesc=ویرایشگر منو به شما اجازه تعریف نوشته های شخصی در منوها. استفاده از آن را به دقت برای جلوگیری از ساخت dolibarr نوشته های ناپایدار و منو برای همیشه غیر قابل دسترس. 
 برخی از ماژول اضافه کردن ورودی در منو (در منو همه در اغلب موارد). اگر برخی از این نوشته های به اشتباه حذف خواهند، شما می توانید آنها را غیر فعال و reenabling ماژول بازگرداند.
 MenuForUsers=منو برای کاربران
@@ -299,7 +299,7 @@ DoNotUseInProduction=آیا در استفاده از تولید نیست
 ThisIsProcessToFollow=این راه اندازی به فرآیند است:
 StepNb=مرحله٪ s را
 FindPackageFromWebSite=پیدا کردن یک بسته است که ویژگی فراهم می کند شما می خواهید (به عنوان مثال در وب سایت رسمی٪ بازدید کنندگان).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=دانلود بسته %s.
 UnpackPackageInDolibarrRoot=باز کردن فایل بسته به پوشه ریشه Dolibarr هست٪ s
 SetupIsReadyForUse=نصب به پایان رسید و Dolibarr آماده استفاده است با این بخش جدید است.
 NotExistsDirect=ریشه جایگزین تعریف نشده است. 

@@ -309,7 +309,7 @@ YouCanSubmitFile=ماژول را انتخاب کنید:
 CurrentVersion=نسخه فعلی Dolibarr
 CallUpdatePage=برو به صفحه ای که به روز رسانی ساختار بانک اطلاعاتی و دادهها:٪ است.
 LastStableVersion=آخرین نسخه پایدار
-UpdateServerOffline=Update server offline
+UpdateServerOffline=بروزرسانی آفلاین سرور
 GenericMaskCodes=شما می توانید ماسک شماره را وارد کنید. در این ماسک، تگ های زیر می تواند مورد استفاده قرار گیرد: 
 {000000} مربوط به تعداد خواهد شد که در هر یک از٪ s را افزایش مییابد. به عنوان بسیاری از صفر را وارد کنید به عنوان طول مورد نظر از ضد. شمارنده خواهد شد صفر از سمت چپ به منظور به صفر کرده اند و بسیاری از ماسک به پایان رسید. 
 {000.000 +000} همان قبلی است اما جبران مربوطه را به شماره در سمت راست علامت + شروع به کار رفته در اولین٪ است. 
 {000000 @ X} همان قبلی است اما شمارنده به صفر زمانی که ماه X برسد (x بین 1 و 12، و یا 0 به استفاده از ماه های اولیه سال مالی تعیین شده در تنظیمات خود را، و یا 99 به صفر هر ماه ). اگر این گزینه استفاده می شود و x است 2 یا بالاتر، و سپس دنباله {YY} {میلی متر} یا {تاریخ برای ورود yyyy} {میلی متر} نیز مورد نیاز است. 
 {تولد} روز (01 تا 31). 
 {میلی متر} ماه (01 تا 12). 
 {YY}، {تاریخ برای ورود yyyy} یا {Y} سال بیش از 2، 4 و یا 1 عدد. 

 GenericMaskCodes2={CCCC} کد مشتری در تعداد کاراکتر 
 {cccc000} کد مشتری در تعداد کاراکتر توسط شمارنده اختصاص داده شده برای مشتری است. این مبارزه اختصاص داده شده به مشتری است که در همان زمان از مبارزه جهانی بازنشانی کنید. 
 {TTTT} کد از نوع thirdparty در تعداد شخصیت (نگاه کنید به انواع فرهنگ لغت-thirdparty). 

 GenericMaskCodes3=تمام شخصیت های دیگر در ماسک دست نخورده باقی خواهد ماند. 
 فضاهای امکان پذیر نیست. 

@@ -389,6 +389,7 @@ ExtrafieldSeparator=تفکیک کننده
 ExtrafieldCheckBox=جعبه
 ExtrafieldRadio=دکمه های رادیویی
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=فهرست پارامترها را به مانند کلید، ارزش است 

 به عنوان مثال: 
 1، VALUE1 
 2، VALUE2 
 3، value3 
 ... 

 به منظور داشتن لیست بسته به نوع دیگر: 
 1، VALUE1 | parent_list_code: parent_key 
 2، VALUE2 | parent_list_code: parent_key
 ExtrafieldParamHelpcheckbox=فهرست پارامترها را به مانند کلید، ارزش است 

 به عنوان مثال: 
 1، VALUE1 
 2، VALUE2 
 3، value3 
 ...
 ExtrafieldParamHelpradio=فهرست پارامترها را به مانند کلید، ارزش است 

 به عنوان مثال: 
 1، VALUE1 
 2، VALUE2 
 3، value3 
 ...
@@ -494,6 +495,8 @@ Module500Name=هزینه های ویژه (مالیاتی، کمک های اجت
 Module500Desc=مدیریت هزینه های خاص مانند مالیات، مشارکت اجتماعی، سود سهام و حقوق
 Module510Name=حقوق
 Module510Desc=مدیریت کارکنان حقوق و پرداخت
+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=کمک های مالی
@@ -506,23 +509,23 @@ Module1200Name=اخوندک
 Module1200Desc=ادغام آخوندک
 Module1400Name=حسابداری
 Module1400Desc=مدیریت حسابداری (احزاب دو)
-Module1520Name=Document Generation
+Module1520Name=ساخت سند
 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
+Module2200Name=قیمت های پویا.
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=cron را
-Module2300Desc=وظیفه مدیریت برنامه ریزی
+Module2300Desc=Scheduled job management
 Module2400Name=دستور کار
 Module2400Desc=رویدادهای / وظایف و مدیریت برنامه
 Module2500Name=الکترونیکی مدیریت محتوا
 Module2500Desc=ذخیره و به اشتراک اسناد
 Module2600Name=سرویس دهنده وب
 Module2600Desc=فعال کردن Dolibarr خدمات وب سرور
-Module2650Name=WebServices (client)
+Module2650Name=وب سروسی ها ( کلاینت)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar در
 Module2700Desc=استفاده از سرویس آنلاین Gravatar در (www.gravatar.com) برای نشان دادن عکس از کاربران / کاربران (که با ایمیل های خود را). نیاز به دسترسی به اینترنت
@@ -714,6 +717,11 @@ Permission510=خوانده شده حقوق
 Permission512=ایجاد / اصلاح حقوق
 Permission514=حذف حقوق
 Permission517=حقوق صادرات
+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=سفارشات عرضه کننده کالا صادرات و مش
 Permission1251=اجرای واردات انبوه از داده های خارجی به پایگاه داده (بار داده ها)
 Permission1321=فاکتورها صادرات به مشتریان، ویژگی ها و پرداخت ها
 Permission1421=سفارشات صادرات مشتری و ویژگی های
-Permission23001 = به نشانه خوانده شدن برنامه ریزی شده کار
-Permission23002 = ایجاد / بروز رسانی برنامه ریزی شده کار
-Permission23003 = حذف کار برنامه ریزی شده
-Permission23004 = اجرای کار برنامه ریزی شده
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=دفعات بازدید: اقدامات (رویدادها و وظایف) مرتبط با حساب کاربری خود
 Permission2402=ایجاد / اصلاح اعمال (رویدادها و وظایف) به حساب او در ارتباط است
 Permission2403=حذف اقدامات (رویدادها و وظایف) مرتبط با حساب کاربری خود
@@ -808,7 +817,7 @@ DictionaryOrderMethods=مرتب سازی بر روش
 DictionarySource=منبع از پیشنهادات / سفارشات
 DictionaryAccountancyplan=نمودار حساب
 DictionaryAccountancysystem=مدل برای نمودار حساب
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=الگوهای ایمیل
 SetupSaved=راه اندازی نجات داد
 BackToModuleList=بازگشت به لیست ماژول ها
 BackToDictionaryList=برگشت به فهرست واژه نامه ها
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=بازگشت یک کد حسابداری ساخته ش
 ModuleCompanyCodePanicum=بازگشت یک کد حسابداری خالی است.
 ModuleCompanyCodeDigitaria=کد حسابداری بستگی به کد های شخص ثالث. کد از شخصیت "C" در مقام اول و پس از آن 5 حرف اول کد های شخص ثالث تشکیل شده است.
 UseNotifications=استفاده از اطلاعیه
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=اسناد قالب
 DocumentModelOdt=تولید اسناد از OpenDocuments قالب (. ODT و یا فایل های ODS برای آفیس اپن سورس کنند، KOffice، TextEdit، ...)
 WatermarkOnDraft=تعیین میزان مد آب در پیش نویس سند
@@ -1557,6 +1566,7 @@ SuppliersSetup=تامین کننده راه اندازی ماژول
 SuppliersCommandModel=قالب کامل جهت عرضه کننده کالا (logo. ..)
 SuppliersInvoiceModel=قالب کامل منبع فاکتور (logo. ..)
 SuppliersInvoiceNumberingModel=فاکتورها تامین کننده شماره مدل
+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=مسیر فایل حاوی Maxmind آی پی به ترجمه کشور است. 
 مثال: 
 / usr / محلی / سهم / GeoIP با / GeoIP.dat 
 / usr / اشتراک / 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
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index 6e11caf7b70..a264cc8804c 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=فاکتور٪ بازدید کنندگان اعتبا
 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=منظور از٪ s را رد کرد
 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
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index db80589b564..a3f3768a280 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -294,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
 
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index d220bfe612d..b3684bac87e 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/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=٪ s با موفقیت اضافه شد.
-ObjectAlreadyLinkedToCategory=عنصر در حال حاضر به این گروه مرتبط است.
-CategorySuccessfullyCreated=این رده در٪ s را با موفقیت اضافه شده است.
-ProductIsInCategories=محصولات / خدمات دارای به مقوله های زیر است
-SupplierIsInCategories=شخص ثالث صاحب به زیر تامین کنندگان مجموعه ها
-CompanyIsInCustomersCategories=این شخص ثالث صاحب به زیر مشتریان / چشم انداز مجموعه ها
-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=برگشت به کارت مشتری / چشم انداز
 ContentsVisibleByAll=مطالب توسط همه قابل مشاهده خواهد بود
 ContentsVisibleByAllShort=مطالب توسط همه قابل مشاهده
 ContentsNotVisibleByAllShort=مطالب توسط همه قابل رویت نیست
-CategoriesTree=شاخه درخت
-DeleteCategory=حذف گروه
-ConfirmDeleteCategory=آیا مطمئن هستید که می خواهید این دسته را حذف کنید؟
-RemoveFromCategory=حذف لینک با categorie
-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=مشتریان مشخصات. / 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=شناسه گروه
-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=افزودن پیگیری محصول/سرویس
-ShowCategory=نمایش دسته
+ShowCategory=نمایش دسته
\ No newline at end of file
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index feca42ac429..8483a8ed71f 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=تاریخ و زمان آخرین خروجی اجرا
 CronLastResult=آخرین نتیجه
 CronListOfCronJobs=لیست شغل ها برنامه ریزی شده
 CronCommand=فرمان
-CronList=فهرست مشاغل
-CronDelete= حذف کارهای cron
-CronConfirmDelete= آیا مطمئن هستید که می خواهید این برنامه cron را حذف کنید؟
-CronExecute=کار راه اندازی
-CronConfirmExecute= آیا مطمئن به اجرای این کار در حال حاضر
-CronInfo= شغل اجازه می دهد برای اجرای وظیفه ای که برنامه ریزی شده است
-CronWaitingJobs=شغل Wainting
+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=کار
-CronNone= هیچ یک
+CronNone=هیچ یک
 CronDtStart=تاریخ شروع
 CronDtEnd=تاریخ پایان
 CronDtNextLaunch=اعدام بعدی
@@ -75,6 +75,7 @@ CronObjectHelp=نام شی برای بارگذاری. 
 برای exemple به
 CronMethodHelp=روش شی برای راه اندازی. 
 برای exemple به بهانه روش Dolibarr محصولات شی / htdocs / محصول / کلاس / product.class.php، ارزش روش است fecth
 CronArgsHelp=استدلال از روش. 
 برای exemple به بهانه روش Dolibarr محصولات شی / htdocs / محصول / کلاس / product.class.php، مقدار پارامترهای می تواند 0، ProductRef
 CronCommandHelp=خط فرمان سیستم را اجرا کند.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=اطلاعات
 # Common
diff --git a/htdocs/langs/fa_IR/donations.lang b/htdocs/langs/fa_IR/donations.lang
index 27a5ed5f685..8e7f94bfebd 100644
--- a/htdocs/langs/fa_IR/donations.lang
+++ b/htdocs/langs/fa_IR/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
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index feea5472afb..6331432e548 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/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=پارامترهای راه اندازی اجباری هنوز تعریف نشده
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index e4bc57e2d42..ad218124678 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 8e9afbf39b0..578185c24e2 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/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=اضافه کردن جعبه
 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=سهشنبه
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index c680e0c4e84..bd43d5e6381 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/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=منظور کلون
 ConfirmCloneOrder=آیا مطمئن هستید که می خواهید به کلون کردن این منظور از٪ s؟
 DispatchSupplierOrder=دریافت کننده کالا منظور از٪ s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=نماینده سفارش مشتری زیر به بالا
 TypeContact_commande_internal_SHIPPING=نماینده زیر را به بالا حمل و نقل
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 0276748a4da..e552336f405 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=مداخله اعتبار
 Notify_FICHINTER_SENTBYMAIL=مداخله با پست
 Notify_BILL_VALIDATE=صورت حساب به مشتری اعتبار
 Notify_BILL_UNVALIDATE=صورت حساب به مشتری 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=ایجاد پروژه
 Notify_TASK_CREATE=وظیفه ایجاد
 Notify_TASK_MODIFY=وظیفه اصلاح شده
 Notify_TASK_DELETE=وظیفه حذف
-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 خودداری کرد.
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index f7f332d68a0..620e7121399 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index efcea608be1..31b2ef018c6 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/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=فعالیت در پروژه این ماه
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index f456863b564..530ad3a8b6b 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=کد عکس. حمل
 Sending=حمل
 Sendings=حمل و نقل
+AllSendings=All Shipments
 Shipment=حمل
 Shipments=حمل و نقل
 ShowSending=Show Sending
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 917a56b1758..0699573aec7 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/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)
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 9ead36d476c..33c0c40e280 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Ilmoitukset
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Lahjoitukset
@@ -508,14 +511,14 @@ Module1400Name=Kirjanpidon asiantuntija
 Module1400Desc=Kirjanpidon hallinta asiantuntijoille (double osapuolet)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategoriat
-Module1780Desc=Kategoriat hallintaa (tuotteet, tavarantoimittajat ja asiakkaat)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-editori
 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=Toimet / tehtävät ja esityslistan hallinta
 Module2500Name=Sähköinen 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=Lue palvelut
 Permission532=Luoda / muuttaa palvelut
 Permission534=Poista palvelut
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Tilaa toimittaja tilaukset
 Permission1187=Vastaanottaneeni toimittaja tilaukset
 Permission1188=Sulje toimittaja tilaukset
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Hanki seurauksena vienti
 Permission1202=Luo / Muuta vienti
 Permission1231=Lue toimittajan laskut
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Suorita massa tuonnin ulkoisten tiedot tietokantaan (tiedot kuormitus)
 Permission1321=Vienti asiakkaan laskut, ominaisuudet ja maksut
 Permission1421=Vienti asiakkaan tilaukset ja attribuutit
-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=Lue toimet (tapahtumat tai tehtävät) liittyy hänen tilinsä
 Permission2402=Luoda / muuttaa / poistaa toimet (tapahtumat tai tehtävät) liittyy hänen tilinsä
 Permission2403=Lue toimet (tapahtumat tai tehtävät) muiden
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Paluu kirjanpitoyrityksen koodi rakentanut %s, jota se
 ModuleCompanyCodePanicum=Palata tyhjään kirjanpitotietojen koodi.
 ModuleCompanyCodeDigitaria=Kirjanpito-koodi riippuu kolmannen osapuolen koodi. Koodi koostuu merkin "C" ensimmäisessä kanta seurasi ensimmäisen 5 merkkiä kolmannen osapuolen koodi.
 UseNotifications=Käytä ilmoitukset
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Asiakirjat mallit
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vesileima asiakirjaluonnos
@@ -1557,6 +1566,7 @@ SuppliersSetup=Toimittajan moduuli setup
 SuppliersCommandModel=Täydellinen malli toimittajan järjestys (logo. ..)
 SuppliersInvoiceModel=Täydellinen malli toimittajan laskun (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 moduuli setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index e7156ddf654..867498a3bfa 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Laskun validoitava
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Laskun %s palata luonnos tila
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Tilaa validoitava
+OrderValidatedInDolibarr=Tilaa validoitava
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Tilaus %s peruutettu
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Tilaa %s hyväksytty
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Tilaa %s palata luonnos tila
@@ -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
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index e8d2f7c5646..42f4b5eb341 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Yhteensä kaksi uutta alennus on oltava alk
 ConfirmRemoveDiscount=Oletko varma, että haluat poistaa tämän edullisista?
 RelatedBill=Related lasku
 RelatedBills=Related laskut
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Varoitus, yksi tai useampi lasku jo olemassa
 
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index 7fcb659df3b..c78728f3f83 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Luokka
-Categories=Kategoriat
-Rubrique=Luokka
-Rubriques=Kategoriat
-categories=luokat
-TheCategorie=Luokka
-NoCategoryYet=Luokkaa ei tällaisen luonut
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Sisällä
 AddIn=Lisää
 modify=muuttaa
 Classify=Luokittele
-CategoriesArea=Kategoriat alueella
-ProductsCategoriesArea=Tuotteet / Palvelut "luokkiin alue
-SuppliersCategoriesArea=Toimittajien luokkiin alue
-CustomersCategoriesArea=Asiakkaiden kategoriat alueella
-ThirdPartyCategoriesArea=Kolmansien osapuolten luokkiin alue
-MembersCategoriesArea=Jäsenet luokat alue
-ContactsCategoriesArea=Contacts categories area
-MainCats=Pääryhmään
+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=Alaluokat
 CatStatistics=Tilastot
-CatList=Luettelo catgories
-AllCats=Kaikki kategoriat
-ViewCat=Näytä luokkien
-NewCat=Lisää luokka
-NewCategory=Uusi luokka
-ModifCat=Muokkaa luokka
-CatCreated=Luokka luonut
-CreateCat=Luo luokka
-CreateThisCat=Luo tähän luokkaan
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate aloilla
 NoSubCat=N: o alaluokka.
 SubCatOf=Alaluokat
-FoundCats=Löytyi tuoteryhmät
-FoundCatsForName=Kategoriat löydetty nimi:
-FoundSubCatsIn=Alaluokat löytyy luokkaan
-ErrSameCatSelected=Valittaessa samaan kategoriaan useita kertoja
-ErrForgotCat=Unohditte valita luokka
+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=Unohditte ilmoitettava kentät
 ErrCatAlreadyExists=Tämä nimi on jo käytössä
-AddProductToCat=Lisää tämä tuote luokka?
-ImpossibleAddCat=Mahdotonta lisätä luokkaan
-ImpossibleAssociateCategory=Mahdotonta yhdistää luokka
+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 on lisätty onnistuneesti.
-ObjectAlreadyLinkedToCategory=Osa on jo liitetty tähän luokkaan.
-CategorySuccessfullyCreated=Tähän luokkaan %s on lisätty menestys.
-ProductIsInCategories=Tuotteen / palvelun omistaa seuraavien luokkien
-SupplierIsInCategories=Kolmas osapuoli omistaa seuraavien toimittajien tuoteryhmät
-CompanyIsInCustomersCategories=Tämä kolmas osapuoli omistaa seuraavien asiakkaat / näkymät tuoteryhmät
-CompanyIsInSuppliersCategories=Tämä kolmas osapuoli omistaa seuraavien toimittajien tuoteryhmät
-MemberIsInCategories=Tämä jäsen omistaa seuraaville jäsenille ryhmiin
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Tämä tuote / palvelu ei ole mitään luokkia
-SupplierHasNoCategory=Tämä toimittaja ei ole mitään luokkia
-CompanyHasNoCategory=Tämä yritys ei ole mitään luokkia
-MemberHasNoCategory=Tämä jäsen ei ole mitään luokkiin
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Luokitella luokkaan
+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=Ei mitään
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Tämä luokka on jo olemassa samassa paikassa
 ReturnInProduct=Takaisin tuotteen / palvelun kortti
 ReturnInSupplier=Palaa toimittaja-kortti
@@ -66,22 +64,22 @@ ReturnInCompany=Palaa asiakas / näköpiirissä kortti
 ContentsVisibleByAll=Sisältö näkyy kaikkien
 ContentsVisibleByAllShort=Sisällys näkyviin kaikki
 ContentsNotVisibleByAllShort=Sisältö ei näy kaikissa
-CategoriesTree=Categories tree
-DeleteCategory=Poista luokka
-ConfirmDeleteCategory=Oletko varma, että haluat poistaa tämän luokan?
-RemoveFromCategory=Poista yhteys Categorie
-RemoveFromCategoryConfirm=Oletko varma, että haluat poistaa välinen kauppa-ja luokka?
-NoCategoriesDefined=N: o luokkaan
-SuppliersCategoryShort=Tavarantoimittajat luokka
-CustomersCategoryShort=Asiakkaat luokka
-ProductsCategoryShort=Tuotteet luokka
-MembersCategoryShort=Jäsenet luokka
-SuppliersCategoriesShort=Tavarantoimittajat tuoteryhmät
-CustomersCategoriesShort=Asiakkaat tuoteryhmät
+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. luokat
-ProductsCategoriesShort=Tuotteet Tuoteryhmät
-MembersCategoriesShort=Jäsenet luokat
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Tämä kategoria ei sisällä mitään tuotetta.
 ThisCategoryHasNoSupplier=Tämä kategoria ei sisällä mitään toimittaja.
 ThisCategoryHasNoCustomer=Tämä kategoria ei sisällä asiakkaalle.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Annetaan asiakkaalle
 AssignedToTheCustomer=Annetaan asiakkaan
 InternalCategory=Inernal luokka
-CategoryContents=Luokka sisältö
-CategId=Luokka id
-CatSupList=Luettelo toimittaja tuoteryhmät
-CatCusList=Luettelo asiakas / näköpiirissä tuoteryhmät
-CatProdList=Luettelo tuotteista tuoteryhmät
-CatMemberList=Jäsenlista luokkien
-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
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index bba69fbb33f..62cdc0a8183 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Viimeisen ajon tulostus
 CronLastResult=Viimeisen tuloksen koodi
 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= Ei mitään
+CronNone=Ei mitään
 CronDtStart=Aloituspäivämäärä
 CronDtEnd=Lopetuspäivä
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/fi_FI/donations.lang b/htdocs/langs/fi_FI/donations.lang
index 85d041a84cf..2d55edc3294 100644
--- a/htdocs/langs/fi_FI/donations.lang
+++ b/htdocs/langs/fi_FI/donations.lang
@@ -6,6 +6,8 @@ Donor=Rahoittajien
 Donors=Luovuttajat
 AddDonation=Create a donation
 NewDonation=Uusi lahjoitus
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift lupaus
 PromisesNotValid=Ei validoitava lupaukset
@@ -21,6 +23,8 @@ DonationStatusPaid=Lahjoituksen vastaanotti
 DonationStatusPromiseNotValidatedShort=Vedos
 DonationStatusPromiseValidatedShort=Validoidut
 DonationStatusPaidShort=Vastatut
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Vahvista lupaus
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Rakenna vastaanottamisesta
@@ -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
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 3a31847c78b..53a0744840f 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/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
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index 59a4f74abc8..a1f6062735d 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Listaa kaikki sähköposti-ilmoitukset lähetetään
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 4e6098fd766..5f32596ece3 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -352,6 +352,7 @@ Status=Tila
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Viite
+ExternalRef=Ref. extern
 RefSupplier=Toimittajan viite
 RefPayment=Maksun viite
 CommercialProposalsShort=Kaupalliset ehdotukset
@@ -394,8 +395,8 @@ Available=Saatavissa
 NotYetAvailable=Ei vielä saatavilla
 NotAvailable=Ei saatavilla
 Popularity=Suosio
-Categories=Kategoriat
-Category=Luokka
+Categories=Tags/categories
+Category=Tag/category
 By=Mennessä
 From=Mistä
 to=on
@@ -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=Maanantai
 Tuesday=Tiistai
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index 408212eb534..ab380e928e3 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Laiva tuote
 Discount=Discount
 CreateOrder=Luo Tilaa
 RefuseOrder=Jätteiden jotta
-ApproveOrder=Hyväksy jotta
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate jotta
 UnvalidateOrder=Unvalidate järjestys
 DeleteOrder=Poista jotta
@@ -102,6 +103,8 @@ ClassifyBilled=Luokittele "Laskutetun"
 ComptaCard=Kirjanpito-kortti
 DraftOrders=Luonnos tilaukset
 RelatedOrders=Aiheeseen liittyvät tilaukset
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Prosessissa tilaukset
 RefOrder=Ref. tilata
 RefCustomerOrder=Ref. asiakas jotta
@@ -118,6 +121,7 @@ PaymentOrderRef=Maksutoimisto jotta %s
 CloneOrder=Klooni jotta
 ConfirmCloneOrder=Oletko varma, että haluat klooni tässä järjestyksessä %s?
 DispatchSupplierOrder=Vastaanottaminen toimittaja järjestys %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Edustaja seurantaan asiakkaan tilauksen
 TypeContact_commande_internal_SHIPPING=Edustaja seurantaan merenkulku
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 66aea85c008..3a3ceea1169 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validate interventioelimen
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Validate bill
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Toimittaja jotta hyväksytty
 Notify_ORDER_SUPPLIER_REFUSE=Toimittaja jotta evätty
 Notify_ORDER_VALIDATE=Asiakas tilaa validoitu
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kaupallinen ehdotus lähetetään postitse
 Notify_BILL_PAYED=Asiakas laskun maksanut
 Notify_BILL_CANCEL=Asiakas lasku peruutettu
 Notify_BILL_SENTBYMAIL=Asiakkaan lasku lähetetään postitse
-Notify_ORDER_SUPPLIER_VALIDATE=Toimittaja jotta validoitu
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Toimittaja jotta postitse
 Notify_BILL_SUPPLIER_VALIDATE=Toimittaja laskun validoitu
 Notify_BILL_SUPPLIER_PAYED=Toimittaja laskun maksanut
@@ -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=Numero liitettyjen tiedostojen / asiakirjat
 TotalSizeOfAttachedFiles=Kokonaiskoosta liitettyjen tiedostojen / asiakirjat
 MaxSize=Enimmäiskoko
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Lasku %s validoitava
 EMailTextProposalValidated=Ehdotus %s on hyväksytty.
 EMailTextOrderValidated=Jotta %s on hyväksytty.
 EMailTextOrderApproved=Tilaa %s hyväksytty
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Tilaa %s hyväksynyt %s
 EMailTextOrderRefused=Tilaa %s evätty
 EMailTextOrderRefusedBy=Tilaa %s hylätty %s
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 6b6c461876d..42b86221dca 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index bb52a53a1b6..1c9d5a4bd16 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Luettelo tavarantoimittajien laskut liitty
 ListContractAssociatedProject=Luettelo sopimukset hankkeeseen liittyvät
 ListFichinterAssociatedProject=Luettelo toimien hankkeeseen liittyvän
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Luettelo toimia, jotka liittyvät hankkeen
 ActivityOnProjectThisWeek=Toiminta hanke tällä viikolla
 ActivityOnProjectThisMonth=Toiminta hankkeen tässä kuussa
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index 27c8093e232..0701b49d469 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. lähettäminen
 Sending=Lähettävä
 Sendings=Sendings
+AllSendings=All Shipments
 Shipment=Lähettävä
 Shipments=Toimitukset
 ShowSending=Show Sending
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index aca987a8016..0112a1bf127 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/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)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index fb2b1687199..a890d2ea7f3 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -8,11 +8,11 @@ VersionExperimental=Expérimental
 VersionDevelopment=Développement
 VersionUnknown=Inconnue
 VersionRecommanded=Recommandé
-FileCheck=Files Integrity
-FilesMissing=Missing Files
+FileCheck=Intégrité des fichiers
+FilesMissing=Fichiers manquants
 FilesUpdated=Mettre à jour les fichiers
 FileCheckDolibarr=Vérifier l'intégrité des fichiers
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+XmlNotFound=Fichier Xml d'intégrité de Dolibarr non trouvé
 SessionId=ID Session
 SessionSaveHandler=Modalité de sauvegarde des sessions
 SessionSavePath=Emplacement de sauvegarde sessions
@@ -389,7 +389,8 @@ ExtrafieldSelectList = Liste issue d'une table
 ExtrafieldSeparator=Séparateur de champ
 ExtrafieldCheckBox=Case à cocher
 ExtrafieldRadio=Bouton radio
-ExtrafieldCheckBoxFromList= Case à cocher issue d'une table
+ExtrafieldCheckBoxFromList= Liste à cocher issue d'une table
+ExtrafieldLink=Lier à un objet
 ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur

 par exemple : 
1,valeur1
2,valeur2
3,valeur3
...

Pour que la liste soit dépendante d'une autre :
1,valeur1|code_liste_parent:clef_parent
2,valeur2|code_liste_parent:clef_parent
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur

 par exemple : 
1,valeur1
2,valeur2
3,valeur3
...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur

 par exemple : 
1,valeur1
2,valeur2
3,valeur3
...
@@ -501,24 +502,24 @@ Module600Name=Notifications
 Module600Desc=Envoi de notifications Email sur certains événements métiers Dolibarr, aux contacts de tiers (configuration réalisé sur chaque tiers)
 Module700Name=Dons
 Module700Desc=Gestion des dons
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Note de frais
+Module770Desc=Gestion et déclaration des notes de frais (transports, repas, ...)
+Module1120Name=Propositions commerciales founisseurs
+Module1120Desc=Demander des devis et tarifs aux fournisseurs
 Module1200Name=Mantis
 Module1200Desc=Interface avec le bug tracker Mantis
 Module1400Name=Comptabilité
 Module1400Desc=Gestion de la comptabilité (partie double)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Catégories
-Module1780Desc=Gestion des catégories (produits, fournisseurs, clients et adhérents)
+Module1520Name=Génération de document
+Module1520Desc=Génération de documents de publipostages
+Module1780Name=Tags/Catégories
+Module1780Desc=Créer tags/catégories (pour les produits, clients, fournisseurs, contacts ou adhérents)
 Module2000Name=Éditeur WYSIWYG
 Module2000Desc=Permet la saisie de certaines zones de textes grace à un éditeur avancé
 Module2200Name=Prix calculés dynamiquement
 Module2200Desc=Active l'usage d'expressions mathématiques
 Module2300Name=Travaux programmés
-Module2300Desc=Gestionnaire de travaux programmés (Cron)
+Module2300Desc=Travaux planifiées
 Module2400Name=Agenda
 Module2400Desc=Gestion des actions (événements et tâches) et de l'agenda
 Module2500Name=Gestion électronique de documents
@@ -729,13 +730,13 @@ Permission538=Exporter les services
 Permission701=Consulter les dons
 Permission702=Créer/modifier les dons
 Permission703=Supprimer les dons
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Voir les notes de frais (Les vôtres et les utilisateurs autorisés)
+Permission772=Créer/modifier les notes de frais
+Permission773=Supprimer les notes de frais
+Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
+Permission775=Approuver les notes de frais
+Permission776=Payer les notes de frais
+Permission779=Exporter les notes de frais
 Permission1001=Consulter les stocks
 Permission1002=Créer/modifier entrepôts
 Permission1003=Supprimer entrepôts
@@ -753,6 +754,7 @@ Permission1185=Approuver les commandes fournisseur
 Permission1186=Commander les commandes fournisseur
 Permission1187=Accuser réception des commandes fournisseur
 Permission1188=Supprimer les commandes fournisseur
+Permission1190=Approuver les commandes fournisseur (second niveau)
 Permission1201=Récupérer le résultat d'un export
 Permission1202=Créer/modifier un export
 Permission1231=Consulter les factures fournisseur
@@ -765,10 +767,10 @@ Permission1237=Exporter les commande fournisseurs, attributs
 Permission1251=Lancer des importations en masse dans la base (chargement de données)
 Permission1321=Exporter les factures clients, attributs et règlements
 Permission1421=Exporter les commandes clients et attributs
-Permission23001 = Voir les tâches planifiées
-Permission23002 = Créer/modifier les tâches planifiées
-Permission23003 = Supprimer les tâches planifiées
-Permission23004 = Lancer les tâches planifiées
+Permission23001=Voir les travaux planifiés
+Permission23002=Créer/Modifier des travaux planifiées
+Permission23003=Effacer travail planifié
+Permission23004=Exécuté Travail planifié
 Permission2401=Lire les actions (événements ou tâches) liées à son compte
 Permission2402=Créer/modifier les actions (événements ou tâches) liées à son compte
 Permission2403=Supprimer les actions (événements ou tâches) liées à son compte
@@ -1050,8 +1052,8 @@ MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire
 DefineHereComplementaryAttributes=Définissez ici la liste des attributs supplémentaires, non disponibles en standard, et que vous voulez voir gérer sur les %s.
 ExtraFields=Attributs supplémentaires
 ExtraFieldsLines=Attributs supplémentaires (lignes)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Attributs supplémentaires (lignes de commandes)
+ExtraFieldsSupplierInvoicesLines=Attributs supplémentaires (lignes de factures)
 ExtraFieldsThirdParties=Attributs supplémentaires (tiers)
 ExtraFieldsContacts=Attributs supplémentaires (contacts/adresses)
 ExtraFieldsMember=Attributs supplémentaires (adhérents)
@@ -1114,7 +1116,7 @@ ModuleCompanyCodeAquarium=Renvoie un code comptable composé de :
%s suivi du
 ModuleCompanyCodePanicum=Renvoie un code comptable vide.
 ModuleCompanyCodeDigitaria=Renvoie un code comptable composé suivant le code tiers. Le code est composé du caractère 'C' en première position suivi des 5 premiers caractères du code tiers.
 UseNotifications=Utiliser les notifications
-NotificationsDesc=La fonction des notifications par emails permet d'envoyer automatiquement un email, lors de certains événements Dolibarr. La cible des notifications peut être défini:
* par contacts de tiers (clients, prospects ou fournisseurs), tiers par tiers.
* ou en positionnant un email en paramètre global sur la page de configuration du module notification.
+NotificationsDesc=La fonction des notifications par emails permet d'envoyer automatiquement un email, lors de certains événements Dolibarr. La cible des notifications peut être défini:
* par contacts de tiers (clients, prospects ou fournisseurs), contact par contact.
* ou en positionnant un email en paramètre global sur la page de configuration du module Notification.
 ModelModules=Modèle de documents
 DocumentModelOdt=Génération depuis des modèles OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…)
 WatermarkOnDraft=Filigrane sur les documents brouillons
@@ -1180,13 +1182,12 @@ FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciale
 WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Configuration du module Demandes de Prix Fournisseurs
-AskPriceSupplierNumberingModules=Modèles de numérotation des demandes de prix fournisseurs
-AskPriceSupplierPDFModules=Modèles de documents de demandes de prix fournisseurs
-AskPriceSupplierPDFModules=Modèles de documents de demandes de prix fournisseurs
-FreeLegalTextOnAskPriceSupplier=Mention complémentaire sur les demandes de prix fournisseurs
-WatermarkOnDraftAskPriceSupplier=Filigrane sur les brouillons de demandes de prix (aucun si vide)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Saisir le compte bancaire cible lors de la demande de prix
+AskPriceSupplierSetup=Configuration du module Demande de tarifs forunisseurs
+AskPriceSupplierNumberingModules=Modèles de numérotation des demandes de prix
+AskPriceSupplierPDFModules=Modèles de documents des demandes de prix
+FreeLegalTextOnAskPriceSupplier=Texte libre sur les demande de tarifs fournisseurs
+WatermarkOnDraftAskPriceSupplier=Filigrane sur le document de demande de prix fournisseurs (aucun si vide)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Demander le compte bancaire cible durant la création de la demande de prix fournisseur
 ##### Orders #####
 OrdersSetup=Configuration du module Commandes
 OrdersNumberingModules=Modèles de numérotation des commandes
@@ -1536,10 +1537,10 @@ CashDeskThirdPartyForSell=Tiers générique à utiliser par défaut pour les ven
 CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide
 CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
 CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+CashDeskDoNotDecreaseStock=Désactiver la réduction de stocks systématique lorsque une vente se fait à partir du Point de Vente (si «non», la réduction du stock est faite pour chaque vente faite depuis le POS, quelquesoit l'option de changement de stock définit dans le module Stock).
 CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser pour la réduction de stock
 StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=La décrémentation de stock depuis le Point de Vente n'est pas encore compatible avec la gestion des lots/série.
 CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stocks lors de la réalisation d'une vente depuis le Point de Vente. Aussi, un entrepôt/emplacement est nécessaire.
 ##### Bookmark #####
 BookmarkSetup=Configuration du module Marque-pages
@@ -1565,6 +1566,7 @@ SuppliersSetup=Configuration du module Fournisseurs
 SuppliersCommandModel=Modèle de commandes fournisseur complet (logo…)
 SuppliersInvoiceModel=Modèle de factures fournisseur complet (logo…)
 SuppliersInvoiceNumberingModel=Modèles de numérotation des factures fournisseur
+IfSetToYesDontForgetPermission=Si positionné sur Oui, n'oubliez pas de donner les permissions aux groupes ou utilisateurs qui auront le droit de cette action.
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuration du module GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Chemin du fichier Maxmind contenant les conversions IP->Pays.
Exemples
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat
@@ -1604,8 +1606,13 @@ SalariesSetup=Configuration du module salariés
 SortOrder=Ordre de tri
 Format=Format
 TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Paiement de type client et fournisseur
-IncludePath=Chemin Include (définir dans la variable %s)
+IncludePath=Chemin Include (défini dans la variable %s)
 ExpenseReportsSetup=Configuration du module Notes de frais
 TemplatePDFExpenseReports=Modèles de documents pour générer les document de Notes de frais
-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.
+NoModueToManageStockDecrease=Aucun module capable d'assurer la réduction de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle.
+NoModueToManageStockIncrease=Aucun module capable d'assurer l'augmentation de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Vous pouvez trouver d'autres options pour la notification par Email en activant et configurant le module "Notification".
+ListOfNotificationsPerContact=Liste des notifications par contact*
+ListOfFixedNotifications=Liste des notifications emails fixes
+GoOntoContactCardToAddMore=Allez sur l'onglet "Notifications" d'un contact de tiers pour ajouter ou supprimer des notifications pour les contacts/adresses
+Threshold=Seuil
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index c29e782ab94..bd4709d1649 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Facture %s validée
 InvoiceValidatedInDolibarrFromPos=Facture %s validée depuis le Point de Vente
 InvoiceBackToDraftInDolibarr=Facture %s repassée en brouillon
 InvoiceDeleteDolibarr=Facture %s supprimée
-OrderValidatedInDolibarr= Commande %s validée
+OrderValidatedInDolibarr=Commande %s validée
+OrderDeliveredInDolibarr=Commande %s classée Délivrée
+OrderCanceledInDolibarr=Commande %s annulée
+OrderBilledInDolibarr=Commande %s classée Facturée
 OrderApprovedInDolibarr=Commande %s approuvée
 OrderRefusedInDolibarr=Commande %s refusée
 OrderBackToDraftInDolibarr=Commande %s repassée en brouillon
@@ -91,3 +94,5 @@ WorkingTimeRange=Plage d'heures travaillées
 WorkingDaysRange=Plage de jours travaillés
 AddEvent=Créer un événement
 MyAvailability=Ma disponibilité
+ActionType=Type événement
+DateActionBegin=Date début événément
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 255838cede3..a6a4c1a85a4 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -74,9 +74,9 @@ PaymentsAlreadyDone=Versements déjà effectués
 PaymentsBackAlreadyDone=Remboursements déjà effectués
 PaymentRule=Mode de paiement
 PaymentMode=Mode de règlement
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentTerm=Condition de règlement
+PaymentConditions=Conditions de règlement
+PaymentConditionsShort=Conditions de règlement
 PaymentAmount=Montant règlement
 ValidatePayment=Valider ce règlement
 PaymentHigherThanReminderToPay=Règlement supérieur au reste à payer
@@ -95,7 +95,7 @@ SearchACustomerInvoice=Rechercher une facture client
 SearchASupplierInvoice=Rechercher une facture fournisseur
 CancelBill=Annuler une facture
 SendRemindByMail=Envoyer rappel
-DoPayment=Émettre règlement
+DoPayment=Saisir règlement
 DoPaymentBack=Émettre remboursement
 ConvertToReduc=Convertir en réduction future
 EnterPaymentReceivedFromCustomer=Saisie d'un règlement reçu du client
@@ -190,7 +190,7 @@ AlreadyPaid=Déjà réglé
 AlreadyPaidBack=Déjà remboursé
 AlreadyPaidNoCreditNotesNoDeposits=Déjà réglé (hors avoirs et acomptes)
 Abandoned=Abandonné
-RemainderToPay=Restant impayé
+RemainderToPay=Reste à payer
 RemainderToTake=Montant restant à percevoir
 RemainderToPayBack=Montant à rembourser
 Rest=Créance
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La somme du montant des 2 nouvelles réduct
 ConfirmRemoveDiscount=Êtes-vous sûr de vouloir supprimer cette réduction ?
 RelatedBill=Facture associée
 RelatedBills=Factures associées
+RelatedCustomerInvoices=Factures clients liées
+RelatedSupplierInvoices=Factures fournisseurs liées
 LatestRelatedBill=Dernière facture en rapport
 WarningBillExist=Attention, une ou plusieurs factures existent déjà
 
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 1c29dfc7772..c310342feff 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Catégorie
-Categories=Catégories
-Rubrique=Rubrique
-Rubriques=Rubriques
-categories=catégorie(s)
-TheCategorie=La catégorie
-NoCategoryYet=Aucune catégorie de ce type créée
+Rubrique=Label/Catégorie
+Rubriques=Labels/Catégories
+categories=labels/catégories
+TheCategorie=Le label/Catégorie
+NoCategoryYet=Aucun label/catégorie de ce type n'a été créé
 In=Dans
 AddIn=Ajouter dans
 modify=modifier
 Classify=Classer
-CategoriesArea=Espace catégories
-ProductsCategoriesArea=Espace des catégories de produits et services
-SuppliersCategoriesArea=Espace des catégories de tiers fournisseurs
-CustomersCategoriesArea=Espace des catégories de tiers clients ou prospects
-ThirdPartyCategoriesArea=Espace des catégories de tiers
-MembersCategoriesArea=Espace des catégories d'adhérents
-ContactsCategoriesArea=Espace des catégories des contacts
-MainCats=Catégories principales
+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=Sous-catégories
 CatStatistics=Statistiques
-CatList=Liste des catégories
-AllCats=Toutes les catégories
-ViewCat=Visualisation de la catégorie
-NewCat=Nouvelle catégorie
-NewCategory=Nouvelle catégorie
-ModifCat=Modifier une catégorie
-CatCreated=Catégorie créée
-CreateCat=Ajouter une catégorie
-CreateThisCat=Ajouter cette catégorie
+CatList=Liste des labels/catégories
+AllCats=Tous les labels/catégories
+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=Valider les champs
 NoSubCat=Cette catégorie ne contient aucune sous-catégorie.
 SubCatOf=Sous-catégorie
-FoundCats=Catégories trouvées
-FoundCatsForName=Catégories trouvées pour le nom :
-FoundSubCatsIn=Sous-catégories trouvées dans la catégorie
-ErrSameCatSelected=Vous avez sélectionné la même catégorie plusieurs fois
-ErrForgotCat=Vous avez oublié de choisir la catégorie
+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=Vous avez oublié de renseigner un champ
 ErrCatAlreadyExists=Ce nom est déjà utilisé
-AddProductToCat=Ajouter ce produit à une catégorie ?
-ImpossibleAddCat=Impossible d'ajouter la catégorie
-ImpossibleAssociateCategory=Impossible d'associer la catégorie
+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 a été ajouté avec succès.
-ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
-CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
-ProductIsInCategories=Ce produit/service est dans les catégories suivantes
-SupplierIsInCategories=Ce fournisseur est dans les catégories suivantes
-CompanyIsInCustomersCategories=Cette société est dans les catégories clients/prospects suivantes
-CompanyIsInSuppliersCategories=Cette société est dans les catégories fournisseurs suivantes
-MemberIsInCategories=Cet adhérent est dans les catégories adhérent suivantes
-ContactIsInCategories=Ce contact est dans les catégories contact suivantes
-ProductHasNoCategory=Ce produit/service n'est dans aucune catégorie en particulier
-SupplierHasNoCategory=Ce fournisseur n'est dans aucune catégorie en particulier
-CompanyHasNoCategory=Cette société n'est dans aucune catégorie en particulier
-MemberHasNoCategory=Cet adhérent n'est dans aucune catégorie en particulier
-ContactHasNoCategory=Ce contact n'est dans aucune catégorie en particulier
-ClassifyInCategory=Classer dans la catégorie
+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=Aucune
-NotCategorized=Sans catégorie
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Cette catégorie existe déjà pour cette référence
 ReturnInProduct=Retour sur la fiche produit/service
 ReturnInSupplier=Retour sur la fiche fournisseur
@@ -66,22 +64,22 @@ ReturnInCompany=Retour sur la fiche client/prospect
 ContentsVisibleByAll=Le contenu sera visible par tous
 ContentsVisibleByAllShort=Contenu visible par tous
 ContentsNotVisibleByAllShort=Contenu non visible par tous
-CategoriesTree=Arbre des catégories
-DeleteCategory=Supprimer catégorie
-ConfirmDeleteCategory=Êtes-vous sûr de vouloir supprimer cette catégorie ?
-RemoveFromCategory=Supprimer lien avec catégorie
-RemoveFromCategoryConfirm=Êtes-vous sûr de vouloir supprimer le lien entre la transaction et la catégorie ?
-NoCategoriesDefined=Aucune catégorie définie
-SuppliersCategoryShort=Catégorie fournisseurs
-CustomersCategoryShort=Catégorie clients
-ProductsCategoryShort=Catégorie produits
-MembersCategoryShort=Catégorie adhérent
-SuppliersCategoriesShort=Catégories fournisseurs
-CustomersCategoriesShort=Catégories 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=Catégories clients/prosp.
-ProductsCategoriesShort=Catégories produits
-MembersCategoriesShort=Catégories adhérents
-ContactCategoriesShort=Catégories contacts
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Cette catégorie ne contient aucun produit.
 ThisCategoryHasNoSupplier=Cette catégorie ne contient aucun fournisseur.
 ThisCategoryHasNoCustomer=Cette catégorie ne contient aucun client.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Cette catégorie ne contient aucun contact.
 AssignedToCustomer=Attribuer à un client
 AssignedToTheCustomer=Attribué au client
 InternalCategory=Catégorie interne
-CategoryContents=Contenu de la catégorie
-CategId=Identifiant catégorie
-CatSupList=Liste des catégories fournisseurs
-CatCusList=Liste des catégories clients/prospects
-CatProdList=Liste des catégories produits
-CatMemberList=Liste des catégories adhérents
-CatContactList=Liste des catégories contacts et contacts
-CatSupLinks=Liens entre les fournisseurs et les catégories
-CatCusLinks=Liens entre les clients/prospects et les catégories
-CatProdLinks=Liens entre les produits/services et les catégories
-CatMemberLinks=Liens entre les adhérents et les catégories
-DeleteFromCat=Supprimer de la catégorie
+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=Supprimer image
 ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ?
 ExtraFieldsCategories=Attributs supplémentaires
-CategoriesSetup=Configuration du module catégories
-CategorieRecursiv=Lier avec les catégories parentes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une catégorie, l'ajouter aussi dans toutes les catégories parentes
 AddProductServiceIntoCategory=Ajouter le produit/service suivant
-ShowCategory=Afficher catégorie
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 659113176be..b009c0b54d6 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser l'entrée
 CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tache pour lancer cette commande toute les 5 minutes.
 # Menu
 CronJobs=Travaux programmés
-CronListActive=Liste des travaux actifs/programmés
+CronListActive=Liste des travaux
 CronListInactive=Liste des travaux inactifs
 # Page list
 CronDateLastRun=Dernier lancement
@@ -26,15 +26,15 @@ CronLastOutput=Sortie du dernier lancement
 CronLastResult=Dernier code de retour
 CronListOfCronJobs=Liste des travaux planifiés
 CronCommand=Commande
-CronList=Liste des travaux
-CronDelete= Supprimer les travaux cron
-CronConfirmDelete= Êtes-vous sûr de vouloir supprimer ces travaux cron ?
-CronExecute=Lancer cette tâche
-CronConfirmExecute= Êtes-vous sûr de vouloir lancer ce travail maintenant?
-CronInfo= Les travaux planifiés permettent d'exécuter des tâches à intervales réguliers
+CronList=Travaux planifiées
+CronDelete=Effacer les travaux planifiés
+CronConfirmDelete=Êtes-vous sûr de vouloir supprimer ce travail planifié ?
+CronExecute=Lancer les travaux planifiés
+CronConfirmExecute=Êtes-vous sûr de vouloir exécuter ce travail planifié maintenant?
+CronInfo=Le module des travaux planifiés permet d'exécuter des opérations qui ont été programmées
 CronWaitingJobs=Travaux en attente
 CronTask=Tâche
-CronNone= Aucun(e)
+CronNone=Aucun(e)
 CronDtStart=Date de début
 CronDtEnd=Date de fin
 CronDtNextLaunch=Prochaine exécution
@@ -75,6 +75,7 @@ CronObjectHelp=Le nom de l'objet à charger. 
 Par exemple pour appeler la m
 CronMethodHelp=La méthode à lancer. 
 Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur de la méthode est fetch
 CronArgsHelp=Les arguments de la méthode. 
 Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur des arguments pourrait être 0, RefProduit
 CronCommandHelp=La commande système a exécuter.
+CronCreateJob=Créer un nouveau travail planifié
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang
index 84081b64576..3dbb4cc5f76 100644
--- a/htdocs/langs/fr_FR/donations.lang
+++ b/htdocs/langs/fr_FR/donations.lang
@@ -6,6 +6,8 @@ Donor=Donateur
 Donors=Donateurs
 AddDonation=Créer un don
 NewDonation=Nouveau don
+DeleteADonation=Effacer le don
+ConfirmDeleteADonation=Êtes-vous sûr de vouloir supprimer ce don ?
 ShowDonation=Montrer don
 DonationPromise=Promesse de don
 PromisesNotValid=Promesses non validées
@@ -21,6 +23,8 @@ DonationStatusPaid=Don payé
 DonationStatusPromiseNotValidatedShort=Non validée
 DonationStatusPromiseValidatedShort=Validée
 DonationStatusPaidShort=Payé
+DonationTitle=Reçu de dons
+DonationDatePayment=Date paiement
 ValidPromess=Valider promesse
 DonationReceipt=Reçu de dons
 BuildDonationReceipt=Créer reçu
@@ -32,7 +36,8 @@ ThankYou=Merci
 IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des versements ouvrant droit à réduction d'impôt, la somme de
 MinimumAmount=Don minimum de %s
 FreeTextOnDonations=Mention complémentaire sur les dons
-FrenchOptions=Options propre à la france
+FrenchOptions=Options propres à la france
 DONATION_ART200=Afficher article 200 du CGI si vous êtes concernés
 DONATION_ART238=Afficher article 238 du CGI si vous êtes concernés
 DONATION_ART885=Afficher article 885 du CGI si vous êtes concernés
+DonationPayment=Paiement du don
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index ae65a532774..dd92729aa4d 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Les comptes source et destination doivent être d
 ErrorBadThirdPartyName=Nom de tiers incorrect
 ErrorProdIdIsMandatory=Le %s est obligatoire
 ErrorBadCustomerCodeSyntax=La syntaxe du code client est incorrecte
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Mauvaise syntaxe pour le code barre. Peut être que vous avez défini un mauvais type de code-barres ou que vous avez défini un masque de code à barres pour la numérotation qui ne correspond pas à la valeur scannée.
 ErrorCustomerCodeRequired=Code client obligatoire
 ErrorBarCodeRequired=Code-barre requis
 ErrorCustomerCodeAlreadyUsed=Code client déjà utilisé
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Le javascript ne doit pas être désactivé pour qu
 ErrorPasswordsMustMatch=Les 2 mots de passe saisis doivent correspondre
 ErrorContactEMail=Une erreur technique est apparue. Merci de contacter l'administrateur à l'email suivant %s en lui indiquant le code erreur %s dans votre message ou mieux en fournissant une copie d'écran de cette page.
 ErrorWrongValueForField=Mauvaise valeur pour le champ numéro %s (la valeur '%s' ne respecte pas la règle %s)
-ErrorFieldValueNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une valeure présente dans le champ %s de la table %s = %s)
+ErrorFieldValueNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une valeur présente dans le champ %s de la table %s = %s)
 ErrorFieldRefNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une référence existante comme %s)
 ErrorsOnXLines=Erreurs sur %s enregistrement(s) source
 ErrorFileIsInfectedWithAVirus=L'antivirus n'a pas pu valider ce fichier (il est probablement infecté par un virus) !
@@ -160,7 +160,13 @@ ErrorPriceExpressionInternal=Erreur interne '%s'
 ErrorPriceExpressionUnknown=Erreur inconnue '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Les entrepôts source et destination doivent être différents
 ErrorTryToMakeMoveOnProductRequiringBatchData=Erreur, vous essayez de faire un mouvement sans lot/numéro de série, sur un produit qui exige un lot/numéro de série.
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Toutes les réceptions enregistrées doivent d'abord être vérifiées avant d'être autorisés à faire cette action
+ErrorGlobalVariableUpdater0=La requête HTTP a échoué avec l'erreur '%s'
+ErrorGlobalVariableUpdater1=Format JSON invalide '%s'
+ErrorGlobalVariableUpdater2=Paramètre manquant '%s'
+ErrorGlobalVariableUpdater3=La donnée recherché n'a pas été trouvée
+ErrorGlobalVariableUpdater4=Le client SOAP a échoué avec l'erreur '%s'
+ErrorGlobalVariableUpdater5=Pas de variable globale
 
 # Warnings
 WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 8cb4cdcecd1..403b09310c6 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Liste des notifications emails envoyées
 MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre '%s' pour utiliser le mode '%s'. Avec ce mode, vous pouvez accéder à la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse.
 MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s.
+YouCanAlsoUseSupervisorKeyword=Vous pouvez également ajouter le mot-clé __SUPERVISOREMAIL__ pour avoir les emails envoyés au responsable hiérarchique de l'utilisateur (ne fonctionne que si un email est défini pour ce responsable)
+NbOfTargetedContacts=Nombre courant d'emails de contacts cibles
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 1e11dc0040a..b1fe2e89036 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -141,7 +141,7 @@ Cancel=Annuler
 Modify=Modifier
 Edit=Éditer
 Validate=Valider
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Valider et Approuver
 ToValidate=À valider
 Save=Enregistrer
 SaveAs=Enregistrer sous
@@ -159,7 +159,7 @@ Search=Rechercher
 SearchOf=Recherche de
 Valid=Valider
 Approve=Approuver
-Disapprove=Disapprove
+Disapprove=Désapprouver
 ReOpen=Réouvrir
 Upload=Envoyer fichier
 ToLink=Lier
@@ -221,7 +221,7 @@ Cards=Fiches
 Card=Fiche
 Now=Maintenant
 Date=Date
-DateAndHour=Date and hour
+DateAndHour=Date et heure
 DateStart=Date début
 DateEnd=Date fin
 DateCreation=Date création
@@ -352,6 +352,7 @@ Status=État
 Favorite=Favori
 ShortInfo=Infos
 Ref=Réf.
+ExternalRef=Ref. extern
 RefSupplier=Réf. fournisseur
 RefPayment=Réf. paiement
 CommercialProposalsShort=Propositions/devis
@@ -394,8 +395,8 @@ Available=Disponible
 NotYetAvailable=Pas encore disponible
 NotAvailable=Non disponible
 Popularity=Popularité
-Categories=Catégories
-Category=Catégorie
+Categories=Tags/catégories
+Category=Tag/catégorie
 By=Par
 From=Du
 to=au
@@ -694,6 +695,7 @@ AddBox=Ajouter boite
 SelectElementAndClickRefresh=Sélectionnez un élément et cliquez sur Rafraichir
 PrintFile=Imprimer fichier %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Lundi
 Tuesday=Mardi
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 849a6ad0245..3cc4fbd11ad 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -183,7 +183,7 @@ LastMemberDate=Date dernier adhérent
 Nature=Nature
 Public=Informations publiques
 Exports=Exports
-NewMemberbyWeb=Nouvel Adhérent ajoute. En attente de validation
+NewMemberbyWeb=Nouvel adhérent ajouté. En attente de validation
 NewMemberForm=Nouvel Adhérent form
 SubscriptionsStatistics=Statistiques sur les cotisations
 NbOfSubscriptions=Nombre de cotisations
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 78565d17a8a..ec71dfaebca 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -42,7 +42,7 @@ StatusOrderCanceled=Annulée
 StatusOrderDraft=Brouillon (à valider)
 StatusOrderValidated=Validée
 StatusOrderOnProcess=Commandé - en attente de réception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Commandé - en attente de réception ou validation
 StatusOrderProcessed=Traitée
 StatusOrderToBill=Délivrée
 StatusOrderToBill2=À facturer
@@ -59,12 +59,13 @@ MenuOrdersToBill=Commandes délivrées
 MenuOrdersToBill2=Commandes facturables
 SearchOrder=Rechercher une commande
 SearchACustomerOrder=Rechercher une commande client
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Rechercher une commande fournisseur
 ShipProduct=Expédier produit
 Discount=Remise
 CreateOrder=Créer Commande
 RefuseOrder=Refuser la commande
-ApproveOrder=Accepter la commande
+ApproveOrder=Approuver commande
+Approve2Order=Approuver commande (deuxième niveau)
 ValidateOrder=Valider la commande
 UnvalidateOrder=Dévalider la commande
 DeleteOrder=Supprimer la commande
@@ -102,6 +103,8 @@ ClassifyBilled=Classer facturée
 ComptaCard=Fiche compta
 DraftOrders=Commandes brouillons
 RelatedOrders=Commandes rattachées
+RelatedCustomerOrders=Commandes clients liées
+RelatedSupplierOrders=Commandes fournisseurs liées
 OnProcessOrders=Commandes en cours de traitement
 RefOrder=Réf. commande
 RefCustomerOrder=Réf. commande client
@@ -118,6 +121,7 @@ PaymentOrderRef=Paiement commande %s
 CloneOrder=Cloner commande
 ConfirmCloneOrder=Êtes-vous sûr de vouloir cloner cette commande %s ?
 DispatchSupplierOrder=Réception de la commande fournisseur %s
+FirstApprovalAlreadyDone=Premier niveau d'approbation déjà réalisé
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable suivi commande client
 TypeContact_commande_internal_SHIPPING=Responsable envoi commande client
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index e9b121b18fc..4e45d306802 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validation fiche intervention
 Notify_FICHINTER_SENTBYMAIL=Envoi fiche d'intervention par email
 Notify_BILL_VALIDATE=Validation facture client
 Notify_BILL_UNVALIDATE=Dévalidation facture client
+Notify_ORDER_SUPPLIER_VALIDATE=Commande fournisseur enregistrée
 Notify_ORDER_SUPPLIER_APPROVE=Approbation commande fournisseur
 Notify_ORDER_SUPPLIER_REFUSE=Refus commande fournisseur
 Notify_ORDER_VALIDATE=Validation commande client
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Envoi proposition commerciale par email
 Notify_BILL_PAYED=Recouvrement facture client
 Notify_BILL_CANCEL=Annulation facture client
 Notify_BILL_SENTBYMAIL=Envoi facture client par email
-Notify_ORDER_SUPPLIER_VALIDATE=Validation commande fournisseur
+Notify_ORDER_SUPPLIER_VALIDATE=Commande fournisseur enregistrée
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envoi commande fournisseur par email
 Notify_BILL_SUPPLIER_VALIDATE=Validation facture fournisseur
 Notify_BILL_SUPPLIER_PAYED=Paiment facture fournisseur
@@ -47,20 +48,20 @@ Notify_PROJECT_CREATE=Création de projet
 Notify_TASK_CREATE=Tâche créée
 Notify_TASK_MODIFY=Tâche modifiée
 Notify_TASK_DELETE=Tâche supprimée
-SeeModuleSetup=Voir la configuration du module
+SeeModuleSetup=Voir la configuration du module %s
 NbOfAttachedFiles=Nombre de fichiers/documents liés
 TotalSizeOfAttachedFiles=Taille totale fichiers/documents liés
 MaxSize=Taille maximum
 AttachANewFile=Ajouter un nouveau fichier/document
 LinkedObject=Objet lié
 Miscellaneous=Divers
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Nombre de notifications (nb de destinataires emails)
 PredefinedMailTest=Ceci est un message de test.\nLes 2 lignes sont séparées par un retour à la ligne.\n\n__SIGNATURE__
 PredefinedMailTestHtml=Ceci est un message de test (le mot test doit être en gras).
Les 2 lignes sont séparées par un retour à la ligne.

__SIGNATURE__
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\nNous voudrions porter à votre connaissance que la facture  __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la proposition commerciale __PROPREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la demande de prix __ASKREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre demande de tarif __ASKREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=La facture %s vous concernant a été validée.
 EMailTextProposalValidated=La proposition commerciale %s vous concernant a été validée.
 EMailTextOrderValidated=La commande %s vous concernant a été validée.
 EMailTextOrderApproved=La commande %s a été approuvée.
+EMailTextOrderValidatedBy=La commande %s a été enregistrée par %s
 EMailTextOrderApprovedBy=La commande %s a été approuvée par %s.
 EMailTextOrderRefused=La commande %s a été refusée.
 EMailTextOrderRefusedBy=La commande %s a été refusée par %s.
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index d1c1edb2b8e..5551523ad3a 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Lot/Numéro de série
 l_eatby=Date limite de consommation
 l_sellby=Date de péremption
 DetailBatchNumber=Détails Lot/Série
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+DetailBatchFormat=Lot/Série: %s - E: %s - S: %s (Qté: %d)
 printBatch=Lot/Série: %s
 printEatby=Limite de consommation : %s
 printSellby=Péremption : %s
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 3443b2c7aac..e7ec1cba00e 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Prix minimum recommandé : %s
 PriceExpressionEditor=Éditeur d'expression de prix
 PriceExpressionSelected=Expression de prix sélectionnée
 PriceExpressionEditorHelp1="price = 2 + 2" ou "2 + 2" pour définir un prix. Utilisez ; pour séparer les expressions
-PriceExpressionEditorHelp2=Vous pouvez accédez aux ExtraFields avec des variables comme\n#options_myextrafieldkey#
+PriceExpressionEditorHelp2=Vous pouvez accédez aux ExtraFields avec des variables comme\n#extrafield_myextrafieldkey# et aux variables globales avec #global_myvar#
 PriceExpressionEditorHelp3=Dans les produits commes les services et les prix fournisseurs, les variables suivantes sont disponibles:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Dans les prix produits/services uniquement: #supplier_min_price#
Dans les prix fournisseurs uniquement: #supplier_quantity# et #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Mode de tarification
 PriceNumeric=Nombre
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+DefaultPrice=Prix par défaut
+ComposedProductIncDecStock=Augmenter/Réduire le stock sur changement du stock du père
+ComposedProduct=Sous-produits
+MinSupplierPrice=Prix minimum fournisseur
+DynamicPriceConfiguration=Configuration du prix dynamique
+GlobalVariables=Variables globales
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=Données JSON
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Le format est {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Données WebService
+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=Le format est {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Intervale de mise à jour (minutes)
+LastUpdated=Dernière mise à jour
+CorrectlyUpdated=Mise à jour avec succès
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 65575fd5ce8..4f1cecb79c8 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -8,10 +8,10 @@ SharedProject=Tout le monde
 PrivateProject=Contacts du projet
 MyProjectsDesc=Cette vue projet est restreinte aux projets pour lesquels vous êtes un contact affecté (quel qu'en soit le type).
 ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive).
 MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous êtes un contact affecté à au moins une tâche (quel qu'en soit le type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Seules les projets ouverts sont visibles (les projets avec le statut brouillon et fermé ne sont pas affichés)
 TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
 ProjectsArea=Espace projet
@@ -31,8 +31,8 @@ NoProject=Aucun projet défini ou responsable
 NbOpenTasks=Nb Tâches Ouvertes
 NbOfProjects=Nombre de projets
 TimeSpent=Temps consommé
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Temps consommé par vous
+TimeSpentByUser=Temps consommé par utilisateur
 TimesSpent=Temps consommés
 RefTask=Ref. tâche
 LabelTask=Libellé tâche
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées
 ListContractAssociatedProject=Liste des contrats associés au projet
 ListFichinterAssociatedProject=Liste des interventions associées au projet
 ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet
+ListDonationsAssociatedProject=Liste des dons associés au projet
 ListActionsAssociatedProject=Liste des événements associés au projet
 ActivityOnProjectThisWeek=Activité sur les projets cette semaine
 ActivityOnProjectThisMonth=Activité sur les projets ce mois
@@ -131,14 +132,14 @@ UnlinkElement=Délier l'élément
 # Documents models
 DocumentModelBaleine=Modèle de rapport de projet complet (logo...)
 PlannedWorkload=Charge de travail prévue
-PlannedWorkloadShort=Workload
-WorkloadOccupation=Workload assignation
+PlannedWorkloadShort=Charge de travail
+WorkloadOccupation=Charge de travail affectée
 ProjectReferers=Objets associés
 SearchAProject=Rechercher un projet
 ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
 ProjectDraft=Projets brouillons
 FirstAddRessourceToAllocateTime=Ajouter une ressource pour pouvoir allouer tu temps
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+InputPerDay=Saisie par jour
+InputPerWeek=Saisie par semaine
+InputPerAction=Saisie par action
+TimeAlreadyRecorded=Temps consommé déjà enregistré pour cette tâche/jour et utilisateur %s
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index e65707e186c..1354fe7ddf6 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Réf. expédition
 Sending=Expédition
 Sendings=Expéditions
+AllSendings=Toutes les expéditions
 Shipment=Expédition
 Shipments=Expéditions
 ShowSending=Afficher expédition
@@ -23,7 +24,7 @@ QtyOrdered=Qté. commandée
 QtyShipped=Qté. expédiée
 QtyToShip=Qté. à expédier
 QtyReceived=Qté. reçue
-KeepToShip=Remain to ship
+KeepToShip=Reste à expédier
 OtherSendingsForSameOrder=Autres expéditions pour cette commande
 DateSending=Date ordre d'expédition
 DateSendingShort=Date ordre exp.
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 07904930bf2..233e1828ca6 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Factures fournisseurs et règlements
 ExportDataset_fournisseur_3=Commandes fournisseur et lignes de commande
 ApproveThisOrder=Approuver la commande
 ConfirmApproveThisOrder=Êtes-vous sûr de vouloir approuver la commande fournisseur %s ?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Refuser cette commande
 ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser la commande fournisseur %s ?
 ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler la commande fournisseur %s ?
 AddCustomerOrder=Créer commande client
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Liste des commandes fournisseurs
 MenuOrdersSupplierToBill=Commandes fournisseurs en facture
 NbDaysToDelivery=Délai de livraison en jours
 DescNbDaysToDelivery=Délai le plus élevé parmi la liste de produit dans la commande
+UseDoubleApproval=Utiliser la double approbation (la deuxième approbation pourra être faite par tout utilisateur qui bénéficie de la permission dédiée à cela) 
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 3a11b7c4036..b36286cdb57 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -22,7 +22,7 @@ SearchATripAndExpense=Rechercher une note de frais
 ClassifyRefunded=Classer 'Remboursé'
 ExpenseReportWaitingForApproval=Une nouvelle note de frais a été soumise pour approbation
 ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
+TripId=Id note de frais
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information société
 TripSalarie=Informations utilisateur
@@ -32,49 +32,49 @@ ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
 TF_OTHER=Autre
-TF_TRANSPORTATION=Transportation
+TF_TRANSPORTATION=Transport
 TF_LUNCH=Repas
-TF_METRO=Metro
+TF_METRO=Métro
 TF_TRAIN=Train
 TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_CAR=Voiture
+TF_PEAGE=Péage
+TF_ESSENCE=Carburant
+TF_HOTEL=Hôtel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 ListTripsAndExpenses=Liste des notes de frais
-AucuneNDF=No expense reports found for this criteria
-AucuneLigne=There is no expense report declared yet
+AucuneNDF=Pas de note de frais trouvées avec ces critères
+AucuneLigne=Aucune note de frais déclarée
 AddLine=Ajout nouvelle ligne
-AddLineMini=Add
+AddLineMini=Ajouter
 
 Date_DEBUT=Date début
 Date_FIN=Date fin
 ModePaiement=Mode de paiement
 Note=Note
-Project=Project
+Project=Projet
 
-VALIDATOR=User to inform for approbation
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
-REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+VALIDATOR=Utilisateur à informer pour approbation
+VALIDOR=Approuvé par
+AUTHOR=Enregistré par
+AUTHORPAIEMENT=Payé par
+REFUSEUR=Refusé par
+CANCEL_USER=Annulé par
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Motif
+MOTIF_CANCEL=Motif
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_VALIDE=Validation date
-DateApprove=Approving date
-DATE_CANCEL=Cancelation date
+DATE_REFUS=Date refus
+DATE_SAVE=Date validation
+DATE_VALIDE=Date validation
+DateApprove=Date approbation
+DATE_CANCEL=Date annulation
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
-TO_PAID=Pay
+Deny=Refuser
+TO_PAID=Payer
 BROUILLONNER=Reopen
 SendToValid=Sent to approve
 ModifyInfoGen=Edit
@@ -86,13 +86,13 @@ NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
 RefuseTrip=Deny an expense report
 ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=Approuver note de frais
+ConfirmValideTrip=Êtes-vous sûr de vouloir approuver cette note de frais ?
 
-PaidTrip=Pay an expense report
+PaidTrip=Payer note de frais
 ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
 
-CancelTrip=Cancel an expense report
+CancelTrip=Annuler note de frais
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
 BrouillonnerTrip=Move back expense report to status "Draft"n
@@ -123,4 +123,4 @@ TripForValid=à Valider
 TripForPaid=à Payer
 TripPaid=Payée
 
-NoTripsToExportCSV=No expense report to export for this period.
+NoTripsToExportCSV=Pas de note de frais à exporter dans cette période
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 40ebcc8f65d..4ca97ee13e9 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Categorie ההנהלה (מוצרים, ספקים ולקוחות)
+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 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=קוד חשבונאות תלוי קוד של צד שלישי. הקוד מורכב בעל אופי "C" בעמדה 1 ואחריו את 5 התווים הראשונים של קוד של צד שלישי.
 UseNotifications=השתמש הודעות
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=תבניות מסמכים
 DocumentModelOdt=צור מסמכים מתבניות OpenDocuments (. ODT קבצים של אופן אופיס, 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=הנתיב לקובץ המכיל IP Maxmind תרגום הארץ. 
 דוגמה: / 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
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index ca1edd3df0e..ba1542e483f 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 28559d91fa7..a5796dd0544 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index 244341b4fba..7c293065433 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=קטגוריות
-Rubrique=Category
-Rubriques=קטגוריות
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index bb128746069..63223b9e15e 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/he_IL/donations.lang b/htdocs/langs/he_IL/donations.lang
index 8f009f4a115..a8365c79d8c 100644
--- a/htdocs/langs/he_IL/donations.lang
+++ b/htdocs/langs/he_IL/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/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
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index d7a601e8382..42eeab81dd4 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 510dc2d1443..54717d8915e 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-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
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 3e45ed9db31..ba84cae1344 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/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 %s ?
 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
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 4c5e1b6346f..5b9876272c7 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/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.
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 9c98812f2a3..179740315d1 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 31eba8b830a..54d25b4ef24 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index 51b04b2db35..c8d5d582b68 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=משלוחים
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=משלוחים
 ShowSending=Show Sending
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index 591b1d13545..e3f2c428379 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/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)
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 22a62f00d59..2cdcce59866 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index b61eb591433..8e49047bf96 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Račun %s ovjeren
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Račun %s  vraćen u status skice
 InvoiceDeleteDolibarr=Račun %s obrisan
-OrderValidatedInDolibarr= Narudžba %s ovjerena
+OrderValidatedInDolibarr=Narudžba %s ovjerena
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Narudžba %s otkazana
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Narudžba %s je odbijena
 OrderBackToDraftInDolibarr=Narudžba %s vraćena u status skice
@@ -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
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index fbc13f66546..640257f7a11 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Jeste li sigurni da želite ukloniti ovaj popust?
 RelatedBill=Povezani račun
 RelatedBills=Povezani račun
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/hr_HR/donations.lang
+++ b/htdocs/langs/hr_HR/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/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
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 3e299f51788..756360ff88a 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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=Od
 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
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index f59089eee0f..2561198dd90 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Pošalji proizvod
 Discount=Popust
 CreateOrder=Kreiraj narudžbu
 RefuseOrder=Odbij narudžbu
-ApproveOrder=Prihvati narudžbu
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Ovjeri narudžbu
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Obriši narudžbu
@@ -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 %s ?
 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
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/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.
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 0b8b37f2a97..e94e24244a7 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 9c5fecce3da..068aa55954a 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index b4f1e2b8e25..e20a1b00985 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Pošiljka
 Sendings=Pošiljke
+AllSendings=All Shipments
 Shipment=Pošiljka
 Shipments=Pošiljke
 ShowSending=Show Sending
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/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)
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 6bf991e2634..0c7daf61ed2 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Értesítések
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Adományok
@@ -508,14 +511,14 @@ Module1400Name=Számvitel
 Module1400Desc=Számviteli menedzsment (dupla felek)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategóriák
-Module1780Desc=Kategóriában vezetősége (termékek, szállítók és vevők)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG szerkesztő
 Module2000Desc=Hagyjuk szerkeszteni egy szöveget terület egy fejlett szerkesztő
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Napirend
 Module2400Desc=Események / feladatok és napirend menedzsment
 Module2500Name=Elektronikus 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=Olvassa szolgáltatások
 Permission532=Létrehozza / módosítja szolgáltatások
 Permission534=Törlés szolgáltatások
@@ -746,6 +754,7 @@ Permission1185=Jóváhagyás beszállítói megrendelések
 Permission1186=Rendelés szállító megrendelések
 Permission1187=Kézhezvételét beszállítói megrendelések
 Permission1188=Törlés beszállítói megrendelések
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get eredményeképpen az export
 Permission1202=Létrehozása / módosítása a kiviteli
 Permission1231=Olvassa szállító számlák
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Fuss tömeges import a külső adatok adatbázisba (adatok terhelés)
 Permission1321=Export vevői számlák, attribútumok és kifizetések
 Permission1421=Export vevői megrendelések és attribútumok
-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=Olvassa tevékenységek (rendezvények, vagy feladatok) kapcsolódik a számláját
 Permission2402=Létrehozza / módosítja tevékenységek (rendezvények, vagy feladatok) kapcsolódik a számláját
 Permission2403=Törlés tevékenységek (rendezvények, vagy feladatok) kapcsolódik a számláját
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Vissza 1 számviteli kódot építette: 
 %s követ
 ModuleCompanyCodePanicum=Vissza az üres számviteli kódot.
 ModuleCompanyCodeDigitaria=Számviteli kód attól függ, hogy harmadik fél kódot. A kód áll a karakter "C"-ben az első helyen, majd az első 5 karakter a harmadik fél kódot.
 UseNotifications=Használja értesítések
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Dokumentumok sablonok
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vízjel dokumentum tervezetét
@@ -1557,6 +1566,7 @@ SuppliersSetup=Szállító modul beállítása
 SuppliersCommandModel=Teljes sablon szállító érdekében (logo. ..)
 SuppliersInvoiceModel=A teljes szállítói számla sablon (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 modul beállítása
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index c6decbcb31a..b3144ba2bd2 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=%s számla érvényesítve
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Számla %s menj vissza a tervezett jogállását
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= %s megrendelés érvényesítve
+OrderValidatedInDolibarr=%s megrendelés érvényesítve
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Rendelés %s törölt
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Rendelés %s jóváhagyott
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Rendelés %s menj vissza vázlat
@@ -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
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 682a36e4fde..f33958ab6f6 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Összesen két új kedvezményt meg kell eg
 ConfirmRemoveDiscount=Biztosan el akarja távolítani ezt a kedvezményt?
 RelatedBill=Kapcsolódó számla
 RelatedBills=Kapcsolódó számlák
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 348f309e7f2..340e05776ac 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategória
-Categories=Kategóriák
-Rubrique=Kategória
-Rubriques=Kategóriák
-categories=kategóriák
-TheCategorie=A kategória
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=módosítás
 Classify=Osztályozás
-CategoriesArea=Kategóriák terület
-ProductsCategoriesArea=Termékek/Szolgáltatások kategória terület
-SuppliersCategoriesArea=Beszállítói kategóriák terület
-CustomersCategoriesArea=Ügyfél kategóriák terület
-ThirdPartyCategoriesArea=Harmadik fél kategóriák terület
-MembersCategoriesArea=Tagok kategória terület
-ContactsCategoriesArea=Contacts categories area
-MainCats=Fő kategóriák
+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=Alkategóriák
 CatStatistics=Statisztikák
-CatList=Kategóriák listája
-AllCats=Minden kategória
-ViewCat=Kategória megtekintése
-NewCat=Add category
-NewCategory=Új kategória
-ModifCat=Kategória módosítása
-CatCreated=Kategória létrehozva
-CreateCat=Kategória létrehozása
-CreateThisCat=Kategória létrehozása
+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=Mezők hitelesítése
 NoSubCat=Nincs alkategória.
 SubCatOf=Alkategória
-FoundCats=Talált kategóriák
-FoundCatsForName=Név számára talált kategóriák:
-FoundSubCatsIn=Talált alkategória a kategóriában
-ErrSameCatSelected=Többször választotta ki ugyan azt a kategóriát
-ErrForgotCat=Elfelejtett kategóriát választani
+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=Elfelejtette kitölteni a mezőket
 ErrCatAlreadyExists=Ez a nvé már használatban van
-AddProductToCat=Adjuk hozzá a terméket ehhez a kategóriához?
-ImpossibleAddCat=Nem lehet kategorizálni
-ImpossibleAssociateCategory=Nem lehet asszociálni a kategóriát
+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 sikeresen hozzá lett adva.
-ObjectAlreadyLinkedToCategory=Már a kategóriához van linkelve.
-CategorySuccessfullyCreated=Ez a kategória %s sikeresen hozzá lett adva.
-ProductIsInCategories=Termékek/Szolgáltatások a következő kategóriákat tulajdonolják
-SupplierIsInCategories=Ez a harmadik fél a következő beszállítókat tulajdonolják
-CompanyIsInCustomersCategories=Ez a harmadik fél a következő ügyfeleket/kilátásokat tulajdonolják
-CompanyIsInSuppliersCategories=Ez a harmadik fél a következő beszállítókat tulajdonolják
-MemberIsInCategories=Ez a tag ebbe a tag kategóriába tartozik
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Ez a termék/szolgáltatás nincs egy kategóriában sem
-SupplierHasNoCategory=Ez a beszállító nincs egy kategóriában sem
-CompanyHasNoCategory=Ez a cég nincs egy kategóriában sem
-MemberHasNoCategory=Ez a tag nincs egy kategóriában sem
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Kategorizálni
+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=Nincs
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ez a kategória ezzel a ref# -el már létezik
 ReturnInProduct=Vissza a termék/szolgáltatás kártyához
 ReturnInSupplier=Vissza a beszállító kártyához
@@ -66,22 +64,22 @@ ReturnInCompany=Vissza az ügyfél/kilátás kártyához
 ContentsVisibleByAll=A tartalom mindenki számára látható lesz
 ContentsVisibleByAllShort=Tartalom látható mindenki számára
 ContentsNotVisibleByAllShort=Tartalom nem látható mindenki számára
-CategoriesTree=Categories tree
-DeleteCategory=Kategória törlése
-ConfirmDeleteCategory=Biztos törölni akarja a kategóriát?
-RemoveFromCategory=Kategória link eltávolítása
-RemoveFromCategoryConfirm=Biztos törölni akarja a kapcsolatot a tranzakció és a kategória közt?
-NoCategoriesDefined=Nincs definiált kategóriáa
-SuppliersCategoryShort=Beszállítói kategória
-CustomersCategoryShort=Vásárlói kategória
-ProductsCategoryShort=Termék kategória
-MembersCategoryShort=Tag kategória
-SuppliersCategoriesShort=Beszállítói kategória
-CustomersCategoriesShort=Vásárlói kategória
+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=Vásárló/Kilátás kategóriák
-ProductsCategoriesShort=Termék kategória
-MembersCategoriesShort=Tag kategória
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ez a kategória nem tartalmaz termékeket.
 ThisCategoryHasNoSupplier=Ez a kategória nem tartalmaz beszállítót.
 ThisCategoryHasNoCustomer=Ez a kategória nem tartalmaz vásárlót.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Vásárlóhoz rendelve
 AssignedToTheCustomer=Vásárlóhoz rendelve
 InternalCategory=Belső kategória
-CategoryContents=Kategória tartalmak
-CategId=Kategória azon#
-CatSupList=Beszállítói kategóriák listázása
-CatCusList=Ügyfél/kilátás kategóriák listázása
-CatProdList=Termék kategóriák listázása
-CatMemberList=Tag kategóriák listázása
-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
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index b186a698110..078f1829621 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/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= Nincs
+CronNone=Nincs
 CronDtStart=Kezdési dátum
 CronDtEnd=Befejezési dátum
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/hu_HU/donations.lang b/htdocs/langs/hu_HU/donations.lang
index 78108dcd9dc..606cc976570 100644
--- a/htdocs/langs/hu_HU/donations.lang
+++ b/htdocs/langs/hu_HU/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donorok
 AddDonation=Create a donation
 NewDonation=Új adomány
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Ajándék ígéret
 PromisesNotValid=Nem hitelesített ígéretek
@@ -21,6 +23,8 @@ DonationStatusPaid=Kapott adomány
 DonationStatusPromiseNotValidatedShort=Vázlat
 DonationStatusPromiseValidatedShort=Hitelesített
 DonationStatusPaidShort=Kapott
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Érvényesítés ígéret
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Nyugta készítése
@@ -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
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 197f9806cca..18243bd074f 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/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
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 60741482144..8fd814d95e0 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista minden e-mail értesítést küldeni
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 47b61bbf942..9789a1797c2 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -352,6 +352,7 @@ Status=Állapot
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Beszállító Ref.
 RefPayment=Fizetési Ref.
 CommercialProposalsShort=Üzleti ajánlatok
@@ -394,8 +395,8 @@ Available=Elérhető
 NotYetAvailable=Még nem elérhető
 NotAvailable=Nem elérhető
 Popularity=Népszerűság
-Categories=Kategóriák
-Category=Kategória
+Categories=Tags/categories
+Category=Tag/category
 By=által
 From=Kitől?
 to=kinek
@@ -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=Hétfő
 Tuesday=Kedd
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index d146ad13e0b..d6338ec744b 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Hajó termék
 Discount=Kedvezmény
 CreateOrder=Rendet
 RefuseOrder=Hulladékgyűjtő érdekében
-ApproveOrder=Accept érdekében
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Érvényesítése érdekében
 UnvalidateOrder=Unvalidate érdekében
 DeleteOrder=Törlése érdekében
@@ -102,6 +103,8 @@ ClassifyBilled=Classify "számlázott"
 ComptaCard=Számviteli kártya
 DraftOrders=Tervezet megrendelések
 RelatedOrders=Kapcsolódó megrendelések
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=A folyamat sorrendek
 RefOrder=Ref. érdekében
 RefCustomerOrder=Ref. az ügyfelek érdekében
@@ -118,6 +121,7 @@ PaymentOrderRef=Kifizetése érdekében %s
 CloneOrder=Clone érdekében
 ConfirmCloneOrder=Biztos vagy benne, hogy ezt a sorrendet %s klónozni?
 DispatchSupplierOrder=Fogadása érdekében szállító %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Reprezentatív nyomon követése az ügyfelek érdekében
 TypeContact_commande_internal_SHIPPING=Képviselő-up a következő hajózási
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 5b4e01644cd..f18813e846a 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Beavatkozás validált
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Ügyfél számla hitelesített
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Szállító érdekében elfogadott
 Notify_ORDER_SUPPLIER_REFUSE=Szállító érdekében hajlandó
 Notify_ORDER_VALIDATE=Ügyfél érdekében érvényesített
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kereskedelmi által küldött javaslatban mail
 Notify_BILL_PAYED=Az ügyfél számlát fizetni
 Notify_BILL_CANCEL=Az ügyfél számlát törölt
 Notify_BILL_SENTBYMAIL=Az ügyfél számlát postai úton
-Notify_ORDER_SUPPLIER_VALIDATE=Szállító annak hitelesített
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Szállító érdekében postai úton
 Notify_BILL_SUPPLIER_VALIDATE=Szállító számlát érvényesített
 Notify_BILL_SUPPLIER_PAYED=Szállító számlát fizetni
@@ -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=Száma csatolt fájlok / dokumentumok
 TotalSizeOfAttachedFiles=Teljes méretű csatolt fájlok / dokumentumok
 MaxSize=Maximális méret
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=A számla %s nem érvényesítette.
 EMailTextProposalValidated=A javaslat %s nem érvényesítette.
 EMailTextOrderValidated=A rendelés %s nem érvényesítette.
 EMailTextOrderApproved=A rendelés %s nem hagyták jóvá.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=A megrendelés %s jóváhagyta %s.
 EMailTextOrderRefused=A megrendelés %s visszautasításra került.
 EMailTextOrderRefusedBy=A megrendelés %s már elutasította %s.
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 584d47aeb70..73774ec73c9 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 75518a0bc42..8485f52743c 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=A projekthez tartozó beszállítói szám
 ListContractAssociatedProject=A projekthez tartozó szerződések listája
 ListFichinterAssociatedProject=A projekthez tartozó intervenciók listája
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=A projekthez tartozó cselekvések listája
 ActivityOnProjectThisWeek=Heti projekt aktivitás
 ActivityOnProjectThisMonth=Havi projekt aktivitás
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index b2c42484995..65d32d6f400 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Szállítási Ref.
 Sending=Szállítás
 Sendings=Szállítások
+AllSendings=All Shipments
 Shipment=Szállítás
 Shipments=Szállítások
 ShowSending=Show Sending
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index bf6540154b1..761f1450e6d 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/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)
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 7c834ac36f8..ae4ea132bc1 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Pembatas
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Notifikasi
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Sumbangan
@@ -508,14 +511,14 @@ Module1400Name=Akunting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategori
-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=Membaca Jasa
 Permission532=Membuat/Merubah Jasa
 Permission534=Menghapus Jasa
@@ -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=Mambaca Nota Pemasok
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 3b088ea3c7d..5f9bc8f8e5e 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 27b0443877e..dc23045e239 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/id_ID/donations.lang b/htdocs/langs/id_ID/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/id_ID/donations.lang
+++ b/htdocs/langs/id_ID/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/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
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 81deb7c28f0..27779080dd0 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/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 %s ?
 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
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 1f2b7c1b38d..a34983b009f 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/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.
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 1f90724539e..5ce0419ddf4 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Daftar pesanan suplier
 MenuOrdersSupplierToBill=Pesanan suplier menjadi 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)
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 50ac8371a52..74f0eb019d1 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Tilkynningar
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Fjárframlög
@@ -508,14 +511,14 @@ Module1400Name=Bókhald
 Module1400Desc=Bókhald stjórnun (tvöfaldur aðila)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Flokkar
-Module1780Desc=Stjórn Flokkur's (vörur, birgja og viðskiptavina)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Dagskrá
 Module2400Desc=Aðgerðir / verkefni og dagskrá stjórnun
 Module2500Name=Rafræn Innihald Stjórnun
@@ -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=Lesa þjónusta
 Permission532=Búa til / breyta þjónusta
 Permission534=Eyða þjónustu
@@ -746,6 +754,7 @@ Permission1185=Samþykkja birgir pantanir
 Permission1186=Order / Hætta við birgi pantanir
 Permission1187=Staðfesta móttöku fyrirmæla birgir
 Permission1188=Loka birgir pantanir
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Fá vegna útflutnings
 Permission1202=Búa til / breyta útflutnings
 Permission1231=Lesa birgir reikningum
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Setja massa innflutningi af ytri gögn inn í gagnagrunn (gögn álag)
 Permission1321=Útflutningur viðskiptavina reikninga, eiginleika og greiðslur
 Permission1421=Útflutningur viðskiptavina pantanir og eiginleika
-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=Lesa aðgerða (atburðum eða verkefni) tengd reikningnum hans
 Permission2402=Búa til / breyta aðgerðum (atburðum eða verkefni) tengd reikningnum hans
 Permission2403=Eyða aðgerða (atburðum eða verkefni) tengd reikningnum hans
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Fara aftur á bókhalds kóða byggt af %s á eftir þ
 ModuleCompanyCodePanicum=Return tómt bókhalds-númer.
 ModuleCompanyCodeDigitaria=Bókhalds kóða ráðast á þriðja aðila kóða. Kóðinn er samsett af eðli "C" í efstu stöðu eftir fyrstu 5 stafina þriðja aðila kóðann.
 UseNotifications=Notaðu tilkynningar
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Skjöl sniðmát
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vatnsmerki á drögum að skjali
@@ -1557,6 +1566,7 @@ SuppliersSetup=Birgir mát skipulag
 SuppliersCommandModel=Heill sniðmát af röð birgir (logo. ..)
 SuppliersInvoiceModel=Heill sniðmát af reikningi birgis (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 mát skipulag
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index 1b163691b92..057e39f0584 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s  staðfestar
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Vörureikningi %s fara aftur til drög að stöðu
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Panta %s  staðfestar
+OrderValidatedInDolibarr=Panta %s  staðfestar
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Panta %s niður
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Panta %s samþykkt
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Panta %s fara aftur til drög að stöðu
@@ -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
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 2da4c4085f7..1fa4a21c586 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Samtals tvö ný afsláttur verður jafn up
 ConfirmRemoveDiscount=Ertu viss um að þú viljir fjarlægja þetta afslætti?
 RelatedBill=Svipaðir Reikningar
 RelatedBills=Svipaðir reikningum
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index 4308d85801f..6a6769cfc33 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Flokkur
-Categories=Flokkar
-Rubrique=Flokkur
-Rubriques=Flokkar
-categories=Flokkur
-TheCategorie=Flokki
-NoCategoryYet=Engin flokkur af þessu tagi skapaði
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Í
 AddIn=Bæta við í
 modify=breyta
 Classify=Flokka
-CategoriesArea=Flokkar area
-ProductsCategoriesArea=Vörur / Þjónusta flokka svæði
-SuppliersCategoriesArea=Birgjar flokkar area
-CustomersCategoriesArea=Viðskiptavinir flokkar area
-ThirdPartyCategoriesArea=Í þriðja aðila flokkar area
-MembersCategoriesArea=Members flokkar area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Helstu flokkar
+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=Undirflokkar
 CatStatistics=Tölfræði
-CatList=Listi yfir flokka
-AllCats=Allir flokkar
-ViewCat=Skoða flokk
-NewCat=Bæta við flokk
-NewCategory=Nýr flokkur
-ModifCat=Breyta flokki
-CatCreated=Flokkur búið
-CreateCat=Búa til flokkur
-CreateThisCat=Búa þessum flokki
+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=Staðfesta reitina
 NoSubCat=Nei undirflokk.
 SubCatOf=Undirflokkur
-FoundCats=Stofna flokkar
-FoundCatsForName=Flokkar fundust fyrir Notendanafn:
-FoundSubCatsIn=Undirflokkar fundust í flokknum
-ErrSameCatSelected=Þú valdir sama flokki nokkrum sinnum
-ErrForgotCat=Þú hefur gleymt að velja þann flokk
+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=Þú gleymdi að tilkynna þeim sviðum
 ErrCatAlreadyExists=Þetta heiti er þegar í notkun
-AddProductToCat=Bæta þessari vöru flokk?
-ImpossibleAddCat=Ómögulegt að bæta við flokki
-ImpossibleAssociateCategory=Ómögulegt að tengja flokk
+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  var bætt við.
-ObjectAlreadyLinkedToCategory=Frumefni er nú þegar tengdur þessum flokki.
-CategorySuccessfullyCreated=Þetta% flokki s hefur verið bætt við að ná árangri.
-ProductIsInCategories=Vöru / þjónustu er eigandi að eftirtöldum flokkum
-SupplierIsInCategories=Þriðji aðili er eigandi að eftirtöldum birgjum flokkar
-CompanyIsInCustomersCategories=Þessi þriðji aðili er eigandi að fylgja viðskiptavinum / horfur flokkar
-CompanyIsInSuppliersCategories=Þessi þriðji aðili er eigandi að eftirtöldum birgjum flokkar
-MemberIsInCategories=Þessi aðili er eigandi að eftirfarandi aðilar flokkar
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Þessi vara / þjónusta er ekki í neinum flokkum
-SupplierHasNoCategory=Þetta birgir ekki í neinum flokkum
-CompanyHasNoCategory=Þetta fyrirtæki er ekki í neinum flokkum
-MemberHasNoCategory=Þessi aðili er ekki í neinum flokkum
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Flokka í flokki
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Þessi flokkur er þegar til með þessu tilv
 ReturnInProduct=Til baka vöru / þjónustu kort
 ReturnInSupplier=Til baka birgir kort
@@ -66,22 +64,22 @@ ReturnInCompany=Til baka viðskiptavina / horfur kort
 ContentsVisibleByAll=Inntak verður sýnilegt af öllum
 ContentsVisibleByAllShort=Efnisyfirlit sýnileg um alla
 ContentsNotVisibleByAllShort=Efnisyfirlit ekki sýnileg um alla
-CategoriesTree=Categories tree
-DeleteCategory=Eyða flokki
-ConfirmDeleteCategory=Ertu viss um að þú viljir eyða þessum flokki?
-RemoveFromCategory=Fjarlægja hlekk með Flokkur
-RemoveFromCategoryConfirm=Ertu viss um að þú viljir fjarlægja tengilinn á milli viðskipta og flokk?
-NoCategoriesDefined=Engin flokkur er skilgreind
-SuppliersCategoryShort=Birgjar flokkur
-CustomersCategoryShort=Viðskiptavinir flokkur
-ProductsCategoryShort=Vörur flokkur
-MembersCategoryShort=Members flokkur
-SuppliersCategoriesShort=Birgjar flokkar
-CustomersCategoriesShort=Viðskiptavinir flokkar
+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. Flokkur
-ProductsCategoriesShort=Vörur flokkar
-MembersCategoriesShort=Members flokkar
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Þessi flokkur inniheldur ekki vöruna.
 ThisCategoryHasNoSupplier=Þessi flokkur inniheldur ekki birgir.
 ThisCategoryHasNoCustomer=Þessi flokkur inniheldur ekki allir viðskiptavinur.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Úthlutað til viðskiptavinar
 AssignedToTheCustomer=Úthlutað til viðskiptavinar
 InternalCategory=Innri flokkur
-CategoryContents=Flokkur innihald
-CategId=Auðkenni
-CatSupList=Listi yfir flokka birgir
-CatCusList=Listi yfir viðskiptavini / horfur flokkar
-CatProdList=Listi yfir vörur flokkar
-CatMemberList=Listi yfir meðlimi flokkar
-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
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index 746b799208a..af03d82d7bb 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/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= None
+CronNone=None
 CronDtStart=Upphafsdagur
 CronDtEnd=Lokadagur
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/is_IS/donations.lang b/htdocs/langs/is_IS/donations.lang
index 12fc71b3b9e..0c204f442f3 100644
--- a/htdocs/langs/is_IS/donations.lang
+++ b/htdocs/langs/is_IS/donations.lang
@@ -6,6 +6,8 @@ Donor=Gjafa
 Donors=Styrktaraðila
 AddDonation=Create a donation
 NewDonation=New málefnið
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gjöf loforð
 PromisesNotValid=Ekki staðfest loforð
@@ -21,6 +23,8 @@ DonationStatusPaid=Framlag borist
 DonationStatusPromiseNotValidatedShort=Víxill
 DonationStatusPromiseValidatedShort=Staðfestar
 DonationStatusPaidShort=Móttekin
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Staðfesta loforð
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Byggja kvittun
@@ -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
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 4676457743f..c0fdc7b7bd0 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/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
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 6f5f9108e3a..b99aa9b8fd8 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Sýna allar tilkynningar í tölvupósti sendi
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 0e595e2d7be..370be13bc99 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Tilv.
+ExternalRef=Ref. extern
 RefSupplier=Tilv. birgir
 RefPayment=Tilv. greiðslu
 CommercialProposalsShort=Auglýsing tillögur
@@ -394,8 +395,8 @@ Available=Laus
 NotYetAvailable=Ekki enn í boði
 NotAvailable=Ekki í boði
 Popularity=Vinsældir
-Categories=Flokkar
-Category=Flokkur
+Categories=Tags/categories
+Category=Tag/category
 By=Með því að
 From=Frá
 to=til
@@ -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=Mánudagur
 Tuesday=Þriðjudagur
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index 29a82746738..902d6f40508 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Skip vöru
 Discount=Afsláttur
 CreateOrder=Búa Order
 RefuseOrder=Neita röð
-ApproveOrder=Samþykkja röð
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Staðfesta röð
 UnvalidateOrder=Unvalidate röð
 DeleteOrder=Eyða röð
@@ -102,6 +103,8 @@ ClassifyBilled=Flokka "borgað"
 ComptaCard=Bókhalds-kort
 DraftOrders=Drög að fyrirmælum
 RelatedOrders=Svipaðir pantanir
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Í pantanir ferli
 RefOrder=Tilv. röð
 RefCustomerOrder=Tilv. viðskiptavina þess
@@ -118,6 +121,7 @@ PaymentOrderRef=Greiðsla %s kyni s
 CloneOrder=Klóna röð
 ConfirmCloneOrder=Ertu viss um að þú viljir klón þessari röð %s ?
 DispatchSupplierOrder=Móttaka birgir röð %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Fulltrúi eftirfarandi upp viðskiptavina röð
 TypeContact_commande_internal_SHIPPING=Fulltrúi eftirfarandi upp siglinga
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 051c37066dc..9286b8bdd81 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention staðfestar
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Viðskiptavinur Reikningar staðfestar
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Birgir röð samþykkt
 Notify_ORDER_SUPPLIER_REFUSE=Birgir þess neitaði
 Notify_ORDER_VALIDATE=Viðskiptavinur til setja í gildi
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Auglýsing tillögu send með pósti
 Notify_BILL_PAYED=Viðskiptavinur Reikningar borgað
 Notify_BILL_CANCEL=Viðskiptavinur reikning niður
 Notify_BILL_SENTBYMAIL=Viðskiptavinur Reikningar send með pósti
-Notify_ORDER_SUPPLIER_VALIDATE=Birgir röð fullgilt
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Birgir röð send með pósti
 Notify_BILL_SUPPLIER_VALIDATE=Birgir reikning fullgilt
 Notify_BILL_SUPPLIER_PAYED=Birgir reikning borgað
@@ -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=Fjöldi meðfylgjandi skrá / gögn
 TotalSizeOfAttachedFiles=Heildarstærð meðfylgjandi skrá / gögn
 MaxSize=Hámarks stærð
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Í% reikningi s hefur verið staðfest.
 EMailTextProposalValidated=Á% Tillagan s hefur verið staðfest.
 EMailTextOrderValidated=Á %s kyni s hefur verið staðfest.
 EMailTextOrderApproved=Á %s kyni s hefur verið samþykkt.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Á %s kyni s hefur verið samþykkt af %s .
 EMailTextOrderRefused=Á %s kyni s hefur verið hafnað.
 EMailTextOrderRefusedBy=Á %s kyni s hefur verið hafnað af %s .
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 655a4801339..278ac3161f0 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index f8426bd2033..8a186277a99 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Listi yfir reikninga birgis í tengslum vi
 ListContractAssociatedProject=Listi yfir samninga í tengslum við verkefnið
 ListFichinterAssociatedProject=Listi yfir inngrip í tengslum við verkefnið
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Listi yfir aðgerðir í tengslum við verkefnið
 ActivityOnProjectThisWeek=Afþreying á verkefni í þessari viku
 ActivityOnProjectThisMonth=Afþreying á verkefni í þessum mánuði
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index 0e2e1d76be7..40d0f918aa2 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Tilv. sendingunni
 Sending=Sendingunni
 Sendings=Sendingar
+AllSendings=All Shipments
 Shipment=Sendingunni
 Shipments=Sendingar
 ShowSending=Show Sending
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 6635f860563..4176fa17e9d 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/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)
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 9348b460f9a..386fa3c17e4 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separatore
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Bottone Radio
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=I parametri della lista deveono avere una sintassi tipo chiave,valore

 ad esempio: 
1,valore1
2,valore2
3,valore3
...

 In modo da avere una lista madre che dipenda da un altra:
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=La lista dei parametri deve contenere chiave univoca e valore.

Per esempio:
1, valore1
2, valore2
3, valore3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -494,6 +495,8 @@ Module500Name=Spese speciali (tasse, contributi sociali, dividendi)
 Module500Desc=Amministrazione delle spese speciali quali tasse, contributi sociali, dividendi e salari.
 Module510Name=Stipendi
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifiche
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donazioni
@@ -508,14 +511,14 @@ Module1400Name=Contabilità avanzata
 Module1400Desc=Gestione contabilità per esperti (partita doppia)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categorie
-Module1780Desc=Gestione Categorie (prodotti, fornitori e clienti)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Permette di usare un editor avanzato per alcune aree di testo
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Gestione dei task programmati
+Module2300Desc=Scheduled job management
 Module2400Name=Ordine del giorno
 Module2400Desc=Gestione eventi/compiti e ordine del giorno
 Module2500Name=Gestione dei contenuti digitali
@@ -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=Vedere servizi
 Permission532=Creare/modificare servizi
 Permission534=Eliminare servizi
@@ -746,6 +754,7 @@ Permission1185=Approvare ordini fornitore
 Permission1186=Ordinare ordini fornitore
 Permission1187=Accettare consegna ordini fornitore
 Permission1188=Chiudere ordini fornitore
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Ottieni il risultato di un esportazione
 Permission1202=Creare/Modificare esportazioni
 Permission1231=Vedere fatture fornitore
@@ -758,10 +767,10 @@ Permission1237=Esportazione ordini fornitori e loro dettagli
 Permission1251=Eseguire importazioni di massa di dati esterni nel database (data load)
 Permission1321=Esportare fatture cliente, attributi e pagamenti
 Permission1421=Esportare ordini cliente e attributi
-Permission23001 = Leggi compito programmato
-Permission23002 = Crea/aggiorna compito programmato
-Permission23003 = Cancella compito programmato
-Permission23004 = Esegui compito programmato
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Vedere azioni (eventi o compiti) personali
 Permission2402=Creare/modificare azioni (eventi o compiti) personali
 Permission2403=Cancellare azioni (eventi o compiti) personali
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Restituisce una stringa composta da %s seguito dal cod
 ModuleCompanyCodePanicum=Restituisce un codice contabile vuoto.
 ModuleCompanyCodeDigitaria=Codice contabile dipendente dal codice di terze parti. Il codice è composto dal carattere "C" nella prima posizione seguito da i primi 5 caratteri del codice cliente/fornitore.
 UseNotifications=Attiva le notifiche
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Modelli per i documenti
 DocumentModelOdt=Generare documenti da modelli OpenDocuments (file .ODT o .ODS per OpenOffice, KOffice, TextEdit, ecc...)
 WatermarkOnDraft=Filigrana sulle bozze
@@ -1557,6 +1566,7 @@ SuppliersSetup=Impostazioni modulo fornitori
 SuppliersCommandModel=Modello completo di ordine fornitore (logo...)
 SuppliersInvoiceModel=Modello completo di fattura fornitore (logo...)
 SuppliersInvoiceNumberingModel=Modello per la numerazione delle fatture fornitore
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Impostazioni modulo GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 4a8317beef2..5ee3c2ee363 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Fattura convalidata
 InvoiceValidatedInDolibarrFromPos=Ricevute %s validate dal POS
 InvoiceBackToDraftInDolibarr=Fattura %s riportata allo stato di bozza
 InvoiceDeleteDolibarr=La fattura %s è stata cancellata
-OrderValidatedInDolibarr= Ordine convalidato
+OrderValidatedInDolibarr=Ordine convalidato
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=ordine %s annullato
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Ordine %s approvato
 OrderRefusedInDolibarr=Ordine %s rifiutato
 OrderBackToDraftInDolibarr=Ordine %s riportato allo stato di bozza
@@ -91,3 +94,5 @@ WorkingTimeRange=Intervallo di tempo di lavoro
 WorkingDaysRange=Intervallo di giorni di lavoro
 AddEvent=Crea evento
 MyAvailability=Mie disponibilità
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 451631b87a7..0f4132f0162 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Il totale di due nuovi sconti deve essere p
 ConfirmRemoveDiscount=Vuoi davvero eliminare questo sconto?
 RelatedBill=Fattura correlata
 RelatedBills=Fatture correlate
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Ultima fattura correlata
 WarningBillExist=Attenzione, una o più fatture già esistenti
 
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 0514f048fa6..806156a82a4 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categoria
-Categories=Categorie
-Rubrique=Categoria
-Rubriques=Categorie
-categories=categorie
-TheCategorie=La categoria
-NoCategoryYet=Non esiste alcuna categoria di questo tipo
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Aggiungi a
 modify=modifica
 Classify=Classifica
-CategoriesArea=Area categorie
-ProductsCategoriesArea=Area categorie prodotti/servizi
-SuppliersCategoriesArea=Area categorie fornitori
-CustomersCategoriesArea=Area categorie clienti
-ThirdPartyCategoriesArea=Area categorie soggetti terzi
-MembersCategoriesArea=Area categorie membri
-ContactsCategoriesArea=Area Categorie di contatti
-MainCats=Categorie principali
+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=Sub-categorie
 CatStatistics=Statistiche
-CatList=Elenco delle categorie
-AllCats=Tutte le categorie
-ViewCat=Visualizza categoria
-NewCat=Aggiungi categoria
-NewCategory=Nuova categoria
-ModifCat=Modifica categoria
-CatCreated=Categoria creata
-CreateCat=Crea categoria
-CreateThisCat=Crea questa 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=Convalidare i campi
 NoSubCat=Nessuna sottocategoria
 SubCatOf=Sottocategoria
-FoundCats=Categorie trovate
-FoundCatsForName=Categorie trovate per il nome:
-FoundSubCatsIn=Sottocategorie trovate nella categoria
-ErrSameCatSelected=Hai selezionato la stessa categoria più volte
-ErrForgotCat=Hai dimenticato di scegliere 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=Hai dimenticato di indicare i campi
 ErrCatAlreadyExists=La categoria esiste già
-AddProductToCat=Inserire il prodotto in una categoria?
-ImpossibleAddCat=Impossibile aggiungere la categoria
-ImpossibleAssociateCategory=Impossibile associare la categoria a
+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  aggiunta con successo
-ObjectAlreadyLinkedToCategory=L'elemento appartiene già questa categoria.
-CategorySuccessfullyCreated=La categoria %s è stata aggiunta con successo.
-ProductIsInCategories=Il Prodotto/servizio appartiene alle seguenti categorie
-SupplierIsInCategories=Questo Fornitore appartiene alle seguenti categorie
-CompanyIsInCustomersCategories=Questa società si trova nelle seguenti categorie di clienti
-CompanyIsInSuppliersCategories=Questa società si trova nelle seguenti categorie di fornitori
-MemberIsInCategories=Questo membro appartiene alle seguenti categorie
-ContactIsInCategories=Il contatto appartiene alle seguenti categorie
-ProductHasNoCategory=Il prodotto/servizio non apaprtiene ad alcuna categoria
-SupplierHasNoCategory=Questo fornitore non appartiene ad alcuna categoria
-CompanyHasNoCategory=Questa società non è in alcuna categoria
-MemberHasNoCategory=Questo membro non è in alcuna categoria
-ContactHasNoCategory=Il contatto non ha categoria
-ClassifyInCategory=Classificare nella 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=Nessuna
-NotCategorized=Senza categoria
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Questa categoria esiste già allo stesso livello
 ReturnInProduct=Torna alla scheda prodotto/servizio
 ReturnInSupplier=Torna alla scheda fornitore
@@ -66,22 +64,22 @@ ReturnInCompany=Torna alla scheda cliente
 ContentsVisibleByAll=I contenuti saranno visibili a tutti gli utenti
 ContentsVisibleByAllShort=Contenuti visibili a tutti
 ContentsNotVisibleByAllShort=Contenuti non visibili a tutti
-CategoriesTree=Albero categorie
-DeleteCategory=Elimina categoria
-ConfirmDeleteCategory=Vuoi davvero eliminare questa categoria?
-RemoveFromCategory=Rimuovi collegamento con la categoria
-RemoveFromCategoryConfirm=Sei sicuro di voler rimuovere il legame tra l'operazione e la categoria?
-NoCategoriesDefined=Nessuna categoria definita
-SuppliersCategoryShort=Categoria fornitori
-CustomersCategoryShort=Categoria clienti
-ProductsCategoryShort=Categorie prodotti
-MembersCategoryShort=Categoria membri
-SuppliersCategoriesShort=Categorie fornitori
-CustomersCategoriesShort=Categorie clienti
+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=Categorie clienti potenziali
-ProductsCategoriesShort=Categorie dei prodotti/servizi
-MembersCategoriesShort=Categorie membri
-ContactCategoriesShort=Categorie di contatti
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Questa categoria non contiene alcun prodotto
 ThisCategoryHasNoSupplier=Questa categoria non contiene alcun fornitore
 ThisCategoryHasNoCustomer=Questa categoria non contiene alcun cliente
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Questa categoria non contiene contatti
 AssignedToCustomer=Assegnato ad un cliente
 AssignedToTheCustomer=Assegnato al cliente
 InternalCategory=Categoria interna
-CategoryContents=Contenuti categoria
-CategId=Id categoria
-CatSupList=Elenco delle categorie per i fornitori
-CatCusList=Elenco delle categorie per i clienti/clienti potenziali
-CatProdList=Elenco delle categorie per i prodotti
-CatMemberList=Elenco delle categorie per i membri
-CatContactList=Lista di categorie di contatti e di contatti
-CatSupLinks=Collegamenti tra fornitori e categorie
-CatCusLinks=Collegamenti tra clienti/clienti potenziali e categorie
-CatProdLinks=Collegamenti tra prodotti/servizi e categorie
-CatMemberLinks=Collegamenti tra membri e categorie
-DeleteFromCat=Elimina dalla 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=Foto cancellata
 ConfirmDeletePicture=Confermi l'eliminazione della foto?
 ExtraFieldsCategories=Campi extra
-CategoriesSetup=Impostazioni categorie
-CategorieRecursiv=Collega automaticamente con la categoria padre
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Se attivata, il prodotto sarà inserito anche nella categoria padre quando  lo aggiungi ad una sottocategoria
 AddProductServiceIntoCategory=Aggiungi il seguente prodotto/servizio
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index edb0ea5183b..f0fa432c985 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Output dell'ultimo avvio
 CronLastResult=Codice del risultato dell'ultima esecuzione
 CronListOfCronJobs=Lista dei job programmati
 CronCommand=Comando
-CronList=Lista dei job
-CronDelete= Cancella job di cron
-CronConfirmDelete= Vuoi davvero cancellare questa azione pianificata?
-CronExecute=Esegui azione
-CronConfirmExecute= Sei sicuro di voler eseguire ora questo job
-CronInfo= I job possono eseguire compiti pianificati
-CronWaitingJobs=Job in attesa
+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=Azione
-CronNone= Nessuno
+CronNone=Nessuno
 CronDtStart=Data di inizio
 CronDtEnd=Data di fine
 CronDtNextLaunch=Prossima esecuzione
@@ -75,6 +75,7 @@ CronObjectHelp=Nome dell'oggetto da caricare. 
Per esempio per ottenere il me
 CronMethodHelp=Nome del metodo dell'oggetto da eseguire. 
Per esempio per ottenere il metodo dell'oggetto /htdocs/product/class/product.class.php, il valore da inserire è fetch
 CronArgsHelp=Argomenti del metodo.
 Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/product.class.php, il valore dei parametri può essere 0, ProductRef
 CronCommandHelp=Il comando da eseguire sul sistema
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informazioni
 # Common
diff --git a/htdocs/langs/it_IT/donations.lang b/htdocs/langs/it_IT/donations.lang
index 6ee8837eeeb..67c45f72dba 100644
--- a/htdocs/langs/it_IT/donations.lang
+++ b/htdocs/langs/it_IT/donations.lang
@@ -6,6 +6,8 @@ Donor=Donatore
 Donors=Donatori
 AddDonation=Crea donazione
 NewDonation=Nuova donazione
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Visualizza donazione
 DonationPromise=Donazione promessa
 PromisesNotValid=Promesse non convalidate
@@ -21,6 +23,8 @@ DonationStatusPaid=Donazione ricevuta
 DonationStatusPromiseNotValidatedShort=Bozza
 DonationStatusPromiseValidatedShort=Promessa convalidata
 DonationStatusPaidShort=Ricevuta
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Convalida promessa
 DonationReceipt=Ricevuta per donazione
 BuildDonationReceipt=Genera ricevuta donazione
@@ -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
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 69de1916c4b..61c8dcff477 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/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=I parametri di configurazione obbligatori non sono ancora stati definiti
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 9e5b6c21480..a99f261e44f 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Elenco delle notifiche spedite per email
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index a545e5a156d..699cb4296bd 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -352,6 +352,7 @@ Status=Stato
 Favorite=Preferito
 ShortInfo=Info.
 Ref=Rif.
+ExternalRef=Ref. extern
 RefSupplier=Rif. fornitore
 RefPayment=Rif. pagamento
 CommercialProposalsShort=Preventivi/Proposte commerciali
@@ -394,8 +395,8 @@ Available=Disponibile
 NotYetAvailable=Non ancora disponibile
 NotAvailable=Non disponibile
 Popularity=Popularità
-Categories=Categorie
-Category=Categoria
+Categories=Tags/categories
+Category=Tag/category
 By=Per
 From=Da
 to=a
@@ -694,6 +695,7 @@ AddBox=Aggiungi box
 SelectElementAndClickRefresh=Seleziona un elemento e clicca Aggiorna
 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=Lunedì
 Tuesday=Martedì
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 7206efd62c2..ceec5498561 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Spedisci prodotto
 Discount=Sconto
 CreateOrder=Crea ordine
 RefuseOrder=Rifiuta ordine
-ApproveOrder=Accetta ordine
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Convalida ordine
 UnvalidateOrder=Invalida ordine
 DeleteOrder=Elimina ordine
@@ -102,6 +103,8 @@ ClassifyBilled=Classifica "fatturato"
 ComptaCard=Scheda contabilità
 DraftOrders=Bozze di ordini
 RelatedOrders=Ordini collegati
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Ordini in lavorazione
 RefOrder=Rif. ordine
 RefCustomerOrder=Rif. ordine cliente
@@ -118,6 +121,7 @@ PaymentOrderRef=Riferimento pagamento ordine %s
 CloneOrder=Clona ordine
 ConfirmCloneOrder=Vuoi davvero clonare l'ordine %s?
 DispatchSupplierOrder=Ricezione ordine fornitore %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsabile ordini cliente
 TypeContact_commande_internal_SHIPPING=Responsabile spedizioni cliente
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index ef337e3c36c..dd2e00eb508 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervento convalidato
 Notify_FICHINTER_SENTBYMAIL=Intervento inviato per posta
 Notify_BILL_VALIDATE=Convalida fattura attiva
 Notify_BILL_UNVALIDATE=Ricevuta cliente non convalidata
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Ordine fornitore approvato
 Notify_ORDER_SUPPLIER_REFUSE=Ordine fornitore rifiutato
 Notify_ORDER_VALIDATE=Ordine cliente convalidato
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Proposta inviata per email
 Notify_BILL_PAYED=Fattura attiva pagata
 Notify_BILL_CANCEL=Fattura attiva annullata
 Notify_BILL_SENTBYMAIL=Fattura attiva inviata per email
-Notify_ORDER_SUPPLIER_VALIDATE=Ordine fornitore convalidato
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Ordine fornitore inviato per email
 Notify_BILL_SUPPLIER_VALIDATE=Fattura fornitore convalidata
 Notify_BILL_SUPPLIER_PAYED=Fattura fornitore pagata
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Creazione del progetto
 Notify_TASK_CREATE=Attività creata
 Notify_TASK_MODIFY=Attività modificata
 Notify_TASK_DELETE=Attività cancellata
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Numero di file/documenti allegati
 TotalSizeOfAttachedFiles=Dimensione totale dei file/documenti allegati
 MaxSize=La dimensione massima è
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Fattura %s convalidata
 EMailTextProposalValidated=Proposta %s convalidata.
 EMailTextOrderValidated=Ordine %s convalidato.
 EMailTextOrderApproved=Ordine %s approvato
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Ordine %s approvato da %s
 EMailTextOrderRefused=Ordine %s rifiutato
 EMailTextOrderRefusedBy=Ordine %s rifiutato da %s
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 6bb5e68614e..950d8dc38ef 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Il prezzo minimo raccomandato è: %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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 8520ba26e37..d12ac2a4ad0 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Elenco delle fatture passive associate al
 ListContractAssociatedProject=Elenco dei contratti associati al progetto
 ListFichinterAssociatedProject=Elenco degli interventi associati al progetto
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Elenco delle azioni associate al progetto
 ActivityOnProjectThisWeek=Operatività sul progetto questa settimana
 ActivityOnProjectThisMonth=Operatività sul progetto questo mese
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index b4a29ef16c4..319b526628e 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Rif. spedizione
 Sending=Spedizione
 Sendings=Spedizioni
+AllSendings=All Shipments
 Shipment=Spedizione
 Shipments=Spedizioni
 ShowSending=Show Sending
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 9d21cef1c12..49343fbc66e 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Elenco ordini fornitori
 MenuOrdersSupplierToBill=Ordini fornitori in fatture
 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)
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index bac8eb6dbcf..a2a0af90f93 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Categorieの管理（製品、サプライヤー、顧客）
+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 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文字が続く最初の位置に "C"で構成されています。
 UseNotifications=通知を使用する
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 292509ba6e8..24c589e4fb1 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/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
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 0fcd2a7fcc2..7a6c45ea12d 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -294,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
 
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 697c8c985dc..6027c5137f4 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/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=%sが正常に追加されました。
-ObjectAlreadyLinkedToCategory=要素は、既にこのカテゴリにリンクされています。
-CategorySuccessfullyCreated=このカテゴリの%sは成功して追加されました。
-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=このカテゴリには、このrefで既に存在している
 ReturnInProduct=戻る製品/サービスカード
 ReturnInSupplier=サプライヤーカードにバックアップする
@@ -66,22 +64,22 @@ ReturnInCompany=戻る顧客/見込み客カードに
 ContentsVisibleByAll=内容は、すべてで見えるようになります
 ContentsVisibleByAllShort=すべてから見える内容
 ContentsNotVisibleByAllShort=すべてでは表示されない内容
-CategoriesTree=Categories tree
-DeleteCategory=カテゴリを削除します。
-ConfirmDeleteCategory=このカテゴリを削除してもよろしいですか？
-RemoveFromCategory=categorieのリンクを削除します。
-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=クスト/ 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=内部カテゴリ
-CategoryContents=カテゴリの内容
-CategId=カテゴリID
-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
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index d10cb4a8784..103bd29a409 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/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. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang
index 10ce21a04c4..788a696e7ca 100644
--- a/htdocs/langs/ja_JP/donations.lang
+++ b/htdocs/langs/ja_JP/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
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 852bc364ace..609e4764bfe 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/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
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index f5138fd4a12..42b6f7a5e5f 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 66fd5efdecf..0b44e77f1ef 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -352,6 +352,7 @@ Status=ステータス
 Favorite=Favorite
 ShortInfo=Info.
 Ref=REF。
+ExternalRef=Ref. extern
 RefSupplier=REF。サプライヤー
 RefPayment=REF。支払い
 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=火曜日
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index f0267668aed..797306821d6 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/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=REF。オーダー
 RefCustomerOrder=REF。顧客注文
@@ -118,6 +121,7 @@ PaymentOrderRef=オーダーの%sの支払い
 CloneOrder=クローンの順序
 ConfirmCloneOrder=あなたは、この順序%sのクローンを作成してもよろしいですか？
 DispatchSupplierOrder=サプライヤの注文%sを受信
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代表的なフォローアップ、顧客の注文
 TypeContact_commande_internal_SHIPPING=代表的なフォローアップ出荷
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index fe4bdc9e962..af1c98b5cf3 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/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=顧客への請求は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=サプライヤの請求書は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によって拒否されました。
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index cadaad87d96..bb0d1ca3050 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 92c233d9feb..84f8113a5e4 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/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=プロジェクトの活動今月
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index 43ca3aaec39..d7fc750da77 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=REF。出荷
 Sending=出荷
 Sendings=出荷
+AllSendings=All Shipments
 Shipment=出荷
 Shipments=出荷
 ShowSending=Show Sending
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 0596adaa02c..8b71d67b2ab 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/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)
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/ka_GE/agenda.lang b/htdocs/langs/ka_GE/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/ka_GE/agenda.lang
+++ b/htdocs/langs/ka_GE/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/ka_GE/donations.lang b/htdocs/langs/ka_GE/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/ka_GE/donations.lang
+++ b/htdocs/langs/ka_GE/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/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
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index d40e28cb776..4b393ec50c5 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/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 %s ?
 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
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/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.
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/ka_GE/sendings.lang
+++ b/htdocs/langs/ka_GE/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/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)
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/kn_IN/agenda.lang
+++ b/htdocs/langs/kn_IN/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/kn_IN/donations.lang b/htdocs/langs/kn_IN/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/kn_IN/donations.lang
+++ b/htdocs/langs/kn_IN/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/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
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index d40e28cb776..4b393ec50c5 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/kn_IN/orders.lang
+++ b/htdocs/langs/kn_IN/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 %s ?
 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
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/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.
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/kn_IN/sendings.lang
+++ b/htdocs/langs/kn_IN/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/kn_IN/suppliers.lang
+++ b/htdocs/langs/kn_IN/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)
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index af647d9f52c..a554ac64ee7 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index 99f110deaf9..06b08f18561 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/ko_KR/donations.lang b/htdocs/langs/ko_KR/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/ko_KR/donations.lang
+++ b/htdocs/langs/ko_KR/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 7c88ed9e005..636e4ed9ef1 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/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
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index dd8caefab78..3b2fcaf0f52 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index de1eb65bf14..2f1e4633ebe 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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=월요일
 Tuesday=화요일
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/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 %s ?
 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
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 80399108329..bcee06dd11b 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/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.
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/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)
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 0b715dc2929..879f9fc27c8 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -7,20 +7,20 @@ Chartofaccounts=Chart of accounts
 Fiscalyear=Fiscal years
 Menuaccount=Accounting accounts
 Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+MenuTools=ເຄື່ອງມື
 
 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
 JournalFinancial=Financial journals
 Exports=Exports
-Export=Export
+Export=ສົ່ງອອກ
 Modelcsv=Model of export
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
 Selectmodelcsv=Select a model of export
 Modelcsv_normal=Classic export
 Modelcsv_CEGID=Export towards CEGID Expert
 BackToChartofaccounts=Return chart of accounts
-Back=Return
+Back=ກັບຄືນ
 
 Definechartofaccounts=Define a chart of accounts
 Selectchartofaccounts=Select a chart of accounts
@@ -34,13 +34,13 @@ Dispatched=Dispatched
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
-Reports=Reports
+Reports=ບົດລາຍງານ
 ByCustomerInvoice=By invoices customers
 ByMonth=By Month
 NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
+Update=ປັບປຸງ
+List=ລາຍການ
+Create=ສ້າງ
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
@@ -94,10 +94,10 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
 
-Doctype=Type of document
-Docdate=Date
+Doctype=ປະເພດເອກະສານ
+Docdate=ວັນທີ
 Docref=Reference
-Numerocompte=Account
+Numerocompte=ບັນຊີ
 Code_tiers=Thirdparty
 Labelcompte=Label account
 Debit=Debit
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/lo_LA/agenda.lang
+++ b/htdocs/langs/lo_LA/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index a2306950fb4..5893c36a4f6 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Bank
-Banks=Banks
-MenuBankCash=Bank/Cash
-MenuSetupBank=Bank/Cash setup
-BankName=Bank name
-FinancialAccount=Account
-FinancialAccounts=Accounts
-BankAccount=Bank account
+Bank=ທະນາຄານ
+Banks=ທະນາຄານ
+MenuBankCash=ທະນາຄານ/ເງິນສົດ
+MenuSetupBank=ທະນາຄານ/ຕັ້ງຄ່າເງິນສົດ
+BankName=ຊື່ທະນາຄານ
+FinancialAccount=ບັນຊີ
+FinancialAccounts=ບັນຊີ
+BankAccount=ບັນຊີທະນາຄານ
 BankAccounts=Bank accounts
 ShowAccount=Show Account
 AccountRef=Financial account ref
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/lo_LA/donations.lang b/htdocs/langs/lo_LA/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/lo_LA/donations.lang
+++ b/htdocs/langs/lo_LA/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/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
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index d40e28cb776..4b393ec50c5 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/lo_LA/orders.lang
+++ b/htdocs/langs/lo_LA/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 %s ?
 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
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/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.
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/lo_LA/sendings.lang
+++ b/htdocs/langs/lo_LA/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/lo_LA/suppliers.lang
+++ b/htdocs/langs/lo_LA/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)
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index baf209f9d1c..52c2f25d8b0 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -4,43 +4,43 @@ UserCard=User card
 ContactCard=Contact card
 GroupCard=Group card
 NoContactCard=No card among contacts
-Permission=Permission
-Permissions=Permissions
-EditPassword=Edit password
-SendNewPassword=Regenerate and send password
-ReinitPassword=Regenerate password
+Permission=ການອະນຸຍາດ
+Permissions=ການອະນຸຍາດ
+EditPassword=ແກ້ໄຂລະຫັດຜ່ານ
+SendNewPassword=ສ້າງລະຫັດຜ່ານແບບສຸ່ມ ແລະ ສົ່ງ
+ReinitPassword=ສ້າງລະຫັດແບບສຸ່ມ
 PasswordChangedTo=Password changed to: %s
-SubjectNewPassword=Your new password for Dolibarr
+SubjectNewPassword=ລະຫັດຜ່ານໃຫມ່ຂອງທ່ານສຳລັບ Dolibarr
 AvailableRights=Available permissions
 OwnedRights=Owned permissions
 GroupRights=Group permissions
 UserRights=User permissions
 UserGUISetup=User display setup
-DisableUser=Disable
-DisableAUser=Disable a user
-DeleteUser=Delete
-DeleteAUser=Delete a user
-DisableGroup=Disable
-DisableAGroup=Disable a group
-EnableAUser=Enable a user
-EnableAGroup=Enable a group
-DeleteGroup=Delete
-DeleteAGroup=Delete a group
-ConfirmDisableUser=Are you sure you want to disable user %s ?
-ConfirmDisableGroup=Are you sure you want to disable group %s ?
-ConfirmDeleteUser=Are you sure you want to delete user %s ?
-ConfirmDeleteGroup=Are you sure you want to delete group %s ?
-ConfirmEnableUser=Are you sure you want to enable user %s ?
-ConfirmEnableGroup=Are you sure you want to enable group %s ?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user %s ?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user %s ?
-NewUser=New user
-CreateUser=Create user
-SearchAGroup=Search a group
-SearchAUser=Search a user
+DisableUser=ປິດການນຳໃຊ້
+DisableAUser=ປິດຜູ້ນຳໃຊ້
+DeleteUser=ລຶບ
+DeleteAUser=ລຶບຜູ້ນຳໃຊ້
+DisableGroup=ປິດການນຳໃຊ້
+DisableAGroup=ປິດນຳໃຊ້ກຸ່ມ
+EnableAUser=ເປີດຜູ້ນຳໃຊ້
+EnableAGroup=ເປີດນຳໃຊ້ກຸ່ມ
+DeleteGroup=ລຶບ
+DeleteAGroup=ລຶບກຸ່ມ
+ConfirmDisableUser=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການປິດນຳໃຊ້ຜູ້ນຳໃຊ້ %s ?
+ConfirmDisableGroup=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການປິດນຳໃຊ້ກຸ່ມ %s ?
+ConfirmDeleteUser=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການລຶບຜູ້ນຳໃຊ້ %s ?
+ConfirmDeleteGroup=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການລຶບກຸ່ມ %s ?
+ConfirmEnableUser=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການເປີດຜູ້ນຳໃຊ້ %s ?
+ConfirmEnableGroup=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການເປີດນຳໃຊ້ກຸ່ມ %s ?
+ConfirmReinitPassword=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການສ້າງລະຫັດຜ່ານແບບສຸ່ມໃໝ່ຜູ້ນຳໃຊ້ %s ?
+ConfirmSendNewPassword=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການສ້າງລະຫັດຜ່ານແບບສຸ່ມໃໝ່ ແລະ ສົ່ງໃຫ້ຜູ້ນຳໃຊ້ %s ?
+NewUser=ຜູ້ນຳໃຊ້ໃໝ່
+CreateUser=ສ້າງຜູ້ນຳໃຊ້ໃໝ່
+SearchAGroup=ຄົ້ນຫາກຸ່ມ
+SearchAUser=ຄົ້ນຫາຜູ້ນຳໃຊ້
 LoginNotDefined=Login is not defined.
 NameNotDefined=Name is not defined.
-ListOfUsers=List of users
+ListOfUsers=ລາຍການຂອງຜູ້ນຳໃຊ້
 Administrator=Administrator
 SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Global administrator
@@ -48,19 +48,19 @@ AdministratorDesc=Administrator's entity
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here default permissions that are automatically granted to a new created user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Name
-FirstName=First name
-ListOfGroups=List of groups
-NewGroup=New group
-CreateGroup=Create group
-RemoveFromGroup=Remove from group
+LastName=ຊື່
+FirstName=ຊື່ແທ້
+ListOfGroups=ລາຍການຂອງກຸ່ມ
+NewGroup=ກຸ່ມໃໝ່
+CreateGroup=ສ້າງກຸ່ມ
+RemoveFromGroup=ລຶບຈາກກຸ່ມ
 PasswordChangedAndSentTo=Password changed and sent to %s.
 PasswordChangeRequestSent=Request to change password for %s sent to %s.
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
-ShowGroup=Show group
-ShowUser=Show user
+ShowGroup=ສະແດງກຸ່ມ
+ShowUser=ສະແດງຜູ້ນຳໃຊ້
 NonAffectedUsers=Non assigned users
 UserModified=User modified successfully
 PhotoFile=Photo file
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index bb9b358c045..9ca41bce1f9 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
 
-Accounting=Accounting
-Globalparameters=Global parameters
+Accounting=Apskaita
+Globalparameters=Bendrieji parametrai
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
+Fiscalyear=Fiskaliniai metai
+Menuaccount=Apskaitos sąskaitos
 Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+MenuTools=Įrankiai
 
 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 0a9afd42fe8..9ab50d7e82a 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separatorius
 ExtrafieldCheckBox=Žymimasis langelis ("paukščiukas")
 ExtrafieldRadio=Opcijų mygtukai
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -494,6 +495,8 @@ Module500Name=Specialiosios išlaidos (mokesčiai, socialinės įmokos, dividend
 Module500Desc=Spec. išlaidų valdymas, pavyzdžiui: mokesčių, socialinių įmokų, dividendų ir atlyginimų
 Module510Name=Atlyginimai
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Pranešimai
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Parama
@@ -508,14 +511,14 @@ Module1400Name=Apskaita
 Module1400Desc=Apskaitos valdymas (dvivietės šalys)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorijos
-Module1780Desc=Kategorijų valdymas (produktai, tiekėjai ir klientai)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG redaktorius
 Module2000Desc=Leisti redaguoti tam tikrą teksto sritį naudojant pažangų redaktorių
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Numatomų užduočių valdymas
+Module2300Desc=Scheduled job management
 Module2400Name=Darbotvarkė
 Module2400Desc=Renginių/užduočių ir darbotvarkės valdymas
 Module2500Name=Elektroninis Turinio Valdymas
@@ -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=Skaityti paslaugas
 Permission532=Sukurti/keisti paslaugas
 Permission534=Ištrinti paslaugas
@@ -746,6 +754,7 @@ Permission1185=Patvirtinti tiekėjo užsakymus
 Permission1186=Tvarkyti tiekėjo užsakymus
 Permission1187=Pripažinti tiekėjo užsakymų įplaukas
 Permission1188=Ištrinti tiekėjo užsakymus
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Gauti eksporto rezultatą
 Permission1202=Sukurti/keisti eksportą
 Permission1231=Skaityti tiekėjo sąskaitas-faktūras
@@ -758,10 +767,10 @@ Permission1237=Eksportuoti tiekėjo užsakymus ir jų detales
 Permission1251=Pradėti masinį išorinių duomenų importą į duomenų bazę (duomenų užkrovimas)
 Permission1321=Eksportuoti klientų sąskaitas-faktūras, atributus ir mokėjimus
 Permission1421=Eksportuoti klientų užsakymus ir atributus
-Permission23001 = Skaityti suplanuotas užduotis
-Permission23002 = Sukurti/atnaujinti suplanuotas užduotis
-Permission23003 = Ištrinti suplanuotas užduotis
-Permission23004 = Vykdyti suplanuotas užduotis
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Skaityti veiksmus (įvykiai ar užduotys), susijusius su jų sąskaita
 Permission2402=Sukurti/keisti veiksmus (įvykiai ar užduotys) susijusius su jų sąskaita
 Permission2403=Ištrinti veiksmus (įvykius ar užduotis), susijusius su jų sąskaita
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Grąžinti apskaitos kodą, sudarytą pagal:
%s po
 ModuleCompanyCodePanicum=Grąžinti tuščią apskaitos kodą.
 ModuleCompanyCodeDigitaria=Apskaitos kodas priklauso nuo trečiosios šalies kodo. Kodas yra sudarytas iš simbolių "C" į pirmąją poziciją, toliau seka 5 simbolių trečiosios šalies kodas.
 UseNotifications=Naudokite pranešimus
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Dokumentų šablonai
 DocumentModelOdt=Sukurti dokumentus pagal OpenDocuments šablonus (.ODT arba .OAM failus OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vandens ženklas ant dokumento projekto
@@ -1557,6 +1566,7 @@ SuppliersSetup=Tiekėjo modulio nustatymas
 SuppliersCommandModel=Pilnas tiekėjo užsakymo šablonas (logo. ..)
 SuppliersInvoiceModel=Pilnas tiekėjo sąskaitos-faktūros šablonas (logo. ..)
 SuppliersInvoiceNumberingModel=Tiekėjo sąskaitų-faktūrų numeracijos modeliai
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modulio nustatymas
 PathToGeoIPMaxmindCountryDataFile=Kelias iki failo, kuriame yra MaxMind IP į šalies kalbą. 
 Pavyzdžiai: 
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index a963e4807a3..53d5804edd2 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -6,11 +6,11 @@ Agenda=Operacijų sąrašas
 Agendas=Operacijų sąrašai
 Calendar=Kalendorius
 Calendars=Kalendoriai
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+LocalAgenda=Vidinis kalendorius
+ActionsOwnedBy=Įvykio savininkas
 AffectedTo=Priskirtas
 DoneBy=Atliko
-Event=Event
+Event=Įvykis
 Events=Įvykiai
 EventsNb=Įvykių skaičius
 MyEvents=Mano įvykiai
@@ -23,20 +23,20 @@ MenuToDoActions=Visi neužbaigti įvykiai
 MenuDoneActions=Visi užbaigti/nutraukti įvykiai
 MenuToDoMyActions=Mano neužbaigti įvykiai
 MenuDoneMyActions=Mano užbaigti/nutraukti įvykiai
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Įvykių sąrašas (vidinis kalendorius)
 ActionsAskedBy=Įvykiai, apie kuriuos pranešė
 ActionsToDoBy=Įvykiai priskirti
 ActionsDoneBy=Įvykiai atlikti
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
-ActionAssignedTo=Event assigned to
+ActionsForUser=Įvykiai vartotojui
+ActionsForUsersGroup=Įvykiai visiems grupės vartotojams
+ActionAssignedTo=Įvykis priskirtas
 AllMyActions= Visi mano įvykiai/užduotys
 AllActions= Visi įvykiai/užduotys
 ViewList=Sąrašo vaizdas
 ViewCal=Mėnesio vaizdas
 ViewDay=Dienos vaizdas
 ViewWeek=Savaitės vaizdas
-ViewPerUser=Per user view
+ViewPerUser=Vartotojo nuomone
 ViewWithPredefinedFilters= Peržiūrėti su nustatytais filtrais
 AutoActions= Automatinis užpildymas
 AgendaAutoActionDesc= Nustatykite įvykius, kuriems norite, kad Dolibarr sukurtų automatiškai įvykį operacijoje. Jei niekas nepažymėta (pagal nutylėjimą), tik rankomis įvesti veiksmai bus įtraukti į operaciją.
@@ -45,10 +45,13 @@ AgendaExtSitesDesc=Šis puslapis leidžia paskelbti išorinius kalendorių šalt
 ActionsEvents=Įvykiai, kuriems Dolibarr sukurs veiksmą operacijų sąraše automatiškai
 PropalValidatedInDolibarr=Pasiūlymas %s pripažintas galiojančiu
 InvoiceValidatedInDolibarr=Sąskaita-faktūra %s pripažinta galiojančia
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Sąskaita patvirtinta per POS
 InvoiceBackToDraftInDolibarr=Sąskaita-faktūra %s grąžinama į projektinę būklę
 InvoiceDeleteDolibarr=Sąskaita-faktūra %s ištrinta
-OrderValidatedInDolibarr= Užsakymas %s pripažintas galiojančiu
+OrderValidatedInDolibarr=Užsakymas %s pripažintas galiojančiu
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Užsakymas %s atšauktas
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Užsakymas %s patvirtintas
 OrderRefusedInDolibarr=Užsakymas %s atmestas
 OrderBackToDraftInDolibarr=Užsakymas %s grąžintas į projektinę būklę
@@ -58,9 +61,9 @@ OrderSentByEMail=Kliento užsakymas %s atsiųstas e-paštu
 InvoiceSentByEMail=Kliento sąskaita-faktūra %s išsiųsta e-paštu
 SupplierOrderSentByEMail=Tiekėjo užsakymas %s atsiųstas e-paštu
 SupplierInvoiceSentByEMail=Tiekėjo sąskaita-faktūra %s atsiųsta e-paštu
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
+ShippingSentByEMail=Siunta %s išsiųsta EMail
+ShippingValidated= Siunta %s patvirtinta
+InterventionSentByEMail=Intervencija %s išsiųsta EMail
 NewCompanyToDolibarr= Trečioji šalis sukūrė
 DateActionPlannedStart= Planuojama pradžios data
 DateActionPlannedEnd= Planuojama pabaigos data
@@ -69,25 +72,27 @@ DateActionDoneEnd= Reali pabaigos data
 DateActionStart= Pradžios data
 DateActionEnd= Pabaigos data
 AgendaUrlOptions1=Taip pat galite pridėti šiuos parametrus išvesties filtravimui:
-AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s.
-AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s.
+AgendaUrlOptions2=login=%s uždrausti išvestis veiksmų sukurtų ar priskirtų vartotojui %s išvestis.
+AgendaUrlOptions3=logina=%s uždrausti vartotojo veiksmų išvestis %s.
 AgendaUrlOptions4=logint =%s ​​apriboti išvedimą veiksmais, priskirtais vartotojui %s.
-AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID.
+AgendaUrlOptionsProject=projektas=PROJECT_ID uždrausti veiksmų asocijuotų su projektu PROJECT_ID išvestis.
 AgendaShowBirthdayEvents=Rodyti gimtadienio adresatus
 AgendaHideBirthdayEvents=Paslėpti gimtadienio adresatus
 Busy=Užimtas
 ExportDataset_event1=Operacijos įvykių sąrašas
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Numatytoji darbo dienų sritis savaitėje (Pvz.: 1-5, 1-6)
+DefaultWorkingHours=Numatyta darbo valandų per dieną (Pvz.: 9-18)
 # External Sites ical
 ExportCal=Eksportuoti kalendorių
 ExtSites=Importuoti išorinį kalendorių
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Rodyti išorinius kalendorius (nustatytus pagrindinuose nustatymuose) darbotvarkėje. Neįtakoja išorinių kalendorių nustatytų vartotojo.
 ExtSitesNbOfAgenda=Kalendorių skaičius
 AgendaExtNb=Kalendoriaus nb %s
 ExtSiteUrlAgenda=URL prieiga prie .ical failo
 ExtSiteNoLabel=Aprašymo nėra
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
-AddEvent=Create event
-MyAvailability=My availability
+WorkingTimeRange=Darbo laiko sritis
+WorkingDaysRange=Darbo dienų sritis
+AddEvent=Sukurti įvykį
+MyAvailability=Mano eksploatacinė parengtis
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index aafc8302888..7f5f7daea2d 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Dviejų naujų nuolaidų suma turi būti ly
 ConfirmRemoveDiscount=Ar tikrai norite pašalinti šią nuolaidą ?
 RelatedBill=Susijusi sąskaita-faktūra
 RelatedBills=Susiję sąskaitos-faktūros
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index ffa404fbb6d..e601cd2fe33 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorija
-Categories=Kategorijos
-Rubrique=Kategorija
-Rubriques=Kategorijos
-categories=kategorijos
-TheCategorie=Kategorija
-NoCategoryYet=Tokiam tipui nėra sukurtų kategorijų
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Į
 AddIn=Įtraukti
 modify=Pakeisti
 Classify=Priskirti
-CategoriesArea=Kategorijų sritis
-ProductsCategoriesArea=Produktų/Paslaugų kategorijų sritis
-SuppliersCategoriesArea=Tiekėjų kategorijų sritis
-CustomersCategoriesArea=Klientų kategorijų sritis
-ThirdPartyCategoriesArea=Trečiųjų šalių kategorijų sritis
-MembersCategoriesArea=Narių kategorijų sritis
-ContactsCategoriesArea=Adresatų kategorijų sritis
-MainCats=Pagrindinės kategorijos
+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=Subkategorijos
 CatStatistics=Statistika
-CatList=Kategorijų sąrašas
-AllCats=Visos kategorijos
-ViewCat=Žiūrėti kategoriją
-NewCat=Įtraukti kategoriją
-NewCategory=Nauja kategorija
-ModifCat=Keisti kategoriją
-CatCreated=Kategorija sukurta
-CreateCat=Sukurti kategoriją
-CreateThisCat=Sukurti šią kategoriją
+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=Patvirtinti laukus
 NoSubCat=Nėra subkategorijos
 SubCatOf=Subkategorija
-FoundCats=Rastos kategorijos
-FoundCatsForName=Rasta kategorijos pavadinimui:
-FoundSubCatsIn=Kategorijoje rastos Subkategorijos
-ErrSameCatSelected=Pasirinkote tą pačią kategoriją keletą kartų
-ErrForgotCat=Pamiršote pasirinkti kategoriją
+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=Pamiršote informuoti laukus
 ErrCatAlreadyExists=Šis pavadinimas jau naudojamas
-AddProductToCat=Pridėti šį produktą į kategoriją ?
-ImpossibleAddCat=Neįmanoma pridėti kategoriją
-ImpossibleAssociateCategory=Neįmanoma susieti kategoriją
+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 buvo sėkmingai įrašytas.
-ObjectAlreadyLinkedToCategory=Elementas jau yra susietas su šia kategorija
-CategorySuccessfullyCreated=Ši kategorija %s buvo pridėta sėkmingai
-ProductIsInCategories=Produktas/paslauga turi šias kategorijas
-SupplierIsInCategories=Trečioji šalis turi sekančias tiekėjų kategorijas
-CompanyIsInCustomersCategories=Ši trečioji šalis turi sekančias klientų/planų kategorijas
-CompanyIsInSuppliersCategories=Ši trečioji šalis turi sekančias tiekėjų kategorijas
-MemberIsInCategories=Šis narys priklauso sekančioms narių kategorijoms
-ContactIsInCategories=Šis adresatas priklauso sekančioms adresatų kategorijoms
-ProductHasNoCategory=Šis produktas/paslauga neturi jokių kategorijų
-SupplierHasNoCategory=Šis tiekėjas neturi jokių kategorijų
-CompanyHasNoCategory=Ši įmonė neturi jokių kategorijų
-MemberHasNoCategory=Šis narys neturi jokių kategorijų
-ContactHasNoCategory=Šis adresatas nėra jokioje kategorijoje
-ClassifyInCategory=Priskirti kategorijai
+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=Nė vienas
-NotCategorized=Be kategorijos
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ši kategorija jau egzistuoja su šia nuoroda
 ReturnInProduct=Atgal į produkto/paslaugos kortelę
 ReturnInSupplier=Atgal į tiekėjo kortelę
@@ -66,22 +64,22 @@ ReturnInCompany=Atgal į kliento/plano kortelę
 ContentsVisibleByAll=Turinys bus matomas visiems
 ContentsVisibleByAllShort=Turinys matomas visiems
 ContentsNotVisibleByAllShort=Turinys nėra matomos visiems
-CategoriesTree=Kategorijų medis
-DeleteCategory=Ištrinti kategoriją
-ConfirmDeleteCategory=Ar tikrai norite ištrinti šią kategoriją?
-RemoveFromCategory=Pašalinti ryšį su kategorija
-RemoveFromCategoryConfirm=Ar tikrai norite pašalinti ryšį tarp operacijos ir kategorijos ?
-NoCategoriesDefined=Nėra apibrėžtos kategorijos
-SuppliersCategoryShort=Tiekėjų kategorija
-CustomersCategoryShort=Klientų kategorija
-ProductsCategoryShort=Produktų kategorija
-MembersCategoryShort=Narių kategorija
-SuppliersCategoriesShort=Tiekėjų kategorijos
-CustomersCategoriesShort=Klientų kategorijos
+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=Klientų/Planų kategorijos
-ProductsCategoriesShort=Produktų kategorijos
-MembersCategoriesShort=Narių kategorijos
-ContactCategoriesShort=Adresatų kategorijos
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ši kategorija neturi jokių produktų.
 ThisCategoryHasNoSupplier=Ši kategorija neturi jokių tiekėjų.
 ThisCategoryHasNoCustomer=Ši kategorija neturi jokių klientų.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Ši kategorija neturi jokių adresatų
 AssignedToCustomer=Paskirti klientui
 AssignedToTheCustomer=Paskirtas klientui
 InternalCategory=Vidinė kategorija
-CategoryContents=Kategorijos turinys
-CategId=Kategorijos ID
-CatSupList=Tiekėjo kategorijų sąrašas
-CatCusList=Kliento/Plano kategorijų sąrašas
-CatProdList=Produktų kategorijų sąrašas
-CatMemberList=Narių kategorijų sąrašas
-CatContactList=Adresatų kategorijų ir adresatų sąrašas
-CatSupLinks=Ryšys tarp tiekėjų ir kategorijų
-CatCusLinks=Ryšys tarp klientų/planų ir kategorijų
-CatProdLinks=Ryšys tarp produktų/paslaugų ir kategorijų
-CatMemberLinks=Ryšys tarp narių ir kategorijų
-DeleteFromCat=Pašalinti iš kategorijos
+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=Ištrinti nuotrauką
 ConfirmDeletePicture=Patvirtinkite nuotraukos trynimą
 ExtraFieldsCategories=Papildomi atributai
-CategoriesSetup=Kategorijų nustatymai
-CategorieRecursiv=Automatiškai susieti su pirmine kategorija
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Jei įjungta, produktas taip pat susijęs su pirmine kategorija, kai dedamas į subkategoriją
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+AddProductServiceIntoCategory=Pridėti sekantį produktą / servisą
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 55aee3fddce..480c3ab3d63 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Paskutinė paleista išvestis
 CronLastResult=Paskutinio rezultato kodas
 CronListOfCronJobs=Numatytų darbų sąrašas
 CronCommand=Komanda
-CronList=Darbų sąrašas
-CronDelete= Ištrinti cron darbus
-CronConfirmDelete= Ar tikrai norite ištrinti šį cron darbą ?
-CronExecute=Pradėti darbą
-CronConfirmExecute= Ar tikrai norite vykdyti šį darbą dabar ?
-CronInfo= Darbai leidžia vykdyti užduotį, kuri buvo suplanuota
-CronWaitingJobs=Laukiantys darbai
+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=Darbas
-CronNone= Nė vienas
+CronNone=Nė vienas
 CronDtStart=Pradžios data
 CronDtEnd=Pabaigos data
 CronDtNextLaunch=Kitas vykdymas
@@ -75,6 +75,7 @@ CronObjectHelp=Objekto pavadinimas įkėlimui. 
 Pvz.:Dolibarr Produkto objek
 CronMethodHelp=Objekto metodas įkėlimui. 
 Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, metodo reikšmė yra fecth
 CronArgsHelp=Metodo argumentai. 
 Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, parametrų reikšmė gali būti 0, ProductRef
 CronCommandHelp=Sistemos komandinė eilutė vykdymui
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informacija
 # Common
diff --git a/htdocs/langs/lt_LT/dict.lang b/htdocs/langs/lt_LT/dict.lang
index a662b0f7573..b77f195b2ea 100644
--- a/htdocs/langs/lt_LT/dict.lang
+++ b/htdocs/langs/lt_LT/dict.lang
@@ -1,329 +1,327 @@
 # Dolibarr language file - Source file is en_US - dict
-# CountryFR=France
-# CountryBE=Belgium
-# CountryIT=Italy
-# CountryES=Spain
-# CountryDE=Germany
-# CountryCH=Switzerland
-# CountryGB=Great Britain
-# CountryUK=United Kingdom
-# CountryIE=Ireland
-# CountryCN=China
-# CountryTN=Tunisia
-# CountryUS=United States
-# CountryMA=Morocco
-# CountryDZ=Algeria
-# CountryCA=Canada
-# CountryTG=Togo
-# CountryGA=Gabon
-# CountryNL=Netherlands
-# CountryHU=Hungary
-# CountryRU=Russia
-# CountrySE=Sweden
-# CountryCI=Ivoiry Coast
-# CountrySN=Senegal
-# CountryAR=Argentina
-# CountryCM=Cameroon
-# CountryPT=Portugal
-# CountrySA=Saudi Arabia
-# CountryMC=Monaco
-# CountryAU=Australia
-# CountrySG=Singapore
-# CountryAF=Afghanistan
-# CountryAX=Åland Islands
-# CountryAL=Albania
-# CountryAS=American Samoa
-# CountryAD=Andorra
-# CountryAO=Angola
-# CountryAI=Anguilla
-# CountryAQ=Antarctica
-# CountryAG=Antigua and Barbuda
-# CountryAM=Armenia
-# CountryAW=Aruba
-# CountryAT=Austria
-# CountryAZ=Azerbaijan
-# CountryBS=Bahamas
-# CountryBH=Bahrain
-# CountryBD=Bangladesh
-# CountryBB=Barbados
-# CountryBY=Belarus
-# CountryBZ=Belize
-# CountryBJ=Benin
-# CountryBM=Bermuda
-# CountryBT=Bhutan
-# CountryBO=Bolivia
-# CountryBA=Bosnia and Herzegovina
-# CountryBW=Botswana
-# CountryBV=Bouvet Island
-# CountryBR=Brazil
-# CountryIO=British Indian Ocean Territory
-# CountryBN=Brunei Darussalam
-# CountryBG=Bulgaria
-# CountryBF=Burkina Faso
-# CountryBI=Burundi
-# CountryKH=Cambodia
-# CountryCV=Cape Verde
-# CountryKY=Cayman Islands
-# CountryCF=Central African Republic
-# CountryTD=Chad
-# CountryCL=Chile
-# CountryCX=Christmas Island
-# CountryCC=Cocos (Keeling) Islands
-# CountryCO=Colombia
-# CountryKM=Comoros
-# CountryCG=Congo
-# CountryCD=Congo, The Democratic Republic of the
-# CountryCK=Cook Islands
-# CountryCR=Costa Rica
-# CountryHR=Croatia
-# CountryCU=Cuba
-# CountryCY=Cyprus
-# CountryCZ=Czech Republic
-# CountryDK=Denmark
-# CountryDJ=Djibouti
-# CountryDM=Dominica
-# CountryDO=Dominican Republic
-# CountryEC=Ecuador
-# CountryEG=Egypt
-# CountrySV=El Salvador
-# CountryGQ=Equatorial Guinea
-# CountryER=Eritrea
-# CountryEE=Estonia
-# CountryET=Ethiopia
-# CountryFK=Falkland Islands
-# CountryFO=Faroe Islands
-# CountryFJ=Fiji Islands
-# CountryFI=Finland
-# CountryGF=French Guiana
-# CountryPF=French Polynesia
-# CountryTF=French Southern Territories
-# CountryGM=Gambia
-# CountryGE=Georgia
-# CountryGH=Ghana
-# CountryGI=Gibraltar
-# CountryGR=Greece
-# CountryGL=Greenland
-# CountryGD=Grenada
-# CountryGP=Guadeloupe
-# CountryGU=Guam
-# CountryGT=Guatemala
-# CountryGN=Guinea
-# CountryGW=Guinea-Bissau
-# CountryGY=Guyana
-# CountryHT=Haïti
-# CountryHM=Heard Island and McDonald
-# CountryVA=Holy See (Vatican City State)
-# CountryHN=Honduras
-# CountryHK=Hong Kong
-# CountryIS=Icelande
-# CountryIN=India
-# CountryID=Indonesia
-# CountryIR=Iran
-# CountryIQ=Iraq
-# CountryIL=Israel
-# CountryJM=Jamaica
-# CountryJP=Japan
-# CountryJO=Jordan
-# CountryKZ=Kazakhstan
-# CountryKE=Kenya
-# CountryKI=Kiribati
-# CountryKP=North Korea
-# CountryKR=South Korea
-# CountryKW=Kuwait
-# CountryKG=Kyrghyztan
-# CountryLA=Lao
-# CountryLV=Latvia
-# CountryLB=Lebanon
-# CountryLS=Lesotho
-# CountryLR=Liberia
-# CountryLY=Libyan
-# CountryLI=Liechtenstein
-# CountryLT=Lituania
-# CountryLU=Luxembourg
-# CountryMO=Macao
-# CountryMK=Macedonia, the former Yugoslav of
-# CountryMG=Madagascar
-# CountryMW=Malawi
-# CountryMY=Malaysia
-# CountryMV=Maldives
-# CountryML=Mali
-# CountryMT=Malta
-# CountryMH=Marshall Islands
-# CountryMQ=Martinique
-# CountryMR=Mauritania
-# CountryMU=Mauritius
-# CountryYT=Mayotte
-# CountryMX=Mexico
-# CountryFM=Micronesia
-# CountryMD=Moldova
-# CountryMN=Mongolia
-# CountryMS=Monserrat
-# CountryMZ=Mozambique
-# CountryMM=Birmania (Myanmar)
-# CountryNA=Namibia
-# CountryNR=Nauru
-# CountryNP=Nepal
-# CountryAN=Netherlands Antilles
-# CountryNC=New Caledonia
-# CountryNZ=New Zealand
-# CountryNI=Nicaragua
-# CountryNE=Niger
-# CountryNG=Nigeria
-# CountryNU=Niue
-# CountryNF=Norfolk Island
-# CountryMP=Northern Mariana Islands
-# CountryNO=Norway
-# CountryOM=Oman
-# CountryPK=Pakistan
-# CountryPW=Palau
-# CountryPS=Palestinian Territory, Occupied
-# CountryPA=Panama
-# CountryPG=Papua New Guinea
-# CountryPY=Paraguay
-# CountryPE=Peru
-# CountryPH=Philippines
-# CountryPN=Pitcairn Islands
-# CountryPL=Poland
-# CountryPR=Puerto Rico
-# CountryQA=Qatar
-# CountryRE=Reunion
-# CountryRO=Romania
-# CountryRW=Rwanda
-# CountrySH=Saint Helena
-# CountryKN=Saint Kitts and Nevis
-# CountryLC=Saint Lucia
-# CountryPM=Saint Pierre and Miquelon
-# CountryVC=Saint Vincent and Grenadines
-# CountryWS=Samoa
-# CountrySM=San Marino
-# CountryST=Sao Tome and Principe
-# CountryRS=Serbia
-# CountrySC=Seychelles
-# CountrySL=Sierra Leone
-# CountrySK=Slovakia
-# CountrySI=Slovenia
-# CountrySB=Solomon Islands
-# CountrySO=Somalia
-# CountryZA=South Africa
-# CountryGS=South Georgia and the South Sandwich Islands
-# CountryLK=Sri Lanka
-# CountrySD=Sudan
-# CountrySR=Suriname
-# CountrySJ=Svalbard and Jan Mayen
-# CountrySZ=Swaziland
-# CountrySY=Syrian
-# CountryTW=Taiwan
-# CountryTJ=Tajikistan
-# CountryTZ=Tanzania
-# CountryTH=Thailand
-# CountryTL=Timor-Leste
-# CountryTK=Tokelau
-# CountryTO=Tonga
-# CountryTT=Trinidad and Tobago
-# CountryTR=Turkey
-# CountryTM=Turkmenistan
-# CountryTC=Turks and Cailos Islands
-# CountryTV=Tuvalu
-# CountryUG=Uganda
-# CountryUA=Ukraine
-# CountryAE=United Arab Emirates
-# CountryUM=United States Minor Outlying Islands
-# CountryUY=Uruguay
-# CountryUZ=Uzbekistan
-# CountryVU=Vanuatu
-# CountryVE=Venezuela
-# CountryVN=Viet Nam
-# CountryVG=Virgin Islands, British
-# CountryVI=Virgin Islands, U.S.
-# CountryWF=Wallis and Futuna
-# CountryEH=Western Sahara
-# CountryYE=Yemen
-# CountryZM=Zambia
-# CountryZW=Zimbabwe
-# CountryGG=Guernsey
-# CountryIM=Isle of Man
-# CountryJE=Jersey
-# CountryME=Montenegro
-# CountryBL=Saint Barthelemy
-# CountryMF=Saint Martin
+CountryFR=Prancūzija
+CountryBE=Belgija
+CountryIT=Italija
+CountryES=Ispanija
+CountryDE=Vokietija
+CountryCH=Šveicarija
+CountryGB=Didžioji Britanija
+CountryUK=Jungtinė Karalystė
+CountryIE=Airija
+CountryCN=Kinija
+CountryTN=Tunisas
+CountryUS=Jungtinės Amerikos Valstijos
+CountryMA=Marokas
+CountryDZ=Alžyras
+CountryCA=Kanada
+CountryTG=Togas
+CountryGA=Gabonas
+CountryNL=Nyderlandai
+CountryHU=Vengrija
+CountryRU=Rusija
+CountrySE=Švedija
+CountryCI=Dramblio kaulo krantas
+CountrySN=Senegalas
+CountryAR=Argentina
+CountryCM=Kamerūnas
+CountryPT=Portugalija
+CountrySA=Saudo Arabija
+CountryMC=Monakas
+CountryAU=Australija
+CountrySG=Singapūras
+CountryAF=Afganistanas
+CountryAX=Alandų salos
+CountryAL=Albanija
+CountryAS=Amerikos Samoa
+CountryAD=Andora
+CountryAO=Angola
+CountryAI=Angilija
+CountryAQ=Antarktida
+CountryAG=Antigva ir Barbuda
+CountryAM=Armėnija
+CountryAW=Aruba
+CountryAT=Austrija
+CountryAZ=Azerbaidžanas
+CountryBS=Bahamos
+CountryBH=Bahreinas
+CountryBD=Bangladešas
+CountryBB=Barbadosas
+CountryBY=Baltarusija
+CountryBZ=Belizas
+CountryBJ=Beninas
+CountryBM=Bermudų salos
+CountryBT=Butanas
+CountryBO=Bolivija
+CountryBA=Bosnija ir Hercegovina
+CountryBW=Botsvana
+CountryBV=Bouvet sala
+CountryBR=Brazilija
+CountryIO=Indijos vandenyno britų sritis
+CountryBN=Brunėjaus Darusalamas
+CountryBG=Bulgarija
+CountryBF=Burkina Fasas
+CountryBI=Burundis
+CountryKH=Kambodža
+CountryCV=Žaliasis Kyšulys
+CountryKY=Kaimanų salos
+CountryCF=Centrinės Afrikos Respublika
+CountryTD=Čadas
+CountryCL=Čilė
+CountryCX=Kalėdų sala
+CountryCC=Kokosų (Kilingo) salos
+CountryCO=Kolumbija
+CountryKM=Komorai
+CountryCG=Kongas
+CountryCD=Kongo Demokratinė Respublika
+CountryCK=Kuko salos
+CountryCR=Kosta Rika
+CountryHR=Kroatija
+CountryCU=Kuba
+CountryCY=Kipras
+CountryCZ=Čekija
+CountryDK=Danija
+CountryDJ=Džibutis
+CountryDM=Dominika
+CountryDO=Dominikos Respublika
+CountryEC=Ekvadoras
+CountryEG=Egiptas
+CountrySV=Salvadoras
+CountryGQ=Pusiaujo Gvinėja
+CountryER=Eritrėja
+CountryEE=Estija
+CountryET=Etiopija
+CountryFK=Folklendo salos
+CountryFO=Farerų salos
+CountryFJ=Fidžio Salų Respublika
+CountryFI=Suomija
+CountryGF=Prancūzijos Gviana
+CountryPF=Prancūzijos Polinezija
+CountryTF=Prancūzijos Pietų ir Antarkties sritys
+CountryGM=Gambija
+CountryGE=Gruzija
+CountryGH=Gana
+CountryGI=Gibraltaras
+CountryGR=Graikija
+CountryGL=Grenlandija
+CountryGD=Grenada
+CountryGP=Gvadelupa
+CountryGU=Guamas
+CountryGT=Gvatemala
+CountryGN=Gvinėja
+CountryGW=Bisau Gvinėja
+CountryGY=Gajana
+CountryHT=Haitis
+CountryHM=Herdo ir Makdonaldo
+CountryVA=Šventasis Sostas (Vatikano Miesto Valstybė)
+CountryHN=Hondūras
+CountryHK=Honkongas
+CountryIS=Islandija
+CountryIN=Indija
+CountryID=Indonezija
+CountryIR=Iranas
+CountryIQ=Irakas
+CountryIL=Izraelis
+CountryJM=Jamaika
+CountryJP=Japonija
+CountryJO=Jordanija
+CountryKZ=Kazachstanas
+CountryKE=Kenija
+CountryKI=Kiribatis
+CountryKP=Šiaurės Korėja
+CountryKR=Pietų Korėja
+CountryKW=Kuveitas
+CountryKG=Kirgizija
+CountryLA=Lao
+CountryLV=Latvija
+CountryLB=Libanas
+CountryLS=Lesotas
+CountryLR=Liberija
+CountryLY=Libija
+CountryLI=Lichtenšteinas
+CountryLT=Lietuva
+CountryLU=Liuksemburgas
+CountryMO=Makao
+CountryMK=Makedonija
+CountryMG=Madagaskaras
+CountryMW=Malavis
+CountryMY=Malaizija
+CountryMV=Maldyvai
+CountryML=Malis
+CountryMT=Malta
+CountryMH=Maršalo salos
+CountryMQ=Martinika
+CountryMR=Mauritanija
+CountryMU=Mauricijus
+CountryYT=Mayotte
+CountryMX=Meksika
+CountryFM=Mikronezija
+CountryMD=Moldova
+CountryMN=Mongolija
+CountryMS=Monseratas
+CountryMZ=Mozambikas
+CountryMM=Birma (Mianmaras)
+CountryNA=Namibija
+CountryNR=Nauru
+CountryNP=Nepalas
+CountryAN=Olandijos Antilai
+CountryNC=Naujoji Kaledonija
+CountryNZ=Naujoji Zelandija
+CountryNI=Nikaragva
+CountryNE=Nigeris
+CountryNG=Nigerija
+CountryNU=Niue salos
+CountryNF=Norfolko sala
+CountryMP=Marianos šiaurinės salos
+CountryNO=Norvegija
+CountryOM=Omanas
+CountryPK=Pakistanas
+CountryPW=Palau
+CountryPS=Okupuota Palestinos teritorija
+CountryPA=Panama
+CountryPG=Papua ir Naujoji Gvinėja
+CountryPY=Paragvajus
+CountryPE=Peru
+CountryPH=Filipinai
+CountryPN=Pitkerno salos
+CountryPL=Lenkija
+CountryPR=Puerto Rikas
+CountryQA=Kataras
+CountryRE=Reunion sala
+CountryRO=Rumunija
+CountryRW=Ruanda
+CountrySH=Elenos sala
+CountryKN=Sent Kitsas ir Nevis
+CountryLC=Sent Lusija
+CountryPM=Sen Pjeras ir Mikelonas
+CountryVC=Sent Vinsentas ir Grenadinai
+CountryWS=Samoa
+CountrySM=San Marinas
+CountryST=San Tomė ir Prinsipė
+CountryRS=Serbija
+CountrySC=Seišelių salos
+CountrySL=Siera Leonė
+CountrySK=Slovakija
+CountrySI=Slovėnija
+CountrySB=Saliamono salos
+CountrySO=Somalis
+CountryZA=Pietų Afrikos Respublika
+CountryGS=Pietų Džordžija ir Pietų Sandvičo salos
+CountryLK=Šri Lanka
+CountrySD=Sudanas
+CountrySR=Surinamas
+CountrySJ=Svalbardas ir Jan Mayenas
+CountrySZ=Svazilendas
+CountrySY=Sirija
+CountryTW=Taivanis
+CountryTJ=Tadžikistanas
+CountryTZ=Tanzanija
+CountryTH=Tailandas
+CountryTL=Rytų Timoras
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidadas ir Tobagas
+CountryTR=Turkija
+CountryTM=Turkmėnistanas
+CountryTC=Terkso ir Cailos salos
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraina
+CountryAE=Jungtiniai Arabų Emyratai
+CountryUM=Jungtinių Valstijų mažosios aplinkinės salos
+CountryUY=Urugvajus
+CountryUZ=Uzbekistanas
+CountryVU=Vanuatu
+CountryVE=Venesuela
+CountryVN=Vietnamas
+CountryVG=Didžiosios Britanijos Mergelių salos
+CountryVI=Mergelių salos, JAV
+CountryWF=Volisas ir Futūna
+CountryEH=Vakarų Sachara
+CountryYE=Jemenas
+CountryZM=Zambija
+CountryZW=Zimbabvė
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Džersis
+CountryME=Juodkalnija
+CountryBL=Švento Baltramiejaus sala
+CountryMF=Saint Martin
 
 ##### Civilities #####
-# CivilityMME=Mrs.
-# CivilityMR=Mr.
-# CivilityMLE=Ms.
-# CivilityMTRE=Master
-# CivilityDR=Doctor
-
+CivilityMME=p.
+CivilityMR=p.
+CivilityMLE=p.
+CivilityMTRE=Magistras
+CivilityDR=Daktaras
 ##### Currencies #####
-# Currencyeuros=Euros
-# CurrencyAUD=AU Dollars
-# CurrencySingAUD=AU Dollar
-# CurrencyCAD=CAN Dollars
-# CurrencySingCAD=CAN Dollar
-# CurrencyCHF=Swiss Francs
-# CurrencySingCHF=Swiss Franc
-# CurrencyEUR=Euros
-# CurrencySingEUR=Euro
-# CurrencyFRF=French Francs
-# CurrencySingFRF=French Franc
-# CurrencyGBP=GB Pounds
-# CurrencySingGBP=GB Pound
-# CurrencyINR=Indian rupees
-# CurrencySingINR=Indian rupee
-# CurrencyMAD=Dirham
-# CurrencySingMAD=Dirham
-# CurrencyMGA=Ariary
-# CurrencySingMGA=Ariary
-# CurrencyMUR=Mauritius rupees
-# CurrencySingMUR=Mauritius rupee
-# CurrencyNOK=Norwegian krones
-# CurrencySingNOK=Norwegian krone
-# CurrencyTND=Tunisian dinars
-# CurrencySingTND=Tunisian dinar
-# CurrencyUSD=US Dollars
-# CurrencySingUSD=US Dollar
-# CurrencyUAH=Hryvnia
-# CurrencySingUAH=Hryvnia
-# CurrencyXAF=CFA Francs BEAC
-# CurrencySingXAF=CFA Franc BEAC
-# CurrencyXOF=CFA Francs BCEAO
-# CurrencySingXOF=CFA Franc BCEAO
-# CurrencyXPF=CFP Francs
-# CurrencySingXPF=CFP Franc
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+Currencyeuros=Eurų
+CurrencyAUD=AUS doleriai
+CurrencySingAUD=AUS doleris
+CurrencyCAD=CAN doleriai
+CurrencySingCAD=CAN doleris
+CurrencyCHF=Šveicarijos frankas
+CurrencySingCHF=Šveicarijos frankas
+CurrencyEUR=Eurų
+CurrencySingEUR=Euras
+CurrencyFRF=Prancūzijos frankas
+CurrencySingFRF=Prancūzijos frankas
+CurrencyGBP=Didžiosios Britanijos svarais
+CurrencySingGBP=GB svaras
+CurrencyINR=Indijos rupijų
+CurrencySingINR=Indijos rupija
+CurrencyMAD=Dirhamas
+CurrencySingMAD=Dirhamas
+CurrencyMGA=Ariaris
+CurrencySingMGA=Ariaris
+CurrencyMUR=Mauricijaus rupijų
+CurrencySingMUR=Mauricijaus rupija
+CurrencyNOK=Norvegijos kronų
+CurrencySingNOK=Norvegijos krona
+CurrencyTND=Tuniso dinaras
+CurrencySingTND=Tuniso dinaras
+CurrencyUSD=JAV doleriai
+CurrencySingUSD=JAV doleris
+CurrencyUAH=Grivina
+CurrencySingUAH=Grivina
+CurrencyXAF=CFA frankai BEAC
+CurrencySingXAF=CFA frankas BEAC
+CurrencyXOF=CFA frankai BCEAO
+CurrencySingXOF=CFA BCEAO frankas
+CurrencyXPF=CFP frankai
+CurrencySingXPF=CFP frankas
+CurrencyCentSingEUR=centas
+CurrencyCentINR=paisa (1/100 rupijos)
+CurrencyCentSingINR=paisa (1/100 rupijos)
+CurrencyThousandthSingTND=tūkstantasis
 #### Input reasons #####
-# DemandReasonTypeSRC_INTE=Internet
-# DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-# DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-# DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-# DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-# DemandReasonTypeSRC_COMM=Commercial contact
-# DemandReasonTypeSRC_SHOP=Shop contact
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_INTE=Internetas
+DemandReasonTypeSRC_CAMP_MAIL=Pašto kampanija
+DemandReasonTypeSRC_CAMP_EMAIL=E-Pašto kampanija
+DemandReasonTypeSRC_CAMP_PHO=Telefoninė kampanija
+DemandReasonTypeSRC_CAMP_FAX=Faksinė kampanija
+DemandReasonTypeSRC_COMM=Komerciniai kontaktai
+DemandReasonTypeSRC_SHOP=Parduotuvės kontaktai
+DemandReasonTypeSRC_WOM=Žodis
+DemandReasonTypeSRC_PARTNER=Partneris
+DemandReasonTypeSRC_EMPLOYEE=Darbuotojas
+DemandReasonTypeSRC_SPONSORING=Rėmimas
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Formatas 4A0
+PaperFormatEU2A0=Formatas 2A0
+PaperFormatEUA0=Formatas A0
+PaperFormatEUA1=Formatas A1
+PaperFormatEUA2=Formatas A2
+PaperFormatEUA3=Formatas A3
+PaperFormatEUA4=Formatas A4
+PaperFormatEUA5=Formatas A5
+PaperFormatEUA6=Formatas A6
+PaperFormatUSLETTER=Formatas Letter US
+PaperFormatUSLEGAL=Formatas Legal US
+PaperFormatUSEXECUTIVE=Formatas Executive US
+PaperFormatUSLEDGER=Formatas Ledger/Tabloid
+PaperFormatCAP1=Formatas P1 Kanada
+PaperFormatCAP2=Formatas P2 Kanada
+PaperFormatCAP3=Formatas P3 Kanada
+PaperFormatCAP4=Formatas P4 Kanada
+PaperFormatCAP5=Formatas P5 Kanada
+PaperFormatCAP6=Formatas P6 Kanada
diff --git a/htdocs/langs/lt_LT/donations.lang b/htdocs/langs/lt_LT/donations.lang
index 145d05b7cf1..5786862a6a5 100644
--- a/htdocs/langs/lt_LT/donations.lang
+++ b/htdocs/langs/lt_LT/donations.lang
@@ -6,6 +6,8 @@ Donor=Donoras
 Donors=Donorai
 AddDonation=Create a donation
 NewDonation=Nauja auka
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Rodyti auką
 DonationPromise=Dovanos pažadas
 PromisesNotValid=Nepripažinti galiojančiais pažadai
@@ -21,6 +23,8 @@ DonationStatusPaid=Gauta auka
 DonationStatusPromiseNotValidatedShort=Projektas/apmatai
 DonationStatusPromiseValidatedShort=Pripažintas galiojančiu
 DonationStatusPaidShort=Gautas
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Pažadą pripažinti galiojančiu
 DonationReceipt=Aukos įplaukos
 BuildDonationReceipt=Sukurti įplaukas
@@ -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
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 4f45a89c521..8112a8f674a 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/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=Privalomi nustatymų parametrai dar nėra apibrėžti
diff --git a/htdocs/langs/lt_LT/link.lang b/htdocs/langs/lt_LT/link.lang
index 8b1efb75ef3..c48d83ce6e4 100644
--- a/htdocs/langs/lt_LT/link.lang
+++ b/htdocs/langs/lt_LT/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
+LinkANewFile=Susieti naują filą / dokumentą
 LinkedFiles=Linked files and documents
 NoLinkFound=No registered links
 LinkComplete=The file has been linked successfully
 ErrorFileNotLinked=The file could not be linked
 LinkRemoved=The link %s has been removed
 ErrorFailedToDeleteLink= Failed to remove link '%s'
-ErrorFailedToUpdateLink= Failed to update link '%s'
+ErrorFailedToUpdateLink= Nesėkmingas sąsajos '%s' atnaujinimas
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 39c860d518d..609ecce2f42 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Visų išsiųstų e-pašto pranešimų sąrašas
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 1ff97860263..f3b8fc5263e 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -352,6 +352,7 @@ Status=Būklė
 Favorite=Favorite
 ShortInfo=Informacija
 Ref=Nuoroda
+ExternalRef=Ref. extern
 RefSupplier=Tiekėjo nuoroda
 RefPayment=Mokėjimo nuoroda
 CommercialProposalsShort=Komerciniai pasiūlymai
@@ -394,8 +395,8 @@ Available=Prieinamas
 NotYetAvailable=Dar nėra prieinamas
 NotAvailable=Nėra prieinamas
 Popularity=Populiarumas
-Categories=Kategorijos
-Category=Kategorija
+Categories=Tags/categories
+Category=Tag/category
 By=Pagal
 From=Nuo
 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=Pirmadienis
 Tuesday=Antradienis
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index 9ddb927bb6f..6ad2ae7c62c 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Gabenti produktą
 Discount=Nuolaida
 CreateOrder=Sukurti Užsakymą
 RefuseOrder=Atmesti užsakymą
-ApproveOrder=Priimti užsakymą
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Patvirtinti užsakymą
 UnvalidateOrder=Nepatvirtinti užsakymo
 DeleteOrder=Ištrinti užsakymą
@@ -102,6 +103,8 @@ ClassifyBilled=Rūšiuoti pateiktas sąskaitas-faktūras
 ComptaCard=Apskaitos kortelė
 DraftOrders=Užsakymų projektai
 RelatedOrders=Susiję užsakymai
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Apdorojami užsakymai
 RefOrder=Užsakymo nuoroda
 RefCustomerOrder=Kliento užsakymo nuoroda
@@ -118,6 +121,7 @@ PaymentOrderRef=Užsakymo apmokėjimas %s
 CloneOrder=Užsakymo klonavimas
 ConfirmCloneOrder=Ar tikrai norite klonuoti šį užsakymą %s ?
 DispatchSupplierOrder=Tiekėjo užsakymo %s gavimas
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Sekančio kliento užsakymo atstovas
 TypeContact_commande_internal_SHIPPING=Sekančio pakrovimo atstovas
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 1a21722f710..0dcd8e7f106 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervencija patvirtinta
 Notify_FICHINTER_SENTBYMAIL=Intervencija nusiųsta paštu
 Notify_BILL_VALIDATE=Kliento sąskaita-faktūra patvirtinta
 Notify_BILL_UNVALIDATE=Kliento sąskaita-faktūra nepatvirtinta
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Tiekėjo užsakymas patvirtintas
 Notify_ORDER_SUPPLIER_REFUSE=Tiekėjo užsakymas atmestas
 Notify_ORDER_VALIDATE=Kliento užsakymas patvirtintas
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Komercinis pasiūlymas nusiųstas paštu
 Notify_BILL_PAYED=Kliento sąskaita-faktūra apmokėta
 Notify_BILL_CANCEL=Kliento sąskaita-faktūra atšaukta
 Notify_BILL_SENTBYMAIL=Kliento sąskaita-faktūra išsiųsta paštu
-Notify_ORDER_SUPPLIER_VALIDATE=Tiekėjo užsakymas patvirtintas
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Tiekėjo užsakymas išsiųstas paštu
 Notify_BILL_SUPPLIER_VALIDATE=Tiekėjo sąskaita-faktūra patvirtinta
 Notify_BILL_SUPPLIER_PAYED=Tiekėjo sąskaita-faktūra apmokėta
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Projekto kūrimas
 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=Prikabintų failų/dokumentų skaičius
 TotalSizeOfAttachedFiles=Iš viso prikabintų failų/dokumentų dydis
 MaxSize=Maksimalus dydis
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Sąskaita-faktūra %s buvo patvirtinta
 EMailTextProposalValidated=Pasiūlymas %s patvirtintas
 EMailTextOrderValidated=Užsakymas %s pripažintas galiojančiu
 EMailTextOrderApproved=Užsakymas %s patvirtintas
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Užsakymas %s buvo patvirtintas %s
 EMailTextOrderRefused=Užsakymas %s atmestas
 EMailTextOrderRefusedBy=Užsakymas %s atmestas %s
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 119a17d71e2..6148b31c11a 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 571dc0007cc..385638c087f 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Tiekėjo sąskaitų-faktūrų, susijusių
 ListContractAssociatedProject=Sudarytų sutarčių, susijusių su projektu, sąrašas
 ListFichinterAssociatedProject=Intervencijų, susijusių su projektu, sąrašas
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Įvykių, susijusių su projektu, sąrašas
 ActivityOnProjectThisWeek=Projekto aktyvumas šią savaitę
 ActivityOnProjectThisMonth=Projekto aktyvumas šį mėnesį
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index 15cf1916fcf..3003c65d6b7 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Pakrovimo nuoroda
 Sending=Pakrovimas
 Sendings=Pakrovimai
+AllSendings=All Shipments
 Shipment=Siunta
 Shipments=Pakrovimai
 ShowSending=Show Sending
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index 63a3de6a9e5..c1510a3b5de 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Tiekėjai
-AddSupplier=Create a supplier
+AddSupplier=Sukurti tiekėją
 SupplierRemoved=Tiekėjas pašalintas
 SuppliersInvoice=Tiekėjo sąskaita-faktūra
 NewSupplier=Naujas tiekėjas
@@ -39,7 +39,8 @@ AddSupplierInvoice=Sukurti tiekėjo sąskaitą-faktūrą
 ListOfSupplierProductForSupplier=Produktų ir kainų sąrašas tiekėjui %s
 NoneOrBatchFileNeverRan=Nėra arba grupinis %s neseniai neįvyko
 SentToSuppliers=Nusiųsta tiekėjams
-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
+ListOfSupplierOrders=Tiekėjo užsakymų sąrašas
+MenuOrdersSupplierToBill=Tiekėjo užsakymai sąskaitoms
+NbDaysToDelivery=Pristatymo vėlavimas dienomis
+DescNbDaysToDelivery=Didžiausias vėlavimas rodomas
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 5cfd0de415e..26bdce05e84 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Atdalītājs
 ExtrafieldCheckBox=Rūtiņa
 ExtrafieldRadio=Radio poga
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Atalgojums
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Paziņojumi
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Ziedojumi
@@ -508,14 +511,14 @@ Module1400Name=Grāmatvedība
 Module1400Desc=Grāmatvedības vadība (dubultā partijas)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Sadaļas
-Module1780Desc=Kategoriju vadība (produktiem, piegādātājiem un klientiem)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG redaktors
 Module2000Desc=Ļauj rediģēt kādu teksta apgabalu, izmantojot uzlabotas redaktoru
 Module2200Name=Dinamiskas cenas
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Plānotais uzdevumu pārvaldība
+Module2300Desc=Scheduled job management
 Module2400Name=Darba kārtība
 Module2400Desc=Notikumi / uzdevumi un darba kārtības vadība
 Module2500Name=Elektroniskā satura pārvaldība
@@ -714,6 +717,11 @@ Permission510=Apskatīt algas
 Permission512=Izveidot/labot algas
 Permission514=Dzēst algas
 Permission517=Eksportēt algas
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Lasīt pakalpojumus
 Permission532=Izveidot/mainīt pakalpojumus
 Permission534=Dzēst pakalpojumus
@@ -746,6 +754,7 @@ Permission1185=Apstiprināt piegādātājq pasūtījumus
 Permission1186=Pasūtīt piegādātāja pasūtījumus
 Permission1187=Saņemšanu piegādātāju pasūtījumu
 Permission1188=Dzēst piegādātāju pasūtījumus
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Saņemt eksportēšanas rezultātu
 Permission1202=Izveidot/Modificēt eksportu
 Permission1231=Lasīt piegādātāja rēķinus
@@ -758,10 +767,10 @@ Permission1237=Eksporta piegādātāju pasūtījumus un to detaļas
 Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielāde)
 Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus
 Permission1421=Eksporta klientu pasūtījumus un atribūti
-Permission23001 = Skatīt plānoto uzdevumu
-Permission23002 = Izveidot/atjaunināt plānoto uzdevumu
-Permission23003 = Dzēst plānoto uzdevumu
-Permission23004 = Izpildīt plānoto uzdevumu
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=SKatīt darbības (pasākumi vai uzdevumi), kas saistīti ar kontu
 Permission2402=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
 Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Atgriezties grāmatvedības kodu būvēts pēc: 
 %
 ModuleCompanyCodePanicum=Atgriezt tukšu grāmatvedības uzskaites kodu.
 ModuleCompanyCodeDigitaria=Grāmatvedība kods ir atkarīgs no trešās personas kodu. Kods sastāv no simbols "C" pirmajā pozīcijā un pēc tam pirmais 5 zīmēm no trešās puses kodu.
 UseNotifications=Izmantot paziņojumus
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Dokumentu veidnes
 DocumentModelOdt=Izveidot dokumentus no OpenDocument veidnes (. ODT vai. ODS failus OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Ūdenszīme dokumenta projektā
@@ -1557,6 +1566,7 @@ SuppliersSetup=Piegādātāja moduļa iestatījumi
 SuppliersCommandModel=Pilnīga veidni no piegādātāja secībā (logo. ..)
 SuppliersInvoiceModel=Pilnīga veidni no piegādātāja rēķina (logo. ..)
 SuppliersInvoiceNumberingModel=Piegādātāju rēķinu numerācijas modeļus
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind moduļa iestatīšana
 PathToGeoIPMaxmindCountryDataFile=Ceļš uz failu, kas satur MaxMind ip uz valsti tulkojumu. 
 Piemēri: 
 / Usr / local / share / GeoIP / GeoIP.dat 
 / 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
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index 9cca7068840..362db73f511 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Rēķins %s apstiprināts
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Rēķins %s doties atpakaļ uz melnrakstu
 InvoiceDeleteDolibarr=Rēķins %s dzēsts
-OrderValidatedInDolibarr= Pasūtījums %s pārbaudīts
+OrderValidatedInDolibarr=Pasūtījums %s pārbaudīts
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Pasūtījums %s atcelts
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Pasūtījums %s apstiprināts
 OrderRefusedInDolibarr=Pasūtījums %s atteikts
 OrderBackToDraftInDolibarr=Pasūtījums %s doties atpakaļ uz melnrakstu
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Izveidot notikumu
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index cf62660e3df..51186618520 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -74,9 +74,9 @@ PaymentsAlreadyDone=Jau samaksāts
 PaymentsBackAlreadyDone=Maksājumi atpakaļ izdarījušas
 PaymentRule=Maksājuma noteikums
 PaymentMode=Maksājuma veids
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentTerm=Apmaksas noteikumi
+PaymentConditions=Apmaksas noteikumi
+PaymentConditionsShort=Apmaksas noteikumi
 PaymentAmount=Maksājuma summa
 ValidatePayment=Apstiprināt maksājumu
 PaymentHigherThanReminderToPay=Maksājumu augstāka nekā atgādinājums par samaksu
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Divām jaunajām atlaidēm jābūt vienāda
 ConfirmRemoveDiscount=Vai tiešām vēlaties noņemt šo atlaidi?
 RelatedBill=Saistītais rēķins
 RelatedBills=Saistītie rēķini
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Jaunākais sasitītais rēķins
 WarningBillExist=Uzmanību, viens vai vairāki rēķini jau eksistē
 
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 54d4a89cb71..b1c8e62adf0 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Sadaļa
-Categories=Sadaļas
-Rubrique=Sadaļa
-Rubriques=Sadaļas
-categories=sadaļas
-TheCategorie=Sadaļa
-NoCategoryYet=No category šī radīja veida
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Uz
 AddIn=Pievienot
 modify=modificēt
 Classify=Klasificēt
-CategoriesArea=Kategoriju sadaļa
-ProductsCategoriesArea=Produktu/Pakalpojumu sadaļas
-SuppliersCategoriesArea=Piegādātāju sadaļa
-CustomersCategoriesArea=Klientu sadaļa
-ThirdPartyCategoriesArea=Trešo personu sadaļa
-MembersCategoriesArea=Dalībnieku sadaļa
-ContactsCategoriesArea=Kontaktu sadaļa
-MainCats=Galvenās sadaļas
+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=Apakšsadaļas
 CatStatistics=Statistika
-CatList=Sadaļu saraksts
-AllCats=Visas sadaļas
-ViewCat=Skatīt sadaļu
-NewCat=Pievienot sadaļu
-NewCategory=Jauna sadaļa
-ModifCat=Mainīt sadaļu
-CatCreated=Sadaļa izveidota
-CreateCat=Izveidot sadaļu
-CreateThisCat=Izveidot šo sadaļu
+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=Apstiprināt laukus
 NoSubCat=Nav apakšsadaļas.
 SubCatOf=Apakšsadaļa
-FoundCats=Atrastās sadaļas
-FoundCatsForName=Sadaļas atrastas ar nosaukumu:
-FoundSubCatsIn=Apakšsadaļas atrastas sadaļā
-ErrSameCatSelected=Izvēlējāties to pašu sadaļu vairākas reizes
-ErrForgotCat=Jūs aizmirsāt izvēlēties sadaļu
+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=Jūs aizmirsāt, lai informētu laukus
 ErrCatAlreadyExists=Šis nosaukums jau tiek izmantots
-AddProductToCat=Pievienot šo produktu sadaļai?
-ImpossibleAddCat=Nav iespējams pievienot sadaļu
-ImpossibleAssociateCategory=Neiespējami saistīt kategoriju
+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 tika veiksmīgi pievienots.
-ObjectAlreadyLinkedToCategory=Elements ir jau saistīts ar šo sadaļu.
-CategorySuccessfullyCreated=Šī sadaļa %s ir pievienota veiksmīgi.
-ProductIsInCategories=Produkts / pakalpojums pieder pie šādām kategorijām
-SupplierIsInCategories=Trešai personai pieder sekojoša piegādātāju sadaļas
-CompanyIsInCustomersCategories=Šī trešā persona pieder pie šādiem klientiem / perspektīvas kategorijām
-CompanyIsInSuppliersCategories=Šī trešā persona pieder, lai pēc piegādātājiem sadaļas
-MemberIsInCategories=Šis dalībnieks ir šādās dalībnieku sadaļās
-ContactIsInCategories=Šī kontaktpersona pieder pie šādiem kontaktiem kategorijām
-ProductHasNoCategory=Šis produkts/pakalpojums nav nevienā sadaļā
-SupplierHasNoCategory=Šis piegādātājs nav nevienā sadaļā
-CompanyHasNoCategory=Šis uzņēmums nav nevienā sadaļā
-MemberHasNoCategory=Šis dalībnieks nav nevienā sadaļā
-ContactHasNoCategory=Šī kontaktpersona nav nekādas kategorijās
-ClassifyInCategory=Klasificēt sadaļā
+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=Nav
-NotCategorized=Bez sadaļas
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Šī sadaļa jau pastāv ar šo ref
 ReturnInProduct=Atpakaļ uz produktu / pakalpojumu karti
 ReturnInSupplier=Atpakaļ uz piegādātāju karti
@@ -66,22 +64,22 @@ ReturnInCompany=Atpakaļ uz klienta / izredzes kartes
 ContentsVisibleByAll=Saturs būs redzams visiem
 ContentsVisibleByAllShort=Saturs redzams visiem
 ContentsNotVisibleByAllShort=Saturu visi neredz
-CategoriesTree=Sadaļu koks
-DeleteCategory=Dzēst kategoriju
-ConfirmDeleteCategory=Vai tiešām vēlaties dzēst šo sadaļu?
-RemoveFromCategory=Noņemt sadaļas saiti
-RemoveFromCategoryConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījumu un sadaļu?
-NoCategoriesDefined=Nav izveidotu sadaļu
-SuppliersCategoryShort=Piegādātāju sadaļa
-CustomersCategoryShort=Klientu sadaļa
-ProductsCategoryShort=Produktu sadaļa
-MembersCategoryShort=Dalībnieku sadaļa
-SuppliersCategoriesShort=Piegādātāju sdaļas
-CustomersCategoriesShort=Klientu sadaļas
+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. sadaļas
-ProductsCategoriesShort=Produktu sadaļas
-MembersCategoriesShort=Dalībnieku sadaļas
-ContactCategoriesShort=Kontaktu sadaļas
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Šī sadaļā nav produktu.
 ThisCategoryHasNoSupplier=Šajā sadaļā nav neviena piegādātāja.
 ThisCategoryHasNoCustomer=Šī sadaļa nesatur klientu.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Šajā kategorijā nav nekādu kontaktu.
 AssignedToCustomer=Piešķirts klientam
 AssignedToTheCustomer=Piešķirts klientam
 InternalCategory=Iekšējā sadaļa
-CategoryContents=Sadaļas saturs
-CategId=Sadaļas id
-CatSupList=Piegādātāju sadaļu saraksts
-CatCusList=Klientu/perspektīva sadaļu saraksts
-CatProdList=Produktu sadaļu saraksts
-CatMemberList=Dalībnieku sadaļu saraksts
-CatContactList=Saraksts kontaktu kategorijām un kontaktu
-CatSupLinks=Saikne starp piegādātājiem un sadaļām
-CatCusLinks=Saiknes starp klientu / perspektīvām un kategorijām
-CatProdLinks=Saiknes starp produktu / pakalpojumu un kategoriju
-CatMemberLinks=Saikne starp biedriem un kategorijām
-DeleteFromCat=Noņemt no sadaļas
+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=Dzēst attēlu
 ConfirmDeletePicture=Apstiprināt attēla dzēšanu
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Sadaļas iestatījumi
-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=Rādīt sadaļu
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index d75495175ef..c879b80c2d6 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Pēdējo reizi palaist izejas
 CronLastResult=Pēdējais rezultātu kods
 CronListOfCronJobs=Saraksts ar plānotajiem darbiem
 CronCommand=Komanda
-CronList=Darbu saraksts
-CronDelete= Dzēst cron darbavietas
-CronConfirmDelete= Vai tiešām vēlaties dzēst šo cron darbu?
-CronExecute=Uzsākt darbu
-CronConfirmExecute= Vai esat pārliecināts, ka, lai izpildītu šo darbu tagad
-CronInfo= Darbs ļauj izpildīt uzdevumu, kas ir plānots
-CronWaitingJobs=Wainting darbavietas
+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=Darbs
-CronNone= Nav
+CronNone=Nav
 CronDtStart=Sākuma datums
 CronDtEnd=Beigu datums
 CronDtNextLaunch=Nākošā izpilde
@@ -75,6 +75,7 @@ CronObjectHelp=Objekta nosaukums, lai slodze. 
 Par exemple atnest metodi Dol
 CronMethodHelp=Objekts metode, lai palaistu. 
 Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / produktu / klase / product.class.php, metodes vērtība ir ir fecth
 CronArgsHelp=Šī metode argumentus. 
 Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / produktu / klase / product.class.php, no paramters vērtība var būt 0, ProductRef
 CronCommandHelp=Sistēma komandrindas izpildīt.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informācija
 # Common
@@ -84,4 +85,4 @@ CronType_command=Shell komandu
 CronMenu=Cron
 CronCannotLoadClass=Nevar ielādēt klases %s vai objektu %s
 UseMenuModuleToolsToAddCronJobs=Iet uz izvēlni "Home - moduļi instrumenti - Darbs sarakstu", lai redzētu un rediģēt plānoto darbu.
-TaskDisabled=Task disabled
+TaskDisabled=Uzdevums bloķēts
diff --git a/htdocs/langs/lv_LV/donations.lang b/htdocs/langs/lv_LV/donations.lang
index 0d9036343bb..792b322fd91 100644
--- a/htdocs/langs/lv_LV/donations.lang
+++ b/htdocs/langs/lv_LV/donations.lang
@@ -6,6 +6,8 @@ Donor=Donors
 Donors=Donori
 AddDonation=Izveidot ziedojumu
 NewDonation=Jauns ziedojums
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Rādīt ziedojumu
 DonationPromise=Dāvanu solījumu
 PromisesNotValid=Nav apstiprinātas solījumi
@@ -21,6 +23,8 @@ DonationStatusPaid=Ziedojums saņemts
 DonationStatusPromiseNotValidatedShort=Melnraksts
 DonationStatusPromiseValidatedShort=Apstiprināts
 DonationStatusPaidShort=Saņemti
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Apstiprināt solījumu
 DonationReceipt=Ziedojuma kvīts
 BuildDonationReceipt=Veidot kvīti
@@ -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
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index c3f12157435..916ac4676a6 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Nezināma kļūda '%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=Obligātie uzstādīšanas parametri vēl nav definētas
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 2a1530a3612..8276f5a23aa 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Uzskaitīt visus e-pasta nosūtītās paziņojumus
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index edc3343f1be..c080d22c708 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -221,7 +221,7 @@ Cards=Kartes
 Card=Karte
 Now=Tagad
 Date=Datums
-DateAndHour=Date and hour
+DateAndHour=Datums un laiks
 DateStart=Sākuma datums
 DateEnd=Beigu datums
 DateCreation=Izveidošanas datums
@@ -352,6 +352,7 @@ Status=Statuss
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. piegādātājs
 RefPayment=Ref. maksājums
 CommercialProposalsShort=Komerciālie priekšlikumi
@@ -394,8 +395,8 @@ Available=Pieejams
 NotYetAvailable=Nav vēl pieejams
 NotAvailable=Nav pieejams
 Popularity=Popularitāte
-Categories=Sadaļas
-Category=Sadaļa
+Categories=Tags/categories
+Category=Tag/category
 By=Līdz
 From=No
 to=līdz
@@ -693,7 +694,8 @@ PublicUrl=Publiskā saite
 AddBox=Pievienot info logu
 SelectElementAndClickRefresh=Izvēlieties elementu un nospiediet atjaunot
 PrintFile=Print File %s
-ShowTransaction=Show transaction
+ShowTransaction=Rādīt transakcijas
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Pirmdiena
 Tuesday=Otrdiena
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index abed9fe2985..c53ed262d23 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -59,12 +59,13 @@ MenuOrdersToBill=Pasūtījumi piegādāti
 MenuOrdersToBill2=Billable orders
 SearchOrder=Meklēšanas kārtība
 SearchACustomerOrder=Meklēt klienta pasūtījumu
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Meklēt piegādātāja pasūtījumu
 ShipProduct=Sūtīt produktu
 Discount=Atlaide
 CreateOrder=Izveidot pasūtījumu
 RefuseOrder=Atteikt pasūtījumu
-ApproveOrder=Pieņemt pasūtījumu
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Apstiprināt pasūtījumu
 UnvalidateOrder=Unvalidate pasūtījumu
 DeleteOrder=Dzēst pasūtījumu
@@ -102,6 +103,8 @@ ClassifyBilled=Klasificēt rēķins
 ComptaCard=Grāmatvedības kartiņa
 DraftOrders=Projekts pasūtījumi
 RelatedOrders=Saistītie pasūtījumi
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Pasūtījumi procesā
 RefOrder=Ref. pasūtījuma
 RefCustomerOrder=Ref. klienta rīkojums
@@ -118,6 +121,7 @@ PaymentOrderRef=Apmaksa pasūtījumu %s
 CloneOrder=Klonēt pasūtījumu
 ConfirmCloneOrder=Vai jūs tiešām vēlaties klonēt šo pasūtījumu %s ?
 DispatchSupplierOrder=Saņemšanas piegādātājs pasūtījuma %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Pārstāvis turpinot darboties klienta pasūtījumu
 TypeContact_commande_internal_SHIPPING=Pārstāvis turpinot darboties kuģniecības
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 731b200e05d..fa1e46bc8e2 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervences apstiprināts
 Notify_FICHINTER_SENTBYMAIL=Intervences nosūtīt pa pastu
 Notify_BILL_VALIDATE=Klienta rēķins apstiprināts
 Notify_BILL_UNVALIDATE=Klienta rēķins neapstiprināts
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Piegādātājs, lai apstiprinātu
 Notify_ORDER_SUPPLIER_REFUSE=Piegādātājs lai atteicās
 Notify_ORDER_VALIDATE=Klienta rīkojumu apstiprināts
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial priekšlikums nosūtīts pa pastu
 Notify_BILL_PAYED=Klienta rēķins samaksāts
 Notify_BILL_CANCEL=Klienta rēķins atcelts
 Notify_BILL_SENTBYMAIL=Klienta rēķins nosūtīts pa pastu
-Notify_ORDER_SUPPLIER_VALIDATE=Piegādātāja pasūtījums pārbaudīts
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Piegādātājs rīkojumam, kas nosūtīts pa pastu
 Notify_BILL_SUPPLIER_VALIDATE=Piegādātāja rēķins apstiprināts
 Notify_BILL_SUPPLIER_PAYED=Piegādātāja rēķins jāapmaksā
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Projekts izveidots
 Notify_TASK_CREATE=Uzdevums izveidots
 Notify_TASK_MODIFY=Uzdevums labots
 Notify_TASK_DELETE=Uzdevums dzēsts
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Skaits pievienotos failus / dokumentus
 TotalSizeOfAttachedFiles=Kopējais apjoms pievienotos failus / dokumentus
 MaxSize=Maksimālais izmērs
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Rēķins %s ir apstiprināts.
 EMailTextProposalValidated=Priekšlikums %s ir apstiprināts.
 EMailTextOrderValidated=Pasūtījums %s ir apstiprināts.
 EMailTextOrderApproved=Pasūtījums %s ir apstiprināts.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Pasūtījumu %s ir apstiprinājis %s.
 EMailTextOrderRefused=Pasūtījums %s ir noraidīts.
 EMailTextOrderRefusedBy=Pasūtījums %s ir noraidījis %s.
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 0a00746d8e3..4ea82dbcfbd 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimālā rekomendējamā cena : %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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Numurs
-DefaultPrice=Default price
+DefaultPrice=Noklusējuma cena
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+ComposedProduct=Apakš produkts
+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
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 975654740b1..534102353d3 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Saraksts no piegādātāja rēķinus saist
 ListContractAssociatedProject=Līgumu sarakstu kas saistīti ar projektu
 ListFichinterAssociatedProject=Saraksts iejaukšanās saistīts ar projektu
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Saraksts ar notikumiem, kas saistīti ar projektu
 ActivityOnProjectThisWeek=Aktivitāte projektu šonedēļ
 ActivityOnProjectThisMonth=Aktivitāte projektu šomēnes
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index 3816af9db35..03d28db44fe 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. sūtījumam
 Sending=Sūtījums
 Sendings=Sūtījumi
+AllSendings=All Shipments
 Shipment=Sūtījums
 Shipments=Sūtījumi
 ShowSending=Show Sending
@@ -23,7 +24,7 @@ QtyOrdered=Pasūtītais daudzums
 QtyShipped=Daudzums kas nosūtīts
 QtyToShip=Daudzums, kas jānosūta
 QtyReceived=Saņemtais daudzums
-KeepToShip=Remain to ship
+KeepToShip=Vēl jāpiegādā
 OtherSendingsForSameOrder=Citas sūtījumiem uz šo rīkojumu
 DateSending=Datums nosūtot kārtība
 DateSendingShort=Datums nosūtot kārtība
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 5d278bd1f7a..5cdb13ce298 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Saraksts ar piegādātāju pasūtījumiem
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Piegādes kavēšanās dienās
 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)
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/mk_MK/donations.lang b/htdocs/langs/mk_MK/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/mk_MK/donations.lang
+++ b/htdocs/langs/mk_MK/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/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
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 81deb7c28f0..27779080dd0 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/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 %s ?
 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
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/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.
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/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)
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index a094028679b..bd5c4996e2a 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Avmerkingsboks
 ExtrafieldRadio=Radio-knapp
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -494,6 +495,8 @@ Module500Name=Spesielle utgifter (skatt, sosiale bidrag, utbytte)
 Module500Desc=Forvaltning av spesielle utgifter som skatt, sosiale bidrag, utbytte og lønn
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Varselmeldinger
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donasjoner
@@ -508,14 +511,14 @@ Module1400Name=Regnskapsekspert
 Module1400Desc=Behandling av regnskapssopplysninger for eksperter (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorier
-Module1780Desc=Behandling av kategorier (varer, leverandører og kunder)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Behandle planlagte oppgaver
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Handlinger/oppgaver og agendabehandling
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Les Lønn
 Permission512=Opprett/endre lønn
 Permission514=Slett lønn
 Permission517=Eksporter lønn
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Les tjenester
 Permission532=Opprett / endre tjenester
 Permission534=Slett tjenester
@@ -746,6 +754,7 @@ Permission1185=Godkjenne leverandørordre
 Permission1186=Bestille leverandørordre
 Permission1187=Bekrefte mottak av leverandørordre
 Permission1188=Lukke leverandørordre
+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=Eksporter leverandør-bestillinger og detaljer
 Permission1251=Kjør massen import av eksterne data til database (data last)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
 Permission1421=Eksport kundeordre og attributter
-Permission23001 = Les Planlagt oppgave
-Permission23002 = Lag / oppdater Planlagt oppgave
-Permission23003 = Slett planlagt oppgave
-Permission23004 = Utfør planlagt oppgave
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Vise handlinger (hendelser og oppgaver) lenket til egen brukerkonto
 Permission2402=Lage/endre/slette handlinger (hendelser og oppgaver) lenket til egen brukerkonto
 Permission2403=Vise andre personers handlinger (hendelser og oppgaver)
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by %s followed by thi
 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=Bruk beskjeder
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Dokumenter maler
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vannmerke på utkast
@@ -1557,6 +1566,7 @@ SuppliersSetup=Leverandør modulen oppsett
 SuppliersCommandModel=Komplett mal av leverandør rekkefølge (logo. ..)
 SuppliersInvoiceModel=Komplett mal av leverandør faktura (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 modul-oppsett
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index dfddfc2b3e6..e2da157733d 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura godkjent
 InvoiceValidatedInDolibarrFromPos=Faktura %s godkjent fra POS
 InvoiceBackToDraftInDolibarr=Faktura %s gå tilbake til utkast status
 InvoiceDeleteDolibarr=Faktura %s slettet
-OrderValidatedInDolibarr= Ordre godkjent
+OrderValidatedInDolibarr=Ordre godkjent
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Bestill %s kansellert
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Bestill %s godkjent
 OrderRefusedInDolibarr=Ordre %s nektet
 OrderBackToDraftInDolibarr=Bestill %s gå tilbake til utkast status
@@ -91,3 +94,5 @@ WorkingTimeRange=Arbeidstid
 WorkingDaysRange=Arbeidsuke
 AddEvent=Opprett hendelse
 MyAvailability=Min tilgjengelighet
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 510cc00557a..033c9414bfd 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -23,13 +23,13 @@ InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=Proforma faktura er et bilde av en ekte faktura, men har ingen regnskapsføring verdi.
 InvoiceReplacement=Erstatningsfaktura. Må erstatte faktura med referanse
 InvoiceReplacementAsk=Erstatningsfaktura for faktura
-InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=Erstatningsfaktura brukes til å avbryte og erstatte en faktura uten at betaling allerede er mottatt. 

 Merk: Bare faktura uten innbetaling kan erstattes. Hvis ikke faktura er stengt, vil den bli automatisk satt til 'forlatt'.
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota for å korriger fektura
 InvoiceAvoirDesc=En kreditnota er en negativ faktura som brukes for å løse situasjoner hvor en faktura har et annet beløp enn det som virkelig er betalt (fordi kunden har betalt for lite ved en feil, eller for eksempel ikke ønsker å betale alt fordi han har returnert noen varer.).

Obs!: Originalfakturaen må allerede være lukket ('betalt' eller 'delbetalt') for at du skal kunne opprette en kreditnota mot den.
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithLines=Opprett kreditnota med opprinnelige fakturalinjer
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirLineWithPaymentRestAmount=Kreditnota for restbeløp
 ReplaceInvoice=Erstatt faktura %s
 ReplacementInvoice=Erstatningsfaktura
 ReplacedByInvoice=Erstattet av faktura %s
@@ -74,9 +74,9 @@ PaymentsAlreadyDone=Betalinger allerede utført
 PaymentsBackAlreadyDone=Tilbakebetalinger allerede utført
 PaymentRule=Betalingsregel
 PaymentMode=Betalingsmåte
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentTerm=Betalingsbetingelser
+PaymentConditions=Betalingsbetingelser
+PaymentConditionsShort=Betalingsbetingelser
 PaymentAmount=Beløp til betaling
 ValidatePayment=Godkjenn betaling
 PaymentHigherThanReminderToPay=Betalingen er høyere enn restbeløp
@@ -155,9 +155,9 @@ ConfirmCancelBill=Er du sikker på at du vil kansellere faktura %s ?
 ConfirmCancelBillQuestion=hvorfor vil du tapsføre denne fakturaen?
 ConfirmClassifyPaidPartially=Er du sikker på at du vil endre status på faktura %s til betalt?
 ConfirmClassifyPaidPartiallyQuestion=Denne fakturaen er ikke fullt ut betalt. Hva er grunnen til at du vil lukke fakturaen?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg ønsker å rette opp MVA med en kreditnota.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg aksepterer å miste MVA på denne rabatten.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Restebløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg skriver av MVA på denne rabatten uten kreditnota.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Dårlig kunde
 ConfirmClassifyPaidPartiallyReasonProductReturned=Varer delvis returnert
 ConfirmClassifyPaidPartiallyReasonOther=Beløpet tapsføres av en annen årsak
@@ -190,9 +190,9 @@ AlreadyPaid=Allerede betalt
 AlreadyPaidBack=Allerede tilbakebetalt
 AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditt notater og innskudd)
 Abandoned=Tapsført
-RemainderToPay=Remaining unpaid
+RemainderToPay=Restbeløp
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Resterende beløp å betale:
 Rest=Ventende
 AmountExpected=Beløp purret
 ExcessReceived=Overskytende
@@ -223,13 +223,13 @@ NonPercuRecuperable=Non-recoverable
 SetConditions=Angi betalingsbetingelser
 SetMode=Angi betalingsmodus
 Billed=Fakturert
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Fakturamal
+RepeatableInvoices=Fakturamaler
+Repeatable=Mal
+Repeatables=Maler
+ChangeIntoRepeatableInvoice=Gjør om til fakturamal
+CreateRepeatableInvoice=Opprett fakturamal
+CreateFromRepeatableInvoice=Opprett fra fakturamal
 CustomersInvoicesAndInvoiceLines=Kundefakturaer og fakturalinjer
 CustomersInvoicesAndPayments=Kundefakturaer og betalinger
 ExportDataset_invoice_1=Oversikt over kundefakturaer og fakturalinjer
@@ -243,7 +243,7 @@ Discount=Rabatt
 Discounts=Rabatter
 AddDiscount=Legg til rabatt
 AddRelativeDiscount=Lag relativ rabatt
-EditRelativeDiscount=Edit relative discount
+EditRelativeDiscount=Endre relativ rabatt
 AddGlobalDiscount=Legg til rabatt
 EditGlobalDiscounts=Rediger absolutte rabatter
 AddCreditNote=Lag kreditt notat
@@ -294,7 +294,9 @@ TotalOfTwoDiscountMustEqualsOriginal=Totalt to nye rabatt må være lik original
 ConfirmRemoveDiscount=Er du sikker på at du vil fjerne denne rabatten?
 RelatedBill=Relaterte faktura
 RelatedBills=Relaterte fakturaer
-LatestRelatedBill=Latest related invoice
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
+LatestRelatedBill=Siste tilknyttede faktura
 WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
@@ -310,8 +312,8 @@ PaymentConditionShort60DENDMONTH=Leveringsmåned + 60 dager
 PaymentCondition60DENDMONTH=Leveringsmåned + 60 dager
 PaymentConditionShortPT_DELIVERY=Levering
 PaymentConditionPT_DELIVERY=Ved levering
-PaymentConditionShortPT_ORDER=On order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_ORDER=I bestilling
+PaymentConditionPT_ORDER=I bestilling
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% i forskudd, 50%% ved levering
 FixAmount=Fast beløp
@@ -396,7 +398,7 @@ AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil
 ToMakePayment=Betal
 ToMakePaymentBack=Tilbakebetal
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+NoteListOfYourUnpaidInvoices=Denne listen inneholder kun fakturaer for tredjeparter du er koblet til som salgsrepresentant.
 RevenueStamp=Revenue stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
 PDFCrabeDescription=Fakturamal Crabe. En komplett mal (Støtter MVA, rabatter, betalingsbetingelser, logo, osv...)
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index d03d3f0aa7b..662c28bdc3b 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategori
-Categories=Kategorier
-Rubrique=Kategori
-Rubriques=Kategorier
-categories=kategorier
-TheCategorie=Kategorien
-NoCategoryYet=Ingen kategori av denne typen er opprettet
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=I
 AddIn=Legg til i
 modify=endre
 Classify=Klassifiser
-CategoriesArea=Kategoriområde
-ProductsCategoriesArea=Område for kategorier : produkter/tjenester
-SuppliersCategoriesArea=Område for kategorier : Leverandører
-CustomersCategoriesArea=Område for kategorier : Kunder
-ThirdPartyCategoriesArea=Område for kategorier : Tredjeparter
-MembersCategoriesArea=Medlemmers kategoriområder
-ContactsCategoriesArea=Kontaktkategorier 
-MainCats=Hovedkategorier
+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=Underkategorier
 CatStatistics=Statistikk
-CatList=Liste over kategorier
-AllCats=Alle kategorier
-ViewCat=Vis kategori
-NewCat=Legg til kategori
-NewCategory=Ny kategori
-ModifCat=Endre kategori
-CatCreated=Kategori opprettet
-CreateCat=Opprett kategori
-CreateThisCat=Opprett denne kategorien
+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=Godkjenn feltene
 NoSubCat=Ingen underkategori.
 SubCatOf=Undekategori
-FoundCats=Kategorier funnet
-FoundCatsForName=Fant kategorier med navnet :
-FoundSubCatsIn=Undekategorier funnet i kategorien
-ErrSameCatSelected=Du har valgt samme kategori flere ganger
-ErrForgotCat=Du glemte å velge kategorien
+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=Du glemte feltene
 ErrCatAlreadyExists=Dette navnet er allerede i bruk
-AddProductToCat=Legg til dette produktet i en kategori?
-ImpossibleAddCat=Umulig å legge til kategorien
-ImpossibleAssociateCategory=Umulig å knytte kategorien til
+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 ble lagt til.
-ObjectAlreadyLinkedToCategory=Elementet er allerede lenket til denne kategorien.
-CategorySuccessfullyCreated=Kategorien %s er opprettet.
-ProductIsInCategories=Dette produktet/tjenesten hører til følgende kategorier
-SupplierIsInCategories=Denne tredjeparten hører til følgende leverandørkategorier
-CompanyIsInCustomersCategories=Denne tredjeparten hører til følgende kunder/prospektkategorier
-CompanyIsInSuppliersCategories=Denne tredjeparten hører til følgende leverandørkategorier
-MemberIsInCategories=Dette medlemmet hører til følgende medlemmeskategorier
-ContactIsInCategories=Denne kontakten hører til følgende kontaktkategorier
-ProductHasNoCategory=Dette produktet/tjenesten er ikke i noen kategorier
-SupplierHasNoCategory=Denne leverandøren er ikke i noen kategorier
-CompanyHasNoCategory=Dette firmaet er ikke i noen kategorier
-MemberHasNoCategory=Dette medlem er ikke i noen kategorier
-ContactHasNoCategory=Denne kontakten er ikke i noen kategorier
-ClassifyInCategory=Klassifiser i kategori
+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=Ingen
-NotCategorized=Uten kategori
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denne kategorien finnes allerede med denne referansen
 ReturnInProduct=Tilbake til produkt-/tjenestekort
 ReturnInSupplier=Tilbake til leverandørkort
@@ -66,22 +64,22 @@ ReturnInCompany=Tilbake til kunde-/prospektkort
 ContentsVisibleByAll=Inneholdet vil være synlig for alle
 ContentsVisibleByAllShort=Innhold synlig for alle
 ContentsNotVisibleByAllShort=Innhold ikke synlig for alle
-CategoriesTree=Kategori-tre
-DeleteCategory=Slett kategori
-ConfirmDeleteCategory=Er du sikker på at du vil slette denne kategorien?
-RemoveFromCategory=Fjern lenke med kategori
-RemoveFromCategoryConfirm=Er du sikker på at du vil fjerne lenken mellom transaksjonen og kategorien?
-NoCategoriesDefined=Ingen kategori definert
-SuppliersCategoryShort=Leverandøkategori
-CustomersCategoryShort=Kundekategori
-ProductsCategoryShort=Produktkategori
-MembersCategoryShort=Medlemskategori
-SuppliersCategoriesShort=Leverandøkategorier
-CustomersCategoriesShort=Kundekategorier
+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=Kunde-/prospektkategorier
-ProductsCategoriesShort=Produktkategorier
-MembersCategoriesShort=Medlemskategorier
-ContactCategoriesShort=Kontaktkategorier
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Denne kategorien inneholder ingen produkter.
 ThisCategoryHasNoSupplier=Denne kategorien inneholder ingen leverandører.
 ThisCategoryHasNoCustomer=Denne kategorien inneholder ingen kunder.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Denne kategorien inneholder ikke noen kontakt.
 AssignedToCustomer=Knyttet til en kunde
 AssignedToTheCustomer=Knyttet til kunden
 InternalCategory=Intern kategori
-CategoryContents=Innhold i kategori
-CategId=Kategori-ID
-CatSupList=Liste av leverandørkategorier
-CatCusList=Liste over kunde-/prospektkategorier
-CatProdList=Liste over produktkategorier
-CatMemberList=Liste over medlemskategorier
-CatContactList=Liste over kontaktkategorier og kontakt
-CatSupLinks=Koblinger mellom leverandører og kategorier
-CatCusLinks=Koblinger mellom kunder/prospekter og kategorier
-CatProdLinks=Koblinger mellom produkter/tjenester og kategorier
-CatMemberLinks=Koblinger mellom medlemmer og kategorier
-DeleteFromCat=Fjern fra kategori
+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=Slette bilde 
 ConfirmDeletePicture=Bekreft bildesletting?
 ExtraFieldsCategories=Komplementære attributter
-CategoriesSetup=Kategori-oppsett
-CategorieRecursiv=Link automatisk med overordnet kategori
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Hvis aktivert, vil produktet også knyttes til overordnet kategori når du legger inn en underkategori
 AddProductServiceIntoCategory=Legg til følgende produkt/tjeneste
-ShowCategory=Vis kategori
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index e15b4232a60..848d170e2cc 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/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= Ingen
+CronNone=Ingen
 CronDtStart=Startdato
 CronDtEnd=Sluttdato
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/nb_NO/donations.lang b/htdocs/langs/nb_NO/donations.lang
index 5b4828f6cfa..ce2c7feea42 100644
--- a/htdocs/langs/nb_NO/donations.lang
+++ b/htdocs/langs/nb_NO/donations.lang
@@ -6,6 +6,8 @@ Donor=Giver
 Donors=Givere
 AddDonation=Create a donation
 NewDonation=Ny donasjon
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Lovet donasjon
 PromisesNotValid=Ikke godkjente løfter
@@ -21,6 +23,8 @@ DonationStatusPaid=Mottatt donasjon
 DonationStatusPromiseNotValidatedShort=Kladd
 DonationStatusPromiseValidatedShort=Godkjent
 DonationStatusPaidShort=Mottatt
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Valider lover
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Opprett kvittering
@@ -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
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 7f06fb6e0fa..4c05c7e2f26 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/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
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 011ac84fb48..f886b9c1129 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List alle e-postmeldinger sendt
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 6fc76ac7a89..bcbad4f6d72 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favoritt
 ShortInfo=Info.
 Ref=Nummer
+ExternalRef=Ref. extern
 RefSupplier=Ref. leverandør
 RefPayment=Ref. betaling
 CommercialProposalsShort=Tilbud
@@ -394,8 +395,8 @@ Available=Tilgjengelig
 NotYetAvailable=Ikke tilgjengelig ennå
 NotAvailable=Ikke tilgjengelig
 Popularity=Popularitet
-Categories=Kategorier
-Category=Kategori
+Categories=Tags/categories
+Category=Tag/category
 By=Av
 From=Fra
 to=til
@@ -694,6 +695,7 @@ AddBox=Legg til boks
 SelectElementAndClickRefresh=Velg et element og klikk Oppfrisk
 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=Mandag
 Tuesday=Tirsdag
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 8aea126a9c1..e013d9b79c9 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Lever produkt
 Discount=Rabatt
 CreateOrder=Lag ordre
 RefuseOrder=Avvis ordre
-ApproveOrder=Aksepter ordre
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Valider ordre
 UnvalidateOrder=Devalider ordre
 DeleteOrder=Slett ordre
@@ -102,6 +103,8 @@ ClassifyBilled=Klassifiser "Fakturert"
 ComptaCard=Regnskapskort
 DraftOrders=Ordrekladder
 RelatedOrders=Relaterte ordre
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Ordre i behandling
 RefOrder=Ref. ordre
 RefCustomerOrder=Ref. kundeordre
@@ -118,6 +121,7 @@ PaymentOrderRef=Betaling av ordre %s
 CloneOrder=Clone bestilling
 ConfirmCloneOrder=Er du sikker på at du vil klone denne bestillingen %s?
 DispatchSupplierOrder=Motta leverandør bestill %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representant oppfølging kundeordre
 TypeContact_commande_internal_SHIPPING=Representant oppfølging shipping
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 57beeca7610..1fa27e70bac 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Godkjenn intervention
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Godkjenn faktura
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverandør bestill godkjent
 Notify_ORDER_SUPPLIER_REFUSE=Leverandør bestill nektet
 Notify_ORDER_VALIDATE=Kundeordre validert
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kommersiell forslaget sendes med post
 Notify_BILL_PAYED=Kunden faktura betales
 Notify_BILL_CANCEL=Kunden faktura kansellert
 Notify_BILL_SENTBYMAIL=Kunden faktura sendt i posten
-Notify_ORDER_SUPPLIER_VALIDATE=Leverandør orden validert
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverandør ordre sendes med post
 Notify_BILL_SUPPLIER_VALIDATE=Leverandør faktura validert
 Notify_BILL_SUPPLIER_PAYED=Leverandør faktura betales
@@ -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=Antall vedlagte filer/dokumenter
 TotalSizeOfAttachedFiles=Total størrelse på vedlagte filer/dokumenter
 MaxSize=Maksimal størrelse
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Fakturaen %s har blitt validert.
 EMailTextProposalValidated=Forslaget %s har blitt validert.
 EMailTextOrderValidated=Ordren %s har blitt validert.
 EMailTextOrderApproved=Ordren %s er godkjent.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Ordren %s er godkjent av %s.
 EMailTextOrderRefused=Ordren %s har blitt nektet.
 EMailTextOrderRefusedBy=Ordren %s har blitt nektet av %s.
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 1a443f724cd..42894d7663e 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index e1ca6e4c987..62a33832a10 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Liste over leverandørens fakturaer knytte
 ListContractAssociatedProject=Liste over kontrakter knyttet til prosjektet
 ListFichinterAssociatedProject=Liste over tiltak knyttet til prosjektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Liste over tiltak knyttet til prosjektet
 ActivityOnProjectThisWeek=Aktiviteter i prosjektet denne uke
 ActivityOnProjectThisMonth=Aktiviteter i prosjektet denne måned
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index c2e8b0514b6..60d7aa4c22a 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. levering
 Sending=Levering
 Sendings=Leveringer
+AllSendings=All Shipments
 Shipment=Levering
 Shipments=Skipninger
 ShowSending=Show Sending
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 219237d952d..329b4134696 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Liste over leverandørordre
 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)
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index c961b2450f3..4eb15ee7988 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Scheidingsteken
 ExtrafieldCheckBox=Aanvink-vak
 ExtrafieldRadio=Radioknop
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameterlijsten hebben de waarden sleutel,waarde

 bijvoorbeeld: 
1,waarde1
2,waarde2
3,waarde3
...

Voor een afhankelijke lijst:
1,waarde1|parent_list_code:parent_key
2,waarde2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Een parameterlijst heeft de waarden sleutel,waarde

 bijvoorbeeld: 
1,waarde1
2,waarde2
3,waarde3
...


 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -494,6 +495,8 @@ Module500Name=Bijzondere uitgaven (BTW, sociale lasten, dividenden)
 Module500Desc=Beheer van diverse uitgaven, zoals belastingen, sociale bijdragen, dividenden en salarissen
 Module510Name=Salarissen
 Module510Desc=Beheer van de werknemers salarissen en betalingen
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Kennisgevingen
 Module600Desc=Stuur EMail notificaties van bepaalde Dolibarr zakelijke gebeurtenissen naar derde-partijen contacten (setup gedefinieerd in iedere derde-partij)
 Module700Name=Giften
@@ -508,14 +511,14 @@ Module1400Name=Boekhouden
 Module1400Desc=Boekhoudkundig beheer van deskundigen (dubbel partijen)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categorieën
-Module1780Desc=Categoriebeheer (producten, leveranciers en afnemers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=Een WYSIWYG editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Beheer taakplanning
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Acties-, taken- en agendabeheer
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Lees Salarissen
 Permission512=Maak / wijzig salarissen
 Permission514=Verwijder salarissen
 Permission517=Export salarissen
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Diensten inzien
 Permission532=Creëren / wijzigen van diensten
 Permission534=Diensten verwijderen
@@ -746,6 +754,7 @@ Permission1185=Goedkeuren leveranciersopdrachten
 Permission1186=Bestel leveranciersopdrachten
 Permission1187=Bevestigt de ontvangst van de leveranciersopdrachten
 Permission1188=Sluiten leverancier opdrachten
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Geef het resultaat van een uitvoervergunning
 Permission1202=Creëren/wijzigen een uitvoervergunning
 Permission1231=Bekijk leveranciersfacturen
@@ -758,10 +767,10 @@ Permission1237=Exporteer Leverancier opdrachten en hun details
 Permission1251=Voer massale invoer van externe gegevens in de database uit (data load)
 Permission1321=Exporteer afnemersfacturen, attributen en betalingen
 Permission1421=Exporteer afnemersfacturen en attributen
-Permission23001 = Lees geplande taak
-Permission23002 = Maak/wijzig geplande taak
-Permission23003 = Verwijder geplande taak
-Permission23004 = Voer geplande taak uit
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Bekijk acties (gebeurtenissen of taken) in gerelateerd aan eigen account
 Permission2402=Creëren / wijzigen / verwijderen acties (gebeurtenissen of taken) gerelateerd aan eigen account
 Permission2403=Bekijk acties (gebeurtenissen of taken) van anderen
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Geef een boekhoudkundige code terug opgebouwd uit "401
 ModuleCompanyCodePanicum=Geef een lege boekhoudkundige code terug.
 ModuleCompanyCodeDigitaria=Boekhoudkundige-code is afhankelijk van derden code. De code bestaat uit het teken "C" in de eerste positie, gevolgd door de eerste 5 tekens van de derden code.
 UseNotifications=Gebruik kennisgevingen
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Documentensjablonen
 DocumentModelOdt=Genereer documenten uit OpenDocuments sjablonen (. ODT of. ODS-bestanden voor OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Watermerk op conceptdocumenten
@@ -1557,6 +1566,7 @@ SuppliersSetup=Leveranciersmoduleinstellingen
 SuppliersCommandModel=Compleet levaranciersopdrachtsjabloon (logo)
 SuppliersInvoiceModel=Compleet leveranciersfacturensjabloon (logo)
 SuppliersInvoiceNumberingModel=Leveranciersfacturen nummering modellen
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup="GeoIP Maxmind"-moduleinstellingen
 PathToGeoIPMaxmindCountryDataFile=Pad naar bestand met Maxmind ip tot land vertaling. 
Voorbeelden: 
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 22169bc3f06..9f0115bc97f 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factuur %s gevalideerd
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Factuur %s ga terug naar ontwerp van de status van
 InvoiceDeleteDolibarr=Factuur %s verwijderd
-OrderValidatedInDolibarr= Opdracht %s gevalideerd
+OrderValidatedInDolibarr=Opdracht %s gevalideerd
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Bestel %s geannuleerd
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Bestel %s goedgekeurd
 OrderRefusedInDolibarr=Order %s is geweigerd
 OrderBackToDraftInDolibarr=Bestel %s terug te gaan naar ontwerp-status
@@ -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
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 2b5abd111e8..51364e08de8 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Totaal van de twee nieuwe korting moet geli
 ConfirmRemoveDiscount=Weet u zeker dat u van deze korting wilt verwijderen?
 RelatedBill=Gerelateerde factuur
 RelatedBills=Gerelateerde facturen
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 1819c47be8f..1391402e8f3 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categorie
-Categories=Categorieën
-Rubrique=Rubriek
-Rubriques=Rubrieken
-categories=categorieën
-TheCategorie=De categorie
-NoCategoryYet=Geen categorie van dit type gecreëerd
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Invoegen in categorie
 modify=wijzigen
 Classify=Classificeren
-CategoriesArea=Categorieënoverzicht
-ProductsCategoriesArea=Categorieënoverzicht van producten / diensten
-SuppliersCategoriesArea=Categorieënoverzicht van leveranciers
-CustomersCategoriesArea=Categorieënoverzicht van afnemers
-ThirdPartyCategoriesArea=Categorieënoverzicht van derde partijen
-MembersCategoriesArea=Categorieënoverzicht van leden
-ContactsCategoriesArea=Categorie contacten gebied
-MainCats=Belangrijkste categorieën
+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=Subcategorieën
 CatStatistics=Statistieken
-CatList=categorieënlijst
-AllCats=Alle categorieën
-ViewCat=Bekijk categorie
-NewCat=Categorie toevoegen
-NewCategory=Nieuwe categorie
-ModifCat=Categorie wijzigen
-CatCreated=Categorie gecreëerd
-CreateCat=Creëer categorie
-CreateThisCat=Creëer deze categorie
+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=Valideer de velden
 NoSubCat=Geen subcategorie.
 SubCatOf=Subcategorie
-FoundCats=Gevonden categorieën
-FoundCatsForName=Gevonden categorieën voor de naam
-FoundSubCatsIn=Subcategorie gevonden in de categorie
-ErrSameCatSelected=U heeft meerder keren dezelfde categorie geselecteerd
-ErrForgotCat=U vergat de categorie te kiezen
+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=U vergat velden in te vullen
 ErrCatAlreadyExists=Deze naam wordt al gebruikt
-AddProductToCat=Dit product toevoegen aan een categorie?
-ImpossibleAddCat=Niet mogelijk om de categorie toe te voegen
-ImpossibleAssociateCategory=Niet mogelijk om de categorie te koppelen aan
+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 is succesvol toegevoegd.
-ObjectAlreadyLinkedToCategory=Element is al gekoppeld aan deze categorie.
-CategorySuccessfullyCreated=De categorie %s is met succes toegevoegd.
-ProductIsInCategories=Product / dienst is eigenaar van de volgende categorieën
-SupplierIsInCategories=Klant is eigenaar van de volgende leverancierscategorieën
-CompanyIsInCustomersCategories=Deze Klant is eigenaar van de volgende afnemers- / prospectencategorieën
-CompanyIsInSuppliersCategories=Deze Klant is eigenaar van de volgende leverancierscategorieën
-MemberIsInCategories=Dit lid is eigenaar van de volgende ledencategorieën
-ContactIsInCategories=Dit contact kent de volgende  contacts Categorieën
-ProductHasNoCategory=Dit product / dienst behoort tot geen enkele categorie
-SupplierHasNoCategory=Deze leverancier behoort tot geen enkele categorie
-CompanyHasNoCategory=Dit bedrijf behoort tot geen enkele categorie
-MemberHasNoCategory=Dit lid behoort tot geen enkele categorie
-ContactHasNoCategory=Dit contact is niet in een Categorieën onderverdeeld
-ClassifyInCategory=Classificeren naar categorie
+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=Geen
-NotCategorized=Zonder categorie
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Deze categorie bestaat al op hetzelfde niveau
 ReturnInProduct=Terug naar product- / dienstdetails
 ReturnInSupplier=Terug naar leverancierdetails
@@ -66,22 +64,22 @@ ReturnInCompany=Terug naar de afnemer- / prospectdetails
 ContentsVisibleByAll=De inhoud wordt zichtbaar voor iedereen
 ContentsVisibleByAllShort=Inhoud zichtbaar voor iedereen
 ContentsNotVisibleByAllShort=Inhoud is niet zichtbaar voor iedereen
-CategoriesTree=Overzicht van categorieën
-DeleteCategory=Categorie verwijderen
-ConfirmDeleteCategory=Weet u zeker dat u deze categorie wilt verwijderen?
-RemoveFromCategory=Verwijder de koppeling met de categorie
-RemoveFromCategoryConfirm=Weet u zeker dat u het verband tussen de transactie en de categorie wilt verwijderen?
-NoCategoriesDefined=Geen categorieën ingesteld
-SuppliersCategoryShort=Leverancierscategorie
-CustomersCategoryShort=Afnemerscategorie
-ProductsCategoryShort=Productencategorie
-MembersCategoryShort=Ledencategorie
-SuppliersCategoriesShort=Leverancierscategorie
-CustomersCategoriesShort=Afnemerscategorie
+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=Afnemers- / Prospectencategorie
-ProductsCategoriesShort=Productencategorie
-MembersCategoriesShort=Ledencategorie
-ContactCategoriesShort=Contact Categorieën
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Deze categorie bevat geen producten.
 ThisCategoryHasNoSupplier=Deze categorie bevat geen enkele leverancier.
 ThisCategoryHasNoCustomer=Deze categorie bevat geen enkele afnemer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Deze categorie bevat geen enkel contact.
 AssignedToCustomer=Toegewezen aan een afnemer
 AssignedToTheCustomer=Toegewezen aan de afnemer
 InternalCategory=Interne categorie
-CategoryContents=Categorie-inhoud
-CategId=Categorie-ID
-CatSupList=Leverancierscategorieënlijst
-CatCusList=afnemers- / prospectencategorieënlijst
-CatProdList=productencategorieënlijst
-CatMemberList=Ledencategorieënlijst
-CatContactList=Lijst van Categorieën van Contacten
-CatSupLinks=Verbinding tussen leverancier en categorie
-CatCusLinks=Verbinding tussen klant/prospect en categorie
-CatProdLinks=Verbinding tussen producten/diensten en categorieën
-CatMemberLinks=Verbinding tussen leden en categorieën
-DeleteFromCat=Verwijder uit categorie
+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=Afbeelding verwijderen
 ConfirmDeletePicture=Bevestig verwijderen afbeelding
 ExtraFieldsCategories=Complementaire kenmerken
-CategoriesSetup=Opzetten categorieën 
-CategorieRecursiv=Automatisch linken met bovenliggende categorie
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Indien geactiveerd zal het product ook gelinkt worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt.
 AddProductServiceIntoCategory=Voeg het volgende product/dienst toe
-ShowCategory=Laat categorie zien
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 509725038ef..9308defa42a 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Commando
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Weet je zker dat je deze cron taak wilt verwijderen?
-CronExecute=Voer taak uit
-CronConfirmExecute= Weet je zeker dat je deze taak nu uit wilt voeren
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wachtende taken
+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=Taak
-CronNone= Geen
+CronNone=Geen
 CronDtStart=Begindatum
 CronDtEnd=Einddatum
 CronDtNextLaunch=Volgende uitvoering
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informatie
 # Common
diff --git a/htdocs/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang
index c666ad40925..a3470f88df7 100644
--- a/htdocs/langs/nl_NL/donations.lang
+++ b/htdocs/langs/nl_NL/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donoren
 AddDonation=Create a donation
 NewDonation=Nieuwe donatie
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Toon gift
 DonationPromise=Donatie toezegging
 PromisesNotValid=Niet gevalideerde toezegging
@@ -21,6 +23,8 @@ DonationStatusPaid=Donatie ontvangen
 DonationStatusPromiseNotValidatedShort=Voorlopig
 DonationStatusPromiseValidatedShort=Gevalideerd
 DonationStatusPaidShort=Ontvangen
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Bevestig de toezegging
 DonationReceipt=Gift ontvangstbewijs
 BuildDonationReceipt=Creëer donatieontvangstbewijs
@@ -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
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 0a8f7093045..5b331399e82 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/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=Verplichte setup parameters zijn nog niet gedefinieerd
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index cdd2ca5a1c3..7917a240c14 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Toon een lijst van alle verzonden kennisgevingen
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index e2029732446..613de2e8598 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Referentie
+ExternalRef=Ref. extern
 RefSupplier=Leverancierreferentie
 RefPayment=Betalingskenmerk
 CommercialProposalsShort=Offertes
@@ -394,8 +395,8 @@ Available=Beschikbaar
 NotYetAvailable=Nog niet beschikbaar
 NotAvailable=Niet beschikbaar
 Popularity=Populariteit
-Categories=Categorieën
-Category=Categorie
+Categories=Tags/categories
+Category=Tag/category
 By=Door
 From=Van
 to=aan
@@ -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=Maandag
 Tuesday=Dinsdag
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 83f76d2ab97..08686be5296 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Verzend product
 Discount=Korting
 CreateOrder=Creeer opdracht
 RefuseOrder=Wijger opdracht
-ApproveOrder=Accepteer opdracht
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Valideer opdracht
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Verwijder opdracht
@@ -102,6 +103,8 @@ ClassifyBilled=Classificeer "gefactureerd"
 ComptaCard=Boekhoudingsoverzicht
 DraftOrders=Conceptopdrachten
 RelatedOrders=Gerelateerde opdrachten
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Opdrachten in behandeling
 RefOrder=Ref. Opdracht
 RefCustomerOrder=Ref. afnemersopdracht
@@ -118,6 +121,7 @@ PaymentOrderRef=Betaling van opdracht %s
 CloneOrder=Kloon opdracht
 ConfirmCloneOrder=Weet u zeker dat u deze opdracht %s wilt klonen?
 DispatchSupplierOrder=Ontvangst van leveranciersopdracht %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Vertegenwoordiger die follow-up van afnemersopdracht doet
 TypeContact_commande_internal_SHIPPING=Vertegenwoordiger die follow-up van verzending doet
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 4445dfcb6ca..0c20da6fc3f 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Interventie gevalideerd
 Notify_FICHINTER_SENTBYMAIL=Interventie via mail verzonden
 Notify_BILL_VALIDATE=Klant factuur gevalideerd
 Notify_BILL_UNVALIDATE=Klantenfactuur niet gevalideerd
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverancier te zijn goedgekeurd
 Notify_ORDER_SUPPLIER_REFUSE=Leverancier bestellen geweigerd
 Notify_ORDER_VALIDATE=Bestelling van de klant gevalideerd
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercieel voorstel per e-mail
 Notify_BILL_PAYED=Klant factuur betaald
 Notify_BILL_CANCEL=Klant factuur geannuleerd
 Notify_BILL_SENTBYMAIL=Klant verzonden factuur per post
-Notify_ORDER_SUPPLIER_VALIDATE=Gevalideerde leverancier bestellen
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverancier bestellen per e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Leverancier factuur gevalideerd
 Notify_BILL_SUPPLIER_PAYED=Leverancier factuur betaald
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Creatie project
 Notify_TASK_CREATE=Taak gemaakt
 Notify_TASK_MODIFY=Taak gewijzigd
 Notify_TASK_DELETE=Taak verwijderd
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Aantal bijgevoegde bestanden / documenten
 TotalSizeOfAttachedFiles=Totale omvang van de bijgevoegde bestanden / documenten
 MaxSize=Maximale grootte
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=De factuur %s is gevalideerd
 EMailTextProposalValidated=De offerte %s is gevalideerd.
 EMailTextOrderValidated=De opdracht %s is gevalideerd.
 EMailTextOrderApproved=De opdracht %s is goedgekeurd.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=De order %s is goedgekeuerd door %s.
 EMailTextOrderRefused=De order %s is geweigerd.
 EMailTextOrderRefusedBy=De order %s is geweigerd door %s.
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 784314a472c..0b99eadd66c 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 74ddfd7837e..bddf7fe85d7 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Lijst van aan het project verbonden levera
 ListContractAssociatedProject=Lijst van aan het project verbonden contracten
 ListFichinterAssociatedProject=Lijst van aan het project verbonden interventies
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lijst van aan het project verbonden acties
 ActivityOnProjectThisWeek=Projectactiviteit in deze week
 ActivityOnProjectThisMonth=Projectactiviteit in deze maand
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index 72a94edeec1..42dbd16a12f 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Referentie verzending
 Sending=Verzending
 Sendings=Verzendingen
+AllSendings=All Shipments
 Shipment=Verzending
 Shipments=Verzendingen
 ShowSending=Show Sending
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index e38970a6513..8983b90f533 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/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)
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index bb9b358c045..b9536aee4af 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -1,160 +1,160 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
 
-Accounting=Accounting
-Globalparameters=Global parameters
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+Accounting=Księgowość
+Globalparameters=Parametry globalne
+Chartofaccounts=Plan kont
+Fiscalyear=Lat podatkowych
+Menuaccount=Konta księgowe
+Menuthirdpartyaccount=Rachunki Thirdparty
+MenuTools=Narzędzia
 
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Export=Export
-Modelcsv=Model of export
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
-Back=Return
+ConfigAccountingExpert=Konfiguracja modułu eksperta księgowego
+Journaux=Czasopisma
+JournalFinancial=Czasopisma finansowe
+Exports=Eksportuje
+Export=Eksport
+Modelcsv=Model eksportu
+OptionsDeactivatedForThisExportModel=Dla tego modelu eksportowego, opcje są wyłączone
+Selectmodelcsv=Wybierz model eksportu
+Modelcsv_normal=Klasyczne eksport
+Modelcsv_CEGID=Eksport do Cegid Expert
+BackToChartofaccounts=Powrót planu kont
+Back=Powrót
 
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
+Definechartofaccounts=Definiowanie planu kont
+Selectchartofaccounts=Wybierz plan kont
+Validate=Uprawomocnić
+Addanaccount=Dodaj konto księgowe
+AccountAccounting=Konto księgowe
+Ventilation=Awaria
+ToDispatch=Wysyłką
+Dispatched=Wywoływane
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+CustomersVentilation=Podział klientów
+SuppliersVentilation=Dostawcy Breakdown
+TradeMargin=Marża handlowa
+Reports=Raporty
+ByCustomerInvoice=Fakturami klientów
+ByMonth=Przez miesiąc
+NewAccount=Nowe konto księgowe
+Update=Aktualizacja
+List=Lista
+Create=Utworzyć
+UpdateAccount=Modyfikacja konta księgowego
+UpdateMvts=Modyfikacja ruch
+WriteBookKeeping=Konta rekord w księdze głównej
+Bookkeeping=Księga główna
+AccountBalanceByMonth=Stan konta na miesiąc
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+AccountingVentilation=Rachunkowości podział
+AccountingVentilationSupplier=Dostawca rachunkowości podział
+AccountingVentilationCustomer=Podział klientów rachunkowości
+Line=Linia
 
-CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
+CAHTF=Razem HT dostawca kupna
+InvoiceLines=Linie faktury być wentylowane
+InvoiceLinesDone=Wentylowanych linie faktury
+IntoAccount=W rachunku rachunkowości
 
-Ventilate=Ventilate
-VentilationAuto=Automatic breakdown
+Ventilate=Wietrzyć
+VentilationAuto=Automatyczny podział
 
-Processing=Processing
-EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+Processing=Przetwarzanie
+EndProcessing=Koniec obróbki
+AnyLineVentilate=Wszelkie linie do wentylacji
+SelectedLines=Wybrane linie
+Lineofinvoice=Linia faktury
+VentilatedinAccount=Wentylowane z powodzeniem na koncie księgowym
+NotVentilatedinAccount=Nie wentylowane na koncie księgowym
 
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Separator kolumna w pliku eksportu
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Ilość elementów jest podział przedstawiony przez strony (maksymalna zalecana: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Rozpocząć sortowanie stron rozpadu "Has to podział" przez ostatnich elementów
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Rozpocznij sortowanie stron rozpadu "Breakdown" przez ostatnich elementów
 
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+AccountLength=Długość rozliczania rachunków przedstawiono w Dolibarr
+AccountLengthDesc=Funkcja pozwala udawać długość koncie księgowym zastępując obowiązuje przez cyfrę zero. Funkcja ta dotyka tylko wyświetlacz, to nie zmienia kont księgowych zarejestrowanych w Dolibarr. Na wywóz, funkcja ta jest konieczna, aby być zgodne z określonym oprogramowaniem.
+ACCOUNTING_LENGTH_GACCOUNT=Długość ogólnych rachunków
+ACCOUNTING_LENGTH_AACCOUNT=Długość z rachunków osób trzecich
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=Sprzedam czasopisma
+ACCOUNTING_PURCHASE_JOURNAL=Zakup czasopisma
+ACCOUNTING_BANK_JOURNAL=Czasopismo Banku
+ACCOUNTING_CASH_JOURNAL=Czasopismo Gotówka
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Inne czasopisma
+ACCOUNTING_SOCIAL_JOURNAL=Czasopismo Społecznego
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto transferu
+ACCOUNTING_ACCOUNT_SUSPENSE=Konto czekać
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Rachunkowość konto domyślnie dla zakupionych produktów (jeśli nie jest określony w ulotce)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Rachunkowość konto domyślnie dla sprzedawanych produktów (jeśli nie określono w ulotce)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Rachunkowość konto domyślnie dla zakupionych usług (jeśli nie określona w arkuszu usług)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Rachunkowość konto domyślnie dla sprzedanych usług (jeśli nie określona w arkuszu usług)
 
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
+Doctype=Rodzaj dokumentu
+Docdate=Data
+Docref=Odniesienie
+Numerocompte=Konto
 Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Labelcompte=Konto Wytwórnia
+Debit=Debet
+Credit=Kredyt
+Amount=Ilość
 Sens=Sens
-Codejournal=Journal
+Codejournal=Czasopismo
 
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Usuń zapisy w księdze głównej
 
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
+SellsJournal=Sprzedaje w czasopiśmie
+PurchasesJournal=Zakupy czasopisma
+DescSellsJournal=Sprzedaje w czasopiśmie
+DescPurchasesJournal=Zakupy czasopisma
+BankJournal=Czasopismo Banku
+DescBankJournal=Czasopismo Banku w tym wszystkich rodzajów płatności innych niż gotówka
+CashJournal=Czasopismo Gotówka
+DescCashJournal=Czasopismo pieniężnych w tym rodzaju płatności gotówką
 
-CashPayment=Cash Payment
+CashPayment=Płatność gotówką
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Zapłata faktury dostawcy
+CustomerInvoicePayment=Zapłata faktury klienta
 
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Thirdparty konto
 
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=Nowy ruch
+NumMvts=Ilość ruchów
+ListeMvts=Lista przemieszczania
+ErrorDebitCredit=Debetowych i kredytowych nie może mieć wartość w tym samym czasie
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=Lista thirdparty konto
+DescThirdPartyReport=Skonsultuj się tutaj listę thirdparty klientów i dostawców oraz ich kont księgowych
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Lista kont księgowych
 
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgversion=Wersja planu
+Pcgtype=Klasa konta
+Pcgsubtype=W ramach klasy uwagę
+Accountparent=Korzeń konta
+Active=Oświadczenie
 
-NewFiscalYear=New fiscal year
+NewFiscalYear=Nowy rok podatkowy
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
-TotalVente=Total turnover HT
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilCustomer=Skonsultuj się tutaj rocznego rozliczenia przebicia faktur klientów
+TotalVente=Razem HT obroty
+TotalMarge=Marża całkowita sprzedaż
+DescVentilDoneCustomer=Skonsultuj się tutaj listę linii faktur klientów i ich rachunek rachunkowości
+DescVentilTodoCustomer=Wyraź swoje wiersze faktury klienta z kontem rachunkowości
+ChangeAccount=Zmienianie konta księgowego dla wierszy wybranych przez konto:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Skonsultuj się tutaj rocznego rozliczenia przebicia faktur dostawców
+DescVentilTodoSupplier=Wyraź swoje wiersze dostawcę faktury z kontem rachunkowości
+DescVentilDoneSupplier=Skonsultuj się tutaj listę linii dostawcy faktur i ich koncie księgowym
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Weryfikacja Automatycznie
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Błąd, nie można usunąć to konto księgowe, ponieważ jest używany
 
-FicheVentilation=Breakdown card
+FicheVentilation=Karta Podział
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index d048aa3a61b..a72d6503990 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -8,11 +8,11 @@ VersionExperimental=Eksperymentalny
 VersionDevelopment=Rozwój
 VersionUnknown=Nieznany
 VersionRecommanded=Zalecana
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Pliki Integrity
+FilesMissing=Brakujące pliki
+FilesUpdated=Aktualizacja plików
+FileCheckDolibarr=Sprawdź Dolibarr integralności plików
+XmlNotFound=Plik XML z Dolibarr Integrity Not Found
 SessionId=ID sesji
 SessionSaveHandler=Asystent zapisu sesji
 SessionSavePath=Lokalizacja sesji danych
@@ -48,21 +48,21 @@ SecuritySetup=Ustawienia bezpieczeństwa
 ErrorModuleRequirePHPVersion=Błąd ten moduł wymaga PHP w wersji %s lub większej
 ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lub większej
 ErrorDecimalLargerThanAreForbidden=Błąd, dokładność większa niż %s nie jest obsługiwana
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+DictionarySetup=Słownik setup
+Dictionary=Słowniki
+Chartofaccounts=Plan kont
+Fiscalyear=Lat podatkowych
+ErrorReservedTypeSystemSystemAuto=Wartość "System" i "systemauto" dla typu jest zarezerwowana. Możesz użyć "użytkownik" jako wartości, aby dodać swój własny rekord
 ErrorCodeCantContainZero=Kod nie może zawierać wartości "0"
 DisableJavascript=Wyłącz funkcje JavaScript i Ajax (rekomendowane dla osób niewidomych oraz przeglądarek tekstowych)
 ConfirmAjax=Wykorzystanie potwierdzeń Ajax popups
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
+UseSearchToSelectCompanyTooltip=Także jeśli masz dużą liczbę osób trzecich (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
+UseSearchToSelectCompany=Użyj pól wyboru Autouzupełnianie osób trzecich zamiast pól listy.
 ActivityStateToSelectCompany= Dodaj filtr opcję aby pokazać / ukryć thirdparties, które są aktualnie w działalności lub przestał go
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
+UseSearchToSelectContactTooltip=Także jeśli masz dużą liczbę osób trzecich (> 100 000), można zwiększyć prędkość przez ustawienie stałej CONTACT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
+UseSearchToSelectContact=Użyj pól wyboru Autouzupełnianie kontaktu (zamiast przy użyciu pola listy).
+DelaiedFullListToSelectCompany=Poczekaj naciśnięciu klawisza przed ładowania treści z listy thirdparties kombi (Może to zwiększyć wydajność, jeśli masz dużą liczbę thirdparties)
+DelaiedFullListToSelectContact=Poczekaj naciśnięciu klawisza przed ładowania treści z listy kontaktów kombi (może to zwiększyć wydajność, jeśli masz dużą liczbę kontaktów)
 SearchFilter=Opcje filtrów wyszukiwania
 NumberOfKeyToSearch=NBR znaków do uruchomienia wyszukiwania: %s
 ViewFullDateActions=Pokaż pełny terminy działań w trzecim arkusza
@@ -74,25 +74,25 @@ ShowPreview=Pokaż podgląd
 PreviewNotAvailable=Podgląd niedostępny
 ThemeCurrentlyActive=Theme obecnie aktywnych
 CurrentTimeZone=Aktualna Timezone
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+MySQLTimeZone=Strefa czasowa MySQL (baza danych)
+TZHasNoEffect=Daty są przechowywane i zwrócone przez serwer bazy danych, jak gdyby były przechowywane jako zgłosił ciąg. Strefa czasowa ma wpływ tylko wtedy, gdy przy użyciu funkcji UNIX_TIMESTAMP (które nie powinny być używane przez Dolibarr, więc TZ bazy danych nie powinny mieć wpływu, nawet jeśli zmienił się po dane zostały wprowadzone).
 Space=Space
 Table=Tabela
-Fields=Obszary
+Fields=Pola
 Index=Indeks
 Mask=Maska
 NextValue=Następna wartość
 NextValueForInvoices=Następna wartość (faktury)
 NextValueForCreditNotes=Następna wartość (not kredytowych)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Uwaga: PHP granicach każdego pliku jego rozmiar do %s %s, niezależnie od wartości tego parametru jest
-NoMaxSizeByPHPLimit=Uwaga: Nie jest dopuszczalne w konfiguracji PHP
-MaxSizeForUploadedFiles=Maksymalny rozmiar upload plików (0 uniemożliwiających jakiekolwiek upload)
-UseCaptchaCode=Użyj graficzny kod na stronie logowania
-UseAvToScanUploadedFiles=Użyj antywirusowego do skanowania upload plików
-AntiVirusCommand= Pełna ścieżka do polecenia antivirus
-AntiVirusCommandExample= ClamWin przykład: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe 
 ClamAV przykład: / usr / bin / clamscan
+NextValueForDeposit=Następny wartości (depozyt)
+NextValueForReplacements=Następna wartość (zamienniki)
+MustBeLowerThanPHPLimit=Uwaga: twoj PHP ogranicza rozmiar każdego uploadowanego pliku do %s %s, niezależnie od wartości tego parametru 
+NoMaxSizeByPHPLimit=Uwaga: Brak ustawionego limitu w twojej konfiguracji PHP
+MaxSizeForUploadedFiles=Maksymalny rozmiar dla twoich przesyłanych plików (0 by zabronić jego przesyłanie/upload)
+UseCaptchaCode=Użyj graficzny kod (CAPTCHA) na stronie logowania
+UseAvToScanUploadedFiles=Użyj programu antywirusowego do skanowania przesłanych plików
+AntiVirusCommand= Pełna ścieżka do poleceń antivirusa
+AntiVirusCommandExample= ClamWin przykład: c:\\Program Files (x86)\\ClamWin\\bin\\ clamscan.exe
Przykład dla ClamAV: /usr/bin/clamscan
 AntiVirusParam= Więcej parametrów w linii poleceń
 AntiVirusParamExample= ClamWin przykład: - bazy danych = "C: \\ Program Files (x86) \\ lib ClamWin \\"
 ComptaSetup=Rachunkowość konfiguracji modułu
@@ -113,9 +113,9 @@ OtherOptions=Inne opcje
 OtherSetup=Inne konfiguracji
 CurrentValueSeparatorDecimal=Separator
 CurrentValueSeparatorThousand=Tysiąc separatora
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=Miejsce przeznaczenia
+IdModule=Identyfikator modułu
+IdPermissions=Uprawnienia ID
 Modules=Moduły
 ModulesCommon=Wspólne modules
 ModulesOther=Inne moduły
@@ -127,7 +127,7 @@ LanguageBrowserParameter=Parametr %s
 LocalisationDolibarrParameters=Lokalizacja parametry
 ClientTZ=Strefa Czasowa Klienta (użytkownik)
 ClientHour=Czas klienta (użytkownik)
-OSTZ=Server OS Time Zone
+OSTZ=Strefa czasowa Serwera OS
 PHPTZ=Strefa czasowa serwera PHP
 PHPServerOffsetWithGreenwich=Offset dla PHP serwer szerokość Greenwich (secondes)
 ClientOffsetWithGreenwich=Klient / Przeglądarka offset szerokość Greenwich (sekund)
@@ -136,7 +136,7 @@ CurrentHour=Aktualna godzina
 CompanyTZ=Strefa czasowa spółki (główne firmy)
 CompanyHour=Godzina spółki (główne firmy)
 CurrentSessionTimeOut=Obecna sesja czasu
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=Aby ustawić inną strefę czasową PHP (nie jest wymagany), można spróbować dodać .htacces plików z linii jak ten "Setenv TZ Europe / Paris"
 OSEnv=OS Środowiska
 Box=Box
 Boxes=Pulpity informacyjne
@@ -215,7 +215,7 @@ ModulesJobDesc=Biznes moduły zapewniają prostą konfigurację predefiniowanych
 ModulesMarketPlaceDesc=Mogą Państwo znaleźć więcej modułów do pobrania na zewnętrznych stron internetowych w internecie ...
 ModulesMarketPlaces=Więcej modułów ...
 DoliStoreDesc=DoliStore, urzędowy rynek dla Dolibarr ERP / CRM modułów zewnętrznych
-DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
+DoliPartnersDesc=Lista z niektórych firm, które mogą dostarczyć / opracowanie na żądanie moduły i funkcje (Uwaga: każda firma open source knowning języka PHP może dostarczyć konkretny rozwój)
 WebSiteDesc=dostawców sieci Web można szukać, aby znaleźć więcej modułów ...
 URL=Łącze
 BoxesAvailable=Pola dostępne
@@ -227,7 +227,7 @@ AutomaticIfJavascriptDisabled=Automatyczne gdy JavaScript jest wyłączony
 AvailableOnlyIfJavascriptNotDisabled=Dostępna tylko wtedy, gdy JavaScript jest wyłączony
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostępna tylko wtedy, gdy JavaScript jest wyłączony
 Required=Wymagany
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=Używane przez niektórych opcji porządku obrad tylko
 Security=Bezpieczeństwo
 Passwords=Hasła
 DoNotStoreClearPassword=Czy nie przechowywać hasła w sposób jasny w bazie danych
@@ -246,9 +246,9 @@ OfficialWebSiteFr=Francuski oficjalnej strony www
 OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Dziennik rynku zewnętrznych modułów / addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OfficialWebHostingService=Odwołuje usług hostingowych (cloud hosting)
+ReferencedPreferredPartners=Preferowani Partnerzy
+OtherResources=Zasoby autres
 ForDocumentationSeeWiki=Dla użytkownika lub dewelopera dokumentacji (Doc, FAQ ...), 
 zajrzyj do Dolibarr Wiki: 
  %s
 ForAnswersSeeForum=Na wszelkie inne pytania / pomoc, można skorzystać z Dolibarr forum: 
  %s
 HelpCenterDesc1=Obszar ten może pomóc uzyskać wsparcie na usługi Dolibarr.
@@ -268,9 +268,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP (Nie zdefiniowany w PHP,
 MAIN_MAIL_EMAIL_FROM=Nadawca e-mail do automatycznego przetwarzania wiadomości e-mail (domyślnie w php.ini: %s)
 MAIN_MAIL_ERRORS_TO=Nadawca e-mail używany do wiadomości powraca błędach wysyłane
 MAIN_MAIL_AUTOCOPY_TO= Wyślij systematycznie ukryte węgla kopie wszystkich wysłanych e-maili do
-MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
-MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
-MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Wyślij systematycznie ukryty węgla-egzemplarz wniosków przesłanych pocztą elektroniczną na adres
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Wyślij systematycznie ukryty węglowego kopię zlecenia wysłane e-mailem do
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Wyślij systematycznie ukryty węgla-egzemplarz faktury wysyłane przez e-maili do
 MAIN_DISABLE_ALL_MAILS=Wyłącz wszystkie e-maile sendings (dla celów badań lub demo)
 MAIN_MAIL_SENDMODE=Metoda użyć do wysyłania e-maili
 MAIN_MAIL_SMTPS_ID=SMTP identyfikator, jeżeli wymaga uwierzytelniania
@@ -303,15 +303,15 @@ DownloadPackageFromWebSite=Pobieram paczke %s
 UnpackPackageInDolibarrRoot=Rozpakuj pakiet plików do katalogu głównego Dolibarr %s
 SetupIsReadyForUse=Instalacja jest zakończona i Dolibarr jest gotowy do użycia z tym nowym elementem.
 NotExistsDirect=Alternatywna ścieżka root nie została zdefiniowana.

-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).

-InfDirExample=
Then declare it in the file conf.php
 $dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character.
+InfDirAlt=Od wersji 3, możliwe jest zdefiniowanie alternatywne directory.This administratora pozwala na przechowywanie, to samo miejsce, wtyczek i szablonów niestandardowych. 
 Wystarczy utworzyć katalog w katalogu głównym Dolibarr (np: na zamówienie). 

+InfDirExample=
 Następnie deklarowany w conf.php pliku 
 $ Dolibarr_main_url_root_alt = "http: // myserver / custom" 
 $ Dolibarr_main_document_root_alt = "/ ścieżka / z / Dolibarr / htdocs / obyczaju" 
 * Linie te są skomentował w "#", odkomentowac tylko usunąć znak.
 YouCanSubmitFile=Wybierz moduł:
 CurrentVersion=Dolibarr aktualnej wersji
 CallUpdatePage=Wejdź na stronę aktualizacji struktury bazy danych i danych %s.
 LastStableVersion=Ostatnia wersja stabilna
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. 
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. 
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. 
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers. 

-GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).

+UpdateServerOffline=Aktualizacja serwera nieaktywny
+GenericMaskCodes=Można wpisać dowolną maskę numeracji. W tej masce, może stosować następujące tagi: 
 {000000} odpowiada liczbie, która jest zwiększona w każdym% s. Wprowadzić dowolną liczbę zer jako żądaną długość licznika. Licznik zostaną zakończone zerami z lewej, aby mieć jak najwięcej zer jak maski. 
 {000000 + 000} sama jak poprzednia, ale przesunięciem odpowiadającym numerem, na prawo od znaku + odnosi się począwszy od pierwszego% s. 
 {000000} @ x, ale sama jak poprzednia licznik jest wyzerowany, gdy miesiąc osiągnięciu x (x od 1 do 12 lub ​​0 do korzystania pierwszych miesiącach roku podatkowego określone w konfiguracji, lub 99 do wyzerowany co miesiąc ). Jeśli opcja ta jest używana, a x jest 2 lub więcej, wymagana jest również to ciąg {rr} {mm} lub {rrrr} {mm}. 
 {Dd} dni (01 do 31). 
 {Mm} miesięcy (01 do 12). 
 {Rr}, {rrrr} lub {r} roku ponad 2, 4 lub 1 liczb. 

+GenericMaskCodes2=Cccc} {kod klienta na n znaków 
 {Cccc000} kod klienta na n znaków następuje przez licznik dedykowaną dla klienta. Licznik ten poświęcony klienta jest kasowany w tym samym czasie, niż globalny licznik. 
 {Tttt} kod thirdparty typu na n znaków (patrz typy słowników-thirdparty). 

 GenericMaskCodes3=Wszystkie inne znaki w masce pozostaną nienaruszone. 
 Spacje są niedozwolone. 

 GenericMaskCodes4a=Przykład na 99-cie %s strony trzeciej TheCompany zrobić 2007-01-31: 

 GenericMaskCodes4b=Przykład trzeciej na uaktualniona w dniu 2007-03-01: 

@@ -323,7 +323,7 @@ ServerNotAvailableOnIPOrPort=Serwer nie jest dostępna pod adresem %s na
 DoTestServerAvailability=Test serwera łączność
 DoTestSend=Test wysyłanie
 DoTestSendHTML=Test wysyłania HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazIfNoYearInMask=Błąd, nie można korzystać z opcji @ na reset licznika każdego roku, jeśli ciąg {rr} lub {rrrr} nie jest w masce.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Błąd, nie można użytkownika, jeśli opcja @ sekwencji rr () () lub (mm rrrr mm) () nie jest w maskę.
 UMask=Umask parametr dla nowych plików w Unix / Linux / BSD systemu plików.
 UMaskExplanation=Ten parametr pozwala określić uprawnienia ustawione domyślnie na pliki stworzone przez Dolibarr na serwerze (na przykład podczas przesyłania). 
 To musi być wartość ósemkowa (na przykład, 0666 oznacza odczytu i zapisu dla wszystkich). 
 Paramtre Ce ne sert pas sous un serveur Windows.
@@ -388,32 +388,33 @@ ExtrafieldSelectList = Wybierz z tabeli
 ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Pole wyboru
 ExtrafieldRadio=Przełącznik
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldParamHelpselect=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
-ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value 
 if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value 
 if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
-LibraryToBuildPDF=Library used to build PDF
-WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+ExtrafieldCheckBoxFromList= Pole z tabeli
+ExtrafieldLink=Link to an object
+ExtrafieldParamHelpselect=Parametry lista musi tak być, wartość klucza 

 Na przykład: 
 1, wartosc1 
 2, wartość2 
 3, wartość3 
 ... 

 W celu uzyskania listy zależności od drugiego: 
 1, wartosc1 | parent_list_code: parent_key 
 2, wartość2 | parent_list_code: parent_key
+ExtrafieldParamHelpcheckbox=Parametry lista musi tak być, wartość klucza 

 Na przykład: 
 1, wartosc1 
 2, wartość2 
 3, wartość3 
 ...
+ExtrafieldParamHelpradio=Parametry lista musi tak być, wartość klucza 

 Na przykład: 
 1, wartosc1 
 2, wartość2 
 3, wartość3 
 ...
+ExtrafieldParamHelpsellist=Lista parametrów przychodzi z tabeli 
 Składnia: nazwa_tabeli: label_field: id_field :: Filtr 
 Przykład: c_typent: libelle: id :: Filtr 

 Filtr może być prosty test (np aktywny = 1), aby wyświetlić tylko aktywne wartości 
 jeśli chcesz filtrować extrafields używać syntaxt extra.fieldcode = ... (gdzie kod pole jest kod extrafield) 

 W celu uzyskania listy zależności od drugiego: 
 c_typent: libelle: id: parent_list_code | parent_column: filtr
+ExtrafieldParamHelpchkbxlst=Lista parametrów przychodzi z tabeli 
 Składnia: nazwa_tabeli: label_field: id_field :: Filtr 
 Przykład: c_typent: libelle: id :: Filtr 

 Filtr może być prosty test (np aktywny = 1), aby wyświetlić tylko aktywne wartości 
 jeśli chcesz filtrować extrafields używać syntaxt extra.fieldcode = ... (gdzie kod pole jest kod extrafield) 

 W celu uzyskania listy zależności od drugiego: 
 c_typent: libelle: id: parent_list_code | parent_column: filtr
+LibraryToBuildPDF=Biblioteka wykorzystane do budowy PDF
+WarningUsingFPDF=Uwaga: Twój conf.php zawiera dyrektywę dolibarr_pdf_force_fpdf = 1. Oznacza to, że korzystanie z biblioteki FPDF do generowania plików PDF. Ta biblioteka jest stara i nie obsługuje wiele funkcji (Unicode, przejrzystości obrazu, języków cyrylicy, arabskich oraz azjatyckiego, ...), więc mogą wystąpić błędy podczas generowania pliku PDF. 
 Aby rozwiązać ten problem i mieć pełne wsparcie generacji PDF, należy pobrać bibliotekę TCPDF , to skomentować lub usunięcia linii $ dolibarr_pdf_force_fpdf = 1, i dodać zamiast $ dolibarr_lib_TCPDF_PATH = "path_to_TCPDF_dir"
+LocalTaxDesc=W niektórych krajach stosuje się 2 lub 3 podatki od każdej linii faktury. Jeśli jest to przypadek, wybrać typ dla drugiego i trzeciego podatków i jej stopy. Możliwe typu są: 
 1: opłata stosuje się produktów i usług bez podatku VAT (VAT nie jest stosowana na podatek lokalny) 
 2: lokalny podatek stosuje się na produkty i usługi, zanim VAT (jest obliczany na kwotę + localtax) 
 3: podatek lokalny zastosowanie wobec produktów bez podatku VAT (VAT nie jest stosowana na podatek lokalny) 
 4: podatek lokalny zastosowanie wobec produktów przed VAT (jest obliczany na kwotę + localtax) 
 5: opłata stosuje na usługi, bez podatku VAT (VAT nie jest stosowana na podatek lokalny) 
 6: opłata stosuje na usługi przed VAT (jest obliczany na kwotę + localtax)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s
+LinkToTestClickToDial=Wprowadź numer telefonu, aby zadzwonić, aby zobaczyć link do przetestowania url ClickToDial dla użytkownika% s
 RefreshPhoneLink=Odśwież link
-LinkToTest=Clickable link generated for user %s (click phone number to test)
+LinkToTest=Klikalny link wygenerowany dla użytkownika% s (kliknij, numer telefonu, aby sprawdzić)
 KeepEmptyToUseDefault=Zostaw puste by używać domyślnych wartości
 DefaultLink=Domyślny link
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
-NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+ValueOverwrittenByUserSetup=Uwaga, ta wartość może być zastąpione przez specyficzną konfiguracją użytkowników (każdy użytkownik może ustawić własną clicktodial url)
+ExternalModule=Moduł zewnętrzny - Zainstalowane w katalogu% s
+BarcodeInitForThirdparties=Msza kodów kreskowych o rozruchu thirdparties
+BarcodeInitForProductsOrServices=Msza startowych kodów kreskowych lub zresetować na produkty lub usługi
+CurrentlyNWithoutBarCode=Obecnie masz rekordy% s% s% s bez kodu kreskowego zdefiniowane.
+InitEmptyBarCode=Init wartość przyszłorocznego% s puste rekordy
+EraseAllCurrentBarCode=Usuń wszystkie aktualne wartości kodów kreskowych
+ConfirmEraseAllCurrentBarCode=Czy na pewno chcesz usunąć wszystkie bieżące wartości kodów kreskowych?
+AllBarcodeReset=Wszystkie wartości zostały usunięte z kodem kreskowym
+NoBarcodeNumberingTemplateDefined=Nie szablonu numeracji kodów kreskowych włączona w konfiguracji modułu kodów kreskowych.
+NoRecordWithoutBarcodeDefined=Brak zapisu bez wartości kodów kreskowych zdefiniowane.
 
 # Modules
 Module0Name=Użytkownicy i grupy
@@ -449,13 +450,13 @@ Module52Desc=Zapasy zarządzania produktów
 Module53Name=Usługi
 Module53Desc=Usługi zarządzania
 Module54Name=Kontakty/Subskrypcje
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Desc=Zarządzanie umowami (usług lub subskrypcji Reccuring)
 Module55Name=Kody kreskowe
 Module55Desc=Kody kreskowe zarządzania
 Module56Name=Telefonia
 Module56Desc=Telefonia integracji
 Module57Name=Zlecenia stałe
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Zleceń stałych oraz zarządzanie wypłaty. Również obejmuje generowanie pliku SEPA dla krajów europejskich.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integracji
 Module59Name=Bookmark4u
@@ -486,77 +487,79 @@ Module320Name=RSS Feed
 Module320Desc=Dodaj kanał RSS Dolibarr wewnątrz ekranu stron
 Module330Name=Zakładki
 Module330Desc=Zakładki zarządzania
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Projekty / Możliwości / Przewody
+Module400Desc=Zarządzanie projektami, możliwości lub przewodów. Następnie można przypisać dowolny element (faktury, zamówienia, propozycja, interwencja, ...) do projektu i uzyskać widok poprzeczny z widoku projektu.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integracji
-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
+Module500Name=Koszty specjalne (podatków, składek na ubezpieczenie społeczne, dywidendy)
+Module500Desc=Zarządzanie specjalnych kosztów, takich jak podatki, składki na ubezpieczenie społeczne, dywidend i wynagrodzenia
+Module510Name=Wynagrodzenia
+Module510Desc=Zarządzanie pracownikami wynagrodzenia i płatności
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Powiadomienia
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module600Desc=Wyślij informację, na niektórych zdarzeń gospodarczych do Dolibarr kontaktów zewnętrznych (ustawienia zdefiniowane na każdej thirdparty)
 Module700Name=Darowizny
 Module700Desc=Darowizny zarządzania
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Kosztorys
+Module770Desc=Zarządzanie i roszczenia raporty wydatków (transport, posiłek, ...)
+Module1120Name=Dostawca propozycja handlowa
+Module1120Desc=Dostawca komercyjnych i wniosek propozycja ceny
 Module1200Name=Mantis
 Module1200Desc=Mantis integracji
 Module1400Name=Księgowość ekspertów
 Module1400Desc=Księgowość zarządzania dla ekspertów (double stron)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Kategorie
-Module1780Desc=Kategorie zarządzania (produktów, dostawców i klientów)
+Module1520Name=Generowanie dokumentu
+Module1520Desc=Dokument poczty masowej generacji
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Edytor WYSIWYG
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module2200Name=Dynamiczne Ceny
+Module2200Desc=Włącz użycie wyrażeń matematycznych dla cen
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Porządek obrad
 Module2400Desc=Działania / zadania i porządku zarządzania
 Module2500Name=Electronic Content Management
 Module2500Desc=Zapisz i udostępniania dokumentów
 Module2600Name=WebServices
 Module2600Desc=Włącz serwer usług internetowych Dolibarr
-Module2650Name=WebServices (client)
-Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2650Name=WebServices (klient)
+Module2650Desc=Włącz Dolibarr serwisów internetowych klienta (może być używany do pchania danych / wnioski o dopuszczenie do zewnętrznych serwerów. Zamówień Dostawca obsługiwane tylko na chwilę)
 Module2700Name=Gravatar
 Module2700Desc=Użyj Gravatar usług online (www.gravatar.com), aby pokazać zdjęcia użytkowników / członków (znaleziono ich e-maile). Konieczność dostępu do Internetu
 Module2800Desc=FTP Client
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP możliwości konwersji Maxmind
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
+Module3100Desc=Dodaj przycisk Skype do karty zwolenników / osób trzecich / kontaktów
 Module5000Name=Multi-firma
 Module5000Desc=Pozwala na zarządzanie wieloma firmami
 Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module6000Desc=Zarządzania przepływem pracy
+Module20000Name=Zostaw zarządzanie życzenia
+Module20000Desc=Deklaracja i postępuj pracowników pozostawia wnioski
+Module39000Name=Partii wyrobów
+Module39000Desc=Partii lub serii, jeść po i sprzedawać po zarządzania data o produktach
 Module50000Name=Paybox
 Module50000Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paybox
 Module50100Name=Kasa
 Module50100Desc=Kasa modułu
 Module50200Name=Paypal
 Module50200Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
+Module50400Name=Rachunkowość (zaawansowane)
+Module50400Desc=Rachunkowości zarządczej (podwójne strony)
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
+Module54000Desc=Druk bezpośredni (bez otwierania dokumentów) za pomocą interfejsu Puchary IPP (drukarki muszą być widoczne z serwera, a CUPS musi być installé na serwerze).
+Module55000Name=Otwórz Sonda
+Module55000Desc=Moduł do ankiet internetowych (jak Doodle, Szpilki, Rdvz, ...)
+Module59000Name=Marże
+Module59000Desc=Moduł do zarządzania marże
+Module60000Name=Prowizje
+Module60000Desc=Moduł do zarządzania prowizji
+Module150010Name=Numer partii, jeść po terminie i data sprzedaży
+Module150010Desc=numer partii, jeść po terminie i sprzedawać po zarządzania data dla produktu
 Permission11=Czytaj faktur
 Permission12=Tworzenie/Modyfikacja faktur
 Permission13=faktur Unvalidate
@@ -586,7 +589,7 @@ Permission67=Eksport interwencji
 Permission71=Czytaj użytkowników
 Permission72=Tworzenie / modyfikować użytkowników
 Permission74=Usuwanie użytkowników
-Permission75=Setup types of membership
+Permission75=Typy konfiguracji członkostwa
 Permission76=Eksport danych
 Permission78=Czytaj subskrypcje
 Permission79=Tworzenie / zmodyfikować subskrypcje
@@ -605,12 +608,12 @@ Permission95=Przeczytaj raporty
 Permission101=Czytaj sendings
 Permission102=Utwórz / Modyfikuj sendings
 Permission104=Validate sendings
-Permission106=Export sendings
+Permission106=Sendings eksport
 Permission109=Usuń sendings
 Permission111=Czytaj finansowych
 Permission112=Tworzenie / modyfikować / usuwać i porównać transakcji
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission113=Sprawozdania finansowe konfiguracji (tworzenie, zarządzanie kategoriami)
+Permission114=Reconciliate transakcji
 Permission115=Transakcji eksportowych i konta
 Permission116=Przelewy pomiędzy rachunkami
 Permission117=Zarządzanie czeków wysyłkowe
@@ -627,22 +630,22 @@ Permission151=Czytaj stałych zleceń
 Permission152=Instalacji stałych zleceń
 Permission153=Czytaj zlecenia stałe wpływy
 Permission154=Karta kredytowa / odmówić zleceń stałych wpływów
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips and expenses
+Permission161=Czytaj zamówień / subskrypcjami
+Permission162=Tworzenie / modyfikacja zamówień / subskrypcjami
+Permission163=Aktywacja usługi / subskrypcji umowy
+Permission164=Wyłączanie usług / zapis umowy
+Permission165=Usuń zamówień / subskrypcjami
+Permission171=Czytaj wycieczek i koszty (własne i swoich podwładnych)
+Permission172=Tworzenie / modyfikacja wycieczek i koszty
 Permission173=Usuń wyjazdy i wydatki
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission174=Przeczytaj wszystkie wycieczki i koszty
+Permission178=Eksport wycieczki i koszty
 Permission180=Czytaj dostawców
 Permission181=Czytaj dostawcy zamówienia
 Permission182=Tworzenie / zmodyfikować dostawcy zamówienia
 Permission183=Validate dostawcy zamówienia
 Permission184=Zatwierdź dostawcy zamówienia
-Permission185=Order or cancel supplier orders
+Permission185=Zamówić lub anulować zamówienia dostawca
 Permission186=Odbiór dostawcy zamówienia
 Permission187=Zamknij dostawcy zamówienia
 Permission188=Zrezygnuj dostawcy zamówienia
@@ -663,9 +666,9 @@ Permission221=Czytaj emailings
 Permission222=Utwórz / Modyfikuj emailings (tematu odbiorców ...)
 Permission223=Validate emailings (umożliwia wysyłanie)
 Permission229=Usuń emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
+Permission237=Zobacz odbiorców i informacji
+Permission238=Ręczne wysyłanie mailingów
+Permission239=Usuń wysyłki po zatwierdzeniu lub wysłany
 Permission241=Czytaj kategorii
 Permission242=Tworzenie / modyfikowanie kategorii
 Permission243=Usuwanie kategorii
@@ -693,7 +696,7 @@ Permission300=Odczyt kodów kreskowych
 Permission301=Tworzenie / modyfikować kody kreskowe
 Permission302=Usuwanie kodów kreskowych
 Permission311=Czytaj usług
-Permission312=Assign service/subscription to contract
+Permission312=Przypisywanie usługi / subskrypcja do umowy
 Permission331=Czytaj zakładek
 Permission332=Utwórz / Modyfikuj zakładki
 Permission333=Usuwanie zakładki
@@ -710,10 +713,15 @@ Permission401=Czytaj zniżki
 Permission402=Tworzenie / modyfikować rabaty
 Permission403=Sprawdź rabaty
 Permission404=Usuń zniżki
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
+Permission510=Czytaj Wynagrodzenia
+Permission512=Tworzenie / modyfikacja pensje
+Permission514=Usuń pensje
+Permission517=Wynagrodzenia eksport
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Czytaj usług
 Permission532=Tworzenie / modyfikowania usług
 Permission534=Usuwanie usług
@@ -722,16 +730,16 @@ Permission538=Eksport usług
 Permission701=Czytaj darowizn
 Permission702=Tworzenie / zmodyfikować darowizn
 Permission703=Usuń darowizn
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Raporty Czytaj wydatków (własne i jego podwładni)
+Permission772=Tworzenie / modyfikacja raportów wydatków
+Permission773=Usuń raporty wydatków
+Permission774=Przeczytaj wszystkie raporty wydatków (nawet dla użytkowników nie podwładni)
+Permission775=Zatwierdzanie raportów wydatków
+Permission776=Zapłać raporty wydatków
+Permission779=Raporty wydatków Export
 Permission1001=Czytaj zapasów
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Tworzenie / modyfikacja magazyny
+Permission1003=Usuń magazyny
 Permission1004=Czytaj stanie ruchów
 Permission1005=Tworzenie / zmodyfikować stanie ruchów
 Permission1101=Przeczytaj zamówienia na dostawy
@@ -746,6 +754,7 @@ Permission1185=Zatwierdź dostawcy zamówienia
 Permission1186=Postanowienie dostawcy zamówienia
 Permission1187=Potwierdzam otrzymanie zamówienia dostawcy
 Permission1188=Zamknij dostawcy zamówienia
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Pobierz skutek wywozu
 Permission1202=Utwórz / Modyfikuj wywóz
 Permission1231=Czytaj dostawcy faktur
@@ -754,14 +763,14 @@ Permission1233=Sprawdź dostawcę faktur
 Permission1234=Usuń dostawcy faktur
 Permission1235=Wyślij faktury dostawców za pośrednictwem poczty elektronicznej
 Permission1236=Eksport faktury dostawcy, atrybuty i płatności
-Permission1237=Export supplier orders and their details
+Permission1237=Zamówienia dostawca Eksport i ich szczegóły
 Permission1251=Uruchom masowego importu danych do zewnętrznych baz danych (dane obciążenia)
 Permission1321=Eksport klienta faktury, atrybuty i płatności
 Permission1421=Eksport zamówień i atrybuty
-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=Czytaj działań (zdarzeń lub zadań) związane z jego konta
 Permission2402=Tworzenie / modyfikować / usuwać działań (zdarzeń lub zadań) związane z jego konta
 Permission2403=Czytaj działań (zdarzeń lub zadań) innych
@@ -772,66 +781,66 @@ Permission2501=Przeczytaj dokumenty
 Permission2502=Prześlij dokumenty lub usunąć
 Permission2503=Wyślij lub usuwanie dokumentów
 Permission2515=Konfiguracja katalogów dokumentów
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
+Permission2801=Za pomocą klienta FTP w trybie odczytu (przeglądać i pobierać tylko)
+Permission2802=Korzystanie z klienta FTP w trybie zapisu (usuwanie lub przesyłanie plików)
+Permission50101=Zastosowanie Punkt sprzedaży
 Permission50201=Przeczytaj transakcji
 Permission50202=Transakcji importowych
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
+Permission54001=Druk
+Permission55001=Czytaj ankiet
+Permission55002=Tworzenie / modyfikacja ankiet
+Permission59001=Czytaj marż handlowych
+Permission59002=Zdefiniuj marż handlowych
+Permission59003=Przeczytaj co margines użytkownika
+DictionaryCompanyType=Typ Thirdparties
+DictionaryCompanyJuridicalType=Prawne, rodzaje thirdparties
+DictionaryProspectLevel=Perspektywa potencjalny poziom
+DictionaryCanton=State / Kantonów
+DictionaryRegion=Regiony
+DictionaryCountry=Kraje
+DictionaryCurrency=Waluty
+DictionaryCivility=Tytuł Grzeczność
+DictionaryActions=Rodzaj wydarzenia porządku obrad
+DictionarySocialContributions=Rodzaje składek na ubezpieczenia społeczne
+DictionaryVAT=VAT ceny lub podatku od sprzedaży ceny
+DictionaryRevenueStamp=Ilość znaczków opłaty skarbowej
+DictionaryPaymentConditions=Warunki płatności
+DictionaryPaymentModes=Tryby płatności
+DictionaryTypeContact=Kontakt / typy Adres
+DictionaryEcotaxe=Podatku ekologicznego (WEEE)
+DictionaryPaperFormat=Formaty papieru
+DictionaryFees=Rodzaj opłaty
+DictionarySendingMethods=Metody wysyłki
+DictionaryStaff=Personel
+DictionaryAvailability=Opóźnienie dostawy
+DictionaryOrderMethods=Sposoby zamawiania
+DictionarySource=Pochodzenie wniosków / zleceń
+DictionaryAccountancyplan=Plan kont
+DictionaryAccountancysystem=Modele dla planu kont
+DictionaryEMailTemplates=Szablony wiadomości e-mail
 SetupSaved=Konfiguracja zapisana
 BackToModuleList=Powrót do listy modułów
-BackToDictionaryList=Back to dictionaries list
+BackToDictionaryList=Powrót do listy słowników
 VATReceivedOnly=Specjalne stawki nie obciążają
 VATManagement=Zarządzanie VAT
-VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to VAT, then VAT by default=0. End of rule.
If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule. 
If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold.  End of rule.
If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.
Else the proposed default VAT=0. End of rule.
+VATIsUsedDesc=Stawka VAT domyślnie podczas tworzenia perspektywy, faktur, zamówień itp wykonaj standardową zasadę czynnego: 
 Jeśli sprzedający nie poddaje opodatkowaniu podatkiem VAT, to podatek VAT domyślnie = 0. Koniec rządów. 
 Jeśli (sprzedaż kraj = zakupem kraj), a następnie domyślnie = VAT VAT produktu w kraju sprzedaży. Koniec rządów. 
 Jeżeli sprzedający i kupujący we Wspólnocie Europejskiej i towarów są produkty transportu (samochód, statek, samolot), domyślny VAT = 0 (VAT powinny być wypłacane przez kupującego na customoffice swojego kraju, a nie sprzedawcy). Koniec rządów. 
 Jeżeli sprzedający i kupujący we Wspólnocie Europejskiej, a kupujący nie jest spółką, a następnie domyślnie = VAT VAT sprzedawanych produktów. Koniec rządów. 
 Jeżeli sprzedający i kupujący we Wspólnocie Europejskiej i kupującego jest firma, to VAT domyślnie = 0. Koniec rządów. 
 Else proponowany domyślny VAT = 0. Koniec rządów.
 VATIsNotUsedDesc=Domyślnie proponowany VAT wynosi 0, które mogą być wykorzystane w przypadkach takich jak stowarzyszeń, osób fizycznych lub małych firm.
 VATIsUsedExampleFR=We Francji, oznacza to, że firmy i organizacje o rzeczywistym systemu fiskalnego (uproszczony rzeczywistym lub normalnej rzeczywistym). A system, w którym VAT jest deklarowana.
 VATIsNotUsedExampleFR=We Francji, oznacza to stowarzyszenia, które nie są zgłoszone VAT lub firm, organizacji i wolnych zawodów, które wybrały mikro przedsiębiorstw systemu fiskalnego (VAT w franczyzy) i wypłaciła franszyzowej VAT bez deklaracji VAT. Ten wybór będzie wyświetlany odniesienie "Nie dotyczy podatku VAT - art-293B z CGI" na fakturach.
 ##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsUsed=Use second tax
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
+LTRate=Stawka
+LocalTax1IsUsed=Użyj drugiego podatku
+LocalTax1IsNotUsed=Nie należy używać drugiego podatku
+LocalTax1IsUsedDesc=Użyj drugi typ podatków (innych niż VAT)
+LocalTax1IsNotUsedDesc=Nie należy używać innego rodzaju podatków (innych niż VAT)
+LocalTax1Management=Drugi rodzaj podatku
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsUsed=Use third tax
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
+LocalTax2IsUsed=Użyj trzeci podatku
+LocalTax2IsNotUsed=Nie używać trzeci podatku
+LocalTax2IsUsedDesc=Użyj trzeci rodzaj podatku (poza VAT)
+LocalTax2IsNotUsedDesc=Nie należy używać innego rodzaju podatków (innych niż VAT)
+LocalTax2Management=Trzeci rodzaj podatku
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= RE Management
@@ -844,13 +853,13 @@ LocalTax2IsUsedDescES= RE stawki domyślnie podczas tworzenia perspektyw, faktur
 LocalTax2IsNotUsedDescES= Domyślnie proponowana jest 0 IRPF. Koniec panowania.
 LocalTax2IsUsedExampleES= W Hiszpanii, freelancerów i przedstawicieli wolnych zawodów, którzy świadczą usługi i przedsiębiorstwa, którzy wybrali system podatkowy modułów.
 LocalTax2IsNotUsedExampleES= W Hiszpanii nie są one przedmiotem Bussines modułów systemu podatkowego.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax=Raporty
+CalcLocaltax1ES=Sprzedaż - Zakupy
+CalcLocaltax1Desc=Lokalne raporty Podatki są obliczane z różnicy między sprzedażą localtaxes i localtaxes zakupów
+CalcLocaltax2ES=Zakupy
+CalcLocaltax2Desc=Lokalne raporty Podatki są łącznie localtaxes zakupów
+CalcLocaltax3ES=Obroty
+CalcLocaltax3Desc=Lokalne raporty Podatki są za łączną sprzedaży localtaxes
 LabelUsedByDefault=Wytwórnia używany domyślnie, jeśli nie można znaleźć tłumaczenie dla kodu
 LabelOnDocuments=Etykieta na dokumenty
 NbOfDays=Nb dni
@@ -875,7 +884,7 @@ PhpConf=Conf.
 PhpWebLink=Web-Php link
 Pear=Pear
 PearPackages=Pear Packages
-Browser=Browser
+Browser=Przeglądarka
 Server=Serwer
 Database=Baza
 DatabaseServer=Database host
@@ -902,7 +911,7 @@ MenuCompanySetup=Firma / Fundacja
 MenuNewUser=Nowy użytkownik
 MenuTopManager=Górne menu menedżera
 MenuLeftManager=Lewe menu menedżera
-MenuManager=Menu manager
+MenuManager=Menedżer menu
 MenuSmartphoneManager=Smartphone menedżer menu
 DefaultMenuTopManager=Górne menu menedżera
 DefaultMenuLeftManager=Lewe menu menedżera
@@ -918,7 +927,7 @@ PermanentLeftSearchForm=Stałe formularz wyszukiwania na lewym menu
 DefaultLanguage=Domyślny język do użytku (kod języka)
 EnableMultilangInterface=Włącz wielojęzyczny interfejs
 EnableShowLogo=logo Pokaż na menu po lewej stronie
-EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
+EnableHtml5=Włącz HTML5 (Developement - Dostępna tylko na Eldy szablonu)
 SystemSuccessfulyUpdated=System został zaktualizowany
 CompanyInfo=Firma / fundacja informacji
 CompanyIds=Firma / fundament tożsamości
@@ -962,15 +971,15 @@ SetupDescription5=Inne pozycje menu Zarządzaj opcjonalne parametry.
 EventsSetup=Konfiguracja dzienników zdarzeń
 LogEvents=Audyt bezpieczeństwa imprez
 Audit=Audyt
-InfoDolibarr=Infos Dolibarr
-InfoBrowser=Infos Browser
-InfoOS=Infos OS
-InfoWebServer=Infos web server
-InfoDatabase=Infos database
-InfoPHP=Infos PHP
-InfoPerf=Infos performances
-BrowserName=Browser name
-BrowserOS=Browser OS
+InfoDolibarr=Informacje Dolibarr
+InfoBrowser=Informacje o przeglądarce
+InfoOS=Informacje OS
+InfoWebServer=Informacje serwer WWW
+InfoDatabase=Informacje o bazie
+InfoPHP=Informacje o PHP
+InfoPerf=Informacje o występy
+BrowserName=Nazwa przeglądarki
+BrowserOS=Przeglądarka OS
 ListEvents=Audyt wydarzenia
 ListOfSecurityEvents=Lista Dolibarr bezpieczeństwa imprez
 SecurityEventsPurged=Zdarzenia zabezpieczeń oczyszczone
@@ -991,7 +1000,7 @@ TriggerDisabledAsModuleDisabled=Wyzwalacze w tym pliku są wyłączone jako m
 TriggerAlwaysActive=Wyzwalacze w tym pliku są zawsze aktywne, niezależnie są aktywowane Dolibarr modułów.
 TriggerActiveAsModuleActive=Wyzwalacze w tym pliku są aktywne jako modułu %s jest aktywny.
 GeneratedPasswordDesc=Określ tutaj reguły, które chcesz użyć do wygenerowania nowego hasła, jeśli zapyta się automatycznie wygenerowane hasło
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
+DictionaryDesc=Określ tutaj wszystkie dane teleadresowe referencyjnych. Możesz wypełnić predefiniowaną wartość z Ciebie.
 ConstDesc=Ta strona pozwala edytować wszystkie inne parametry nie są dostępne w poprzedniej strony. Są one zastrzeżone dla zaawansowanych parametrów deweloperzy lub troubleshouting.
 OnceSetupFinishedCreateUsers=Ostrzeżenie, jesteś Dolibarr administratora użytkownika. Administrator użytkowników wykorzystywane są do konfiguracji Dolibarr. Dla Zazwyczaj korzystanie z Dolibarr, zaleca się używać nieujemnych administratora użytkownika tworzone Użytkownicy i grupy menu.
 MiscellaneousDesc=Określ tutaj wszystkie inne parametry związane z bezpieczeństwem.
@@ -1013,11 +1022,11 @@ BackupDesc2=* Zapisz zawartość dokumentów katalog ( %s), który zawier
 BackupDesc3=* Zapisz zawartość bazy danych z zrzutu. do tego, możesz użyć następujących asystenta.
 BackupDescX=Zarchiwizowane katalogu należy przechowywać w bezpiecznym miejscu.
 BackupDescY=Wygenerowany plik zrzutu powinny być przechowywane w bezpiecznym miejscu.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
+BackupPHPWarning=Kopia zapasowa nie może być gwarantowana przy użyciu tej metody. Wolę poprzedni
 RestoreDesc=Aby przywrócić Dolibarr zapasowej, należy:
 RestoreDesc2=* Przywracanie pliku archiwum (np. zip) katalog dokumentów, aby wyodrębnić drzewa plików w katalogu dokumentów na nowe Dolibarr instalacji lub na tym dokumenty directoy ( %s).
 RestoreDesc3=* Przywracanie danych z kopii zapasowej pliku zrzutu, do bazy danych do nowego Dolibarr instalacji lub do bazy danych tej instalacji. Ostrzeżenie, po przywróceniu jest gotowy, należy użyć loginu i hasła, które istniały, gdy kopia zapasowa została dokonana, aby połączyć się ponownie. Aby przywrócić kopię zapasową bazy danych do tej instalacji, można się do tego asystenta.
-RestoreMySQL=MySQL import
+RestoreMySQL=Import MySQL
 ForcedToByAModule= Ta zasada jest zmuszona do %s przez aktywowany modułu
 PreviousDumpFiles=Dump bazy danych dostępne pliki kopii zapasowej
 WeekStartOnDay=Pierwszy dzień tygodnia
@@ -1027,9 +1036,9 @@ YourPHPDoesNotHaveSSLSupport=funkcji SSL nie są dostępne w PHP
 DownloadMoreSkins=Więcej skórek do pobrania
 SimpleNumRefModelDesc=Zwraca numer z formatu %syymm nnnn, gdzie yy to rok, MM miesiąc i nnnn jest ciągiem bez otworu, bez resetowania
 ShowProfIdInAddress=Pokaż zawodami identyfikator z adresów na dokumentach
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
+ShowVATIntaInAddress=Ukryj VAT Intra num z adresów na dokumenty
 TranslationUncomplete=Częściowe tłumaczenie
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/.
+SomeTranslationAreUncomplete=Niektóre języki mogą być częściowo tłumaczona lub maja zawiera błędy. Jeśli wykrycie niektórych, można naprawić pliki językowe z zarejestrowaniem się http://transifex.com/projects/p/dolibarr/ .
 MenuUseLayout=Dodać pionowe menu hidable (javascript opcja nie może być wyłączone)
 MAIN_DISABLE_METEO=Wyłącz widok pictogramów meteo
 TestLoginToAPI=Przetestuj się zalogować do interfejsu API
@@ -1042,51 +1051,51 @@ MAIN_PROXY_USER=Zaloguj się, aby korzystać z serwera proxy
 MAIN_PROXY_PASS=Hasło do korzystania z serwera proxy
 DefineHereComplementaryAttributes=Określ tutaj wszystkie ATUTY, nie są już dostępne domyślnie i że chcesz być obsługiwane przez %s.
 ExtraFields=Uzupełniające atrybuty
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerOrders=Complementary attributes (orders)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+ExtraFieldsLines=Atrybuty uzupełniające (linie)
+ExtraFieldsSupplierOrdersLines=(Linie uzupełniające atrybuty order)
+ExtraFieldsSupplierInvoicesLines=Atrybuty uzupełniające (linie na fakturze)
+ExtraFieldsThirdParties=Atrybuty uzupełniające (thirdparty)
+ExtraFieldsContacts=Atrybuty uzupełniające (kontakt / adres)
+ExtraFieldsMember=Atrybuty uzupełniające (członek)
+ExtraFieldsMemberType=Atrybuty uzupełniające (typ członkiem)
+ExtraFieldsCustomerOrders=Zamówienia uzupełniające (atrybuty)
+ExtraFieldsCustomerInvoices=Atrybuty uzupełniające (faktury)
+ExtraFieldsSupplierOrders=Zamówienia uzupełniające (atrybuty)
+ExtraFieldsSupplierInvoices=Atrybuty uzupełniające (faktury)
+ExtraFieldsProject=Atrybuty uzupełniające (projektów)
+ExtraFieldsProjectTask=Atrybuty uzupełniające (zadania)
+ExtraFieldHasWrongValue=Atrybut% s ma nieprawidłową wartość.
+AlphaNumOnlyCharsAndNoSpace=tylko alphanumericals znaków bez spacji
+AlphaNumOnlyLowerCharsAndNoSpace=tylko alphanumericals i małe litery bez przestrzeni
 SendingMailSetup=Ustawienie sendings emailem
 SendmailOptionNotComplete=Uwaga, w niektórych systemach Linux, aby wysłać e-mail z poczty elektronicznej, konfiguracja wykonanie sendmail musi conatins opcja-ba (mail.force_extra_parameters parametr w pliku php.ini). Jeśli nigdy niektórzy odbiorcy otrzymywać e-maile, spróbuj edytować ten parametr PHP z mail.force_extra_parameters =-ba).
 PathToDocuments=Ścieżka do dokumentów
 PathDirectory=Katalog
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=Choice of language visible on screen can be modified:
* Globally from menu Home - Setup - Display
* For user only from tab User display of user card (click on login on top of screen).
-TotalNumberOfActivatedModules=Total number of activated feature modules: %s
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
-SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+SendmailOptionMayHurtBuggedMTA=Funkcja wysłać maile za pomocą metody "PHP poczty bezpośredniej" wygeneruje wiadomości, że może nie być prawidłowo przeanalizowany przez niektórych otrzymujących serwerów pocztowych. Powoduje to, że niektóre maile nie mogą być odczytywane przez ludzi obsługiwanych przez te platformy podsłuchu. To przypadku niektórych dostawców internetowych (Ex: Pomarańczowy we Francji). To nie jest problem w Dolibarr, ani w PHP, ale na otrzymywanie serwera poczty. Możesz jednak dodać opcję MAIN_FIX_FOR_BUGGED_MTA do 1 w konfiguracji - inne zmodyfikować Dolibarr, aby tego uniknąć. Jednakże, mogą wystąpić problemy z innymi serwerami, które przestrzegają ściśle standardu SMTP. Inne rozwiązanie (zalecane) jest użycie metody "gniazdo SMTP biblioteki", który nie ma wad.
+TranslationSetup=Konfiguracja de la traduction
+TranslationDesc=Wybór języka widoczne na ekranie mogą być modyfikowane: 
 * Globalnie z menu Start - Ustawienia - Wyświetlacz 
 * Dla użytkowników tylko z wyświetlaczem karta użytkownika karty użytkownika (kliknij zaloguj się na górze ekranu).
+TotalNumberOfActivatedModules=Łączna liczba aktywowanych modułów funkcji:% s
+YouMustEnableOneModule=Musisz przynajmniej umożliwić 1 moduł
+ClassNotFoundIntoPathWarning=Klasa% s nie znaleziono na drodze PHP
+YesInSummer=Tak w lecie
+OnlyFollowingModulesAreOpenedToExternalUsers=Uwaga, tylko następujące moduły są otwarte dla użytkowników zewnętrznych (co mają pozwolenie takich użytkowników):
+SuhosinSessionEncrypt=Przechowywania sesji szyfrowane Suhosin
+ConditionIsCurrently=Stan jest obecnie% s
+YouUseBestDriver=Za pomocą sterownika% s, który jest najlepszym kierowcą dostępne obecnie.
+YouDoNotUseBestDriver=Używać dysku% s% s, ale kierowca jest zalecane.
+NbOfProductIsLowerThanNoPb=Masz tylko% s produktów / usług do bazy danych. W ten sposób nie wymaga żadnej szczególnej optymalizacji.
+SearchOptim=Pozycjonowanie
+YouHaveXProductUseSearchOptim=Masz% s produktu w bazie danych. Należy dodać stałą PRODUCT_DONOTSEARCH_ANYWHERE do 1 w Home-Setup-Inne, można ograniczyć wyszukiwanie do początku ciągów składających możliwe dla bazy danych do wykorzystania indeksu i powinieneś otrzymać natychmiastową odpowiedź.
+BrowserIsOK=Używasz przeglądarki internetowej% s. Ta przeglądarka jest ok dla bezpieczeństwa i wydajności.
+BrowserIsKO=Używasz przeglądarki internetowej% s. Ta przeglądarka jest znany zły wybór dla bezpieczeństwa, wydajności i niezawodności. Mamy polecam do korzystania z przeglądarki Firefox, Chrome, Opera lub Safari.
+XDebugInstalled=XDebug jest załadowany.
+XCacheInstalled=XCache jest załadowany.
+AddRefInList=Wyświetlacz klienta / ref dostawcą na liście (wybierz listy lub combobox) i większość z hiperłącza. Osób trzecich pojawia się nazwa "CC12345 - SC45678 - duży coorp firmy", zamiast "The big coorp firmy".
+FieldEdition=Edycja pola% s
+FixTZ=Strefa czasowa fix
+FillThisOnlyIfRequired=Przykład: +2 (wypełnić tylko w przypadku strefy czasowej w stosunku problemy są doświadczeni)
+GetBarCode=Pobierz kod kreskowy
+EmptyNumRefModelDesc=Kod jest bezpłatne. Kod ten może być zmieniane w dowolnym momencie.
 ##### Module password generation
 PasswordGenerationStandard=Wróć hasło generowane zgodnie z wewnętrznym Dolibarr algorytmu: 8 znaków zawierających cyfry i znaki udostępniony w małe.
 PasswordGenerationNone=Nie zgłosił żadnych wygenerowane hasło. Hasło należy wpisać ręcznie.
@@ -1107,15 +1116,15 @@ ModuleCompanyCodeAquarium=Zwrócić rachunkowych kod zbudowany przez %s, a nast
 ModuleCompanyCodePanicum=Wróć pusty rachunkowych kodu.
 ModuleCompanyCodeDigitaria=Księgowość kod zależy od trzeciej kodu. Kod składa się z charakterem "C" na pierwszej pozycji, po którym następuje pierwsze 5 znaków w kodzie strony trzeciej.
 UseNotifications=Użyj powiadomień
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Szablony dokumentów
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Generowanie dokumentów z szablonów (.odt OpenDocuments lub ods pliki dla OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Znak wodny w sprawie projektu dokumentu
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=Aktywuj funkcję automatyczne wypełnianie linii płatności w formie płatności
 CompanyIdProfChecker=Profesjonalny Identyfikator unikalny
 MustBeUnique=Musi być wyjątkowa?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
+MustBeMandatory=Obowiązkowe do tworzenia stron trzecich?
+MustBeInvoiceMandatory=Obowiązkowe do sprawdzania poprawności faktur?
 Miscellaneous=Różne
 ##### Webcal setup #####
 WebCalSetup=Webcalendar link konfiguracji
@@ -1129,7 +1138,7 @@ WebCalServer=Serwerze bazy danych kalendarza
 WebCalDatabaseName=Nazwa bazy danych
 WebCalUser=Użytkownicy mają dostęp do bazy danych
 WebCalSetupSaved=Webcalendar konfiguracji zapisany pomyślnie.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
+WebCalTestOk=Połączenie do serwera '% s' w bazie danych '% s' z użytkownika '% s' sukces.
 WebCalTestKo1=Połączenie do serwera ' %s' sukces, ale baza danych' %s' nie mógł zostać osiągnięty.
 WebCalTestKo2=Połączenie do serwera ' %s' z użytkownika' %s' nie powiodło się.
 WebCalErrorConnectOkButWrongDatabase=Połączenie udało, ale baza danych nie patrzy się Webcalendar danych.
@@ -1157,7 +1166,7 @@ EnableEditDeleteValidInvoice=Włącz możliwość edytować / usuwać ważnej fa
 SuggestPaymentByRIBOnAccount=Zaproponuj płatność wycofać z
 SuggestPaymentByChequeToAddress=Zaproponuj płatności czekiem do
 FreeLegalTextOnInvoices=Wolny tekst na fakturach
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+WatermarkOnDraftInvoices=Znak wodny na projekt faktury (brak jeśli pusty)
 ##### Proposals #####
 PropalSetup=Commercial propozycje konfiguracji modułu
 CreateForm=Tworzenie formularzy
@@ -1170,25 +1179,25 @@ AddShippingDateAbility=Dodaj datę wysyłki zdolność
 AddDeliveryAddressAbility=Dodaj datę dostawy zdolność
 UseOptionLineIfNoQuantity=Linia produktów / usług z zerową ilość jest traktowana jako opcja
 FreeLegalTextOnProposal=Darmowy tekstu propozycji
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+WatermarkOnDraftProposal=Znak wodny projektów wniosków komercyjnych (brak jeśli pusty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia propozycji
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=Cena żąda konfiguracji modułu dostawcy
+AskPriceSupplierNumberingModules=Wnioski Cena dostawcy numeracji modeli
+AskPriceSupplierPDFModules=Cena żąda dostawców modele dokumenty
+FreeLegalTextOnAskPriceSupplier=Bezpłatne tekst na podania Ceny dostawców
+WatermarkOnDraftAskPriceSupplier=Znak wodny na projekt cenie żąda dostawców (brak jeśli pusty)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Zapytaj o rachunku bankowego przeznaczenia zamówienie cena
 ##### Orders #####
 OrdersSetup=Zamówienia zarządzania konfiguracją
 OrdersNumberingModules=Zamówienia numeracji modules
 OrdersModelModule=Zamów dokumenty modeli
-HideTreadedOrders=Hide the treated or cancelled orders in the list
+HideTreadedOrders=Ukryj leczonych lub anulowane zlecenia z listy
 ValidOrderAfterPropalClosed=Aby zatwierdzić wniosek, aby po bliższa, umożliwia nie krok po tymczasowym porządku
 FreeLegalTextOnOrders=Wolny tekst na zamówienie
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+WatermarkOnDraftOrders=Znak wodny w sprawie projektów zamówień (brak jeśli pusty)
+ShippableOrderIconInList=Dodaj ikonę w liście zamówień, które wskazują, czy zamówienie jest shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Zapytaj o rachunku bankowego przeznaczenia porządku
 ##### Clicktodial #####
 ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises
__PHONETO__ qui sera remplacé par le téléphone de l'appelé
__PHONEFROM__ qui sera remplacé par le téléphone de l'appelant (le votre)
__LOGIN__ qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)
__PASS__ qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1199,13 +1208,13 @@ InterventionsSetup=Interwencje konfiguracji modułu
 FreeLegalTextOnInterventions=Darmowe tekst na dokumenty interwencji
 FicheinterNumberingModules=Interwencja numeracji modules
 TemplatePDFInterventions=Interwencja karty wzorów dokumentów
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+WatermarkOnDraftInterventionCards=Znak wodny na dokumentach kart interwencji (brak jeśli pusty)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Kontrakty / konfiguracji modułu Subskrybcje
 ContractsNumberingModules=Kontrakty numerowania modułów
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=Kontrakty modele dokumenty
+FreeLegalTextOnContracts=Wolny tekst na kontraktach
+WatermarkOnDraftContractCards=Znak wodny w sprawie projektów umów (brak jeśli pusty)
 ##### Members #####
 MembersSetup=Członkowie konfiguracji modułu
 MemberMainOptions=Główne opcje
@@ -1274,15 +1283,15 @@ LDAPTestSynchroContact=Test kontaktu synchronizacji
 LDAPTestSynchroUser=Test użytkownika synchronizacji
 LDAPTestSynchroGroup=Test grupy synchronizacji
 LDAPTestSynchroMember=Test członka synchronizacji
-LDAPTestSearch= Test a LDAP search
+LDAPTestSearch= Testowanie wyszukiwania LDAP
 LDAPSynchroOK=Synchronizacja udany test
 LDAPSynchroKO=Niepowodzenie testu synchronizacji
 LDAPSynchroKOMayBePermissions=Niepowodzenie testu synchronizacji. Upewnij się, że łączenie się z serwerem jest poprawnie skonfigurowany i pozwala LDAP udpates
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP podłączyć do serwera LDAP powiodło się (Server= %s, port= %s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP podłączyć do serwera LDAP nie powiodło się (Server= %s, port= %s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Połącz / Authentificate na serwerze LDAP sukces (Server =% s, port =% s, Admin =% s, hasło =% s)
 LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=Kontakt / Authentificate do serwera LDAP nie powiodło się (Server= %s, port= %s, %s= Administrator, Password= %s)
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Odłącz sukces
 LDAPUnbindFailed=Odłącz nie
 LDAPConnectToDNSuccessfull=Połączenie au DN ( %s) Russie
 LDAPConnectToDNFailed=Połączenie au DN ( %s) choue
@@ -1338,8 +1347,8 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Przykład: objectSid
 LDAPFieldEndLastSubscription=Data zakończenia subskrypcji
 LDAPFieldTitle=Post / Funkcja
-LDAPFieldTitleExample=Example: title
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPFieldTitleExample=Przykład: tytuł
+LDAPParametersAreStillHardCoded=Parametry LDAP nadal sztywno (w klasie kontaktowego)
 LDAPSetupNotComplete=LDAP konfiguracji nie są kompletne (przejdź na innych kartach)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr hasło administratora lub przewidziane. LDAP dostęp będą anonimowe i w trybie tylko do odczytu.
 LDAPDescContact=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP drzewa dla każdego danych na Dolibarr kontakty.
@@ -1348,24 +1357,24 @@ LDAPDescGroups=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP dr
 LDAPDescMembers=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP drzewa dla każdego danych na Dolibarr użytkowników modułu.
 LDAPDescValues=Przykład wartości są dla OpenLDAP ładowane z następujących schematów: core.schema, cosine.schema, inetorgperson.schema). Jeśli używasz thoose wartości i OpenLDAP, zmodyfikować plik konfiguracyjny LDAP slapd.conf do wszystkich thoose schemas załadowany.
 ForANonAnonymousAccess=Dla uwierzytelniane dostęp (do zapisu na przykład)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+PerfDolibarr=Konfiguracja Wyniki / optymalizacja raport
+YouMayFindPerfAdviceHere=Znajdziesz na tej stronie kilka czeków lub porad związanych z realizacją.
+NotInstalled=Nie jest zainstalowany, więc serwer nie jest wolniejsze od tego.
+ApplicativeCache=Aplikacyjnych cache
+MemcachedNotAvailable=Nie znaleziono cache aplikacyjnych. Możesz zwiększyć wydajność poprzez zainstalowanie serwera cache i Memcached moduł w stanie korzystać z tego serwera cache. 
 Więcej informacji tutaj http://wiki.dolibarr.org/index.php/Module_MemCached_EN . 
 Należy pamiętać, że wiele hosting provider nie zapewnia takiego serwera cache.
+MemcachedModuleAvailableButNotSetup=Moduł memcached dla aplikacyjnej cache znaleźć, ale konfiguracja modułu nie jest kompletna.
+MemcachedAvailableAndSetup=Moduł memcached dedykowane obsłudze serwer memcached jest włączony.
+OPCodeCache=OPCODE cache
+NoOPCodeCacheFound=Nie znaleziono OpCode cache. Może użyć innego cache OPCODE niż XCache lub eAccelerator (dobry), może nie masz OPCODE cache (bardzo źle).
+HTTPCacheStaticResources=Cache HTTP do zasobów statycznych (css, img, JavaScript)
+FilesOfTypeCached=Pliki typu% s są buforowane przez serwer HTTP
+FilesOfTypeNotCached=Pliki typu% s nie są buforowane przez serwer HTTP
+FilesOfTypeCompressed=Pliki typu% s są skompresowane przez serwer HTTP
+FilesOfTypeNotCompressed=Pliki typu% s nie są kompresowane przez serwer HTTP
+CacheByServer=Cache przez serwer
+CacheByClient=Cache przez przeglądarkę
+CompressionOfResources=Kompresja odpowiedzi HTTP
+TestNotPossibleWithCurrentBrowsers=Taka automatyczna detekcja nie jest możliwe przy obecnych przeglądarek
 ##### Products #####
 ProductSetup=Produkty konfiguracji modułu
 ServiceSetup=Konfiguracja modułu Usługi
@@ -1375,13 +1384,13 @@ ConfirmDeleteProductLineAbility=Potwierdzenie usunięcia linii produkuje w forma
 ModifyProductDescAbility=Personalizacja opisy produkowanych w formach
 ViewProductDescInFormAbility=Wizualizacja opisy produktów w formach (inaczej jak popup tooltip)
 ViewProductDescInThirdpartyLanguageAbility=Wizualizacja produktów opisów w thirdparty języku
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
+UseSearchToSelectProductTooltip=Także jeśli masz dużą ilość produktu (> 100 000), można zwiększyć prędkość przez ustawienie stałej PRODUCT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
+UseSearchToSelectProduct=Użyj wyszukiwarki aby wybrać produkt (zamiast listy rozwijanej).
 UseEcoTaxeAbility=Wsparcie Eko-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Domyślny kod kreskowy typu użyć do produktów
 SetDefaultBarcodeTypeThirdParties=Domyślny kod kreskowy typu do użytku dla osób trzecich
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
+ProductCodeChecker= Moduł do generowania kodu produktu i sprawdzeniu (produkt lub usługa)
+ProductOtherConf= Konfiguracja produktu / usługi
 ##### Syslog #####
 SyslogSetup=Syslog konfiguracji modułu
 SyslogOutput=Zaloguj wyjście
@@ -1392,7 +1401,7 @@ SyslogSimpleFile=Plik
 SyslogFilename=Nazwa pliku i ścieżka
 YouCanUseDOL_DATA_ROOT=Możesz użyć DOL_DATA_ROOT / dolibarr.log do pliku w Dolibarr "dokumenty" katalogu. Można ustawić inną ścieżkę do przechowywania tego pliku.
 ErrorUnknownSyslogConstant=Stała %s nie jest znany syslog stałej
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=System Windows obsługuje tylko LOG_USER
 ##### Donations #####
 DonationsSetup=Darowizna konfiguracji modułu
 DonationsReceiptModel=Szablon otrzymania wpłaty
@@ -1410,33 +1419,33 @@ BarcodeDescUPC=Kod kreskowy typu UPC
 BarcodeDescISBN=Kod kreskowy typu ISBN
 BarcodeDescC39=Kod kreskowy typu C39
 BarcodeDescC128=Kod kreskowy typu C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+GenbarcodeLocation=Bar generowanie kodu narzędzie wiersza polecenia (używany przez silnik wewnętrznego dla niektórych typów kodów kreskowych). Muszą być zgodne z "genbarcode". 
 Na przykład: / usr / local / bin / genbarcode
+BarcodeInternalEngine=Silnik wewnętrznego
+BarCodeNumberManager=Manager auto zdefiniować numery kodów kreskowych
 ##### Prelevements #####
 WithdrawalsSetup=Wycofanie konfiguracji modułu
 ##### ExternalRSS #####
 ExternalRSSSetup=Zewnętrzne RSS przywóz konfiguracji
 NewRSS=Nowy kanał RSS
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=Ciekawe RSS
 ##### Mailing #####
 MailingSetup=Moduł konfiguracji e-maila
 MailingEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane przez e-maila modułu
 MailingEMailError=Powrót e-mail (Errors-do) na e-maile z błędami
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Sekund po wysłaniu czekać następnej wiadomości
 ##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Napisz e-mail konfiguracji modułu powiadomienia
 NotificationEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane do powiadomień
-ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
-FixedEmailTarget=Fixed email target
+ListOfAvailableNotifications=Lista wydarzeń można ustawić powiadomienia w odniesieniu do każdego thirdparty (przejdź do thirdparty karty, aby ustawić) lub ustawiając stały adres e-mail (Lista modułów zależy od aktywowanych)
+FixedEmailTarget=Naprawiono docelowy adres e-mail
 ##### Sendings #####
 SendingsSetup=Wysyłanie konfiguracji modułu
 SendingsReceiptModel=Wysyłanie otrzymania modelu
 SendingsNumberingModules=Sendings numerowania modułów
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Arkusze Wsparcie klienta na dostawy przesyłki
 NoNeedForDeliveryReceipts=W większości przypadków, sendings wpływy są wykorzystywane zarówno jako karty klienta dostaw (wykaz produktów wysłać) i arkusze, które są recevied i podpisana przez klienta. Więc produktu dostaw wpływów jest powielony funkcji i rzadko jest włączony.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Dowolny tekst sprawie przemieszczania
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dostaw otrzymania numeracji modułu
 DeliveryOrderModel=Produkty dostaw otrzymania modelu
@@ -1447,19 +1456,19 @@ AdvancedEditor=Zaawansowany edytor
 ActivateFCKeditor=Uaktywnij FCKeditor za:
 FCKeditorForCompany=WYSIWIG tworzenie / edycja spółek opis i notatki
 FCKeditorForProduct=WYSIWIG tworzenie / edycja produktów / usług "opis i notatki
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.
+FCKeditorForProductDetails=WYSIWIG tworzenie / edycja produktów szczegóły linii dla wszystkich podmiotów (wnioski, zamówienia, faktury, itp ...). Ostrzeżenie: Użycie tej opcji w tym przypadku nie jest zalecane, ponieważ może poważnie to spowodować problemy z znaków specjalnych i strona formatowania, gdy buduje PDF pliki.
 FCKeditorForMailing= WYSIWIG tworzenie / edycja wiadomości
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+FCKeditorForUserSignature=WYSIWIG tworzenie / edycja podpisu użytkownika
+FCKeditorForMail=WYSIWIG tworzenie / edycja dla wszystkich wiadomości (z wyjątkiem Outils-> e-maila)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Połączenie udało, ale baza danych nie patrzy się osCommerce danych (klucz %s nie został znaleziony w tabeli %s).
 OSCommerceTestOk=Połączenie do serwera ' %s' w bazie danych " %s" z użytkownika' %s' powiodło się.
 OSCommerceTestKo1=Połączenie do serwera ' %s' sukces, ale baza danych' %s' nie mógł zostać osiągnięty.
 OSCommerceTestKo2=Połączenie do serwera ' %s' z użytkownika' %s' nie powiodło się.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Magazyn konfiguracji modułu
+UserWarehouse=Korzystanie użytkowników osobiste magazyny
+IfYouUsePointOfSaleCheckModule=W przypadku korzystania z modułu Point of Sale (POS dostarczonych przez moduł domyślnie lub innego modułu zewnętrznego), ta konfiguracja może być ignorowane przez swój punkt modułu sprzedaż. Większość punktem modułów sprzedaży są przeznaczone do tworzenia natychmiast fakturę i zmniejszyć czas, opcje są domyślnie co tutaj. Tak więc, jeśli chcesz, czy nie mieć spadek akcji podczas rejestracji sprzedać z twojego punktu sprzedaży, sprawdź również swój moduł POS skonfigurować.
 ##### Menu #####
 MenuDeleted=Menu skreślony
 TreeMenu=Drzewo menu
@@ -1494,11 +1503,11 @@ ConfirmDeleteLine=Czy na pewno chcesz usunąć ten wiersz?
 ##### Tax #####
 TaxSetup=Podatków, składek na ubezpieczenia społeczne i dywidendy konfiguracji modułu
 OptionVatMode=Opcja d'exigibilit de TVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Kasowej
+OptionVATDebitOption=Memoriału
 OptionVatDefaultDesc=VAT jest należny: 
 - W dniu dostawy / płatności za towary 
 - Na opłatę za usługi
 OptionVatDebitOptionDesc=VAT jest należny: 
 - W dniu dostawy / płatności za towary 
 - Na fakturze (obciążenie) na usługi
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Czas VAT exigibility domyślnie wg wybranej opcji:
 OnDelivery=Na dostawy
 OnPayment=W sprawie wypłaty
 OnInvoice=Na fakturze
@@ -1509,30 +1518,30 @@ Sell=Sprzedać
 InvoiceDateUsed=Faktura używany termin
 YourCompanyDoesNotUseVAT=Twoja firma została określona, aby nie używać VAT (Start - Ustawienia - Firma / fundacji), więc nie ma VAT opcje konfiguracji.
 AccountancyCode=Kod Księgowość
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Rachunek sprzedaży. kod
+AccountancyCodeBuy=Kup konto. kod
 ##### Agenda #####
 AgendaSetup=Działania i porządku konfiguracji modułu
 PasswordTogetVCalExport=Klucz do wywozu zezwolić na link
 PastDelayVCalExport=Nie starsze niż eksport przypadku
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
-AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_USE_EVENT_TYPE=Typy użyć zdarzenia (udało się menu Setup -> słownik -> Rodzaj wydarzenia porządku obrad)
+AGENDA_DEFAULT_FILTER_TYPE=Ustaw automatycznie tego typu imprezy w filtrze wyszukiwania widzenia porządku obrad
+AGENDA_DEFAULT_FILTER_STATUS=Ustaw automatycznie tego stanu dla wydarzeń w filtrze wyszukiwania widzenia porządku obrad
+AGENDA_DEFAULT_VIEW=Która karta chcesz otworzyć domyślnie po wybraniu menu Agendę
 ##### ClickToDial #####
 ClickToDialDesc=Moduł ten pozwala dodać ikonę po numer telefonu Dolibarr kontakty. Kliknięcie na tę ikonę, będzie połączenie z serveur z danego adresu URL można zdefiniować poniżej. Może to być wykorzystane, aby połączyć się z Call Center z systemu Dolibarr, że mogą dzwonić na numer telefonu SIP system przykład.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Punktów sprzedaży
 CashDeskSetup=Kasa konfiguracji modułu
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Domyślnie ogólny osób trzecich do korzystania z Sells
 CashDeskBankAccountForSell=Środki pieniężne na rachunku do korzystania sprzedaje
 CashDeskBankAccountForCheque= Chcesz używać do otrzymywania płatności w formie czeku
 CashDeskBankAccountForCB= Chcesz używać do przyjmowania płatności gotówkowych za pomocą kart kredytowych
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Wyłącz spadek akcji, gdy sprzedaż odbywa się z punktów sprzedaży (jeśli "nie", spadek zapasów odbywa się dla każdego sprzedają zrobić z POS, co jest rozwiązaniem określonym w module magazynie).
+CashDeskIdWareHouse=Życie i ograniczyć magazyn użyć do spadku magazynie
+StockDecreaseForPointOfSaleDisabled=Spadek Zdjęcie z punktach sprzedaży wyłączony
+StockDecreaseForPointOfSaleDisabledbyBatch=Spadek Zdjęcie w POS nie jest kompatybilny z zarządzania partiami
+CashDeskYouDidNotDisableStockDecease=Nie wyłączono spadek akcji podczas dokonywania sprzedaży od punktu sprzedaży. Więc jest wymagane magazynu.
 ##### Bookmark #####
 BookmarkSetup=Zakładka konfiguracji modułu
 BookmarkDesc=Moduł ten umożliwia zarządzanie zakładkami. Możesz także dodać skróty do jakichkolwiek Dolibarr strony lub stron internetowych externale po lewej stronie menu.
@@ -1556,10 +1565,11 @@ MultiCompanySetup=Firma Multi-Moduł konfiguracji
 SuppliersSetup=Dostawca konfiguracji modułu
 SuppliersCommandModel=Kompletny szablon zamówienia dostawcy (logo. ..)
 SuppliersInvoiceModel=Kompletny szablon faktury dostawcy (logo. ..)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+SuppliersInvoiceNumberingModel=Modele numeracji faktur dostawca
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind konfiguracji modułu
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Ścieżka dostępu do pliku zawierającego MaxMind ip do tłumaczenia kraju. 
 Przykłady: 
 /usr/local/share/GeoIP/GeoIP.dat 
 /usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Pamiętać, że dane państwo ip do pliku musi być wewnątrz katalogu PHP może odczytać (sprawdzenie konfiguracji PHP open_basedir i uprawnienia systemu plików).
 YouCanDownloadFreeDatFileTo=Możesz pobrać darmową wersję demo kraju GeoIP plik Maxmind w %s.
 YouCanDownloadAdvancedDatFileTo=Możesz także pobrać bardziej kompletna wersja, z aktualizacjami, kraju GeoIP plik Maxmind w %s.
@@ -1568,36 +1578,41 @@ TestGeoIPResult=Test konwersji IP -> kraj
 ProjectsNumberingModules=Moduł projektów numeracji
 ProjectsSetup=Projekt instalacji modułu
 ProjectsModelModule=Wzór dokumentu projektu sprawozdania
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
+TasksNumberingModules=Zadania numeracji modułu
+TaskModelModule=Zadania raporty modelu dokumentu
 ##### ECM (GED) #####
-ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMSetup = Konfiguracja GED
+ECMAutoTree = Automatyczne drzewa folderów i dokumentów
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+FiscalYears=Lat podatkowych
+FiscalYear=Rok podatkowy
+FiscalYearCard=Fiskalny rok karty
+NewFiscalYear=Nowy rok podatkowy
+EditFiscalYear=Edycja rok obrotowy
+OpenFiscalYear=Otwórz rok obrotowy
+CloseFiscalYear=Blisko rok obrotowy
+DeleteFiscalYear=Usuń rok obrotowy
+ConfirmDeleteFiscalYear=Czy na pewno usunąć ten rok podatkowy?
+Opened=Otwierany
+Closed=Zamknięte
+AlwaysEditable=Zawsze może być edytowany
+MAIN_APPLICATION_TITLE=Wymusza widoczną nazwę aplikacji (ostrzeżenie: ustawienie własnej nazwy tutaj może złamać Autouzupełnianie funkcji logowania przy użyciu DoliDroid aplikację mobilną)
+NbMajMin=Minimalna liczba wielkich liter
+NbNumMin=Minimalna liczba znaków numerycznych
+NbSpeMin=Minimalna liczba znaków specjalnych
+NbIteConsecutive=Maksymalna liczba powtarzając te same znaki
+NoAmbiCaracAutoGeneration=Nie należy używać znaków wieloznacznych ("1", "L", "ja", "|", "0", "O") dla automatycznego generowania
+SalariesSetup=Konfiguracja modułu wynagrodzenia
+SortOrder=Sortowanie po
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-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.
+TypePaymentDesc=0: Rodzaj klienta płatności, 1: Dostawca typ płatności, 2: Zarówno klienci i dostawcy typ płatności
+IncludePath=Dołącz ścieżkę (zdefiniowane w zmiennej% s)
+ExpenseReportsSetup=Konfiguracja modułu kosztów raportów
+TemplatePDFExpenseReports=Szablony dokumentów w celu wygenerowania raportu wydatków dokument
+NoModueToManageStockDecrease=Nie Moduł stanie zarządzać automatyczny spadek akcji zostało aktywowane. Spadek Zdjęcie zostanie zrobione tylko na ręczne wprowadzanie.
+NoModueToManageStockIncrease=Nie Moduł stanie zarządzać automatyczny wzrost akcji zostało aktywowane. Wzrost Zdjęcie zostanie zrobione tylko na ręczne wprowadzanie.
+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
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 58e41af52ac..a2bef22d4fb 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -6,11 +6,11 @@ Agenda=Agenda
 Agendas=Agendy
 Calendar=Kalendarz
 Calendars=Kalendarze
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+LocalAgenda=Kalendarz Wewnętrzne
+ActionsOwnedBy=Wydarzenie własnością
 AffectedTo=Przypisany do
 DoneBy=Wykonane przez
-Event=Event
+Event=Wydarzenie
 Events=Zdarzenia
 EventsNb=Ilość zdarzeń
 MyEvents=Moje zdarzenia
@@ -23,20 +23,20 @@ MenuToDoActions=Wszystkie zdarzenia niekompletne
 MenuDoneActions=Wszystkie zdarzenia zakończone
 MenuToDoMyActions=Moje działania niekompletne
 MenuDoneMyActions=Moje zdarzenia zakończone
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Lista zdarzeń (wewnętrzny kalendarz)
 ActionsAskedBy=Akcje zostały zarejestrowane przez
 ActionsToDoBy=Zdarzenia przypisane do
 ActionsDoneBy=Zdarzenia wykonane przez
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
-ActionAssignedTo=Event assigned to
+ActionsForUser=Imprezy dla użytkowników
+ActionsForUsersGroup=Imprezy dla wszystkich użytkowników grupy
+ActionAssignedTo=Przypisany do zdarzenia
 AllMyActions= Wszystkie moje zdarzenia/zadania
 AllActions= Wszystkie zdarzenia/zadania
 ViewList=Widok listy
 ViewCal=Pokaż miesiąc
 ViewDay=Pokaż dzień
 ViewWeek=Pokaż tydzień
-ViewPerUser=Per user view
+ViewPerUser=Za widzenia użytkownika
 ViewWithPredefinedFilters= Widok ze zdefiniowanymi filtrami
 AutoActions= Automatyczne wypełnianie
 AgendaAutoActionDesc= Określ zdarzenia, dla których Dolibarr ma tworzyć automatycznie wpisy w agendzie. Jeżeli nie jest zaznaczone (domyślnie), w agendzie zostaną utworzone wpisy wyłącznie dla działań manualnych.
@@ -45,12 +45,15 @@ AgendaExtSitesDesc=Ta strona pozwala zdefiniować zewnętrzne źródła kalendar
 ActionsEvents=Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w agendzie
 PropalValidatedInDolibarr=Zatwierdzenie oferty %s
 InvoiceValidatedInDolibarr=Zatwierdzenie faktury %s
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Faktura% s potwierdzone z POS
 InvoiceBackToDraftInDolibarr=Zmiana statusu faktura %s na draft
 InvoiceDeleteDolibarr=Usunięcie faktury %s
-OrderValidatedInDolibarr= Zatwierdzenie zamówienia %s
+OrderValidatedInDolibarr=Zatwierdzenie zamówienia %s
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Anulowanie zamówienia %s
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Akceptacja zamówienia %s
-OrderRefusedInDolibarr=Order %s refused
+OrderRefusedInDolibarr=Zamówienie% s odmówił
 OrderBackToDraftInDolibarr=Zmiana statusu zamówienia %s na draft
 OrderCanceledInDolibarr=Anulowanie zamówienia %s
 ProposalSentByEMail=Oferta %s wysłana e-mailem
@@ -58,9 +61,9 @@ OrderSentByEMail=Zamówienie %s Klienta wysłane e-mailem
 InvoiceSentByEMail=Faktura %s wysłana e-mailem
 SupplierOrderSentByEMail=Zamówienie %s wysłane do dostawcy e-mailem
 SupplierInvoiceSentByEMail=Faktura %s wysłana do dostawcy e-mailem
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
+ShippingSentByEMail=Przesyłka% s wysłane e-mailem
+ShippingValidated= Przesyłka% s potwierdzone
+InterventionSentByEMail=% Interwencja y wysyłane e-mailem
 NewCompanyToDolibarr= Stworzono kontrahenta
 DateActionPlannedStart= Planowana data rozpoczęcia
 DateActionPlannedEnd= Planowana data zakończenia
@@ -69,25 +72,27 @@ DateActionDoneEnd= Rzeczywista data zakończenia
 DateActionStart= Data rozpoczęcia
 DateActionEnd= Data zakończenia
 AgendaUrlOptions1=Możesz także dodać następujące parametry do filtr wyjściowy:
-AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s.
-AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s.
+AgendaUrlOptions2=logowanie =% s, aby ograniczyć wyjścia do działań stworzonych przez lub przypisanych do użytkownika% s.
+AgendaUrlOptions3=Logina =% s, aby ograniczyć wyjścia do działań będących własnością% użytkownika s.
 AgendaUrlOptions4=logint=%s, aby ograniczyć wyjścia do działań przypisanych do użytkownika %s.
-AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID.
+AgendaUrlOptionsProject=Projekt = PROJECT_ID ograniczyć wyjścia do działań związanych z projektem PROJECT_ID.
 AgendaShowBirthdayEvents=Pokaż urodziny kontaktów
 AgendaHideBirthdayEvents=Ukryj urodzin kontaktów
 Busy=Zajęty
 ExportDataset_event1=Lista zdarzeń w agendzie
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Domyślne dni roboczych wahać w tym tygodniu (przykład: 1-5, 1-6)
+DefaultWorkingHours=Domyślnie godziny pracy w dni (przykład: 9-18)
 # External Sites ical
 ExportCal=Eksport kalendarza
 ExtSites=Import zewnętrznych kalendarzy
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Pokaż kalendarze zewnętrznych (zdefiniowane w globalnej konfiguracji) do porządku obrad. Nie ma wpływu na kalendarze zewnętrzne zdefiniowane przez użytkowników.
 ExtSitesNbOfAgenda=Ilość kalendarzy
 AgendaExtNb=Kalendarz nb %s
 ExtSiteUrlAgenda=URL dostępu. Plik iCal
 ExtSiteNoLabel=Brak opisu
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
-AddEvent=Create event
-MyAvailability=My availability
+WorkingTimeRange=Zakres czasu pracy
+WorkingDaysRange=Dni robocze w zakresie
+AddEvent=Utwórz wydarzenie
+MyAvailability=Moja dostępność
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index bbb51193375..da57536fb74 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -8,7 +8,7 @@ FinancialAccount=Konto
 FinancialAccounts=Konta
 BankAccount=Konto bankowe
 BankAccounts=Konta bankowe
-ShowAccount=Show Account
+ShowAccount=Pokaż konto
 AccountRef=Rachunek finansowy ref
 AccountLabel=Etykieta rachunku finansowego
 CashAccount=Rachunek gotówkowy
@@ -20,8 +20,8 @@ SavingAccount=Rachunek oszczędnościowy
 SavingAccounts=Rachunki oszczędnościowe
 ErrorBankLabelAlreadyExists=Etykieta rachunku finansowego już istnieje
 BankBalance=Saldo
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
+BankBalanceBefore=Salda przed
+BankBalanceAfter=Bilans po
 BalanceMinimalAllowed=Minimalne dozwolone saldo
 BalanceMinimalDesired=Minimalne saldo pożądane
 InitialBankBalance=Saldo początkowe
@@ -29,15 +29,15 @@ EndBankBalance=Saldo końcowe
 CurrentBalance=Saldo bieżące
 FutureBalance=Przyszłość równowagi
 ShowAllTimeBalance=Pokaż saldo od początku
-AllTime=From start
+AllTime=Od początku
 Reconciliation=Pojednanie
 RIB=Numer konta bankowego
 IBAN=Numer IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=Ważny jest numer IBAN
+IbanNotValid=IBAN nie jest ważny
 BIC=Numer BIC / SWIFT
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=BIC / SWIFT Ważny
+SwiftNotValid=BIC / SWIFT nie jest ważny
 StandingOrders=Zlecenia stałe
 StandingOrder=Zlecenie stałe
 Withdrawals=Wypłaty
@@ -110,7 +110,7 @@ ConciliatedBy=Pojednaniem przez
 DateConciliating=Zjednać daty
 BankLineConciliated=Transakcja pojednaniem
 CustomerInvoicePayment=Klient płatności
-CustomerInvoicePaymentBack=Customer payment back
+CustomerInvoicePaymentBack=Płatności z powrotem klienta
 SupplierInvoicePayment=Dostawca płatności
 WithdrawalPayment=Wycofanie płatności
 SocialContributionPayment=Społeczny wkład płatności
@@ -138,28 +138,28 @@ CashBudget=Środki pieniężne budżetu
 PlannedTransactions=Planowane transakcje
 Graph=Grafika
 ExportDataset_banque_1=Bank transakcji i konta
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Odcinek wpłaty
 TransactionOnTheOtherAccount=Transakcji na inne konta
 TransactionWithOtherAccount=Konto transferu
 PaymentNumberUpdateSucceeded=Płatność liczba zaktualizowany
 PaymentNumberUpdateFailed=Płatność liczba nie może być aktualizowane
 PaymentDateUpdateSucceeded=Płatność data aktualizacji pomyślnie
 PaymentDateUpdateFailed=Data płatności nie mogą być aktualizowane
-Transactions=Transactions
+Transactions=Transakcje
 BankTransactionLine=Bank transakcji
 AllAccounts=Wszystkie bank / Rachunki
 BackToAccount=Powrót do konta
 ShowAllAccounts=Pokaż wszystkich rachunków
 FutureTransaction=Transakcja w futur. Nie da się pogodzić.
 SelectChequeTransactionAndGenerate=Wybierz / filtr sprawdza, to do otrzymania depozytu wyboru i kliknij przycisk "Utwórz".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-BankDashboard=Bank accounts summary
-DefaultRIB=Default BAN
-AllRIB=All BAN
+InputReceiptNumber=Wybierz wyciągu bankowego związanego z postępowania pojednawczego. Użyj sortable wartość liczbową: RRRRMM lub RRRRMMDD
+EventualyAddCategory=Ostatecznie, określić kategorię, w której sklasyfikować rekordy
+ToConciliate=Do pogodzenia?
+ThenCheckLinesAndConciliate=Następnie sprawdź linie obecne w wyciągu bankowym i kliknij
+BankDashboard=Rachunki bankowe podsumowanie
+DefaultRIB=Domyślnie BAN
+AllRIB=Wszystko BAN
 LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+NoBANRecord=Nie rekord BAN
+DeleteARib=Usuń rekord BAN
+ConfirmDeleteRib=Czy na pewno chcesz usunąć ten rekord BAN?
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 094cf87680e..4072ad3de2f 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -9,8 +9,8 @@ BillsCustomersUnpaidForCompany=Należne wpłaty klientów faktur dla %s
 BillsSuppliersUnpaid=Należne wpłaty dostawców faktur
 BillsSuppliersUnpaidForCompany=Nieodpłatnej dostawcy faktury za %s
 BillsLate=Opóźnienia w płatnościach
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Klienci faktury statystyki
+BillsStatisticsSuppliers=Dostawcy faktury statystyki
 DisabledBecauseNotErasable=Wyłączone, ponieważ nie mogą być skasowane
 InvoiceStandard=Standard faktury
 InvoiceStandardAsk=Standard faktury
@@ -23,13 +23,13 @@ InvoiceProFormaAsk=Proforma faktury
 InvoiceProFormaDesc=Proforma fakturze jest obraz prawdziwy faktury, ale nie ma wartości księgowych.
 InvoiceReplacement=Zastąpienie faktury
 InvoiceReplacementAsk=Zastąpienie faktury do faktury
-InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=Zastąpienie faktury służy do anulowania i całkowicie zastąpić faktury bez zapłaty już otrzymane. 

 Uwaga: Tylko faktury bez zapłaty na jej temat można zastąpić. Jeżeli faktura wymiany nie jest jeszcze zamknięta, zostanie ona automatycznie zamknięta dla "porzucone".
 InvoiceAvoir=Nota kredytowa
 InvoiceAvoirAsk=Kredyt notatkę do skorygowania faktury
 InvoiceAvoirDesc=Kredyt notatka jest negatywny faktury wykorzystane do rozwiązania, że na fakturze jest kwota, która różni się od kwoty faktycznie wypłacana (ponieważ klient wypłacana przez pomyłkę zbyt dużo, albo nie będzie wypłacana w całości, ponieważ wrócił niektórych produktów na przykład). 

 Uwaga: oryginał faktury musi być już zamknięta ( "wypłata" lub "częściowo wypłacana") w celu umożliwienia stworzenia kredytowej notatkę na jej temat.
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithLines=Tworzenie kredytowa Uwaga liniami z faktury pochodzenia
+invoiceAvoirWithPaymentRestAmount=Tworzenie kredytowa z nieopłacone Uwaga faktury pochodzenia
+invoiceAvoirLineWithPaymentRestAmount=Nota kredytowa na kwotę pozostałą nieodpłatną
 ReplaceInvoice=Wymień faktury %s
 ReplacementInvoice=Zastąpienie faktury
 ReplacedByInvoice=Otrzymuje fakturę %s
@@ -58,7 +58,7 @@ Payment=Płatność
 PaymentBack=Płatność powrót
 Payments=Płatności
 PaymentsBack=Płatności powrót
-PaidBack=Paid back
+PaidBack=Spłacona
 DatePayment=Data płatności
 DeletePayment=Usuń płatności
 ConfirmDeletePayment=Czy na pewno chcesz usunąć tę płatność?
@@ -66,30 +66,30 @@ ConfirmConvertToReduc=Czy chcesz przekonwertować tego kredytu notatkę do absol
 SupplierPayments=Dostawcy płatności
 ReceivedPayments=Odebrane płatności
 ReceivedCustomersPayments=Zaliczki otrzymane od klientów
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Płatności zapłaci dostawcom
 ReceivedCustomersPaymentsToValid=Odebrane płatności klientów, aby potwierdzić
 PaymentsReportsForYear=Płatności raportów dla %s
 PaymentsReports=Płatności raportów
 PaymentsAlreadyDone=Płatności już
-PaymentsBackAlreadyDone=Payments back already done
+PaymentsBackAlreadyDone=Płatności powrotem już zrobione
 PaymentRule=Zasady płatności
 PaymentMode=Typ płatności
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentTerm=Termin płatności
+PaymentConditions=Warunki płatności
+PaymentConditionsShort=Warunki płatności
 PaymentAmount=Kwota płatności
-ValidatePayment=Validate payment
+ValidatePayment=Weryfikacja płatności
 PaymentHigherThanReminderToPay=Płatności wyższe niż upomnienie do zapłaty
 HelpPaymentHigherThanReminderToPay=Uwaga, płatność kwoty jednego lub więcej rachunków jest wyższa niż reszta zapłacić. 
 Edycja wpisu, inaczej potwierdzić i myśleć o tworzeniu kredytowej uwagę nadwyżki otrzymanych dla każdego nadpłaty faktur.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. 
 Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Uwagi, kwotę płatności z jednego lub większej liczby rachunków jest większa niż reszta zapłacić. 
 Edytuj swoje wejście, w przeciwnym razie potwierdzić.
 ClassifyPaid=Klasyfikacja "wypłata"
 ClassifyPaidPartially=Klasyfikacja "paid częściowo"
 ClassifyCanceled=Klasyfikacji "Abandoned"
 ClassifyClosed=Klasyfikacja "zamkniętych"
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Sklasyfikować "Unbilled"
 CreateBill=Utwórz fakturę
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
+AddBill=Tworzenie faktury lub kredytową wiadomości
+AddToDraftInvoices=Dodaj do sporządzenia faktury
 DeleteBill=Usuń faktury
 SearchACustomerInvoice=Szukaj klienta faktury
 SearchASupplierInvoice=Szukaj dostawcy fakturę
@@ -100,7 +100,7 @@ DoPaymentBack=Czy płatności powrót
 ConvertToReduc=Konwersja w przyszłości rabatu
 EnterPaymentReceivedFromCustomer=Wprowadź płatności otrzymanych od klienta
 EnterPaymentDueToCustomer=Dokonaj płatności do klienta
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Wyłączona, ponieważ nieopłacone jest zero
 Amount=Ilość
 PriceBase=Cena podstawy
 BillStatus=Faktura statusu
@@ -155,9 +155,9 @@ ConfirmCancelBill=Czy na pewno chcesz anulować fakturę %s?
 ConfirmCancelBillQuestion=Dlaczego chcesz zaklasyfikować tę fakturę "opuszczonych"?
 ConfirmClassifyPaidPartially=Czy na pewno chcesz zmienić fakturę %s do statusu wypłatę?
 ConfirmClassifyPaidPartiallyQuestion=Niniejsza faktura nie została całkowicie wypłacana. Jakie są powody, aby zamknąć tę fakturę?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Nieopłacone (% s% s) jest zniżka przyznane, ponieważ płatność została dokonana przed terminem. I uregulowania podatku VAT z faktury korygującej.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Nieopłacone (% s% s) jest zniżka przyznane, ponieważ płatność została dokonana przed terminem. Akceptuję stracić VAT od tej zniżki.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Nieopłacone (% s% s) jest zniżka przyznane, ponieważ płatność została dokonana przed terminem. Odzyskać VAT od tej zniżki bez noty kredytowej.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad klienta
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty częściowo zwrócone
 ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucił dla innej przyczyny
@@ -170,7 +170,7 @@ ConfirmClassifyPaidPartiallyReasonOtherDesc=Użyj tego wyboru, jeśli wszystkie
 ConfirmClassifyAbandonReasonOther=Inny
 ConfirmClassifyAbandonReasonOtherDesc=Wybór ten będzie używany we wszystkich innych przypadkach. Na przykład dlatego, że jest plan, aby utworzyć zastępująca faktury.
 ConfirmCustomerPayment=Czy to potwierdzić paiement wejściowych dla %s %s?
-ConfirmSupplierPayment=Do you confirm this payment input for %s %s ?
+ConfirmSupplierPayment=Czy możesz potwierdzić tej płatności wejście dla% s% s?
 ConfirmValidatePayment=Êtes-vous sur de vouloir Valider ce paiment, aucune zmiany n'est możliwe une fois le paiement ważne?
 ValidateBill=Validate faktury
 UnvalidateBill=Unvalidate faktury
@@ -187,23 +187,23 @@ ShowInvoiceDeposit=Pokaż złożeniu faktury
 ShowPayment=Pokaż płatności
 File=Plik
 AlreadyPaid=Już paid
-AlreadyPaidBack=Already paid back
+AlreadyPaidBack=Już zwrócona
 AlreadyPaidNoCreditNotesNoDeposits=Już wypłacone (bez not kredytowych i depozytów)
 Abandoned=Porzucone
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
-Rest=Pending
+RemainderToPay=Nieopłacone
+RemainderToTake=Pozostała kwota do podjęcia
+RemainderToPayBack=Pozostała kwota do zwrotu
+Rest=W oczekiwaniu
 AmountExpected=Kwota twierdził
 ExcessReceived=Trop Peru
 EscompteOffered=Rabat oferowane (płatność przed kadencji)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=Złożenie faktury% s
+SendReminderBillRef=Złożenie faktury% s (przypomnienie)
 StandingOrders=Zlecenia stałe
 StandingOrder=Zlecenie stałe
 NoDraftBills=Projekt nr faktury
 NoOtherDraftBills=Żaden inny projekt faktur
-NoDraftInvoices=No draft invoices
+NoDraftInvoices=Brak projektów faktury
 RefBill=Faktura ref
 ToBill=Do rachunku
 RemainderToBill=Pozostająca do rachunku
@@ -218,18 +218,18 @@ NoInvoice=Nr faktury
 ClassifyBill=Klasyfikacja faktury
 SupplierBillsToPay=Dostawcy faktur do zapłaty
 CustomerBillsUnpaid=Należne wpłaty klientów faktury
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Pisemne faktur drogą procedur mecanographic są dozowane przez porządek w listach
 NonPercuRecuperable=Niepodlegające zwrotowi
 SetConditions=Ustaw warunki płatności
 SetMode=Ustaw tryb płatności
 Billed=Billed
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Szablon faktury
+RepeatableInvoices=Szablon faktury
+Repeatable=Szablon
+Repeatables=Szablony
+ChangeIntoRepeatableInvoice=Konwersja do szablonu faktury
+CreateRepeatableInvoice=Tworzenie szablonu faktury
+CreateFromRepeatableInvoice=Utwórz z szablonu faktury
 CustomersInvoicesAndInvoiceLines=Klienta faktury i faktury linii
 CustomersInvoicesAndPayments=Klient faktur i płatności
 ExportDataset_invoice_1=Klient faktury i faktury listę "linii
@@ -243,12 +243,12 @@ Discount=Rabat
 Discounts=Zniżki
 AddDiscount=Dodaj zniżki
 AddRelativeDiscount=Tworzenie względnej zniżki
-EditRelativeDiscount=Edit relative discount
+EditRelativeDiscount=Edycja względną zniżki
 AddGlobalDiscount=Dodaj zniżki
 EditGlobalDiscounts=Edytuj bezwzględne zniżki
 AddCreditNote=Tworzenie noty kredytowej
 ShowDiscount=Pokaż zniżki
-ShowReduc=Show the deduction
+ShowReduc=Pokaż odliczenia
 RelativeDiscount=Względna zniżki
 GlobalDiscount=Globalne zniżki
 CreditNote=Nota kredytowa
@@ -285,7 +285,7 @@ InvoiceNotChecked=Nie wybrano faktura
 CloneInvoice=Clone faktury
 ConfirmCloneInvoice=Czy na pewno chcesz klon tej faktury %s?
 DisabledBecauseReplacedInvoice=Działania wyłączone, ponieważ na fakturze została zastąpiona
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+DescTaxAndDividendsArea=Obszar ten stanowi podsumowanie wszystkich płatności dokonanych na specjalne wydatki. Tylko zapisy z płatności w czasie ustalonym roku zostały tu uwzględnione.
 NbOfPayments=Nb płatności
 SplitDiscount=Split zniżki w dwóch
 ConfirmSplitDiscount=Czy na pewno chcesz podzielić tym rabat w %s %s na 2 niższe zniżki?
@@ -294,8 +294,10 @@ TotalOfTwoDiscountMustEqualsOriginal=Suma dwóch nowych rabatu musi być równa
 ConfirmRemoveDiscount=Czy na pewno chcesz usunąć ten rabat?
 RelatedBill=Podobne faktury
 RelatedBills=Faktur związanych
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
+LatestRelatedBill=Ostatnie pokrewne faktury
+WarningBillExist=Ostrzeżenie, jeden lub więcej faktur istnieje
 
 # PaymentConditions
 PaymentConditionShortRECEP=Natychmiastowe
@@ -310,12 +312,12 @@ PaymentConditionShort60DENDMONTH=60 dni koniec miesiąca
 PaymentCondition60DENDMONTH=60 dni koniec miesiąca
 PaymentConditionShortPT_DELIVERY=Dostawa
 PaymentConditionPT_DELIVERY=Na dostawy
-PaymentConditionShortPT_ORDER=On order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_ORDER=Na zamówienie
+PaymentConditionPT_ORDER=Na zamówienie
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-FixAmount=Fix amount
-VarAmount=Variable amount (%% tot.)
+PaymentConditionPT_5050=50 %% z góry, Pobranie 50 %%
+FixAmount=Kwota Fix
+VarAmount=Zmienna ilość (%% tot.)
 # PaymentType
 PaymentTypeVIR=Lokat bankowych
 PaymentTypeShortVIR=Lokat bankowych
@@ -349,7 +351,7 @@ ChequeNumber=Czek N
 ChequeOrTransferNumber=Cheque / Transferu N
 ChequeMaker=Sprawdź nadajnikiem
 ChequeBank=Bank czek
-CheckBank=Check
+CheckBank=Sprawdź
 NetToBePaid=Netto do wypłaty
 PhoneNumber=Tel
 FullPhoneNumber=Telefon
@@ -366,7 +368,7 @@ LawApplicationPart2=towary pozostają własnością
 LawApplicationPart3=sprzedającego do pełna cashing z
 LawApplicationPart4=ich ceny.
 LimitedLiabilityCompanyCapital=SARL z Stolicy
-UseLine=Apply
+UseLine=Zastosować
 UseDiscount=Użyj zniżki
 UseCredit=Wykorzystanie kredytu
 UseCreditNoteInInvoicePayment=Zmniejszenie płatności z tego nota kredytowa
@@ -390,18 +392,18 @@ DisabledBecausePayments=Nie możliwe, ponieważ istnieją pewne płatności
 CantRemovePaymentWithOneInvoicePaid=Nie można usunąć płatności, ponieważ istnieje przynajmniej na fakturze sklasyfikowane płatne
 ExpectedToPay=Oczekuje płatności
 PayedByThisPayment=Wypłacana przez płatność
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
-ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidInvoicesAutomatically=Sklasyfikować "Paid" wszystkie standardowe, sytuacja lub faktury zamienne wypłacane w całości.
+ClosePaidCreditNotesAutomatically=Klasyfikująsubstancje "Paid" wszystkie noty kredytowe w całości zwrócona.
 AllCompletelyPayedInvoiceWillBeClosed=Wszystko faktura bez pozostawać do zapłaty zostanie automatycznie zamknięta do statusu "płatny".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+ToMakePayment=Płacić
+ToMakePaymentBack=Spłacać
+ListOfYourUnpaidInvoices=Lista niezapłaconych faktur
+NoteListOfYourUnpaidInvoices=Uwaga: Ta lista zawiera tylko faktury dla osób trzecich jesteś powiązanych jako przedstawiciel sprzedaży.
+RevenueStamp=Znaczek skarbowy
+YouMustCreateInvoiceFromThird=Ta opcja jest dostępna tylko podczas tworzenia faktury z zakładki "klienta" z thirdparty
 PDFCrabeDescription=Faktura Crabe modelu. Pełna faktura modelu (VAT Wsparcie opcji, rabaty, warunki płatności, logo, itp. ..)
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Powrót liczbę z formatu% syymm-nnnn do standardowych faktur i% syymm-nnnn do not kredytowych, gdzie RR oznacza rok, miesiąc i jest mm nnnn jest ciągiem bez przerwy i nie ma powrotu do 0
+MarsNumRefModelDesc1=Powrót liczbę z formatu% syymm-nnnn do standardowych faktur,% syymm-nnnn faktur zamiennych,% syymm-nnnn do not kredytowych i% syymm-nnnn do not kredytowych, gdzie rr jest rok, miesiąc i jest mm nnnn jest ciągiem bez przerwy i nie ma powrotu do 0
 TerreNumRefModelError=Rachunek zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł.
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Przedstawiciela w ślad za klienta faktura
@@ -413,19 +415,19 @@ TypeContact_invoice_supplier_external_BILLING=kontakt fakturze dostawcy
 TypeContact_invoice_supplier_external_SHIPPING=kontakt koszty dostawcy
 TypeContact_invoice_supplier_external_SERVICE=Dostawca usługi kontakt
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-Progress=Progress
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-NotLastInCycle=This invoice in not the last in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
-InvoiceSituationLast=Final and general invoice
+InvoiceFirstSituationAsk=Pierwsza faktura sytuacja
+InvoiceFirstSituationDesc=Faktury sytuacji, są związane z sytuacji związanych z progresją np postęp budowy. Każda sytuacja jest związana z fakturą.
+InvoiceSituation=Sytuacja na fakturze
+InvoiceSituationAsk=Faktura następujących sytuacji
+InvoiceSituationDesc=Utwórz nową sytuację po już istniejącej
+SituationAmount=Kwota Sytuacja faktury (netto)
+SituationDeduction=Sytuacja odejmowanie
+Progress=Postęp
+ModifyAllLines=Modyfikować wszystkie linie
+CreateNextSituationInvoice=Tworzenie kolejnej sytuacji
+NotLastInCycle=Ta faktura nie ostatni w cyklu i nie mogą być modyfikowane.
+DisabledBecauseNotLastInCycle=Następna sytuacja już istnieje.
+DisabledBecauseFinal=Sytuacja ta jest ostateczna.
+CantBeLessThanMinPercent=Postęp nie może być mniejsza niż wartość w poprzedniej sytuacji.
+NoSituations=Brak otwarte sytuacje
+InvoiceSituationLast=Ostateczna i ogólnie faktury
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index fe0d43bf7f3..86f10513d1a 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Rss informacji
 BoxLastProducts=Ostatnie produkty / usługi
-# BoxProductsAlertStock=Products in stock alert
+BoxProductsAlertStock=Produkty w alercie magazynie
 BoxLastProductsInContract=Ostatnia zakontraktowanych produktów / usług
 BoxLastSupplierBills=Ostatnia dostawcy faktur
 BoxLastCustomerBills=Ostatnia klienta faktury
@@ -12,13 +12,14 @@ BoxLastProspects=Ostatnie modyfikowani potencjalni klienci
 BoxLastCustomers=Ostatnia klientów
 BoxLastSuppliers=Ostatnia dostawców
 BoxLastCustomerOrders=Ostatnia zamówień
+BoxLastValidatedCustomerOrders=Ostatnie potwierdzone zamówienia klientów
 BoxLastBooks=Ostatnie książki
 BoxLastActions=Ostatnie działania
 BoxLastContracts=Siste kontrakter
 BoxLastContacts=Ostatnie kontakty / adresy
 BoxLastMembers=Ostatnie użytkowników
-# BoxFicheInter=Last interventions
-# BoxCurrentAccounts=Opened accounts balance
+BoxFicheInter=Ostatnie interwencje
+BoxCurrentAccounts=Saldo konta otwarte
 BoxSalesTurnover=Obrót
 BoxTotalUnpaidCustomerBills=Suma niezapłaconych faktur przez klientów
 BoxTotalUnpaidSuppliersBills=Suma niezapłaconych faktur dostawcy
@@ -26,27 +27,30 @@ BoxTitleLastBooks=Ostatnia %s rejestrowane książek
 BoxTitleNbOfCustomers=Nombre de klienta
 BoxTitleLastRssInfos=Ostatnie wieści z %s %s
 BoxTitleLastProducts=Ostatnia %s zmodyfikowane produkty / usługi
-# BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Ostatnia %s zmodyfikowane zamówień
+BoxTitleProductsAlertStock=Produkty w alercie magazynie
+BoxTitleLastCustomerOrders=W ostatnim% s zamówień klientów
+BoxTitleLastModifiedCustomerOrders=W ostatnim% s zmodyfikowane zamówienia klientów
 BoxTitleLastSuppliers=Ostatnia %s zarejestrowanych dostawców
 BoxTitleLastCustomers=Ostatnia %s zarejestrowanych klientów
 BoxTitleLastModifiedSuppliers=%s ostatnio zmodyfikowano dostawców
 BoxTitleLastModifiedCustomers=%s ostatnio zmodyfikowanych klientów
-BoxTitleLastCustomersOrProspects=Ostatnia %s zarejestrowanych klientów lub potencjalnych klientów
-BoxTitleLastPropals=Ostatnia %s rejestrowane propozycje
+BoxTitleLastCustomersOrProspects=W ostatnim% s klienci lub perspektywy
+BoxTitleLastPropals=W ostatnim% s propozycje
+BoxTitleLastModifiedPropals=W ostatnim% s zmodyfikowane propozycje
 BoxTitleLastCustomerBills=%s ostatnich faktur klientów
+BoxTitleLastModifiedCustomerBills=W ostatnim% s zmodyfikowane faktury klienta
 BoxTitleLastSupplierBills=Ostatnia %s dostawcy faktur
-BoxTitleLastProspects=%s ostatnio dodanych potencjalnych klientów
+BoxTitleLastModifiedSupplierBills=W ostatnim% s zmodyfikowane faktur dostawca
 BoxTitleLastModifiedProspects=%s ostatnio zmodyfikowanych potencjalnych klientów
 BoxTitleLastProductsInContract=Ostatnie %s produktów / usług w umowie
-BoxTitleLastModifiedMembers=Ostatnie %s zmodyfikowane użytkowników
-# BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=%s najstarszych, niezapłaconych faktur klientów
-BoxTitleOldestUnpaidSupplierBills=Najstarszy %s dostawcy niezapłaconych faktur
-# BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleLastModifiedMembers=W ostatnim% s użytkowników
+BoxTitleLastFicheInter=W ostatnim% s zmodyfikowano interwencji
+BoxTitleOldestUnpaidCustomerBills=Najstarsze% s niezapłacone faktury klienta
+BoxTitleOldestUnpaidSupplierBills=Najstarsze% s niezapłacone faktury dostawca
+BoxTitleCurrentAccounts=Salda otworzył koncie
 BoxTitleSalesTurnover=Obrót
-BoxTitleTotalUnpaidCustomerBills=Należne wpłaty klienta faktury
-BoxTitleTotalUnpaidSuppliersBills=Zaległej płatności za faktury dostawcy
+BoxTitleTotalUnpaidCustomerBills=Niezapłacone faktury klienta
+BoxTitleTotalUnpaidSuppliersBills=Niezapłacone faktury dostawca
 BoxTitleLastModifiedContacts=%s ostatnio zmodyfikowanych kontaktów / adresów
 BoxMyLastBookmarks=Moje ostatnie %s zakładek
 BoxOldestExpiredServices=Najstarszy aktywny minął usługi
@@ -55,7 +59,7 @@ BoxTitleLastActionsToDo=Ostatnia %s do działania
 BoxTitleLastContracts=Siste %s kontrakter
 BoxTitleLastModifiedDonations=Ostatnie %s modyfikowane darowizn
 BoxTitleLastModifiedExpenses=Ostatnie %s modyfikowane wydatki
-# BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
 FailedToRefreshDataInfoNotUpToDate=Nie można odświeżyć RSS topnika. Ostatnie udane odświeżenie data: %s
 LastRefreshDate=Ostatnia odświeżyć daty
 NoRecordedBookmarks=No bookmarks defined. Click tutaj, aby dodać zakładki.
@@ -74,18 +78,19 @@ NoRecordedProducts=Nr zarejestrowane produkty / usługi
 NoRecordedProspects=Brak potencjalnyc klientów
 NoContractedProducts=Brak produktów / usług zakontraktowanych
 NoRecordedContracts=Ingen registrert kontrakter
-# NoRecordedInterventions=No recorded interventions
-# BoxLatestSupplierOrders=Latest supplier orders
-# BoxTitleLatestSupplierOrders=%s latest supplier orders
-# NoSupplierOrder=No recorded supplier order
+NoRecordedInterventions=Brak zapisanych interwencje
+BoxLatestSupplierOrders=Ostatnie zamówienia dostawca
+BoxTitleLatestSupplierOrders=W ostatnim% s zamówienia dostawca
+BoxTitleLatestModifiedSupplierOrders=W ostatnim% s zmodyfikowane zamówienia dostawca
+NoSupplierOrder=Nie odnotowano zamówienia dostawca
 BoxCustomersInvoicesPerMonth=Ilość faktur w skali miesiąca
-# BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-# BoxCustomersOrdersPerMonth=Customer orders per month
-# BoxSuppliersOrdersPerMonth=Supplier orders per month
-# BoxProposalsPerMonth=Proposals per month
-# NoTooLowStockProducts=No product under the low stock limit
-# BoxProductDistribution=Products/Services distribution
-# BoxProductDistributionFor=Distribution of %s for %s
+BoxSuppliersInvoicesPerMonth=Faktur dostawca miesięcznie
+BoxCustomersOrdersPerMonth=Zamówienia klientów miesięcznie
+BoxSuppliersOrdersPerMonth=Zamówienia dostawca miesięcznie
+BoxProposalsPerMonth=Propozycje na miesiąc
+NoTooLowStockProducts=Brak produktów w dolnej granicy magazynie
+BoxProductDistribution=Produkty / Usługi dystrybucji
+BoxProductDistributionFor=Dystrybucja% s% s
 ForCustomersInvoices=Faktury Klientów
-# ForCustomersOrders=Customers orders
+ForCustomersOrders=Zamówienia klientów
 ForProposals=Propozycje
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 007c40feaae..20027eddfa8 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -3,38 +3,38 @@ CashDeskMenu=Punkt sprzedaży
 CashDesk=Punkt sprzedaży
 CashDesks=Punkt sprzedaży
 CashDeskBank=Konto bankowe
-CashDeskBankCash=Na konto bankowe (gotówka)
-CashDeskBankCB=Na konto bankowe (karty)
-CashDeskBankCheque=Na konto bankowe (czek)
+CashDeskBankCash=Konto bankowe (gotówka)
+CashDeskBankCB=Konto bankowe (karty)
+CashDeskBankCheque=Konto bankowe (czek)
 CashDeskWarehouse=Magazyn
-CashdeskShowServices=Sprzedaży usług
+CashdeskShowServices=Działy sprzedaży
 CashDeskProducts=Produkty
-CashDeskStock=Fotografii
+CashDeskStock=Zapasy
 CashDeskOn=na
-CashDeskThirdParty=Osoby trzecie
-# CashdeskDashboard=Point of sale access
+CashDeskThirdParty=Zamówienie
+CashdeskDashboard=Punkt dostępu sprzedaży
 ShoppingCart=Koszyk
-NewSell=Nowy Sprzedam
-BackOffice=Back Office
+NewSell=Nowa tranzakcja
+BackOffice=Powrót do biura
 AddThisArticle=Dodaj ten artykuł
 RestartSelling=Wróć na sprzedaż
 SellFinished=Sprzedaż zakończona
 PrintTicket=Bilet do druku
-NoProductFound=Żaden artykuł znalezionych
+NoProductFound=Artykuł nie znaleziony
 ProductFound=Znaleziono produkt
-ProductsFound=znalezionych produktów
-NoArticle=Żaden artykuł
+ProductsFound=znalezione produkty
+NoArticle=Brak artykułu
 Identification=Identyfikacja
 Article=Artykuł
 Difference=Różnica
-TotalTicket=Całkowity bilet
-NoVAT=VAT nie dla tej sprzedaży
-Change=Nadmiar otrzymał
+TotalTicket=Podsumowanie całkowity
+NoVAT=bez podatku VAT dla tej sprzedaży
+Change=Nadwyżka otrzymana
 CalTip=Kliknij aby zobaczyć kalendarz
-CashDeskSetupStock=Możesz poprosić, aby zmniejszyć zapasy na tworzenia faktury, ale za to magazyn nie został zdefiniowany 
 Zmiana ustawień modułu akcji, lub wybierz magazyn
-BankToPay=Rachunku kosztów
+CashDeskSetupStock=Prosisz, o zmniejszenie zapasów produktów na fakturze, ale magazyn nie został zdefiniowany 
 Zmień zapasy ustawień modułu, lub wybierz magazyn
+BankToPay=Należności konta
 ShowCompany=Pokaż firmę
 ShowStock=Pokaż magazyn
 DeleteArticle=Kliknij, aby usunąć ten artykuł
-# FilterRefOrLabelOrBC=Search (Ref/Label)
-# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+FilterRefOrLabelOrBC=Szukaj (Ref / Label)
+UserNeedPermissionToEditStockToUsePos=Próbujesz zmniejszyć zapasy na fakturze stworzonej, więc użytkownik by mógł używać POS potrzebuje mieć uprawnienie by edytować zapasy.
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 8afe23bd46a..09bb7efef99 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategoria
-Categories=Kategorie
-Rubrique=Kategoria
-Rubriques=Kategorie
-categories=kategorie
-TheCategorie=Kategoria
-NoCategoryYet=Nr kategorii tego typu tworzone
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=W
 AddIn=Dodaj w
 modify=modyfikować
 Classify=Klasyfikacja
-CategoriesArea=Kategorie obszarze
-ProductsCategoriesArea=Produkty / Usługi kategorii powierzchni
-SuppliersCategoriesArea=Dostawcy kategorii powierzchni
-CustomersCategoriesArea=Klienci kategorii powierzchni
-ThirdPartyCategoriesArea=Stron trzecich kategorii powierzchni
-MembersCategoriesArea=Członków kategorii obszaru
-ContactsCategoriesArea=Contacts categories area
-MainCats=Główne 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=Statystyki
-CatList=Lista catgories
-AllCats=Wszystkie kategorie
-ViewCat=Wyświetl kategorii
-NewCat=Dodaj kategorię
-NewCategory=Nowa kategoria
-ModifCat=Modyfikacja kategorii
-CatCreated=Kategoria utworzonych
-CreateCat=Tworzenie kategorii
-CreateThisCat=Tworzenie tej kategorii
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate pola
 NoSubCat=Brak podkategorii.
 SubCatOf=Podkategoria
-FoundCats=Znaleziono kategorii
-FoundCatsForName=Kategorie znaleźć na imię i nazwisko:
-FoundSubCatsIn=Podkategorie w kategorii
-ErrSameCatSelected=Wybrano tej samej kategorii, kilka razy
-ErrForgotCat=You forgot wybrać kategorię
+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=Zapomniałeś o zakresie
 ErrCatAlreadyExists=Ta nazwa jest już używany
-AddProductToCat=Dodaj produkt do kategorii?
-ImpossibleAddCat=Niemożliwe, aby dodać kategorię
-ImpossibleAssociateCategory=Niemożliwe włączają do 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= %s został dodany pomyślnie.
-ObjectAlreadyLinkedToCategory=Element jest już powiązana z tej kategorii.
-CategorySuccessfullyCreated=Ta kategoria %s został dodany pomyślnie.
-ProductIsInCategories=Produktu / usługi posiada do następujących kategorii
-SupplierIsInCategories=Trzeciej posiada do następujących kategorii dostawców
-CompanyIsInCustomersCategories=Wspomniana strona trzecia posiada do następujących klientów / perspektywy kategorii\nTen kontrahent posiada następujące kategorie klientów / potencjalnych klientów
-CompanyIsInSuppliersCategories=Wspomniana strona trzecia posiada do następujących kategorii dostawców
-MemberIsInCategories=Ten użytkownik posiada do następujących kategorii użytkowników
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Ten produkt / usługa nie jest w żaden kategorii
-SupplierHasNoCategory=To dostawca nie jest w żaden kategorii
-CompanyHasNoCategory=Ta firma nie jest w żaden kategorii
-MemberHasNoCategory=Członek ten nie jest w żadnym kategorii
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Klasyfikacja w kategorii
+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=Żaden
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ta kategoria już istnieje w tym samym miejscu
 ReturnInProduct=Powrót do produktów / usług karty
 ReturnInSupplier=Powrót do dostawcy kart
@@ -66,47 +64,47 @@ ReturnInCompany=Powrót do klienta / perspektywa karty
 ContentsVisibleByAll=Zawartość będzie widoczny przez wszystkich
 ContentsVisibleByAllShort=Zawartość widoczna przez wszystkie
 ContentsNotVisibleByAllShort=Treść nie jest widoczna dla wszystkich
-CategoriesTree=Categories tree
-DeleteCategory=Usuwanie kategorii
-ConfirmDeleteCategory=Czy na pewno chcesz usunąć tę kategorię?
-RemoveFromCategory=Usuń powiązanie z kategorii
-RemoveFromCategoryConfirm=Czy na pewno chcesz usunąć związek między transakcją i kategorii?
-NoCategoriesDefined=Nr kategorii zdefiniowanych
-SuppliersCategoryShort=Dostawcy kategorii
-CustomersCategoryShort=Klienci kategorii
-ProductsCategoryShort=Produkty kategorii
-MembersCategoryShort=Członków kategorii
-SuppliersCategoriesShort=Dostawcy kategorii
-CustomersCategoriesShort=Klienci kategorii
+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=Produkty kategorii
-MembersCategoriesShort=Członków kategorii
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ta kategoria nie zawiera żadnych produktów.
 ThisCategoryHasNoSupplier=Ta kategoria nie zawiera żadnego dostawcy.
 ThisCategoryHasNoCustomer=Ta kategoria nie zawiera żadnych klientów.
 ThisCategoryHasNoMember=Ta kategoria nie zawiera żadnych członków.
-ThisCategoryHasNoContact=This category does not contain any contact.
+ThisCategoryHasNoContact=Ta kategoria nie zawiera żadnego kontaktu.
 AssignedToCustomer=Przypisany do klienta
 AssignedToTheCustomer=Przypisany do klienta
 InternalCategory=Inernal kategorii
-CategoryContents=Kategoria treści
-CategId=Kategoria id
-CatSupList=Lista kategorii dostawcy
-CatCusList=Lista klientów / perspektywa kategorii
-CatProdList=Lista produktów kategorii
-CatMemberList=Lista członków kategorii
-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
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent 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
+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=Obraz usunięcia
+ConfirmDeletePicture=Potwierdź usunięcie obrazu?
+ExtraFieldsCategories=Atrybuty uzupełniające
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=Jeśli aktywna, produkt będzie również związany z kategorii nadrzędnej podczas dodawania do podkategorii
+AddProductServiceIntoCategory=Dodaj następujący produkt / usługę
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 75f3244f729..62e5fde531e 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -3,8 +3,8 @@ Accountancy=Księgowość
 AccountancyCard=Księgowość karty
 Treasury=Skarbiec
 MenuFinancial=Finanse
-TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation
+TaxModuleSetupToModifyRules=Przejdź do konfiguracji modułu Podatki zmodyfikować zasady obliczania
+TaxModuleSetupToModifyRulesLT=Przejdź do konfiguracji firmy zmodyfikować zasady obliczania
 OptionMode=Opcja dla księgowych
 OptionModeTrue=Opcja Input-Output
 OptionModeVirtual=Opcja Kredyty-Debits
@@ -12,15 +12,15 @@ OptionModeTrueDesc=W tym kontekście, obrót jest obliczana na płatności (data
 OptionModeVirtualDesc=W tym kontekście, obrót jest obliczana na fakturach (data zatwierdzenia). Gdy te faktury są należne, czy zostały zapłacone, czy nie są one wymienione w obrocie wyjście.
 FeatureIsSupportedInInOutModeOnly=Funkcja dostępna tylko w KREDYTÓW-DŁUGI rachunkowych trybu (patrz Rachunkowych moduł konfiguracji)
 VATReportBuildWithOptionDefinedInModule=Kwoty wyświetlane tutaj są obliczane na zasadach określonych przez organy podatkowe moduł konfiguracji.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Kwoty podane są obliczane na podstawie zasad określonych przez konfiguracji firmy.
 Param=Konfiguracja
 RemainingAmountPayment=Płatność pozostałej kwoty:
 AmountToBeCharged=Łączna kwota do zapłaty:
 AccountsGeneral=Konta
 Account=Konto
 Accounts=Konta
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Konto rodzic
+Accountsparent=Konta rodzica
 BillsForSuppliers=Rachunki dla dostawców
 Income=Przychody
 Outcome=Rezultat
@@ -29,11 +29,11 @@ ReportTurnover=Obrót
 PaymentsNotLinkedToInvoice=Płatności związane z wszelkich faktur, więc nie są związane z jakąkolwiek osobą trzecią
 PaymentsNotLinkedToUser=Płatności związane z dowolnego użytkownika
 Profit=Zysk
-AccountingResult=Accounting result
+AccountingResult=Wynik księgowy
 Balance=Saldo
 Debit=Rozchody
 Credit=Kredyt
-Piece=Accounting Doc.
+Piece=Rachunkowość Doc.
 Withdrawal=Wycofanie
 Withdrawals=Wypłaty
 AmountHTVATRealReceived=HT zebrane
@@ -43,25 +43,25 @@ VATReceived=VAT otrzymana
 VATToCollect=VAT do gromadzenia
 VATSummary=VAT Podsumowanie
 LT2SummaryES=Balans IRPF
-LT1SummaryES=RE Balance
+LT1SummaryES=RE Saldo
 VATPaid=VAT paid
-SalaryPaid=Salary paid
+SalaryPaid=Wynagrodzenie wypłacane
 LT2PaidES=IRPF Płatny
-LT1PaidES=RE Paid
+LT1PaidES=RE Płatny
 LT2CustomerES=Sprzedaż IRPF
 LT2SupplierES=Zakupy IRPF
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=RE sprzedaży
+LT1SupplierES=RE zakupów
 VATCollected=VAT zebrane
 ToPay=Aby zapłacić
 ToGet=Aby powrócić
-SpecialExpensesArea=Area for all special payments
+SpecialExpensesArea=Obszar dla wszystkich specjalnych płatności
 TaxAndDividendsArea=Podatek, składki na ubezpieczenie społeczne i dywidendy obszarze
 SocialContribution=Społeczny wkład
 SocialContributions=Składek na ubezpieczenia społeczne
-MenuSpecialExpenses=Special expenses
+MenuSpecialExpenses=Koszty specjalne
 MenuTaxAndDividends=Podatki i dywidendy
-MenuSalaries=Salaries
+MenuSalaries=Wynagrodzenia
 MenuSocialContributions=Składek na ubezpieczenia społeczne
 MenuNewSocialContribution=Nowe Wkład
 NewSocialContribution=Nowe społecznego wkładu
@@ -74,21 +74,21 @@ PaymentCustomerInvoice=Klient płatności faktury
 PaymentSupplierInvoice=Dostawca płatności faktury
 PaymentSocialContribution=Społeczny wkład płatności
 PaymentVat=Zapłaty podatku VAT
-PaymentSalary=Salary payment
+PaymentSalary=Wypłata wynagrodzenia
 ListPayment=Wykaz płatności
 ListOfPayments=Wykaz płatności
 ListOfCustomerPayments=Lista klientów płatności
 ListOfSupplierPayments=Lista dostawców płatności
 DatePayment=Data płatności
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
+DateStartPeriod=Data okres rozruchu
+DateEndPeriod=Data zakończenia okresu
 NewVATPayment=Nowe zapłaty podatku VAT
 newLT2PaymentES=Nowy IRPF płatności
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Nowa płatność RE
 LT2PaymentES=Płatność IRPF
 LT2PaymentsES=Płatności IRPF
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=RE: Płatność
+LT1PaymentsES=RE Płatności
 VATPayment=Zapłaty podatku VAT
 VATPayments=Płatności VAT
 SocialContributionsPayments=Płatności składek na ubezpieczenia społeczne
@@ -101,7 +101,7 @@ AccountNumberShort=Numer konta
 AccountNumber=Numer konta
 NewAccount=Nowe konto
 SalesTurnover=Obrót
-SalesTurnoverMinimum=Minimum sales turnover
+SalesTurnoverMinimum=Minimalne obroty sprzedaży
 ByThirdParties=Bu trzecich
 ByUserAuthorOfInvoice=Na fakturze autora
 AccountancyExport=Księgowość eksportu
@@ -109,7 +109,7 @@ ErrorWrongAccountancyCodeForCompany=Bad klienta rachunkowych kod %s
 SuppliersProductsSellSalesTurnover=Obrotów generowanych przez sprzedaż dostawców produktów.
 CheckReceipt=Sprawdź depozyt
 CheckReceiptShort=Sprawdź depozyt
-LastCheckReceiptShort=Last %s check receipts
+LastCheckReceiptShort=W ostatnim% s wpływy wyboru
 NewCheckReceipt=Nowe zniżki
 NewCheckDeposit=Nowe sprawdzić depozytu
 NewCheckDepositOn=Nowe sprawdzić depozytu na konto: %s
@@ -121,42 +121,42 @@ ConfirmPaySocialContribution=Czy na pewno chcesz sklasyfikować ten społecznego
 DeleteSocialContribution=Usuń społecznego wkładu
 ConfirmDeleteSocialContribution=Czy na pewno chcesz usunąć ten wkład społeczny?
 ExportDataset_tax_1=Składek na ubezpieczenia społeczne i płatności
-CalcModeVATDebt=Mode %sVAT on commitment accounting%s.
-CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s.
-CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting.
-CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting
-CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s
-CalcModeLT1Debt=Mode %sRE on customer invoices%s
-CalcModeLT1Rec= Mode %sRE on suppliers invoices%s
-CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s
-CalcModeLT2Debt=Mode %sIRPF on customer invoices%s
-CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+CalcModeVATDebt=Tryb% Svat na rachunkowości zaangażowanie% s.
+CalcModeVATEngagement=Tryb% Svat na dochody-wydatki% s.
+CalcModeDebt=Tryb% sClaims-Długi% s powiedział rachunkowości zobowiązania.
+CalcModeEngagement=Tryb% sIncomes-Wydatki% s powiedział kasowej
+CalcModeLT1= Tryb% SRE faktur klienta - dostawcy wystawia faktury% s
+CalcModeLT1Debt=Tryb% SRE faktur klienta% s
+CalcModeLT1Rec= Tryb% SRE dostawców fakturuje% s
+CalcModeLT2= Tryb% sIRPF na fakturach klientów - dostawców faktury% s
+CalcModeLT2Debt=Tryb% sIRPF faktur klienta% s
+CalcModeLT2Rec= Tryb% sIRPF od dostawców faktury% s
+AnnualSummaryDueDebtMode=Saldo przychodów i kosztów, roczne podsumowania
+AnnualSummaryInputOutputMode=Saldo przychodów i kosztów, roczne podsumowania
 AnnualByCompaniesDueDebtMode=Bilan et des recettes dpenses, dtail par tiers, en trybie %sCrances-dettes %s comptabilit dit d'engagement.
 AnnualByCompaniesInputOutputMode=Bilan et des recettes dpenses, dtail par tiers, en trybie %sRecettes-Dpenses %s comptabilit dit de Caisse.
 SeeReportInInputOutputMode=Voir le rapport %sRecettes-Dpenses %s comptabilit dit pour un Caisse de calcul sur les paiements effectivement raliss
 SeeReportInDueDebtMode=Voir le rapport %sCrances-dettes %s comptabilit dit d'engagement pour un calcul sur les factures mises
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesAmountWithTaxIncluded=- Kwoty podane są łącznie z podatkami
 RulesResultDue=- Kwoty wykazane są łącznie ze wszystkimi podatkami 
 - Obejmuje ona zaległych faktur, kosztów i podatku VAT, czy są one wypłacane lub nie. 
 - Jest on oparty na zatwierdzanie daty faktur i podatku VAT oraz o terminie płatności na wydatki.
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. 
- It is based on the payment dates of the invoices, expenses and VAT.
+RulesResultInOut=- Zawiera rzeczywiste płatności na fakturach, wydatki oraz podatek VAT. 
 - To jest na podstawie terminów płatności faktur, koszty i VAT.
 RulesCADue=- Obejmuje ona klientów z powodu faktury, czy są one wypłacane, czy nie. 
 - Jest on oparty na zatwierdzenie daty tych faktur. 

 RulesCAIn=- Obejmuje wszystkie skuteczne płatności faktur otrzymanych od klientów. 
 - Jest on oparty na dacie płatności tych faktur 

 DepositsAreNotIncluded=- Faktury depozytów są ani też
 DepositsAreIncluded=- Faktury depozytowe są zawarte
 LT2ReportByCustomersInInputOutputModeES=Raport osób trzecich IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+LT1ReportByCustomersInInputOutputModeES=Sprawozdanie trzecim RE partii
+VATReportByCustomersInInputOutputMode=Sprawozdanie VAT klienta gromadzone i wypłacane
+VATReportByCustomersInDueDebtMode=Sprawozdanie VAT klienta gromadzone i wypłacane
+VATReportByQuartersInInputOutputMode=Sprawozdanie stawki VAT pobierane i wypłacane
+LT1ReportByQuartersInInputOutputMode=Sprawozdanie stopy RE
+LT2ReportByQuartersInInputOutputMode=Sprawozdanie IRPF stopy
+VATReportByQuartersInDueDebtMode=Sprawozdanie stawki VAT pobierane i wypłacane
+LT1ReportByQuartersInDueDebtMode=Sprawozdanie stopy RE
+LT2ReportByQuartersInDueDebtMode=Sprawozdanie IRPF stopy
 SeeVATReportInInputOutputMode=Zobacz raport %sVAT encasement%s na standardowe obliczenia
 SeeVATReportInDueDebtMode=%sVAT sprawozdanie Zobacz na flow%s do obliczenia z opcją na przepływ
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInServices=- W przypadku usług, raport zawiera przepisów VAT faktycznie otrzymane lub wydane na podstawie daty płatności.
 RulesVATInProducts=- W przypadku środków trwałych, to obejmuje faktur VAT na podstawie daty wystawienia faktury.
 RulesVATDueServices=- W przypadku usług, raport zawiera faktur VAT należnego, płatnego lub nie, w oparciu o daty wystawienia faktury.
 RulesVATDueProducts=- W przypadku środków trwałych, to obejmuje faktury VAT, w oparciu o daty wystawienia faktury.
@@ -179,29 +179,29 @@ CodeNotDef=Nie zdefiniowane
 AddRemind=Wysłanie dostępną kwotę
 RemainToDivide= Pozostają do wysyłki:
 WarningDepositsNotIncluded=Depozyty faktury nie są zawarte w tej wersji z tego modułu księgowego.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Pcg version
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
-ByProductsAndServices=By products and services
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=Link to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is rounding vat on each line, then summing them.
Method 2 is summing all vat on each line, then rounding result.
Final result may differs from few cents. Default mode is mode %s.
-CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module).
-CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+DatePaymentTermCantBeLowerThanObjectDate=Termin płatności określony nie może być niższa niż data obiektu.
+Pcg_version=Wersja PCG
+Pcg_type=Typ PCG
+Pcg_subtype=PCG podtyp
+InvoiceLinesToDispatch=Linie do wysyłki faktury
+InvoiceDispatched=Wysłane faktury
+AccountancyDashboard=Podsumowanie Księgowość
+ByProductsAndServices=Przez produkty i usługi
+RefExt=Ref Zewnętrzne
+ToCreateAPredefinedInvoice=Aby utworzyć predefiniowany fakturę, utworzyć standardowy fakturę następnie, bez sprawdzania, kliknij na przycisk "Convert to predefiniowanym faktury".
+LinkedOrder=Link do zamówienia
+ReCalculate=Przelicz
+Mode1=Metoda 1
+Mode2=Metoda 2
+CalculationRuleDesc=Aby obliczyć całkowity podatek VAT, nie ma dwóch metod: 
 Metoda 1 jest zaokrąglenie vat na każdej linii, a następnie ich zsumowanie. 
 Metoda 2 jest zsumowanie wszystkich vat na każdej linii, a następnie zaokrąglenie wyniku. 
 Efekt końcowy może różni się od kilku centów. Domyślnym trybem jest tryb% s.
+CalculationRuleDescSupplier=wg dostawcy, wybierz odpowiednią metodę zastosować samą zasadę obliczania i uzyskać taki sam wynik oczekiwany przez dostawcę.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Raport obroty na produkcie, w przypadku korzystania z trybu rachunkowości gotówki, nie ma znaczenia. Raport ten jest dostępny tylko w przypadku korzystania z trybu zaangażowanie rachunkowości (patrz konfiguracja modułu księgowego).
+CalculationMode=Tryb Obliczanie
+AccountancyJournal=Kod Księgowość czasopisma
+ACCOUNTING_VAT_ACCOUNT=Domyślny kod rachunkowe poboru VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Domyślny kod księgowość dla płacenia podatku VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Kod Księgowość domyślnie dla thirdparties klientów
+ACCOUNTING_ACCOUNT_SUPPLIER=Kod Księgowość domyślnie dla thirdparties dostawca
+CloneTax=Clone wkład społeczny
+ConfirmCloneTax=Potwierdź klon wkładu społecznego
+CloneTaxForNextMonth=Sklonować go na następny miesiąc
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index 138ce5b91c7..697e7054d09 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Zamówienia obszarze
 ListOfContracts=Wykaz umów
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=W ostatnim% s zmodyfikowane umowy
 AllContracts=Wszystkie umowy
 ContractCard=Zamówienie karty
 ContractStatus=Kontrakt statusu
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Minął
 ServiceStatusClosed=Zamknięte
 ServicesLegend=Usługi legendy
 Contracts=Kontrakty
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Kontrakty i linia umów
 Contract=Kontrakt
 NoContracts=Nr umowy
 MenuServices=Usługi
@@ -28,7 +28,7 @@ MenuRunningServices=Uruchamianie usług
 MenuExpiredServices=Minął usług
 MenuClosedServices=Zamknięte usług
 NewContract=Nowe umowy
-AddContract=Create contract
+AddContract=Tworzenie umowy
 SearchAContract=Szukaj zamówienia
 DeleteAContract=Usuń umowy
 CloseAContract=Zamknij umowy
@@ -39,7 +39,7 @@ ConfirmCloseService=Czy na pewno chcesz zamknąć tej usługi wraz z datą %s
 ValidateAContract=Sprawdź umowę
 ActivateService=Aktywacja usługi
 ConfirmActivateService=Czy na pewno chcesz, aby uaktywnić tę usługę z dnia %s?
-RefContract=Contract reference
+RefContract=Numer umowy
 DateContract=Kontrakt daty
 DateServiceActivate=Data aktywacji usługi
 DateServiceUnactivate=Data doręczenia unactivation
@@ -54,7 +54,7 @@ ListOfRunningContractsLines=Listę uruchomionych linii zamówienia
 ListOfRunningServices=Lista uruchomionych usług
 NotActivatedServices=Nie aktywacji usług (wśród zatwierdzonych umów)
 BoardNotActivatedServices=Usługi uaktywnić wśród zatwierdzonych umów
-LastContracts=Last %s contracts
+LastContracts=Zamówienia w ostatnim% s
 LastActivatedServices=Ostatnia %s aktywacji usługi
 LastModifiedServices=Ostatnia %s zmodyfikowane usług
 EditServiceLine=Edycja usługa linii
@@ -86,13 +86,13 @@ PaymentRenewContractId=Odnowienie umowy linii (liczba %s)
 ExpiredSince=Data ważności
 RelatedContracts=Związane z nimi umowy
 NoExpiredServices=Nie minął aktywne usługi
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ListOfServicesToExpireWithDuration=Lista Usługi wygasa w% s dni
+ListOfServicesToExpireWithDurationNeg=Lista usług wygasły z więcej niż% s dni
+ListOfServicesToExpire=Lista Usług wygaśnie
+NoteListOfYourExpiredServices=Ta lista zawiera tylko usługi umów na rzecz osób trzecich jesteś związanych jako przedstawiciel sprzedaży.
+StandardContractsTemplate=Szablon standardowe kontrakty
+ContactNameAndSignature=Dla% s, nazwisko i podpis:
+OnlyLinesWithTypeServiceAreUsed=Tylko linie z typu "usługi" będzie przebity.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Podpisanie umowy sprzedaży
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index d9628c890ea..15a149f8379 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -1,87 +1,88 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 About = O
-CronAbout = About Cron
-CronAboutPage = Cron about page
+CronAbout = O Cron
+CronAboutPage = Cron o stronie
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Czytaj Zaplanowane zadanie
+Permission23102 = Tworzenie / aktualizacja Zaplanowane zadania
+Permission23103 = Usuwanie zaplanowanego zadania
+Permission23104 = Wykonanie zaplanowanego zadania
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to launch cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronSetup= Zaplanowana konfiguracja zarządzanie zadaniami
+URLToLaunchCronJobs=Adres URL, aby sprawdzić i uruchomić wymagane cron, jeśli
+OrToLaunchASpecificJob=Albo sprawdzić i uruchomić określonej pracy
+KeyForCronAccess=Klucz zabezpieczeń dla URL, aby uruchomić cron
+FileToLaunchCronJobs=Wiersz poleceń uruchomić cron
+CronExplainHowToRunUnix=Na środowisku Unix należy użyć następującego crontabie Uruchom wiersz poleceń co 5 minut
+CronExplainHowToRunWin=W systemie Microsoft (tm) environement systemu Windows można użyć narzędzi zaplanowane zadanie do uruchomienia linii poleceń co 5 minut
 # Menu
-CronJobs=Scheduled jobs
-CronListActive=List of active/scheduled jobs
-CronListInactive=List of disabled jobs
+CronJobs=Zaplanowane zadania
+CronListActive=Lista aktywnych / zaplanowanych zadań
+CronListInactive=Lista miejsc pracy osób niepełnosprawnych
 # Page list
-CronDateLastRun=Last run
-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
-CronTask=Job
-CronNone= Żaden
+CronDateLastRun=Ostatni bieg
+CronLastOutput=Ostatnie wyjście prowadzony
+CronLastResult=Ostatni kod wynikowy
+CronListOfCronJobs=Lista zaplanowanych zadań
+CronCommand=Komenda
+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=Praca
+CronNone=Żaden
 CronDtStart=Data rozpoczęcia
 CronDtEnd=Data zakończenia
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtNextLaunch=Następna realizacja
+CronDtLastLaunch=Ostatnia egzekucja
 CronFrequency=Frequancy
 CronClass=Classe
 CronMethod=Metoda
 CronModule=Moduł
-CronAction=Action
+CronAction=Akcja
 CronStatus=Status
 CronStatusActive=Włączone
 CronStatusInactive=Niepełnosprawnych
-CronNoJobs=No jobs registered
+CronNoJobs=Brak miejsc pracy zarejestrowanych
 CronPriority=Priorytet
 CronLabel=Opis
-CronNbRun=Nb. launch
-CronEach=Every
-JobFinished=Job launched and finished
+CronNbRun=Nb. szalupa
+CronEach=Każdy
+JobFinished=Praca rozpoczął i zakończył
 #Page card
-CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronAdd= Dodaj miejsca pracy
+CronHourStart= Początek godzina i data zadania
+CronEvery= I wykonać każde zadanie
+CronObject= Instance / Obiekt do tworzenia
 CronArgs=Parametry
-CronSaveSucess=Save succesfully
+CronSaveSucess=Zapisz pomyślnie
 CronNote=Komentarz
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-CronStatusActiveBtn=Enable
+CronFieldMandatory=Pola% s jest obowiązkowe
+CronErrEndDateStartDt=Data zakończenia nie może być wcześniejsza niż data rozpoczęcia
+CronStatusActiveBtn=Umożliwiać
 CronStatusInactiveBtn=Wyłączyć
-CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
+CronTaskInactive=Ta praca jest wyłączony
+CronDtLastResult=Data Ostatnie wyniki
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product
-CronClassFileHelp=The file name to load. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php
-CronObjectHelp=The object name to load. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product
-CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
-CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
-CronCommandHelp=The system command line to execute.
+CronClassFile=Zajęcia (filename.class.php)
+CronModuleHelp=Nazwa Dolibarr katalogu modułu (także współpracować z zewnętrznym modułem Dolibarr). 
 Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów / htdocs / /class/product.class.php produktu, wartość modułu jest produktem
+CronClassFileHelp=Nazwa pliku do załadowania. 
 Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów / htdocs / produktu / klasy / product.class.php wartość nazwy pliku klasa product.class.php
+CronObjectHelp=Nazwa obiektu, aby załadować. 
 Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów /htdocs/product/class/product.class.php wartość nazwy pliku klasa produktów
+CronMethodHelp=Metoda obiektu, aby uruchomić. 
 Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów /htdocs/product/class/product.class.php, wartość metody jest to fecth
+CronArgsHelp=Argumenty metody. 
 Reprezentują np sprowadzić sposób Dolibarr obiektu Product /htdocs/product/class/product.class.php, wartość paramters może wynosić 0, ProductRef
+CronCommandHelp=System linii poleceń do wykonania.
+CronCreateJob=Create new Scheduled Job
 # Info
-CronInfoPage=Information
+CronInfoPage=Informacja
 # Common
-CronType=Task type
-CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
+CronType=Typ zadania
+CronType_method=Wywołanie metody z klasy Dolibarr
+CronType_command=Polecenie powłoki
 CronMenu=Cron
-CronCannotLoadClass=Cannot load class %s or object %s
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+CronCannotLoadClass=Nie można załadować klasy% s% s lub obiektu
+UseMenuModuleToolsToAddCronJobs=Wejdź w menu "Home - modułów narzędzi - Lista zadań", aby zobaczyć i edytować zaplanowane zadania.
+TaskDisabled=Zadanie wyłączony
diff --git a/htdocs/langs/pl_PL/deliveries.lang b/htdocs/langs/pl_PL/deliveries.lang
index 7a1320d6207..f279018bf76 100644
--- a/htdocs/langs/pl_PL/deliveries.lang
+++ b/htdocs/langs/pl_PL/deliveries.lang
@@ -23,4 +23,6 @@ GoodStatusDeclaration=Czy otrzymane towary powyżej w dobrym stanie,
 Deliverer=Dostawca:
 Sender=Nadawca
 Recipient=Odbiorca
-# ErrorStockIsNotEnough=There's not enough stock
+ErrorStockIsNotEnough=Nie wystarczy Zdjęcie
+Shippable=Shippable
+NonShippable=Nie shippable
diff --git a/htdocs/langs/pl_PL/dict.lang b/htdocs/langs/pl_PL/dict.lang
index 5bb75c300c3..746867ec3a4 100644
--- a/htdocs/langs/pl_PL/dict.lang
+++ b/htdocs/langs/pl_PL/dict.lang
@@ -6,7 +6,7 @@ CountryES=Hiszpania
 CountryDE=Niemcy
 CountryCH=Szwajcaria
 CountryGB=Wielkiej Brytanii
-# CountryUK=United Kingdom
+CountryUK=Zjednoczone Królestwo
 CountryIE=Polen
 CountryCN=Chiny
 CountryTN=Tunezja
@@ -252,8 +252,7 @@ CivilityMME=Pani
 CivilityMR=Pan
 CivilityMLE=Pani
 CivilityMTRE=Mistrz
-# CivilityDR=Doctor
-
+CivilityDR=Lekarz
 ##### Currencies #####
 Currencyeuros=Euro
 CurrencyAUD=Dolar UA
@@ -290,10 +289,10 @@ CurrencyXOF=Franków CFA BCEAO
 CurrencySingXOF=Frank CFA BCEAO
 CurrencyXPF=Franków CFP
 CurrencySingXPF=Frank CFP
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+CurrencyCentSingEUR=cent
+CurrencyCentINR=Paisa
+CurrencyCentSingINR=Paise
+CurrencyThousandthSingTND=tysięczny
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Kampanie mailingowe
@@ -302,28 +301,27 @@ DemandReasonTypeSRC_CAMP_PHO=Telefon kampanii
 DemandReasonTypeSRC_CAMP_FAX=Kampania Fax
 DemandReasonTypeSRC_COMM=Handlowych kontakt
 DemandReasonTypeSRC_SHOP=Sklep kontakt
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Pracownik
+DemandReasonTypeSRC_SPONSORING=Sponsorowanie
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format List US
+PaperFormatUSLEGAL=Format prawna US
+PaperFormatUSEXECUTIVE=Format wykonawczy US
+PaperFormatUSLEDGER=Format Ledger / Tabloid
+PaperFormatCAP1=Format P1 Kanada
+PaperFormatCAP2=Format P2 Kanada
+PaperFormatCAP3=Format P3 Kanada
+PaperFormatCAP4=Format P4 Kanada
+PaperFormatCAP5=Format P5 Kanada
+PaperFormatCAP6=Format P6 Kanada
diff --git a/htdocs/langs/pl_PL/donations.lang b/htdocs/langs/pl_PL/donations.lang
index 2318d3bf19f..b3d03910754 100644
--- a/htdocs/langs/pl_PL/donations.lang
+++ b/htdocs/langs/pl_PL/donations.lang
@@ -1,12 +1,14 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Darowizna
 Donations=Darowizny
-DonationRef=Donation ref.
+DonationRef=Darowizna sędzią.
 Donor=Donor
 Donors=Darczyńcy
-AddDonation=Create a donation
+AddDonation=Tworzenie darowiznę
 NewDonation=Nowe wpłaty
-ShowDonation=Show donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
+ShowDonation=Pokaż darowizny
 DonationPromise=Prezent obietnicy
 PromisesNotValid=Nie potwierdzone obietnic
 PromisesValid=Zatwierdzona obietnic
@@ -21,18 +23,21 @@ DonationStatusPaid=Darowizna otrzymana
 DonationStatusPromiseNotValidatedShort=Szkic
 DonationStatusPromiseValidatedShort=Zatwierdzona
 DonationStatusPaidShort=Odebrane
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Sprawdź obietnicy
-DonationReceipt=Donation receipt
+DonationReceipt=Otrzymanie darowizny
 BuildDonationReceipt=Zbuduj otrzymania
 DonationsModels=Dokumenty modeli oddawania wpływy
 LastModifiedDonations=Ostatnie %s modyfikowane darowizn
 SearchADonation=Szukaj darowiznę
-DonationRecipient=Donation recipient
-ThankYou=Thank You
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-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
+DonationRecipient=Darowizna odbiorca
+ThankYou=Dziękujemy
+IConfirmDonationReception=Odbiorca deklarują odbiór, jako darowiznę, następującej kwoty
+MinimumAmount=Minimalna kwota to% s
+FreeTextOnDonations=Dowolny tekst do wyświetlenia w stopce
+FrenchOptions=Opcje dla Francji
+DONATION_ART200=Pokaż artykuł 200 z CGI, jeśli obawiasz
+DONATION_ART238=Pokaż artykuł 238 z CGI, jeśli obawiasz
+DONATION_ART885=Pokaż artykuł 885 z CGI, jeśli obawiasz
+DonationPayment=Donation payment
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index 45b1445b898..a547d974dae 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -23,10 +23,10 @@ ECMNewDocument=Nowy dokument
 ECMCreationDate=Data utworzenia
 ECMNbOfFilesInDir=Liczba plików w katalogu
 ECMNbOfSubDir=Liczba pod-katalogi
-ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMNbOfFilesInSubDir=Liczba plików w podkatalogach
 ECMCreationUser=Twórca
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Obszar EDM
+ECMAreaDesc=Powierzchnia (zarządzanie dokumentami elektronicznymi) EDM pozwala na zapisywanie, udostępnianie i szybko wyszukiwać wszelkiego rodzaju dokumentów w Dolibarr.
 ECMAreaDesc2=* Automatyczne katalogi wypełnione automatycznie podczas dodawania dokumentów z karty elementu. 
 * Podręcznik katalogów mogą być wykorzystane do zapisywania dokumentów nie są powiązane z konkretnym elementem.
 ECMSectionWasRemoved=Katalog %s została usunięta.
 ECMDocumentsSection=Dokument katalogu
@@ -35,16 +35,16 @@ ECMSearchByEntity=Szukaj wg obiektu
 ECMSectionOfDocuments=Katalogi dokumentów
 ECMTypeManual=Podręcznik
 ECMTypeAuto=Automatyczne
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Dokumenty związane ze składek na ubezpieczenia społeczne
 ECMDocsByThirdParties=Dokumenty związane z trzecim
 ECMDocsByProposals=Dokumenty związane z wnioskami
 ECMDocsByOrders=Dokumenty związane z zamówień klientów
 ECMDocsByContracts=Dokumenty związane z umowami
 ECMDocsByInvoices=Dokumenty związane z odbiorców faktur
 ECMDocsByProducts=Dokumenty związane z produktami
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByProjects=Dokumenty związane z projektami
+ECMDocsByUsers=Dokumenty związane z użytkowników
+ECMDocsByInterventions=Dokumenty związane z interwencjami
 ECMNoDirectoryYet=Nr katalogu stworzonym
 ShowECMSection=Pokaż katalog
 DeleteSection=Usuwanie katalogu
@@ -53,5 +53,5 @@ ECMDirectoryForFiles=Względna katalog plików
 CannotRemoveDirectoryContainsFiles=Usuwane nie możliwe, ponieważ zawiera ona pewne pliki
 ECMFileManager=Menedżer plików
 ECMSelectASection=Wybierz katalog na lewym drzewa ...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+DirNotSynchronizedSyncFirst=Katalog ten wydaje się być tworzone lub zmieniane poza modułem ECM. Należy kliknąć na przycisk "Odśwież" pierwszy synchronizacji dysku i bazy danych, aby uzyskać zawartość tego katalogu.
 
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 2cf540a0d8d..907f1887ab8 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Nie ma błędu, zobowiązujemy
 # Errors
 Error=Błąd
 Errors=Błędy
-ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorButCommitIsDone=Znalezione błędy, ale mimo to możemy potwierdzić
 ErrorBadEMail=EMail %s jest nie tak
 ErrorBadUrl=Url %s jest nie tak
 ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
@@ -25,11 +25,11 @@ ErrorFromToAccountsMustDiffers=Źródło i celów rachunków bankowych muszą by
 ErrorBadThirdPartyName=Zła wartość w trzeciej imię
 ErrorProdIdIsMandatory=%s jest obowiązkowy
 ErrorBadCustomerCodeSyntax=Bad składni kodu klienta
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Zła składnia kodu kreskowego. Może ustawić typ kodu kreskowego lub złe Zdefiniowane maskę kodów kreskowych do numerowania, że ​​nie pasuje do wartości zeskanowany.
 ErrorCustomerCodeRequired=Klient kod wymagane
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Wymagany kod kreskowy
 ErrorCustomerCodeAlreadyUsed=Klient kod już używane
-ErrorBarCodeAlreadyUsed=Bar code already used
+ErrorBarCodeAlreadyUsed=Kod kreskowy już używana
 ErrorPrefixRequired=Prefiks wymagana
 ErrorUrlNotValid=Adres strony internetowej jest nieprawidłowy
 ErrorBadSupplierCodeSyntax=Bad składni kodu dostawcy
@@ -37,9 +37,9 @@ ErrorSupplierCodeRequired=Dostawca kod wymagane
 ErrorSupplierCodeAlreadyUsed=Dostawca kod już używane
 ErrorBadParameters=Bad parametry
 ErrorBadValueForParameter=Wrong wartość '%s "dla parametrów nieprawidłowe" %s spacerem
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadImageFormat=Plik obrazu ma nie Obsługiwany format (Twój PHP nie obsługuje funkcje do konwersji obrazów tego formatu)
 ErrorBadDateFormat=Wartość '%s "ma zły format daty
-ErrorWrongDate=Date is not correct!
+ErrorWrongDate=Data nie jest poprawny!
 ErrorFailedToWriteInDir=Nie można zapisać w katalogu %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Znaleziono nieprawidłowy adres e-mail składni %s linii w pliku (np. z linii email %s= %s)
 ErrorUserCannotBeDelete=Użytkownik nie może być usunięty. Może być to związane jest na Dolibarr podmiotów.
@@ -60,26 +60,26 @@ ErrorUploadBlockedByAddon=Prześlij zablokowane / PHP wtyczki Apache.
 ErrorFileSizeTooLarge=Rozmiar pliku jest zbyt duży.
 ErrorSizeTooLongForIntType=Rozmiar zbyt długo typu int (%s cyfr maksimum)
 ErrorSizeTooLongForVarcharType=Rozmiar zbyt długo typu string (%s znaków maksymalnie)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores
+ErrorNoValueForSelectType=Proszę wypełnić wartości listy wyboru
+ErrorNoValueForCheckBoxType=Proszę wypełnić pole wyboru wartości dla listy
+ErrorNoValueForRadioType=Proszę wypełnić wartość liście radiowej
+ErrorBadFormatValueList=Wartość lista nie może mieć więcej niż jeden pochodzić:% s, ale potrzeba co najmniej jeden: llave, valores
 ErrorFieldCanNotContainSpecialCharacters=Pole %s nie zawiera znaki specjalne.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Pole% s nie musi zawiera znaki specjalne, ani dużych liter.
 ErrorNoAccountancyModuleLoaded=Nr rachunkowych moduł aktywowany
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Ta nazwa profil już istnieje dla tego zestawu eksportu.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP dopasowywania nie jest kompletna.
 ErrorLDAPMakeManualTest=A. LDIF plik został wygenerowany w katalogu %s. Spróbuj załadować go ręcznie z wiersza polecenia, aby mieć więcej informacji na temat błędów.
 ErrorCantSaveADoneUserWithZeroPercentage=Nie można zapisać działania z "Statut nie rozpocznie", jeśli pole "wykonana przez" jest wypełniona.
 ErrorRefAlreadyExists=Numer identyfikacyjny używany do tworzenia już istnieje.
 ErrorPleaseTypeBankTransactionReportName=Wpisz nazwę banku otrzymania gdy transakcja jest zgłaszane (Format RRRRMM lub RRRRMMDD)
 ErrorRecordHasChildren=Nie można usunąć rekordy, ponieważ ma pewne Childs.
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
+ErrorRecordIsUsedCantDelete=Nie możesz usuwać rekord. Jest ona już używana lub włączane do innego obiektu.
 ErrorModuleRequireJavascript=JavaScript nie musi być wyłączona do tej pracy funkcji. Aby włączyć / wyłączyć Javascript, przejdź do menu Start-> Ustawienia-> Ekran.
 ErrorPasswordsMustMatch=Zarówno wpisane hasło musi się zgadzać się
 ErrorContactEMail=Techniczny błąd. Proszę skontaktować się z administratorem, aby po %s email pl zapewnić %s kod błędu w wiadomości, a nawet lepsze, dodając kopię ekranu strony.
 ErrorWrongValueForField=Nieprawidłowa wartość dla %s numer pola (wartość "%s" nie pasuje regex %s zasady)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
+ErrorFieldValueNotIn=Błędna wartość w polu Numer% s (wartości '% s' nie jest dostępna w polu wartości% s Tabela% s =% s)
 ErrorFieldRefNotIn=Nieprawidłowa wartość dla %s liczba pól (wartość '%s "nie jest %s istniejących ref)
 ErrorsOnXLines=Błędów na linii źródło %s
 ErrorFileIsInfectedWithAVirus=Program antywirusowy nie był w stanie potwierdzić (plik może być zainfekowany przez wirusa)
@@ -91,8 +91,8 @@ ErrorModuleSetupNotComplete=Instalacja modułu wygląda na uncomplete. Idź na i
 ErrorBadMask=Błąd na masce
 ErrorBadMaskFailedToLocatePosOfSequence=Błąd, maska ​​bez kolejnego numeru
 ErrorBadMaskBadRazMonth=Błąd, zła wartość zresetowane
-ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorMaxNumberReachForThisMask=Maksymalna liczba zasięg dla tej maski
+ErrorCounterMustHaveMoreThan3Digits=Licznik musi mieć więcej niż 3 cyfry
 ErrorSelectAtLeastOne=Błąd. Wybierz co najmniej jeden wpis.
 ErrorProductWithRefNotExist=Produkt z '%s "odniesienia nie istnieje
 ErrorDeleteNotPossibleLineIsConsolidated=Usuń nie możliwe, ponieważ zapis jest związany z transation bankowego, który jest conciliated
@@ -116,54 +116,60 @@ ErrorLoginDoesNotExists=Użytkownik z logowania %s nie może zostać znal
 ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany.
 ErrorBadValueForCode=Zła wartość typy kodu. Spróbuj ponownie z nową wartość ...
 ErrorBothFieldCantBeNegative=Pola %s i %s nie może być zarówno negatywny
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Ilość linii do faktur dla klientów nie może być ujemna
 ErrorWebServerUserHasNotPermission=Konto użytkownika %s wykorzystywane do wykonywania serwer WWW nie ma zgody na który
 ErrorNoActivatedBarcode=Nie Typ aktywny kodów kreskowych
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date can not be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature.
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Iperator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpressionInternal=Internal error '%s'
-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
+ErrUnzipFails=Nie udało się rozpakować% s ZipArchive
+ErrNoZipEngine=Nie silnika rozpakować% s plik w PHP
+ErrorFileMustBeADolibarrPackage=Plik% s musi być pakiet zip Dolibarr
+ErrorFileRequired=To zajmuje plik pakietu Dolibarr
+ErrorPhpCurlNotInstalled=PHP CURL nie jest zainstalowany, to jest niezbędne, aby porozmawiać z Paypal
+ErrorFailedToAddToMailmanList=Nie udało się dodać% s do% s listy Mailman lub podstawy SPIP
+ErrorFailedToRemoveToMailmanList=Nie udało się usunąć rekord% s do% s listy Mailman lub podstawy SPIP
+ErrorNewValueCantMatchOldValue=Nowa wartość nie może być równa starego
+ErrorFailedToValidatePasswordReset=Nie udało się REINIT hasło. Mogą być wykonywane już reinit (ten link może być używany tylko jeden raz). Jeśli nie, spróbuj ponownie uruchomić proces reinit.
+ErrorToConnectToMysqlCheckInstance=Podłącz się do bazy danych nie powiedzie się. Sprawdź serwer MySQL jest uruchomiony (w większości przypadków, można go uruchomić z linii poleceń z "sudo /etc/init.d/mysql start").
+ErrorFailedToAddContact=Nie udało się dodać kontakt
+ErrorDateMustBeBeforeToday=Data nie może być większa niż dzisiaj
+ErrorPaymentModeDefinedToWithoutSetup=Tryb płatność została ustawiona na typ% s, ale konfiguracja modułu faktury nie została zakończona do określenia informacji, aby pokazać tym trybie płatności.
+ErrorPHPNeedModule=Błąd, Twój PHP musi mieć zainstalowanego modułu% s, aby korzystać z tej funkcji.
+ErrorOpenIDSetupNotComplete=Ty konfiguracji Dolibarr plik konfiguracyjny, aby umożliwić uwierzytelnianie OpenID, ale adres URL usługi OpenID nie jest zdefiniowany w stałej% s
+ErrorWarehouseMustDiffers=Źródłowy i docelowy składach, musi różni
+ErrorBadFormat=Bad Format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Błąd, członek ten nie jest jeszcze związana z żadnymi thirdparty. Członkiem Link do istniejącej strony trzeciej lub utworzyć nowy thirdparty przed utworzeniem subskrypcji z faktury.
+ErrorThereIsSomeDeliveries=Błąd występuje kilka dostaw związane z tym przemieszczenia. Wykreślenie odmówił.
+ErrorCantDeletePaymentReconciliated=Nie można usunąć płatności, które generowane transakcji w banku, który został pojednaniem
+ErrorCantDeletePaymentSharedWithPayedInvoice=Nie można usunąć płatności udostępnionej przez co najmniej jednego stanu zapłaci faktury z
+ErrorPriceExpression1=Nie można przypisać do stałej '% s'
+ErrorPriceExpression2=Nie można przedefiniować wbudowanej funkcji "% s"
+ErrorPriceExpression3=Niezdefiniowana zmienna '% s' w definicji funkcji
+ErrorPriceExpression4=Nieprawidłowy znak '% s'
+ErrorPriceExpression5=Nieoczekiwany "% s"
+ErrorPriceExpression6=Błędna liczba argumentów (% s podano,% s oczekiwany)
+ErrorPriceExpression8=Operator nieoczekiwane "% s"
+ErrorPriceExpression9=Wystąpił błąd
+ErrorPriceExpression10=Iperator '% s' nie ma argumentu
+ErrorPriceExpression11=Spodziewając '% s'
+ErrorPriceExpression14=Dzielenie przez zero
+ErrorPriceExpression17=Niezdefiniowana zmienna '% s'
+ErrorPriceExpression19=Ekspresja Nie znaleziono
+ErrorPriceExpression20=Pusty wyraz
+ErrorPriceExpression21=Pusty wynik '% s'
+ErrorPriceExpression22=Wynik negatywny "% s"
+ErrorPriceExpressionInternal=Wewnętrzny błąd "% s"
+ErrorPriceExpressionUnknown=Nieznany błąd "% s"
+ErrorSrcAndTargetWarehouseMustDiffers=Źródłowy i docelowy składach, musi różni
+ErrorTryToMakeMoveOnProductRequiringBatchData=Błąd, próbuje zrobić ruch akcji bez partii / informacji szeregowego, na produkt wymagający partii / informacja seryjny
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Wszystkie nagrane przyjęć muszą najpierw zostać zweryfikowane przed dopuszczeniem do wykonania tej akcji
+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
+WarningMandatorySetupNotComplete=Parametry konfiguracyjne obowiązkowe nie są jeszcze określone
 WarningSafeModeOnCheckExecDir=Uwaga, opcja safe_mode w PHP jest więc polecenia muszą być przechowywane wewnątrz katalogu safe_mode_exec_dir parametrów deklarowanych przez php.
 WarningAllowUrlFopenMustBeOn=Allow_url_fopen Parametr musi być ustawiony w Filer php.ini za ten moduł pracy całkowicie. Należy zmodyfikować ten plik ręcznie.
 WarningBuildScriptNotRunned=Skrypt %s nie zostało jeszcze prowadził do tworzenia grafiki, lub nie ma danych do pokazania.
@@ -172,12 +178,12 @@ WarningPassIsEmpty=Ostrzeżenie, hasło bazy danych jest pusta. To jest chronion
 WarningConfFileMustBeReadOnly=Uwaga, plik konfiguracyjny (htdocs / conf / conf.php) mogą być zastąpione przez serwer internetowy. Jest to poważna luka w zabezpieczeniach. Modyfikowanie uprawnień na wniosek jest w trybie tylko do odczytu dla użytkownika system operacyjny używany przez serwer sieci Web. Jeśli używasz systemu Windows i format FAT na dysku, musisz wiedzieć, że ten system plików nie pozwala na dodawanie uprawnień do pliku, więc nie może być całkowicie bezpieczne.
 WarningsOnXLines=Ostrzeżeń na linii źródło %s
 WarningNoDocumentModelActivated=Nie modelu do generowania dokumentu, został aktywowany. Model będzie wybraną domyślnie dopóki nie zajrzysz do modułu konfiguracji.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole.
+WarningLockFileDoesNotExists=Ostrzeżenie, po zakończeniu instalacji, należy wyłączyć instalacji / migracji narzędzia, dodając plik do katalogu install.lock% s. Brakuje tego pliku jest dziura w zabezpieczeniach.
 WarningUntilDirRemoved=To ostrzeżenie pozostanie aktywne, dopóki ten katalog jest obecny (Widoczne tylko admin użytkowników).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningNotRelevant=Irrelevant operation for this dataset
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningCloseAlways=Ostrzeżenie, zamykanie odbywa się nawet wtedy, gdy kwota zależy od elementów źródłowych i docelowych. Włącz tę funkcję, z zachowaniem ostrożności.
+WarningUsingThisBoxSlowDown=Ostrzeżenie, za pomocą tego pola spowolnić poważnie do wszystkich stron zawierających pola.
+WarningClickToDialUserSetupNotComplete=Konfiguracja ClickToDial informacji dla użytkownika nie są kompletne (patrz zakładka ClickToDial na kartę użytkownika).
+WarningNotRelevant=Bez znaczenia dla tej operacji zbiorze
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funkcja wyłączona podczas konfiguracji wyświetlacz jest zoptymalizowana dla osoby niewidomej lub tekstowych przeglądarek.
+WarningPaymentDateLowerThanInvoiceDate=Termin płatności (% s) jest wcześniejsza niż dzień wystawienia faktury (% s) dla faktury% s.
+WarningTooManyDataPleaseUseMoreFilters=Zbyt wiele danych. Proszę używać więcej filtrów
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index 6e701b96939..efabd1bea03 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -8,7 +8,7 @@ ImportableDatas=Przywozowe danych
 SelectExportDataSet=Wybierz dane, które chcesz wyeksportować ...
 SelectImportDataSet=Wybierz dane, które chcesz zaimportować ...
 SelectExportFields=Wybierz pola, które chcesz wyeksportować, lub wybrać predefiniowany profil eksportu
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectImportFields=Wybierz pola plików źródłowych chcesz importować, a ich pola docelowego w bazie danych, przesuwając je w górę iw dół z kotwicą% s, lub wybierz predefiniowany profil importu:
 NotImportedFields=Obszary plik przywożonych źródła nie
 SaveExportModel=Zapisz ten wywóz profil jeśli masz zamiar ponownego użycia go później ...
 SaveImportModel=Zapisz ten przywóz profil jeśli masz zamiar ponownego użycia go później ...
@@ -64,7 +64,7 @@ ChooseFormatOfFileToImport=Wybierz format pliku do wykorzystania jako format pli
 ChooseFileToImport=Wybierz plik do zaimportowania, a następnie kliknij przycisk picto %s ...
 SourceFileFormat=format pliku źródłowego
 FieldsInSourceFile=Obszary w pliku źródłowym
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Pola docelowe w bazie danych Dolibarr (wytłuszczenie = obowiązkowe)
 Field=Pole
 NoFields=Nie pól
 MoveField=Przenieś %s kolumnie polu numeru
@@ -81,7 +81,7 @@ DoNotImportFirstLine=Nie przywozili pierwszym wierszu pliku źródłowego
 NbOfSourceLines=Liczba linii w pliku źródłowym
 NowClickToTestTheImport=Sprawdź parametry na przywóz zostało to określone. Jeśli są one prawidłowe, kliknij na przycisk "%s", aby uruchomić symulację procesu importowania (żadne dane nie zostaną zmienione w bazie danych, to tylko symulacja na razie) ...
 RunSimulateImportFile=Uruchomienie symulacji import
-FieldNeedSource=This field requires data from the source file
+FieldNeedSource=To pole wymaga danych z pliku źródłowego
 SomeMandatoryFieldHaveNoSource=Niektóre z pól obowiązkowych nie ma źródła danych z pliku
 InformationOnSourceFile=Informacje o pliku źródłowego
 InformationOnTargetTables=Informacji na temat docelowego pola
@@ -102,33 +102,33 @@ NbOfLinesImported=Liczba linii zaimportowany: %s.
 DataComeFromNoWhere=Wartości, aby dodać pochodzi z nigdzie w pliku źródłowym.
 DataComeFromFileFieldNb=Wartości, aby dodać pochodzi z %s numer pola w pliku źródłowym.
 DataComeFromIdFoundFromRef=Wartość, która pochodzi z %s numer dziedzinie pliku źródłowego zostaną wykorzystane w celu znalezienia id rodzica obiektu do użytkowania (So %s objet że ma ref. Od pliku źródłowego musi istnieć w Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=Kod, który pochodzi z numeru pola% s w pliku źródłowym zostaną wykorzystane, aby znaleźć identyfikator obiektu nadrzędnego w użyciu (Tak Kod z pliku źródłowego musi istnieje w słowniku% s). Zauważ, że jeśli wiesz, id, można również użyć go do pliku źródłowego zamiast kodu. Import powinien pracować w obu przypadkach.
 DataIsInsertedInto=Danych pochodzących z pliku źródłowego zostanie wstawiony w pole następujące brzmienie:
 DataIDSourceIsInsertedInto=Id rodzica znalezionego obiektu na podstawie danych w pliku źródłowym, zostaną włączone do następujących dziedzinach:
 DataCodeIDSourceIsInsertedInto=Id linii macierzystej znaleźć z kodem, zostaną włączone do następnego pola:
 SourceRequired=Wartość danych jest obowiązkowe
 SourceExample=Przykład możliwych wartości danych
 ExampleAnyRefFoundIntoElement=Wszelkie ref dla %s elementów
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s
+ExampleAnyCodeOrIdFoundIntoDictionary=Każdy kod (lub identyfikator) znajduje się w słowniku% s
 CSVFormatDesc=Format pliku oddzielonych przecinkami jakości (. Csv). 
 Jest to format pliku tekstowego, gdzie pola oddzielone są separatorem [%s]. Jeśli wewnątrz znajduje się separator zawartości pola, jest zaokrąglona przez cały charakter [%s]. Ucieczka do charakteru uciec charakter rundy [%s].
-Excel95FormatDesc=Excel file format (.xls)
This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=Excel file format (.xlsx)
This is native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ).
-CsvOptions=Csv Options
+Excel95FormatDesc=Format pliku Excel (.xls) 
 To jest natywny format programu Excel 95 (BIFF5).
+Excel2007FormatDesc=Format pliku Excel (xlsx) 
 To jest w formacie Excel 2007 rodzimych (SpreadsheetML).
+TsvFormatDesc=Tab separacji format Wartość (.tsv) 
 Jest to format pliku tekstowego, gdzie pola są oddzielone tabulator [TAB].
+ExportFieldAutomaticallyAdded=Pole% s został automatycznie dodany. Będzie unikać, aby mieć podobne linie mają być traktowane jako zduplikowanych rekordów (w tym polu dodał, wszystkie linie będzie posiadać swój własny identyfikator i będą się różnić).
+CsvOptions=Opcje csv
 Separator=Separator
-Enclosure=Enclosure
-SuppliersProducts=Suppliers Products
+Enclosure=Ogrodzenie
+SuppliersProducts=Dostawcy Produkty
 BankCode=Kod banku
 DeskCode=Recepcja kod
 BankAccountNumber=Numer konta
 BankAccountNumberKey=Klucz
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
 > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
 < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a range of values
'>NNNNN' filters by lower values
'>NNNNN' filters by higher values
+SpecialCode=Specjalny kod
+ExportStringFilter=%% Umożliwia zastąpienie jednego lub więcej znaków w tekście
+ExportDateFilter=YYYY, RRRRMM, RRRRMMDD: filtry o rok / miesiąc / dzień 
 RR + YYYY, RRRRMM + RRRRMM, RRRRMMDD + RRRRMMDD: Filtry ponad szeregu lat / miesięcy / dni 
 > YYYY> RRRRMM,> yyyymmdd: filtry na wszystkich kolejnych lat / miesięcy / dni 
  Filtry "NNNNN + NNNNN" ponad zakres wartości 
 "> NNNNN" filtry według niższej wartości 
 "> NNNNN" filtry według wyższych wartości
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
+SelectFilterFields=Jeśli chcesz filtrować niektóre wartości, wartości po prostu wejść tutaj.
 FilterableFields=Champs Filtrables
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+FilteredFields=Pola filtrowane
+FilteredFieldsValues=Wart filtru
diff --git a/htdocs/langs/pl_PL/externalsite.lang b/htdocs/langs/pl_PL/externalsite.lang
index 35765bf2fd5..3064e00428a 100644
--- a/htdocs/langs/pl_PL/externalsite.lang
+++ b/htdocs/langs/pl_PL/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Skonfiguruj link do zewnętrznej strony internetowej
 ExternalSiteURL=Zewnętrzny URL strony
 ExternalSiteModuleNotComplete=Moduł zewnętrznej strony internetowej nie został skonfigurowany poprawny
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Moja pozycja menu
diff --git a/htdocs/langs/pl_PL/ftp.lang b/htdocs/langs/pl_PL/ftp.lang
index b71a5a0faa9..e7eae611fbf 100644
--- a/htdocs/langs/pl_PL/ftp.lang
+++ b/htdocs/langs/pl_PL/ftp.lang
@@ -9,4 +9,4 @@ FailedToConnectToFTPServer=Nie udało się połączyć z serwerem FTP (%s serwer
 FailedToConnectToFTPServerWithCredentials=Nie udało się zalogować do serwera FTP z definicją login / hasło
 FTPFailedToRemoveFile=Nie udało się usunąć pliku %s.
 FTPFailedToRemoveDir=Nie udało się usunąć %s katalogu (Sprawdź uprawnienia i że katalog jest pusty).
-# FTPPassiveMode=Passive mode
+FTPPassiveMode=Tryb pasywny
diff --git a/htdocs/langs/pl_PL/help.lang b/htdocs/langs/pl_PL/help.lang
index b3882097137..988909ade7e 100644
--- a/htdocs/langs/pl_PL/help.lang
+++ b/htdocs/langs/pl_PL/help.lang
@@ -24,5 +24,5 @@ BackToHelpCenter=W innym przypadku, kliknij tutaj, aby przejść ws
 LinkToGoldMember=Możesz połączyć jedno z trenera wybranej przez Dolibarr dla danego języka ( %s), klikając jego Widget (status i maksymalną cenę są automatycznie uaktualniane):
 PossibleLanguages=Obsługiwane języki
 MakeADonation=Pomoc Dolibarr projektu, dokonać wpłaty
-# SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
-# SeeOfficalSupport=For official Dolibarr support in your language: 
%s
+SubscribeToFoundation=Pomoc projekt Dolibarr, zapisz się na fundamencie
+SeeOfficalSupport=Do oficjalnego wsparcia Dolibarr w Twoim języku: 
 % S
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index bbf13703b82..42b65f717e6 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -1,148 +1,148 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
-MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this,  click here .
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
-Employe=Employee
+Holidays=Liście
+CPTitreMenu=Liście
+MenuReportMonth=Oświadczenie miesięczny
+MenuAddCP=Złożyć wniosek do urlopu
+NotActiveModCP=Musisz włączyć liście modułów do strony.
+NotConfigModCP=Musisz skonfigurować moduł Liście do strony. Aby to zrobić, kliknij tutaj  ,
+NoCPforUser=Nie mają żadnych dzień.
+AddCP=Złożyć wniosek do urlopu
+Employe=Pracownik
 DateDebCP=Data rozpoczęcia
 DateFinCP=Data zakończenia
 DateCreateCP=Data utworzenia
 DraftCP=Projekt
-ToReviewCP=Awaiting approval
+ToReviewCP=Oczekuje na zatwierdzenie
 ApprovedCP=Zatwierdzony
 CancelCP=Odwołany
 RefuseCP=Odmówił
 ValidatorCP=Approbator
-ListeCP=List of leaves
-ReviewedByCP=Will be reviewed by
+ListeCP=Lista liści
+ReviewedByCP=Zostanie rozpatrzony przez
 DescCP=Opis
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least %s day(s) before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is %s days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+SendRequestCP=Tworzenie żądania urlopu
+DelayToRequestCP=Zostawić wnioski muszą być wykonane co ​​najmniej% s dzień (dni) przed nimi.
+MenuConfCP=Edycja bilans liści
+UpdateAllCP=Aktualizacja liście
+SoldeCPUser=Liście saldo jest% s dni.
+ErrorEndDateCP=Musisz wybrać datę zakończenia większą niż data rozpoczęcia.
+ErrorSQLCreateCP=Wystąpił błąd SQL podczas tworzenia:
+ErrorIDFicheCP=Wystąpił błąd, wniosek urlop nie istnieje.
+ReturnCP=Powrót do poprzedniej strony
+ErrorUserViewCP=Nie masz uprawnień do czytania tego żądania urlopu.
+InfosCP=Informacje o wniosku urlopowego
+InfosWorkflowCP=Informacje Workflow
+RequestByCP=Wniosek
+TitreRequestCP=Zostaw żądanie
+NbUseDaysCP=Liczba dni urlopu spożywane
 EditCP=Edytuj
 DeleteCP=Usunąć
 ActionValidCP=Validate
-ActionRefuseCP=Refuse
+ActionRefuseCP=Odmawiać
 ActionCancelCP=Zrezygnuj
 StatutCP=Status
-SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-CantUpdate=You cannot update this leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+SendToValidationCP=Wyślij do walidacji
+TitleDeleteCP=Usunąć żądanie urlopu
+ConfirmDeleteCP=Potwierdź usunięcie tego wniosku urlopowego?
+ErrorCantDeleteCP=Błąd nie masz prawo do usunięcia tego żądania urlopu.
+CantCreateCP=Nie mają prawa do składania wniosków urlopowych.
+InvalidValidatorCP=Musisz wybrać approbator do żądania urlopu.
+CantUpdate=Nie można zaktualizować to żądanie urlopu.
+NoDateDebut=Musisz wybrać datę rozpoczęcia.
+NoDateFin=Musisz wybrać datę zakończenia.
+ErrorDureeCP=Twoje zapytanie urlopu nie zawiera dzień roboczy.
+TitleValidCP=Zatwierdzenie wniosku urlopu
+ConfirmValidCP=Czy na pewno chcesz, aby zatwierdzić wniosek urlopu?
+DateValidCP=Data zatwierdzone
+TitleToValidCP=Wyślij prośbę o urlop
+ConfirmToValidCP=Czy jesteś pewien, że chcesz wysłać wniosek do urlopu?
+TitleRefuseCP=Odrzucają wniosek o urlop
+ConfirmRefuseCP=Czy na pewno chcesz odrzucić wniosek urlopu?
+NoMotifRefuseCP=Musisz wybrać powód do odrzucenia wniosku.
+TitleCancelCP=Anuluj żądanie urlopu
+ConfirmCancelCP=Czy na pewno chcesz zrezygnować z żądania urlopu?
+DetailRefusCP=Powodem odmowy
+DateRefusCP=Data odmowy
+DateCancelCP=Data odwołania
+DefineEventUserCP=Przypisywanie wyjątkowy urlop dla użytkownika
+addEventToUserCP=Przypisywanie urlopu
 MotifCP=Powód
 UserCP=Użytkownik
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
+ErrorAddEventToUserCP=Wystąpił błąd podczas dodawania wyjątkowy urlop.
+AddEventToUserOkCP=Dodanie wyjątkowe prawo zostało zakończone.
+MenuLogCP=Zobacz dzienniki wniosków urlopowych
+LogCP=Zaloguj o aktualizacjach dostępnych dni urlopu
+ActionByCP=Wykonywane przez
+UserUpdateCP=Dla użytkownika
+PrevSoldeCP=Poprzedni Saldo
 NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
+alreadyCPexist=Żądanie urlopu zostało już zrobione na ten okres.
 UserName=Nazwa użytkownika
-Employee=Employee
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
+Employee=Pracownik
+FirstDayOfHoliday=Pierwszy dzień wakacji
+LastDayOfHoliday=Ostatni dzień wakacji
+HolidaysMonthlyUpdate=Miesięczna aktualizacja
+ManualUpdate=Ręczna aktualizacja
+HolidaysCancelation=Zostaw żądania anulowanie
 
 ## Configuration du Module ##
-ConfCP=Configuration of leave request module
-DescOptionCP=Description of the option
+ConfCP=Konfiguracja modułu żądanie urlopu
+DescOptionCP=Opis wariantu
 ValueOptionCP=Wartość
-GroupToValidateCP=Group with the ability to approve leave requests
-ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of leaves allocation
-UpdateConfCPOK=Updated successfully.
-ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of leaves allocation of users by clicking here.
-DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of leave days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of leave request
-TitleOptionEventCP=Settings of leave requets for events
+GroupToValidateCP=Grupa ze zdolnością do zatwierdzenia wniosków urlopowych
+ConfirmConfigCP=Weryfikacja konfiguracji
+LastUpdateCP=Ostatni automatyczna aktualizacja alokacji liści
+UpdateConfCPOK=Zaktualizowane.
+ErrorUpdateConfCP=Wystąpił błąd podczas aktualizacji, spróbuj ponownie.
+AddCPforUsers=Proszę dodać równowagę liście przydziału użytkowników, klikając tutaj .
+DelayForSubmitCP=Ostateczny termin się zrobić wniosków urlopowych
+AlertapprobatortorDelayCP=Zapobiec approbator jeżeli żądanie urlopu nie odpowiada termin
+AlertValidatorDelayCP=Préevent na approbator jeżeli wniosek urlop przekroczyć opóźnienia
+AlertValidorSoldeCP=Zapobiec approbator jeżeli wniosek urlop przekroczyć salda
+nbUserCP=Liczba użytkowników obsługiwane w module Liści
+nbHolidayDeductedCP=Liczba dni urlopu do odliczenia za każdy dzień urlopu podjętej
+nbHolidayEveryMonthCP=Liczba dni urlopu co miesiąc dodaje
+Module27130Name= Zarządzanie wniosków urlopowych
+Module27130Desc= Zarządzanie wniosków urlopowych
+TitleOptionMainCP=Główne ustawienia żądanie urlopu
+TitleOptionEventCP=Ustawienia prośby w urlopu na imprezy
 ValidEventCP=Validate
-UpdateEventCP=Update events
+UpdateEventCP=Wydarzenia Aktualizuj
 CreateEventCP=Edytuj
-NameEventCP=Event name
-OkCreateEventCP=The addition of the event went well.
-ErrorCreateEventCP=Error creating the event.
-UpdateEventOkCP=The update of the event went well.
-ErrorUpdateEventCP=Error while updating the event.
-DeleteEventCP=Delete Event
-DeleteEventOkCP=The event has been deleted.
-ErrorDeleteEventCP=Error while deleting the event.
-TitleDeleteEventCP=Delete a exceptional leave
-TitleCreateEventCP=Create a exceptional leave
-TitleUpdateEventCP=Edit or delete a exceptional leave
+NameEventCP=Nazwa wydarzenia
+OkCreateEventCP=Dodanie przypadku poszło dobrze.
+ErrorCreateEventCP=Błąd tworzenia zdarzenia.
+UpdateEventOkCP=Aktualizacja przypadku poszło dobrze.
+ErrorUpdateEventCP=Błąd podczas aktualizacji zdarzenie.
+DeleteEventCP=Usuń zdarzenie
+DeleteEventOkCP=Impreza została usunięta.
+ErrorDeleteEventCP=Błąd podczas usuwania wydarzenia.
+TitleDeleteEventCP=Usuwanie wyjątkowy urlop
+TitleCreateEventCP=Stwórz wyjątkowe prawo
+TitleUpdateEventCP=Edytować lub usunąć w drodze wyjątku prawo
 DeleteEventOptionCP=Usunąć
 UpdateEventOptionCP=Uaktualnić
-ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
-nbJours=Number days
-TitleAdminCP=Configuration of Leaves
+ErrorMailNotSend=Wystąpił błąd podczas wysyłania wiadomości e-mail:
+NoCPforMonth=Nie opuścić ten miesiąc.
+nbJours=Liczba dni
+TitleAdminCP=Konfiguracja Liście
 #Messages
-Hello=Hello
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Hello=Halo
+HolidaysToValidate=Weryfikacja wniosków urlopowych
+HolidaysToValidateBody=Poniżej jest wniosek o dopuszczenie do sprawdzenia
+HolidaysToValidateDelay=Wniosek ten urlop odbędzie się w ciągu mniej niż% s dni.
+HolidaysToValidateAlertSolde=Użytkownik, który dokonał tego zostawić nie mają przesiał wniosek wystarczająco dostępne dni.
+HolidaysValidated=Zatwierdzone wnioski urlopowe
+HolidaysValidatedBody=Twoje zapytanie urlopu% s do% s został zatwierdzony.
+HolidaysRefused=Zapytanie zaprzeczył
+HolidaysRefusedBody=Twoje zapytanie urlopu dla% s do% s została odrzucona z następującego powodu:
+HolidaysCanceled=Anulowane liściasta wniosek
+HolidaysCanceledBody=Twoje zapytanie urlopu% s do% s została anulowana.
+Permission20000=Czytaj jesteś właścicielem wniosków urlopowych
+Permission20001=Tworzenie / modyfikowanie wniosków urlopowych
+Permission20002=Tworzenie / modyfikacja wniosków urlopowych dla wszystkich
+Permission20003=Usuń wniosków urlopowych
+Permission20004=Ustawienia dostępne użytkowników dni urlopu
+Permission20005=Dziennik Przegląd zmodyfikowanych wniosków urlopowych
+Permission20006=Przeczytaj pozostawia raport miesięczny
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 2361a900a14..96f1f87c958 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -156,7 +156,7 @@ LastStepDesc=Ostatni krok: Zdefiniuj tutaj nazwę i hasło, kt
 ActivateModule=Aktywuj moduł %s
 ShowEditTechnicalParameters=Kliknij tutaj, aby pokazać / edytować zaawansowane parametry (tryb ekspert)
 WarningUpgrade=Uwaga:\nPamiętaj o zrobieniu kopi zapasowej bazy!\nWysoko rekomendowane: dla przykładu,  podczas wystąpienia błędu w bazie danych systemu (dla przykładu w wersji 5.5.40 mySQL), niektóre dane lub tabele mogą zostać stracone podczas tego procesu. Rekomendowane jest by zrobic kopię swojej bazy przed migracją.\n\nNaciśnij OK by zacząć migrację...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+ErrorDatabaseVersionForbiddenForMigration=Twoja wersja bazy danych% s. Ma krytycznej utraty danych podejmowania błąd jeśli się zmianę struktury na bazie danych, tak jak jest to wymagane przez proces migracji. Na jego powodu migracji nie zostaną dopuszczone do aktualizacji bazy danych do wyższej wersji stałej (lista znanych wersji podsłuch:% s)
 
 #########
 # upgrade
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index 4ab987ec5fb..558c43cd66a 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -10,10 +10,10 @@ Language_da_DA=Duński
 Language_da_DK=Duński
 Language_de_DE=Niemiecki
 Language_de_AT=Niemiecki (Austria)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Niemiecki (Szwajcaria)
 Language_el_GR=Grecki
 Language_en_AU=Angielski (Australia)
-Language_en_CA=English (Canada)
+Language_en_CA=Angielski (Kanada)
 Language_en_GB=Angielski (Zjednoczone Królestwo)
 Language_en_IN=Angielski (Indie)
 Language_en_NZ=Angielski (Nowa Zelandia)
@@ -21,9 +21,9 @@ Language_en_SA=Angielski (Arabia Saudyjska)
 Language_en_US=Angielski (Stany Zjednoczone)
 Language_en_ZA=Angielski (Republika Południowej Afryki)
 Language_es_ES=Hiszpański
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_DO=Hiszpański (Dominikana)
 Language_es_AR=Hiszpański (Argentyna)
-Language_es_CL=Spanish (Chile)
+Language_es_CL=Hiszpański (Chile)
 Language_es_HN=Hiszpański (Honduras)
 Language_es_MX=Hiszpański (Meksyk)
 Language_es_PY=Hiszpański (Paragwaj)
@@ -41,7 +41,7 @@ Language_fr_NC=Francuski (Nowa Kaledonia)
 Language_he_IL=Hebrajski
 Language_hr_HR=Chorwacki
 Language_hu_HU=Węgierski
-Language_id_ID=Indonesian
+Language_id_ID=Indonezyjski
 Language_is_IS=Islandzki
 Language_it_IT=Włoski
 Language_ja_JP=Japoński
@@ -62,7 +62,7 @@ Language_tr_TR=Turecki
 Language_sl_SI=Słoweński
 Language_sv_SV=Szwedzki
 Language_sv_SE=Szwedzki
-Language_sq_AL=Albanian
+Language_sq_AL=Albański
 Language_sk_SK=Słowacki
 Language_th_TH=Tajski
 Language_uk_UA=Ukraiński
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 634c2963f93..b02bff7a0d4 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista wszystkich powiadomień e-mail wysłany
 MailSendSetupIs=Konfiguracja poczty e-mail wysyłającego musi być połączone z '% s'. Tryb ten może być wykorzystywany do wysyłania masowego wysyłania.
 MailSendSetupIs2=Najpierw trzeba przejść, z konta administratora, w menu% sHome - Ustawienia - e-maile% s, aby zmienić parametr '% s' na tryb '% s' używać. W tym trybie można wprowadzić ustawienia serwera SMTP dostarczonych przez usługodawcę internetowego i używać funkcji e-maila Mszę św.
 MailSendSetupIs3=Jeśli masz jakieś pytania na temat jak skonfigurować serwer SMTP, możesz poprosić o% s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index cec0f69b646..28fd1461784 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -141,7 +141,7 @@ Cancel=Zrezygnuj
 Modify=Modyfikuj
 Edit=Edytuj
 Validate=Potwierdz
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Weryfikacja i zatwierdzanie
 ToValidate=Aby potwierdzić
 Save=Zapisać
 SaveAs=Zapisz jako
@@ -159,7 +159,7 @@ Search=Wyszukaj
 SearchOf=Szukaj
 Valid=Aktualny
 Approve=Zatwierdź
-Disapprove=Disapprove
+Disapprove=Potępiać
 ReOpen=Otwórz ponownie
 Upload=Wyślij plik
 ToLink=Łącze
@@ -221,7 +221,7 @@ Cards=Kartki
 Card=Karta
 Now=Teraz
 Date=Data
-DateAndHour=Date and hour
+DateAndHour=Data i godzina
 DateStart=Data rozpoczęcia
 DateEnd=Data zakończenia
 DateCreation=Data utworzenia
@@ -298,7 +298,7 @@ UnitPriceHT=Cena jednostkowa (netto)
 UnitPriceTTC=Cena jednostkowa
 PriceU=cen/szt.
 PriceUHT=cen/szt (netto)
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=PU HT Zamówiony
 PriceUTTC=cena/szt.
 Amount=Ilość
 AmountInvoice=Kwota faktury
@@ -352,6 +352,7 @@ Status=Stan
 Favorite=Ulubiony
 ShortInfo=Info.
 Ref=Nr ref.
+ExternalRef=Ref. extern
 RefSupplier=Nr ref. Dostawca
 RefPayment=Nr ref. płatności
 CommercialProposalsShort=Propozycje komercyjne
@@ -394,8 +395,8 @@ Available=Dostępny
 NotYetAvailable=Nie są jeszcze dostępne
 NotAvailable=Niedostępne
 Popularity=Popularność
-Categories=Kategorie
-Category=Kategoria
+Categories=Tags/categories
+Category=Tag/category
 By=Przez
 From=Od
 to=do
@@ -525,7 +526,7 @@ DateFromTo=Z %s do %s
 DateFrom=Z %s
 DateUntil=Dopuki %s
 Check=Sprawdzić
-Uncheck=Uncheck
+Uncheck=Usuń zaznaczenie pola wyboru
 Internal=Wewnętrzne
 External=Zewnętrzne
 Internals=Wewnętrzne
@@ -693,7 +694,8 @@ PublicUrl=Publiczny URL
 AddBox=Dodaj skrzynke
 SelectElementAndClickRefresh=Zaznacz element i kliknij Odśwież
 PrintFile=Wydrukuj plik %s
-ShowTransaction=Show transaction
+ShowTransaction=Pokaż transakcji
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Poniedziałek
 Tuesday=Wtorek
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index d6822f8b2c9..e15937923ee 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/margins.lang
@@ -1,45 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
+Margin=Margines
+Margins=Marże
+TotalMargin=Razem Margines
+MarginOnProducts=Margin / Produkty
+MarginOnServices=Margin / Usługi
+MarginRate=Stopa marży
+MarkRate=Stawka Mark
+DisplayMarginRates=Stawki marży wyświetlacz
+DisplayMarkRates=Stawki znaków wyświetlanych
+InputPrice=Cena wejściowa
+margin=Zarządzanie marże
+margesSetup=Marże ustawień zarządzania
+MarginDetails=Szczegóły marginesów
+ProductMargins=Marginesy produktu
+CustomerMargins=Marginesy klientów
+SalesRepresentativeMargins=Sprzedaż marże reprezentatywne
+UserMargins=Marginesy użytkownika
 ProductService=Produkt lub usługa
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
+AllProducts=Wszystkie produkty i usługi
+ChooseProduct/Service=Wybierz produkt lub usługę
 StartDate=Data rozpoczęcia
 EndDate=Data zakończenia
 Launch=Start
-ForceBuyingPriceIfNull=Force buying price if null
-ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Margin type
-MargeBrute=Raw margin
-MargeNette=Net margin
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price
-CostPrice=Cost price
-BuyingCost=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+ForceBuyingPriceIfNull=Siła cena skupu, jeżeli wartość null
+ForceBuyingPriceIfNullDetails=jeśli "ON", marża będzie zero na linii (zakup cenę = cena sprzedaży), w przeciwnym razie ("OFF"), Marge będzie równa cena sprzedaży (cena zakupu = 0)
+MARGIN_METHODE_FOR_DISCOUNT=Metoda marży dla globalnych zniżki
+UseDiscountAsProduct=Jako produkt
+UseDiscountAsService=Jako usługa
+UseDiscountOnTotal=Na podsumy
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Określa, czy globalne rabatu jest traktowana jako produktu, usługi lub tylko na sumy częściowej obliczania marży.
+MARGIN_TYPE=Typ marża
+MargeBrute=Raw marża
+MargeNette=Rentowność netto
+MARGIN_TYPE_DETAILS=Raw margin: Cena sprzedaży - cena zakupu 
 Rentowność netto: Cena sprzedaży - cena kosztów
+CostPrice=Cena fabryczna
+BuyingCost=Cena fabryczna
+UnitCharges=Koszty jednostkowe
+Charges=Opłaty
+AgentContactType=Przedstawiciel handlowy typ kontaktu
+AgentContactTypeDetails=Zdefiniować, jaki rodzaj (związane na fakturach) kontaktowe będą wykorzystywane do raportu marży na reprezentatywną sprzedaż
+rateMustBeNumeric=Stawka musi być wartością liczbową
+markRateShouldBeLesserThan100=Stopa znak powinien być niższy niż 100
+ShowMarginInfos=Pokaż informacje o marżę
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index ec066499c2c..d2e8dfa1c5f 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -8,7 +8,7 @@ Members=Członkowie
 MemberAccount=Member Login
 ShowMember=Pokaż Państwa karty
 UserNotLinkedToMember=Użytkownik nie wiąże się z członkiem
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Innej firmy nie związane z członkiem
 MembersTickets=Członkowie Bilety
 FundationMembers=Fundacja użytkowników
 Attributs=Atrybuty
@@ -85,7 +85,7 @@ SubscriptionLateShort=Późno
 SubscriptionNotReceivedShort=Nigdy nie otrzymała
 ListOfSubscriptions=Lista subskrypcji
 SendCardByMail=Wyślij kartę
-AddMember=Create member
+AddMember=Tworzenie elementu
 NoTypeDefinedGoToSetup=Żaden członek typów zdefiniowanych. Przejdź do konfiguracji - Członkowie typy
 NewMemberType=Nowy członek typu
 WelcomeEMail=Zapraszamy e-mail
@@ -125,12 +125,12 @@ Date=Data
 DateAndTime=Data i czas
 PublicMemberCard=Państwa publiczne karty
 MemberNotOrNoMoreExpectedToSubscribe=Państwa nie są lub nie oczekuje, aby subskrybować
-AddSubscription=Create subscription
+AddSubscription=Tworzenie subskrypcji
 ShowSubscription=Pokaż subskrypcji
 MemberModifiedInDolibarr=Państwa zmodyfikowany w Dolibarr
 SendAnEMailToMember=Wyślij e-mail informacji na członka
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Temat wiadomości e-mail otrzymane w przypadku automatycznego napisem gość
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail otrzymane w przypadku automatycznego napisem gość
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Temat wiadomości dla członka autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=E-mail dotyczące członka autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=EMail temat członkiem walidacji
@@ -141,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail temat członka resiliation
 DescADHERENT_MAIL_RESIL=EMail dla członka resiliation
 DescADHERENT_MAIL_FROM=Nadawca wiadomości e-mail do automatycznych wiadomości e-mail
 DescADHERENT_ETIQUETTE_TYPE=Etykiety formacie
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Tekst drukowany na arkuszach adresowych członkiem
 DescADHERENT_CARD_TYPE=Format karty stronę
 DescADHERENT_CARD_HEADER_TEXT=Tekst wydrukowany na górę członka karty
 DescADHERENT_CARD_TEXT=Tekst wydrukowany na członka karty
@@ -155,7 +155,7 @@ NoThirdPartyAssociatedToMember=Nr trzeciej związane do tego członka
 ThirdPartyDolibarr=Dolibarr trzeciej
 MembersAndSubscriptions= Członkowie i Subscriptions
 MoreActions=Działanie uzupełniające na nagrywanie
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Działania uzupełniające, zasugerował domyślnie podczas nagrywania abonament
 MoreActionBankDirect=Stworzenie bezpośredniego zapisu na rachunku transakcji
 MoreActionBankViaInvoice=Tworzenie faktury i wpłaty na rachunek
 MoreActionInvoiceOnly=Tworzenie faktury bez zapłaty
@@ -170,8 +170,8 @@ LastSubscriptionAmount=Ostatnio kwota subskrypcji
 MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
-MembersStatisticsByRegion=Members statistics by region
-MemberByRegion=Members by region
+MembersStatisticsByRegion=Użytkownicy statystyki regionu
+MemberByRegion=Członków w regionie
 NbOfMembers=Liczba członków
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
 MembersByCountryDesc=Ten ekran pokaże statystyki członków przez poszczególne kraje. Graficzny zależy jednak na Google usługi online grafów i jest dostępna tylko wtedy, gdy połączenie internetowe działa.
@@ -197,10 +197,10 @@ Collectivités=Organizacje
 Particuliers=Osobisty
 Entreprises=Firmy
 DOLIBARRFOUNDATION_PAYMENT_FORM=Aby dokonać płatności abonamentu za pomocą przelewu bankowego, patrz strona http://wiki.dolibarr.org/index.php/Subscribe~~dobj . 
 Aby zapłacić za pomocą karty kredytowej lub PayPal, kliknij przycisk na dole tej strony. 

-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+ByProperties=Według cech
+MembersStatisticsByProperties=Użytkownicy statystyki cech
+MembersByNature=Użytkownicy z natury
+VATToUseForSubscriptions=Stawka VAT użyć do subskrypcji
+NoVatOnSubscription=Nie TVA subskrypcji
+MEMBER_PAYONLINE_SENDEMAIL=E-mail, aby ostrzec, gdy Dolibarr otrzymać potwierdzenie zatwierdzonej płatności subskrypcji
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt stosowany do linii subskrypcji do faktury:% s
diff --git a/htdocs/langs/pl_PL/opensurvey.lang b/htdocs/langs/pl_PL/opensurvey.lang
index 67f78996af0..e0bc3eeaa4c 100644
--- a/htdocs/langs/pl_PL/opensurvey.lang
+++ b/htdocs/langs/pl_PL/opensurvey.lang
@@ -1,66 +1,66 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-# Survey=Poll
-# Surveys=Polls
-# OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
-# NewSurvey=New poll
-# NoSurveysInDatabase=%s poll(s) into database.
-# OpenSurveyArea=Polls area
-# AddACommentForPoll=You can add a comment into poll...
-# AddComment=Add comment
-# CreatePoll=Create poll
-# PollTitle=Poll title
-# ToReceiveEMailForEachVote=Receive an email for each vote
-# TypeDate=Type date
-# TypeClassic=Type standard
-# OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-# RemoveAllDays=Remove all days
-# CopyHoursOfFirstDay=Copy hours of first day
-# RemoveAllHours=Remove all hours
-# SelectedDays=Selected days
-# TheBestChoice=The best choice currently is
-# TheBestChoices=The best choices currently are
-# with=with
-# OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-# CommentsOfVoters=Comments of voters
-# ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-# RemovePoll=Remove poll
-# UrlForSurvey=URL to communicate to get a direct access to poll
-# PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-# CreateSurveyDate=Create a date poll
-# CreateSurveyStandard=Create a standard poll
-# CheckBox=Simple checkbox
-# YesNoList=List (empty/yes/no)
-# PourContreList=List (empty/for/against)
-# AddNewColumn=Add new column
-# TitleChoice=Choice label
-# ExportSpreadsheet=Export result spreadsheet
+Survey=Głosowanie
+Surveys=Ankiety
+OrganizeYourMeetingEasily=Organizowanie spotkań i ankiet łatwo. Najpierw wybierz rodzaj ankiety ...
+NewSurvey=Nowa sonda
+NoSurveysInDatabase=% s ankieta (e) do bazy danych.
+OpenSurveyArea=Obszar ankiety
+AddACommentForPoll=Możesz dodać komentarz do ankiety ...
+AddComment=Dodaj komentarz
+CreatePoll=Tworzenie ankiety
+PollTitle=Tytuł Sonda
+ToReceiveEMailForEachVote=Otrzymasz e-mail dla każdego głosowania
+TypeDate=Data Rodzaj
+TypeClassic=Typ standardowy
+OpenSurveyStep2=Wybierz daty amoung wolnych dni (szary). Wybrane dni są zielone. Możesz odznaczyć dzień wcześniej wybrany przez kliknięcie na nim ponownie
+RemoveAllDays=Usuń wszystkie dni
+CopyHoursOfFirstDay=Godziny rozpowszechnianie pierwszego dnia
+RemoveAllHours=Usuń wszystkie godziny
+SelectedDays=Wybrane dni
+TheBestChoice=Obecnie jest najlepszym wyborem
+TheBestChoices=Najlepszym wyborem są obecnie
+with=z
+OpenSurveyHowTo=Jeśli zgadzasz się głosować w tej ankiecie musisz podać swoje imię, wybrać wartości, które pasują najlepiej dla Ciebie i zatwierdź przyciskiem powiększonej na końcu linii.
+CommentsOfVoters=Komentarze wyborców
+ConfirmRemovalOfPoll=Czy na pewno chcesz usunąć tę ankietę (i wszystkich głosów)
+RemovePoll=Usuń ankieta
+UrlForSurvey=Adres URL do komunikowania się, aby uzyskać bezpośredni dostęp do sondowania
+PollOnChoice=Tworzysz ankietę zrobić testowych na ankiecie. Wprowadź wszystkie możliwe opcje do ankiety:
+CreateSurveyDate=Tworzenie datę ankieta
+CreateSurveyStandard=Tworzenie standardowej ankieta
+CheckBox=Proste pole
+YesNoList=Lista (pusty / tak / nie)
+PourContreList=Lista (pusty / za / przeciw)
+AddNewColumn=Dodaj nową kolumnę
+TitleChoice=Etykieta wybór
+ExportSpreadsheet=Wynik Eksport arkusza kalkulacyjnego
 ExpireDate=Limit daty
-# NbOfSurveys=Number of polls
-# NbOfVoters=Nb of voters
-# SurveyResults=Results
-# PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-# 5MoreChoices=5 more choices
-# Abstention=Abstention
-# Against=Against
-# YouAreInivitedToVote=You are invited to vote for this poll
-# VoteNameAlreadyExists=This name was already used for this poll
-# ErrorPollDoesNotExists=Error, poll %s does not exists.
-# OpenSurveyNothingToSetup=There is no specific setup to do.
-# PollWillExpire=Your poll will expire automatically %s days after the last date of your poll.
-# AddADate=Add a date
-# AddStartHour=Add start hour
-# AddEndHour=Add end hour
-# votes=vote(s)
-# NoCommentYet=No comments have been posted for this poll yet
-# CanEditVotes=Can change vote of others
-# CanComment=Voters can comment in the poll
-# CanSeeOthersVote=Voters can see other people's vote
-# SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-# BackToCurrentMonth=Back to current month
-# ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-# ErrorOpenSurveyOneChoice=Enter at least one choice
-# ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD
-# ErrorInsertingComment=There was an error while inserting your comment
-# MoreChoices=Enter more choices for the voters
-# SurveyExpiredInfo=The voting time of this poll has expired.
-# EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+NbOfSurveys=Liczba ankietach
+NbOfVoters=Nb wyborców
+SurveyResults=Wyniki
+PollAdminDesc=Masz możliwość zmiany wszystkich linii ankiecie uznali tego za pomocą przycisku "Edytuj". Można, jak również, usunąć kolumnę lub wiersz z% s. Możesz również dodać nową kolumnę z% s.
+5MoreChoices=5 więcej możliwości
+Abstention=Wstrzymanie się od głosu
+Against=Przed
+YouAreInivitedToVote=Zapraszamy do głosowania na tej sondzie
+VoteNameAlreadyExists=Nazwa ta była już wykorzystana w tej sondzie
+ErrorPollDoesNotExists=Błąd, ankieta% s nie istnieje.
+OpenSurveyNothingToSetup=Nie ma określonej konfiguracji zrobić.
+PollWillExpire=Twoja ankieta automatycznie wygaśnie,% s dni po ostatnim dniu swojej ankiecie.
+AddADate=Dodaj datę
+AddStartHour=Dodaj rozpoczęcia godzinę
+AddEndHour=Dodaj końcową godzinę
+votes=głos (y)
+NoCommentYet=Brak dodanych komentarzy dla tej ankiecie jeszcze
+CanEditVotes=Może zmienić głos innych
+CanComment=Wyborcy mogą wypowiedzieć się w ankiecie
+CanSeeOthersVote=Wyborcy widzą głos innych ludzi
+SelectDayDesc=Dla każdego wybranego dnia, można wybrać, czy nie, godzina spotkania w następującym formacie: 
 - Pusty, 
 - "8h", "8H" lub "08:00" dać zgromadzenie rozpoczęcia godzinę, 
 - "11/08", "8h-11h", "8H-11H" lub "8: 00-11: 00", aby dać spotkanie za godzinę rozpoczęcia i zakończenia, 
 - "8h15-11h15", "8H15-11H15" lub "8: 15-11: 15" za to samo, ale z minuty.
+BackToCurrentMonth=Powrót do bieżącego miesiąca
+ErrorOpenSurveyFillFirstSection=Nie zapełnione pierwszą część tworzenia ankiecie
+ErrorOpenSurveyOneChoice=Wprowadź co najmniej jeden wybór
+ErrorOpenSurveyDateFormat=Data musi mieć formacie YYYY-MM-DD
+ErrorInsertingComment=Wystąpił błąd podczas wstawiania komentarz
+MoreChoices=Wprowadź więcej możliwości dla wyborców
+SurveyExpiredInfo=Głosowanie w tej sondzie wygasł.
+EmailSomeoneVoted=% S napełnił linię. Możesz znaleźć ankietę na link:% s
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 86ff6886783..2839701ef3c 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -2,7 +2,7 @@
 OrdersArea=Klienci dziedzinie zamówień
 SuppliersOrdersArea=Dostawcy dziedzinie zamówień
 OrderCard=Zamów kartę
-OrderId=Order Id
+OrderId=Zamówienie Id
 Order=Porządek
 Orders=Zamówienia
 OrderLine=Zamówienie linii
@@ -16,20 +16,20 @@ SupplierOrder=Dostawca celu
 SuppliersOrders=Dostawcy zleceń
 SuppliersOrdersRunning=Aktualna dostawców zleceń
 CustomerOrder=Zamówieniem
-CustomersOrders=Customers orders
+CustomersOrders=Zamówienia klientów
 CustomersOrdersRunning=Aktualna klientów zleceń
 CustomersOrdersAndOrdersLines=Zamówień i zleceń linii
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
+OrdersToValid=Zamówienia klientów, aby potwierdzić
+OrdersToBill=Zamówienia klientów są dostarczane
+OrdersInProcess=Zamówienia klientów w procesie
+OrdersToProcess=Zamówienia klientów na przetwarzanie
 SuppliersOrdersToProcess=Dostawcy zamówienia na przetwarzanie
 StatusOrderCanceledShort=Odwołany
 StatusOrderDraftShort=Szkic
 StatusOrderValidatedShort=Zatwierdzona
 StatusOrderSentShort=W procesie
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
+StatusOrderSent=Wysyłka w procesie
+StatusOrderOnProcessShort=Zamówione
 StatusOrderProcessedShort=Przetworzone
 StatusOrderToBillShort=Do rachunku
 StatusOrderToBill2Short=Do rachunku
@@ -41,8 +41,8 @@ StatusOrderReceivedAllShort=Wszystko otrzymała
 StatusOrderCanceled=Odwołany
 StatusOrderDraft=Projekt (musi zostać zatwierdzone)
 StatusOrderValidated=Zatwierdzona
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=Zamówione - odbiór czuwania
+StatusOrderOnProcessWithValidation=Zamówione - odbiór lub walidacji czuwania
 StatusOrderProcessed=Przetworzone
 StatusOrderToBill=Do rachunku
 StatusOrderToBill2=Do rachunku
@@ -51,32 +51,33 @@ StatusOrderRefused=Odmowa
 StatusOrderReceivedPartially=Częściowo otrzymała
 StatusOrderReceivedAll=Wszystko otrzymała
 ShippingExist=Przesyłka istnieje
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraft=Ilość produktów w projektach zamówień
+ProductQtyInDraftOrWaitingApproved=Ilość produktów w projekcie lub zatwierdzonych zamówień, jeszcze nie zamówione
 DraftOrWaitingApproved=Projekt nie został jeszcze zatwierdzony lub sortowane
 DraftOrWaitingShipped=Projekt lub zatwierdzonych jeszcze nie wysłane
 MenuOrdersToBill=Zamówienia na rachunku
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Rozliczanych zamówienia
 SearchOrder=Szukaj celu
-SearchACustomerOrder=Search a customer order
-SearchASupplierOrder=Search a supplier order
+SearchACustomerOrder=Szukaj zamówienie klienta
+SearchASupplierOrder=Szukaj zlecenie dostawców
 ShipProduct=Statek produktu
 Discount=Rabat
 CreateOrder=Tworzenie Zamówienie
 RefuseOrder=Odmówić celu
-ApproveOrder=Akceptuj zamówienie
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Sprawdź zamówienie
 UnvalidateOrder=Unvalidate zamówienie
 DeleteOrder=Usuń zamówienie
 CancelOrder=Anulować zamówienie
-AddOrder=Create order
+AddOrder=Tworzenie zamówienia
 AddToMyOrders=Dodaj do mojego zamówienia
 AddToOtherOrders=Dodaj do zamówienia
-AddToDraftOrders=Add to draft order
+AddToDraftOrders=Dodaj do projektu porządku
 ShowOrder=Pokaż zamówienie
 NoOpenedOrders=Nie otworzył zamówień
 NoOtherOpenedOrders=Żadne inne otwarte zamówienia
-NoDraftOrders=No draft orders
+NoDraftOrders=Brak projektów zamówienia
 OtherOrders=Inne zamówienia
 LastOrders=Ostatnia %s zamówień
 LastModifiedOrders=Ostatnia %s zmodyfikowane zamówień
@@ -86,7 +87,7 @@ NbOfOrders=Liczba zleceń
 OrdersStatistics=Zamówienia statystyk
 OrdersStatisticsSuppliers=Dostawca zamówień statystyk
 NumberOfOrdersByMonth=Liczba zleceń przez miesiąc
-AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Ilość zamówień na miesiąc (po odliczeniu podatku)
 ListOfOrders=Lista zamówień
 CloseOrder=Zamknij celu
 ConfirmCloseOrder=Czy na pewno chcesz zamknąć to zamówienie? Gdy zamówienie jest zamknięta, to może być rozliczone.
@@ -97,11 +98,13 @@ ConfirmUnvalidateOrder=Czy na pewno chcesz przywrócić %s zamówień ze
 ConfirmCancelOrder=Czy na pewno chcesz anulować zamówienie?
 ConfirmMakeOrder=Czy na pewno chcesz, aby potwierdzić wprowadzone tym celu na %s?
 GenerateBill=Generowanie faktur
-ClassifyShipped=Classify delivered
+ClassifyShipped=Klasyfikowania dostarczane
 ClassifyBilled=Klasyfikacja "obciążonego"
 ComptaCard=Księgowość karty
 DraftOrders=Projekt zamówień
 RelatedOrders=Podobne zamówienia
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Na proces zamówienia
 RefOrder=Nr ref. porządek
 RefCustomerOrder=Nr ref. zamówieniem
@@ -118,6 +121,7 @@ PaymentOrderRef=Płatność celu %s
 CloneOrder=Clone celu
 ConfirmCloneOrder=Czy na pewno chcesz klon tej kolejności %s?
 DispatchSupplierOrder=%s Odbiór aby dostawca
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Przedstawiciela w ślad za zamówienie klienta
 TypeContact_commande_internal_SHIPPING=Przedstawiciela w ślad za koszty
@@ -134,7 +138,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Stała COMMANDE_SUPPLIER_ADDON nie zdef
 Error_COMMANDE_ADDON_NotDefined=Stała COMMANDE_ADDON nie zdefiniowane
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nie można załadować modułu pliku ' %s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Nie można załadować modułu pliku ' %s'
-Error_OrderNotChecked=No orders to invoice selected
+Error_OrderNotChecked=Zlecenia do faktury wybrane
 # Sources
 OrderSource0=Commercial wniosku
 OrderSource1=Internet
@@ -148,19 +152,19 @@ AddDeliveryCostLine=Dodaj dostawy koszt linii wskazujące wagi zamówienia
 # Documents models
 PDFEinsteinDescription=Pełna kolejność modelu (logo. ..)
 PDFEdisonDescription=Prosty model celu
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=Pełna faktura proforma (logo ...)
 # Orders modes
 OrderByMail=Poczta
 OrderByFax=Faks
 OrderByEMail=EMail
 OrderByWWW=Online
 OrderByPhone=Telefon
-CreateInvoiceForThisCustomer=Bill orders
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Zamówienia na banknoty
+NoOrdersToInvoice=Brak zleceń rozliczanych
+CloseProcessedOrdersAutomatically=Sklasyfikować "przetwarzane" wszystkie wybrane zamówienia.
+OrderCreation=Stworzenie Zamówienie
+Ordered=Zamówione
+OrderCreated=Twoje zamówienia zostały utworzone
+OrderFail=Błąd podczas tworzenia się zamówień
+CreateOrders=Tworzenie zamówienia
+ToBillSeveralOrderSelectCustomer=Aby utworzyć fakturę za kilka rzędów, kliknij pierwszy na klienta, a następnie wybrać "% s".
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index fb8f7bab39f..3ab98cdaba6 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -9,64 +9,65 @@ DateToBirth=Data urodzenia
 BirthdayAlertOn= urodziny wpisu aktywnych
 BirthdayAlertOff= urodziny wpisu nieaktywne
 Notify_FICHINTER_VALIDATE=Validate interwencji
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_SENTBYMAIL=Interwencja wysyłane pocztą
 Notify_BILL_VALIDATE=Sprawdź rachunki
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=Faktura klienta nie- zwalidowane
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Dostawca celu zatwierdzone
 Notify_ORDER_SUPPLIER_REFUSE=Dostawca odmówił celu
 Notify_ORDER_VALIDATE=Zamówienie Klienta potwierdzone
 Notify_PROPAL_VALIDATE=Oferta klienta potwierdzona
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Zamknięte podpisane PROPAL klienta
+Notify_PROPAL_CLOSE_REFUSED=PROPAL klienta zamknięte odmówił
 Notify_WITHDRAW_TRANSMIT=Wycofanie transmisji
 Notify_WITHDRAW_CREDIT=Wycofanie kredyt
 Notify_WITHDRAW_EMIT=Wycofanie Isue
 Notify_ORDER_SENTBYMAIL=Zamówienie klienta wysyłane pocztą
 Notify_COMPANY_CREATE=Trzeciej stworzone
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Maile wysyłane z karty przez osoby trzecie
 Notify_PROPAL_SENTBYMAIL=Gospodarczy wniosek przesłany pocztą
 Notify_BILL_PAYED=Klient zapłaci faktury
 Notify_BILL_CANCEL=Faktury klienta odwołany
 Notify_BILL_SENTBYMAIL=Faktury klienta wysyłane pocztą
-Notify_ORDER_SUPPLIER_VALIDATE=Aby zatwierdzone Dostawca
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Aby dostawca wysłane pocztą
 Notify_BILL_SUPPLIER_VALIDATE=Faktura dostawca zatwierdzone
 Notify_BILL_SUPPLIER_PAYED=Dostawca zapłaci faktury
 Notify_BILL_SUPPLIER_SENTBYMAIL=Faktura dostawca wysłane pocztą
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Dostawca anulowania faktury
 Notify_CONTRACT_VALIDATE=Umowa zatwierdzona
 Notify_FICHEINTER_VALIDATE=Interwencja zatwierdzone
 Notify_SHIPPING_VALIDATE=Wysyłka zatwierdzone
 Notify_SHIPPING_SENTBYMAIL=Wysyłka wysłane pocztą
 Notify_MEMBER_VALIDATE=Członek zatwierdzone
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=Użytkownik zmodyfikowany
 Notify_MEMBER_SUBSCRIPTION=Członek subskrybowanych
 Notify_MEMBER_RESILIATE=Członek resiliated
 Notify_MEMBER_DELETE=Członek usunięte
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+Notify_PROJECT_CREATE=Stworzenie projektu
+Notify_TASK_CREATE=Utworzone zadanie
+Notify_TASK_MODIFY=Zmodyfikowane zadanie
+Notify_TASK_DELETE=Zadanie usunięte
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Liczba załączonych plików / dokumentów
 TotalSizeOfAttachedFiles=Całkowita wielkość załączonych plików / dokumentów
 MaxSize=Maksymalny rozmiar
 AttachANewFile=Załącz nowy plik / dokument
 LinkedObject=Związany obiektu
 Miscellaneous=Różne
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Liczba zgłoszeń (nb e-maili odbiorców)
 PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur.
 PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift). 
 De to linjene er skilt med en vognretur.
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Znajdziesz tu fakturę __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chcielibyśmy ostrzec, że __FACREF__ faktura wydaje się nie jest wypłacana. Więc to jest faktura w załączniku znowu, jako przypomnienie. __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Znajdziesz tu propozycję handlową __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__ Znajdziesz tu wniosek cen __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Znajdziesz tu porządek __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Znajdziesz tu nasze zamówienie __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Znajdziesz tu fakturę __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Znajdziesz tu wysyłkę __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Znajdziesz tu interwencji __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
 DemoDesc=Dolibarr jest kompaktowym ERP / CRM złożona z kilku modułów funkcjonalnych. A demo, które zawiera wszystkie moduły nie oznacza nic, ponieważ nie występuje. Tak więc, kilka profili są dostępne demo.
 ChooseYourDemoProfil=Wybierz demo, które pasują do profilu działalności ...
 DemoFundation=Zarządzanie użytkowników o fundacji
@@ -81,16 +82,16 @@ ModifiedBy=Zmodyfikowane przez %s
 ValidatedBy=Zatwierdzona przez %s
 CanceledBy=Odwołany przez %s
 ClosedBy=Zamknięte przez %s
-CreatedById=User id who created
-ModifiedById=User id who made last change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made last change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
+CreatedById=ID użytkownika, który stworzył
+ModifiedById=ID użytkownika, który stworzył ostatnią zmianę
+ValidatedById=ID użytkownika, który zatwierdzony
+CanceledById=ID użytkownika, który anulowane
+ClosedById=ID użytkownika, który zamknięty
+CreatedByLogin=Nazwa użytkownika, który stworzył
+ModifiedByLogin=Nazwa użytkownika, który stworzył ostatnią zmianę
+ValidatedByLogin=Nazwa użytkownika, który zatwierdzony
+CanceledByLogin=Nazwa użytkownika, który anulowane
+ClosedByLogin=Nazwa użytkownika, który zamknięty
 FileWasRemoved=Plik został usunięty
 DirWasRemoved=Katalog został usunięty
 FeatureNotYetAvailableShort=Dostępne w następnej wersji
@@ -133,7 +134,7 @@ VolumeUnitdm3=dm3
 VolumeUnitcm3=cm3
 VolumeUnitmm3=mm3
 VolumeUnitfoot3=ft3
-VolumeUnitinch3=in3
+VolumeUnitinch3=cale3
 VolumeUnitounce=uncja
 VolumeUnitlitre=litr
 VolumeUnitgallon=galon
@@ -144,7 +145,7 @@ SizeUnitcm=cm
 SizeUnitmm=mm
 SizeUnitinch=cal
 SizeUnitfoot=stopa
-SizeUnitpoint=point
+SizeUnitpoint=punkt
 BugTracker=Bug tracker
 SendNewPasswordDesc=Ta forma pozwala na złożenie wniosku o nowe hasło. Będzie wyślij swój adres e-mail. 
 Zmiana będzie skuteczne dopiero po kliknięciu na link potwierdzający wewnątrz tej wiadomości. 
 Sprawdź pocztę czytnik oprogramowania.
 BackToLoginPage=Powrót do strony logowania
@@ -158,22 +159,23 @@ StatsByNumberOfEntities=Statystyki liczby podmiotów
 NumberOfProposals=Liczba wniosków o ostatnie 12 miesięcy
 NumberOfCustomerOrders=Liczba zamówień w ostatnich 12 miesięcy
 NumberOfCustomerInvoices=Liczba klientów faktury na ostatnie 12 miesięcy
-NumberOfSupplierOrders=Number of supplier orders on last 12 month
+NumberOfSupplierOrders=Liczba zamówień dostawców, na ostatniej 12 miesięcy
 NumberOfSupplierInvoices=Liczba dostawcy faktur na ostatnie 12 miesięcy
 NumberOfUnitsProposals=Antall enheter på forslag på siste 12 mnd
 NumberOfUnitsCustomerOrders=Liczba jednostek w sprawie zamówień na ostatnie 12 miesięcy
 NumberOfUnitsCustomerInvoices=Liczba jednostek na klienta faktury na ostatnie 12 miesięcy
-NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
+NumberOfUnitsSupplierOrders=Liczba jednostek na terenie dostawców, na ostatniej 12 miesięcy
 NumberOfUnitsSupplierInvoices=Liczba jednostek na dostawcę faktur przez ostatnie 12 miesięcy
 EMailTextInterventionValidated=Interwencja %s zatwierdzone
 EMailTextInvoiceValidated=Faktura %s zatwierdzone
 EMailTextProposalValidated=Forslaget %s har blitt validert.
 EMailTextOrderValidated=Ordren %s har blitt validert.
 EMailTextOrderApproved=Postanowienie %s zatwierdzone
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Zamówienie zatwierdzone przez %s %s
 EMailTextOrderRefused=Postanowienie %s odmówił
 EMailTextOrderRefusedBy=Postanowienie %s %s odmawia
-EMailTextExpeditionValidated=The shipping %s has been validated.
+EMailTextExpeditionValidated=Wysyłka% s został zatwierdzony.
 ImportedWithSet=Przywóz zestaw danych
 DolibarrNotification=Automatyczne powiadomienia
 ResizeDesc=Skriv inn ny bredde eller ny høyde. Forhold vil bli holdt under resizing ...
@@ -195,35 +197,35 @@ StartUpload=Rozpocznij przesyłanie
 CancelUpload=Anuluj przesyłanie
 FileIsTooBig=Plików jest zbyt duży
 PleaseBePatient=Proszę o cierpliwość...
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+RequestToResetPasswordReceived=Wniosek o zmianę hasła Dolibarr został odebrany
+NewKeyIs=To jest twoje nowe klucze, aby zalogować się
+NewKeyWillBe=Twój nowy klucz, aby zalogować się do programu będzie
+ClickHereToGoTo=Kliknij tutaj, aby przejść do% s
+YouMustClickToChange=Trzeba jednak najpierw kliknąć na poniższy link, aby potwierdzić tę zmianę hasła
+ForgetIfNothing=Jeśli nie zwrócić tę zmianę, po prostu zapomnieć ten e-mail. Twoje dane są przechowywane w sposób bezpieczny.
 
 ##### Calendar common #####
 AddCalendarEntry=Dodaj wpis w kalendarzu %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=Spółka% s dodany
+ContractValidatedInDolibarr=Umowa% s potwierdzone
+ContractCanceledInDolibarr=Umowa% s anulowana
+ContractClosedInDolibarr=Umowa% s zamknięty
+PropalClosedSignedInDolibarr=Wniosek% s podpisana
+PropalClosedRefusedInDolibarr=Wniosek% s odmówił
+PropalValidatedInDolibarr=Wniosek% s potwierdzone
+PropalClassifiedBilledInDolibarr=Wniosek% s rozliczane niejawnych
+InvoiceValidatedInDolibarr=Faktura% s potwierdzone
+InvoicePaidInDolibarr=Faktura% s zmieniła się zwrócić
+InvoiceCanceledInDolibarr=Faktura% s anulowana
+PaymentDoneInDolibarr=Płatność% s gotowe
+CustomerPaymentDoneInDolibarr=Płatności klienta% s gotowe
+SupplierPaymentDoneInDolibarr=Płatności Dostawca% s gotowe
+MemberValidatedInDolibarr=% S potwierdzone państwa
+MemberResiliatedInDolibarr=Użytkownik% s resiliated
+MemberDeletedInDolibarr=Użytkownik usunął%
+MemberSubscriptionAddedInDolibarr=Zapisy na członka% s dodany
+ShipmentValidatedInDolibarr=Przesyłka% s potwierdzone
+ShipmentDeletedInDolibarr=Przesyłka% s usunięte
 ##### Export #####
 Export=Eksport
 ExportsArea=Wywóz obszarze
diff --git a/htdocs/langs/pl_PL/paypal.lang b/htdocs/langs/pl_PL/paypal.lang
index 8f6715c6be8..e92b731896e 100644
--- a/htdocs/langs/pl_PL/paypal.lang
+++ b/htdocs/langs/pl_PL/paypal.lang
@@ -9,17 +9,17 @@ PAYPAL_API_USER=API użytkownika
 PAYPAL_API_PASSWORD=API hasło
 PAYPAL_API_SIGNATURE=Podpis API
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta płatności "integralnej" (Karta kredytowa + Paypal) lub "Paypal" tylko
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
+PaypalModeIntegral=Integralny
+PaypalModeOnlyPaypal=Tylko PayPal
 PAYPAL_CSS_URL=Opcjonalnej Url arkusza stylów CSS na stronie płatności
 ThisIsTransactionId=Jest to id transakcji: %s
 PAYPAL_ADD_PAYMENT_URL=Dodaj url płatności PayPal podczas wysyłania dokumentów pocztą
 PAYPAL_IPN_MAIL_ADDRESS=Adres e-mail do natychmiastowego powiadamiania o płatności (BPP)
-PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n
+PredefinedMailContentLink=Możesz kliknąć na obrazek poniżej bezpiecznego aby dokonać płatności (PayPal), jeśli nie jest już zrobione. % S
 YouAreCurrentlyInSandboxMode=Jesteś obecnie w trybie "sandbox"
-NewPaypalPaymentReceived=New Paypal payment received
-NewPaypalPaymentFailed=New Paypal payment tried but failed
-PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+NewPaypalPaymentReceived=Otrzymał nowe Paypal zapłata
+NewPaypalPaymentFailed=Nowe Paypal zapłata próbował, ale nie
+PAYPAL_PAYONLINE_SENDEMAIL=Napisz e-mail, aby ostrzec po płatności (sukces lub nie)
+ReturnURLAfterPayment=Powrót URL po dokonaniu płatności
+ValidationOfPaypalPaymentFailed=Walidacja Paypal płatności zawiodły
+PaypalConfirmPaymentPageWasCalledButFailed=Strona potwierdzenia płatności za Paypal został nazwany przez Paypal, ale potwierdzenie nie udało
diff --git a/htdocs/langs/pl_PL/printipp.lang b/htdocs/langs/pl_PL/printipp.lang
index 835e6827f12..e0e18a450b9 100644
--- a/htdocs/langs/pl_PL/printipp.lang
+++ b/htdocs/langs/pl_PL/printipp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
+PrintIPPSetup=Konfiguracja modułu Direct Print
+PrintIPPDesc=Moduł ten dodaje przycisk Drukuj, aby wysłać dokumenty bezpośrednio do drukarki. To wymaga systemu Linux z CUPS zainstalowanych.
+PRINTIPP_ENABLED=Pokaż ikonę "Druk bezpośredni" na listach dokumentów
+PRINTIPP_HOST=Serwer druku
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
+PRINTIPP_PASSWORD=Hasło
+NoPrinterFound=Nie znaleziono drukarki (sprawdź konfigurację CUPS)
+FileWasSentToPrinter=Plik% s został wysłany do drukarki
+NoDefaultPrinterDefined=Nie drukarka domyślna zdefiniowana
+DefaultPrinter=Drukarka domyślna
+Printer=Drukarka
+CupsServer=Serwer CUPS
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index aadbe802a8f..aee3672e474 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -13,25 +13,25 @@ NewProduct=Nowy produkt
 NewService=Nowa usługa
 ProductCode=Kod produktu
 ServiceCode=Kod usługi
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductVatMassChange=Msza zmiany VAT
+ProductVatMassChangeDesc=Strona ta może być wykorzystana do modyfikacji zdefiniowanego stawkę VAT na produkty i usługi z wartością do drugiego. Uwaga, zmiana ta jest wykonywana na całej bazy danych.
+MassBarcodeInit=Msza kodów kreskowych startowych
+MassBarcodeInitDesc=Strona ta może być używana do zainicjowania kod kreskowy na obiekty, które nie mają kodów kreskowych zdefiniowane. Sprawdź wcześniej, że konfiguracja modułu kodu kreskowego jest kompletna.
 ProductAccountancyBuyCode=Kod księgowy (zakup)
 ProductAccountancySellCode=Kod księgowy (sprzedaż)
 ProductOrService=Produkt lub usługa
 ProductsAndServices=Produkty i usługi
 ProductsOrServices=Produkty lub Usługi
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesOnSell=Produkty i usługi na sprzedaż lub do zakupu
+ProductsAndServicesNotOnSell=Produkty i usługi spośród sprzedaży
 ProductsAndServicesStatistics=Statystyki produktów i usług
 ProductsStatistics=Statystyki produktów
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
+ProductsOnSell=Produkt na sprzedaż lub do pruchase
+ProductsNotOnSell=Produkt na sprzedaż i na zakup
+ProductsOnSellAndOnBuy=Produkty na sprzedaż i do zakupu
+ServicesOnSell=Usługi na sprzedaż lub do zakupu
+ServicesNotOnSell=Usługi spośród sprzedaży
+ServicesOnSellAndOnBuy=Usługi na sprzedaż i do zakupu
 InternalRef=Wewnętrzny nr referencyjny
 LastRecorded=Ostatnie produkty / usługi na sprzedaż rejestrowana
 LastRecordedProductsAndServices=Ostatnie %s zarejestrowanych produktów / usług
@@ -72,20 +72,20 @@ PublicPrice=Cena publiczna
 CurrentPrice=Aktualna cena
 NewPrice=Nowa cena
 MinPrice=Min. cena sprzedaży
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPriceHT=Minim. Cena sprzedaży (po odliczeniu podatku)
+MinPriceTTC=Minim. Cena sprzedaży (inc. podatku)
 CantBeLessThanMinPrice=Cena sprzedaży nie może być niższa niż minimalna dopuszczalna dla tego produktu (%s bez podatku). Ten komunikat może się również pojawić po wpisaniu zbyt wysokiego rabatu.
 ContractStatus=Status zamówienia
 ContractStatusClosed=Zamknięte
 ContractStatusRunning=W trakcie realizacji
 ContractStatusExpired=minął
 ContractStatusOnHold=Nie działa
-ContractStatusToRun=To get running
+ContractStatusToRun=Aby uzyskać działa
 ContractNotRunning=Zamówienie nie jest realizowane
 ErrorProductAlreadyExists=Produkt o numerze referencyjnym %s już istnieje.
 ErrorProductBadRefOrLabel=Błędna wartość referencyjna lub etykieta.
 ErrorProductClone=Podczas próby sklonowania produktu lub usługi wystąpił problem.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Błąd cena nie może być niższa niż cena minimalna.
 Suppliers=Dostawcy
 SupplierRef=Nr referencyjny dostawcy produktu
 ShowProduct=Pokaż produkt
@@ -114,15 +114,15 @@ BarcodeValue=Wartość kodu kreskowego
 NoteNotVisibleOnBill=Uwaga (nie widoczna na fakturach, ofertach...)
 CreateCopy=Utwórz kopię
 ServiceLimitedDuration=Jeśli produkt jest usługą z ograniczonym czasem trwania:
-MultiPricesAbility=Several level of prices per product/service
+MultiPricesAbility=Kilka poziom cen na produkt / usługę
 MultiPricesNumPrices=Ilość cen
 MultiPriceLevelsName=Kategorie cenowe
-AssociatedProductsAbility=Activate the virtual package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
-ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+AssociatedProductsAbility=Włączanie funkcji pakietu wirtualnego
+AssociatedProducts=Produkt w opakowaniu
+AssociatedProductsNumber=Liczba produktów komponując ten produkt wirtualny pakiet
+ParentProductsNumber=Liczba dominującej opakowaniu produktu
+IfZeroItIsNotAVirtualProduct=Jeśli 0, ten produkt nie jest produktem wirtualny pakiet
+IfZeroItIsNotUsedByVirtualProduct=Jeśli 0, produkt ten nie jest używany przez produkt wirtualnego pakietu
 EditAssociate=Współpracownik
 Translation=Tłumaczenie
 KeywordFilter=Filtr słów kluczowych
@@ -132,7 +132,7 @@ AddDel=Dodaj / Usuń
 Quantity=Ilość
 NoMatchFound=Nie znaleziono odpowiednika
 ProductAssociationList=Lista powiązanych produktów / usług: nazwa produktu / usługi (ma wpływ na ilość)
-ProductParentList=List of package products/services with this product as a component
+ProductParentList=Lista produktów / usług pakietowych z tym produktem jako składnika
 ErrorAssociationIsFatherOfThis=Jeden z wybranych produktów jest nadrzędny dla produktu bierzącego
 DeleteProduct=Usuń produkt / usługę
 ConfirmDeleteProduct=Czy na pewno chcesz usunąć ten produkt / usługę?
@@ -161,12 +161,12 @@ NoSupplierPriceDefinedForThisProduct=Nie jest określona cena / ilość dostawcy
 RecordedProducts=Zapisane produkty
 RecordedServices=Zapisane usługi
 RecordedProductsAndServices=Zapisane produkty / usługi
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
+PredefinedProductsToSell=Predefiniowane sprzedawać produkty
+PredefinedServicesToSell=Predefiniowane sprzedawać usługi
+PredefinedProductsAndServicesToSell=Predefiniowane produkty / usługi do sprzedaży
+PredefinedProductsToPurchase=Predefiniowane produkt do zakupu
+PredefinedServicesToPurchase=Predefiniowane usługi do zakupu
+PredefinedProductsAndServicesToPurchase=Predefiniowane produkty / usługi do puchase
 GenerateThumb=Wygeneruj miniaturkę
 ProductCanvasAbility=Użyj specjalnych dodatków "canvas"
 ServiceNb=Usługa #%s
@@ -179,18 +179,18 @@ CloneProduct=Duplikuj produkt lub usługę
 ConfirmCloneProduct=Czy na pewno chcesz wykonać duplikat produktu lub usługi %s??
 CloneContentProduct=Sklonuj wszystkie główne informacje dot. produktu / usługi
 ClonePricesProduct=Clone główne informacje i ceny
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone pakowane produkty / usługi
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Ref. nowych produktów / usług
 CustomerPrices=Ceny klientów
 SuppliersPrices=Ceny dostawców
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Ceny dostawców (wyrobów lub usług)
 CustomCode=Kod taryfy celnej
 CountryOrigin=Kraj pochodzenia
 HiddenIntoCombo=Ukryty na listach wyboru
 Nature=Natura
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=Szablon sędzią wyrobów
+ServiceCodeModel=Serwis szablon sędzią
 AddThisProductCard=Stwórz kartę produktu
 HelpAddThisProductCard=Ta opcja pozwala na tworzenie lub klonowanie produktu, jeśli on nie istnieje.
 AddThisServiceCard=Stwórz kartę usługi
@@ -198,7 +198,7 @@ HelpAddThisServiceCard=Ta opcja pozwala na tworzenie lub klonowanie usługi, je
 CurrentProductPrice=Aktualna cena
 AlwaysUseNewPrice=Zawsze używaj aktualnej ceny produktu / usługi
 AlwaysUseFixedPrice=Zastosuj stałą cenę
-PriceByQuantity=Different prices by quantity
+PriceByQuantity=Różne ceny według ilości
 PriceByQuantityRange=Zakres ilości
 ProductsDashboard=Podsumowanie Produkty / Usługi
 UpdateOriginalProductLabel=Modyfikacja oryginalnej etykiety
@@ -214,43 +214,56 @@ CostPmpHT=Łączna VWAP netto
 ProductUsedForBuild=Automatycznie zużyte przez produkcję
 ProductBuilded=Produkcja została zakończona
 ProductsMultiPrice=Multi-cena produktu
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Ceny klientów (produktów lub usług, multi-ceny)
 ProductSellByQuarterHT=Obroty kwartalne VWAP produktów
 ServiceSellByQuarterHT=Obroty kwartalne VWAP usług
 Quarter1=1-szy Kwartał
 Quarter2=2-i Kwartał
 Quarter3=3-i Kwartał
 Quarter4=4-y Kwartał
-BarCodePrintsheet=Print bar code
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different price for each customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-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 #options_myextrafieldkey#
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
-PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+BarCodePrintsheet=Drukuj kod kreskowy
+PageToGenerateBarCodeSheets=Za pomocą tego narzędzia można drukować arkusze naklejek z kodami kreskowymi. Wybierz format strony naklejki, rodzaj kodu kreskowego i wartości kodu kreskowego, a następnie kliknij w przycisk% s.
+NumberOfStickers=Ilość naklejek do wydrukowania na stronie
+PrintsheetForOneBarCode=Wydrukuj kilka naklejek na jednym kodzie kreskowym
+BuildPageToPrint=Generowanie strony do druku
+FillBarCodeTypeAndValueManually=Wypełnij typ kodu kreskowego i wartość ręcznie.
+FillBarCodeTypeAndValueFromProduct=Wypełnij typ kodu kreskowego i wartości z kodu kreskowego produktu.
+FillBarCodeTypeAndValueFromThirdParty=Wypełnij typ kodu kreskowego i wartości z kodu kreskowego z thirdparty.
+DefinitionOfBarCodeForProductNotComplete=Określenie rodzaju i wartości kodu kreskowego nie kompletnego o produkt% s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Określenie rodzaju i wartości kodu kreskowego nie wyczerpujący thirdparty% s.
+BarCodeDataForProduct=Informacje o kod kreskowy produktu% s:
+BarCodeDataForThirdparty=Informacje o kod kreskowy z thirdparty% s:
+ResetBarcodeForAllRecords=Definiowanie wartości kodów kreskowych dla wszystkich rekordów (to również zresetować wartości kodów kreskowych już zdefiniowane z nowymi wartościami)
+PriceByCustomer=Inna cena dla każdego klienta
+PriceCatalogue=Wyjątkowa cena za produkt / usługę
+PricingRule=Zasady cen z klientami
+AddCustomerPrice=Dodaj cenę przez klientów
+ForceUpdateChildPriceSoc=Ustaw sama cena na zależnych klientów
+PriceByCustomerLog=Cena od dziennika klienta
+MinimumPriceLimit=Cena minimalna nie może być niższa niż% s
+MinimumRecommendedPrice=Cena minimalna zalecana jest:% s
+PriceExpressionEditor=Edytor Cena wyraz
+PriceExpressionSelected=Wybrany wyraz cena
+PriceExpressionEditorHelp1="Cena = 2 + 2" lub "2 + 2" dla ustalenia ceny. Użyj; oddzielić wyrażeń
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
+PriceExpressionEditorHelp3=W obu cen produktów / usług i dostawca są te zmienne dostępne: 
 # # # Localtax1_tx tva_tx # # # # Waga localtax2_tx # # # # Długość powierzchni # # # price_min
+PriceExpressionEditorHelp4=W produkcie / cena usługi tylko: # supplier_min_price # 
 W cenach dostawca tylko: # supplier_quantity # i # supplier_tva_tx #
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Tryb Cena
+PriceNumeric=Liczba
+DefaultPrice=Cena Domyślnie
+ComposedProductIncDecStock=Wzrost / spadek akcji na zmiany dominującej
+ComposedProduct=Pod-Produkt
+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
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index a71243d3674..0baab0048f4 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
+RefProject=Ref. projekt
+ProjectId=Projekt Id
 Project=Project
 Projects=Projekty
-ProjectStatus=Project status
+ProjectStatus=Status projektu
 SharedProject=Współużytkowane projektu
 PrivateProject=Kontakt z projektu
 MyProjectsDesc=Ten widok jest ograniczony do projektów jesteś kontaktu (cokolwiek to typ).
 ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Ten widok przedstawia wszystkie projekty i zadania, które są dozwolone, aby przeczytać.
 ProjectsDesc=Ten widok przedstawia wszystkie projekty (uprawnień użytkownika przyznać uprawnienia do wyświetlania wszystko).
 MyTasksDesc=Ten widok jest ograniczony do projektów i zadań, które są do kontaktu (cokolwiek to typ).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Tylko otwarte projekty są widoczne (projekty z projektu lub stanu zamkniętego nie są widoczne).
 TasksPublicDesc=Ten widok przedstawia wszystkich projektów i zadań, które możesz przeczytać.
 TasksDesc=Ten widok przedstawia wszystkich projektów i zadań (uprawnień użytkownika przyznać uprawnienia do wyświetlania wszystko).
 ProjectsArea=Projekty obszaru
 NewProject=Nowy projekt
-AddProject=Create project
+AddProject=Tworzenie projektu
 DeleteAProject=Usuń projektu
 DeleteATask=Usuń zadanie
 ConfirmDeleteAProject=Czy na pewno chcesz usunąć ten projekt?
@@ -31,27 +31,27 @@ NoProject=Projekt zdefiniowane
 NbOpenTasks=Nb otwartych zadań
 NbOfProjects=Nb projektów
 TimeSpent=Czas spędzony
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Czas spędzony przez Ciebie
+TimeSpentByUser=Czas spędzony przez użytkownika
 TimesSpent=Czas spędzony
 RefTask=Nr ref. zadanie
 LabelTask=Wytwórnia zadanie
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
-WorkloadNotDefined=Workload not defined
+TaskTimeSpent=Czas spędzony na zadaniach
+TaskTimeUser=Użytkownik
+TaskTimeNote=Uwaga
+TaskTimeDate=Data
+TasksOnOpenedProject=Zadania na otwartych projektów
+WorkloadNotDefined=Obciążenie nie zdefiniowano
 NewTimeSpent=Nowy czas spędzony
 MyTimeSpent=Mój czas spędzony
 MyTasks=Moje zadania
 Tasks=Zadania
 Task=Zadanie
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Zadanie data rozpoczęcia
+TaskDateEnd=Data zakończenia zadania
+TaskDescription=Opis zadania
 NewTask=Nowe zadania
-AddTask=Create task
+AddTask=Tworzenie zadania
 AddDuration=Dodaj czas
 Activity=Aktywność
 Activities=Zadania / działania
@@ -60,8 +60,8 @@ MyActivities=Moje zadania / działania
 MyProjects=Moje projekty
 DurationEffective=Efektywny czas trwania
 Progress=Postęp
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Deklarowana postęp
+ProgressCalculated=Obliczone postęp
 Time=Czas
 ListProposalsAssociatedProject=Lista komercyjne propozycje związane z projektem
 ListOrdersAssociatedProject=Lista zamówień związanych z projektem
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Lista dostawców zamówień związanych z pr
 ListSupplierInvoicesAssociatedProject=Lista dostawców faktur związanych z projektem
 ListContractAssociatedProject=Wykaz umów związanych z projektem
 ListFichinterAssociatedProject=Wykaz interwencji związanych z projektem
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Lista raportów o wydatkach związanych z projektem
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Wykaz działań związanych z projektem
 ActivityOnProjectThisWeek=Aktywność na projekt w tym tygodniu
 ActivityOnProjectThisMonth=Aktywność w sprawie projektu w tym miesiącu
@@ -91,54 +92,54 @@ ActionsOnProject=Działania w ramach projektu
 YouAreNotContactOfProject=Nie masz kontaktu to prywatne przedsięwzięcie
 DeleteATimeSpent=Czas spędzony Usuń
 ConfirmDeleteATimeSpent=Czy na pewno chcesz usunąć ten czas?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Zobacz również zadania powierzone mi nie
+ShowMyTasksOnly=Wyświetl tylko zadania przypisane do mnie
 TaskRessourceLinks=Zasoby
 ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej trzeciej
 NoTasks=Brak zadań dla tego projektu
 LinkedToAnotherCompany=Powiązane z innymi trzeciej
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Zadanie nie jest przypisany do Ciebie
 ErrorTimeSpentIsEmpty=Czas spędzony jest pusty
 ThisWillAlsoRemoveTasks=Działanie to będzie także usunąć wszystkie zadania projektu (%s zadania w tej chwili) i wszystkimi wejściami czasu spędzonego.
 IfNeedToUseOhterObjectKeepEmpty=Jeżeli pewne obiekty (faktura, zamówienie, ...), należące do innej osoby trzeciej, musi być związane z projektem tworzenia, zachować ten pusty mieć projekt jest multi osób trzecich.
-CloneProject=Clone project
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
-ConfirmCloneProject=Are you sure to clone this project ?
-ProjectReportDate=Change task date according project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
+CloneProject=Projekt Clone
+CloneTasks=Zadania Clone
+CloneContacts=Kontakty Clone
+CloneNotes=Notatki Clone
+CloneProjectFiles=Projekt klon dołączył pliki
+CloneTaskFiles=Zadanie (s), klon połączone plików (jeśli zadania (s) sklonowano)
+CloneMoveDate=Aktualizacja projektu / zadania pochodzi od teraz?
+ConfirmCloneProject=Czy na pewno chcesz sklonować ten projekt?
+ProjectReportDate=Zmień datę zadaniem data rozpoczęcia według projektu
+ErrorShiftTaskDate=Niemożliwe do przesunięcia daty zadania według nowej daty rozpoczęcia projektu
+ProjectsAndTasksLines=Projekty i zadania
+ProjectCreatedInDolibarr=Projekt% s utworzony
+TaskCreatedInDolibarr=Zadanie% s utworzony
+TaskModifiedInDolibarr=Zadanie% s zmodyfikowano
+TaskDeletedInDolibarr=Zadanie% s usunięte
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Kierownik projektu
 TypeContact_project_external_PROJECTLEADER=Kierownik projektu
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Współpracownik
+TypeContact_project_external_PROJECTCONTRIBUTOR=Współpracownik
 TypeContact_project_task_internal_TASKEXECUTIVE=zadań wykonawczych
 TypeContact_project_task_external_TASKEXECUTIVE=zadań wykonawczych
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-UnlinkElement=Unlink element
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Współpracownik
+TypeContact_project_task_external_TASKCONTRIBUTOR=Współpracownik
+SelectElement=Wybierz elementem
+AddElement=Link do elementu
+UnlinkElement=Rozłącz elementem
 # Documents models
 DocumentModelBaleine=Kompletny model projektu sprawozdania (logo. ..)
-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
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+PlannedWorkload=Planowany nakład pracy
+PlannedWorkloadShort=Nakład pracy
+WorkloadOccupation=Nakład pracy przypisanie
+ProjectReferers=Odnosząc obiektów
+SearchAProject=Szukaj projektu
+ProjectMustBeValidatedFirst=Projekt musi być najpierw zatwierdzone
+ProjectDraft=Projekty Projekty
+FirstAddRessourceToAllocateTime=Kojarzenie ressource przeznaczyć czas
+InputPerDay=Wejście na dzień
+InputPerWeek=Wejście w tygodniu
+InputPerAction=Wejście na działanie
+TimeAlreadyRecorded=Czas spędzony na już zarejestrowane dla tego zadania / dzień i użytkownika% s
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index 4626b302570..6408c15d0d0 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -2,10 +2,11 @@
 RefSending=Nr ref. wysyłanie
 Sending=Wysyłanie
 Sendings=Sendings
+AllSendings=All Shipments
 Shipment=Wysyłanie
 Shipments=Wysyłek
-ShowSending=Show Sending
-Receivings=Receipts
+ShowSending=Pokaż Wysyłanie
+Receivings=Wpływy
 SendingsArea=Sendings obszarze
 ListOfSendings=Lista sendings
 SendingMethod=Wysyłanie metody
@@ -14,8 +15,8 @@ LastSendings=Ostatnia %s sendings
 SearchASending=Wyszukaj wysyłanie
 StatisticsOfSendings=Statystyka sendings
 NbOfSendings=Liczba sendings
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
+NumberOfShipmentsByMonth=Liczba przesyłek przez miesiąc
+SendingCard=Karta Przesyłka
 NewSending=Nowe wysyłanie
 CreateASending=Utwórz wysyłanie
 CreateSending=Utwórz wysyłanie
@@ -23,7 +24,7 @@ QtyOrdered=Ilosc sortowane
 QtyShipped=Ilosc wysłane
 QtyToShip=Ilosc do statku
 QtyReceived=Ilość otrzymanych
-KeepToShip=Remain to ship
+KeepToShip=Pozostają do wysyłki
 OtherSendingsForSameOrder=Inne sendings do tego celu
 DateSending=Data wysłania porządku
 DateSendingShort=Data wysłania porządku
@@ -38,7 +39,7 @@ StatusSendingCanceledShort=Odwołany
 StatusSendingDraftShort=Szkic
 StatusSendingValidatedShort=Zatwierdzona
 StatusSendingProcessedShort=Przetworzony
-SendingSheet=Shipment sheet
+SendingSheet=Arkusz Przesyłka
 Carriers=Przewoźnicy
 Carrier=Przewoźnik
 CarriersArea=Przewoźnicy obszarze
@@ -51,23 +52,23 @@ Enlevement=Zgarnięte przez klienta
 DocumentModelSimple=Prosty wzór dokumentu
 DocumentModelMerou=Mérou model A5
 WarningNoQtyLeftToSend=Ostrzeżenie nie produktów oczekujących na wysłanie.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statystyki prowadzone w sprawie przesyłania tylko potwierdzone. Data używany jest data uprawomocnienia przesyłki (planowanym terminem dostawy nie zawsze jest znana).
 DateDeliveryPlanned=Strugane daty dostawy
 DateReceived=Data otrzymania dostawy
 SendShippingByEMail=Wyślij przesyłki przez e-mail
-SendShippingRef=Submission of shipment %s
+SendShippingRef=Złożenie przesyłki% s
 ActionsOnShipping=Wydarzenia na dostawy
 LinkToTrackYourPackage=Link do strony śledzenia paczki
 ShipmentCreationIsDoneFromOrder=Na razie utworzenie nowego przesyłki odbywa się z karty zamówienia.
-RelatedShippings=Related shipments
-ShipmentLine=Shipment line
-CarrierList=List of transporters
-SendingRunning=Product from ordered customer orders
-SuppliersReceiptRunning=Product from ordered supplier orders
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+RelatedShippings=Podobne przesyłki
+ShipmentLine=Linia Przesyłka
+CarrierList=Lista przewoźników
+SendingRunning=Produkt z zamówionych zleceń klientów
+SuppliersReceiptRunning=Produkt z zamówionych zleceń dostawca
+ProductQtyInCustomersOrdersRunning=Ilość produktów w otwartych zleceń klientów
+ProductQtyInSuppliersOrdersRunning=Ilość produktów w otwartych dostawców zamówień
+ProductQtyInShipmentAlreadySent=Ilość produktów z opended zamówienie klienta już wysłane
+ProductQtyInSuppliersShipmentAlreadyRecevied=Ilość produktów z otwartego zlecenia dostawca otrzymał już
 
 # Sending methods
 SendingMethodCATCH=Catch przez klientów
@@ -77,9 +78,9 @@ SendingMethodCOLSUI=Colissimo
 DocumentModelSirocco=Prosty dokument model dostawy wpływy
 DocumentModelTyphon=Więcej kompletny dokument model dostawy wpływy (logo. ..)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Stała EXPEDITION_ADDON_NUMBER nie zdefiniowano
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Suma wolumenów
+SumOfProductWeights=Suma wag produktów
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= Szczegóły magazynowe
+DetailWarehouseFormat= W:% s (Ilość:% d)
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 9ce3327dd7d..e1f06e833fd 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -8,8 +8,8 @@ MenuNewWarehouse=Nowy magazyn
 WarehouseOpened=Magazyn otwarty
 WarehouseClosed=Magazyn zamknięte
 WarehouseSource=Źródło magazynu
-WarehouseSourceNotDefined=No warehouse defined,
-AddOne=Add one
+WarehouseSourceNotDefined=Nie zdefiniowano magazynu,
+AddOne=Dodaj jedną
 WarehouseTarget=Docelowe magazynie
 ValidateSending=Usuń wysyłanie
 CancelSending=Anuluj wysyłanie
@@ -23,34 +23,34 @@ ErrorWarehouseLabelRequired=Magazyn etykiecie jest wymagane
 CorrectStock=Poprawny stanie
 ListOfWarehouses=Lista magazynów
 ListOfStockMovements=Wykaz stanu magazynowego
-StocksArea=Warehouses area
+StocksArea=Powierzchnia magazynów
 Location=Lieu
 LocationSummary=Nazwa skrócona lokalizacji
-NumberOfDifferentProducts=Number of different products
+NumberOfDifferentProducts=Wiele różnych środków
 NumberOfProducts=Łączna liczba produktów
 LastMovement=Ostatni ruch
 LastMovements=Ostatnie ruchy
 Units=Jednostki
 Unit=Jednostka
 StockCorrection=Poprawny stanie
-StockTransfer=Stock transfer
+StockTransfer=Transfer Zdjęcie
 StockMovement=Przeniesienie
 StockMovements=Stock transfery
-LabelMovement=Movement label
+LabelMovement=Etykieta Ruch
 NumberOfUnit=Liczba jednostek
-UnitPurchaseValue=Unit purchase price
+UnitPurchaseValue=Jednostkowa cena nabycia
 TotalStock=Razem w akcji
 StockTooLow=Zasób zbyt niska
-StockLowerThanLimit=Stock lower than alert limit
+StockLowerThanLimit=Zdjęcie niższa niż progu alarmu
 EnhancedValue=Wartość
 PMPValue=Wartość
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Magazyny wartości
 UserWarehouseAutoCreate=Tworzenie stanie automatycznie podczas tworzenia użytkownika
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Produkt akcji i subproduct akcji są niezależne
 QtyDispatched=Ilość wysyłanych
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
+QtyDispatchedShort=Ilość wysyłanych
+QtyToDispatchShort=Ilość wysyłką
 OrderDispatch=Postanowienie wysyłkowe
 RuleForStockManagementDecrease=Artykuł na zarządzanie zapasami spadek
 RuleForStockManagementIncrease=Artykuł na zarządzanie zapasami wzrost
@@ -60,13 +60,13 @@ DeStockOnShipment=Spadek realnych zasobów wysyłką (zaleciły)
 ReStockOnBill=Wzrost realnego zasobów faktur / not kredytowych
 ReStockOnValidateOrder=Wzrost realnego zasobów zamówień notatek
 ReStockOnDispatchOrder=Wzrost rzeczywisty stan zapasów w magazynach ręcznego wysyłki, po otrzymaniu zamówienia dostawca
-ReStockOnDeleteInvoice=Increase real stocks on invoice deletion
+ReStockOnDeleteInvoice=Wzrost realnych zapasów na fakturze usunięcia
 OrderStatusNotReadyToDispatch=Zamówienie nie jest jeszcze lub nie więcej status, który umożliwia wysyłanie produktów w magazynach czas.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Wyjaśnienie różnicy między fizycznej i teoretycznej magazynie
 NoPredefinedProductToDispatch=Nie gotowych produktów dla tego obiektu. Więc nie w czas wysyłki jest wymagane.
 DispatchVerb=Wysyłka
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Limit dla wpisu
+StockLimit=Zdjęcie do wpisu limitu
 PhysicalStock=Fizyczne zapasy
 RealStock=Real Stock
 VirtualStock=Wirtualne stanie
@@ -91,44 +91,44 @@ PersonalStock=Osobowych %s czas
 ThisWarehouseIsPersonalStock=Tym składzie przedstawia osobiste zasobów %s %s
 SelectWarehouseForStockDecrease=Wybierz magazyn użyć do zmniejszenia czas
 SelectWarehouseForStockIncrease=Wybierz magazyn użyć do zwiększenia czas
-NoStockAction=No stock action
-LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
-AlertOnly= Alerts only
-WarehouseForStockDecrease=The warehouse %s will be used for stock decrease
-WarehouseForStockIncrease=The warehouse %s will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-MassStockMovement=Mass stock movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfert
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
-MovementLabel=Label of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+NoStockAction=Brak akcji stock
+LastWaitingSupplierOrders=Zamówienia oczekujące na przyjęcia
+DesiredStock=Pożądany Zdjęcie
+StockToBuy=Na zamówienie
+Replenishment=Uzupełnianie
+ReplenishmentOrders=Zamówień towarów
+VirtualDiffersFromPhysical=Według zwiększyć / zmniejszyć opcje zdjęcia, fizyczną i wirtualną akcji akcji (fizyczne + zamówień bieżących) może różni
+UseVirtualStockByDefault=Użyj wirtualnej akcji domyślnie, zamiast fizycznego magazynie, do uzupełniania funkcji
+UseVirtualStock=Użyj wirtualnej akcji
+UsePhysicalStock=Użyj fizycznej akcji
+CurentSelectionMode=Tryb wyboru curent
+CurentlyUsingVirtualStock=Wirtualny Zdjęcie
+CurentlyUsingPhysicalStock=Zdjęcie fizyczny
+RuleForStockReplenishment=Reguła dla uzupełnienia zapasów
+SelectProductWithNotNullQty=Wybierz co najmniej jeden produkt z st not null i dostawcy
+AlertOnly= Tylko alarmy
+WarehouseForStockDecrease=Magazyn% s zostaną wykorzystane do zmniejszenia magazynie
+WarehouseForStockIncrease=Magazyn% s zostaną wykorzystane do zwiększenia magazynie
+ForThisWarehouse=W tym magazynie
+ReplenishmentStatusDesc=To jest lista wszystkich produktów z zapasów niższej niż pożądanym stanie (lub niższa niż wartość alertu, jeśli pole wyboru "Alarm tylko" jest zaznaczona), i sugerują tworzenie zamówień dostawca do wypełnienia różnicę.
+ReplenishmentOrdersDesc=To jest lista wszystkich otwartych zleceń dostawca tym predefiniowanych produktów. Tylko otwarty rozkazy z góry określonych produktów, tak, że mogą mieć wpływ na zapasy, są widoczne tutaj.
+Replenishments=Uzupełnianie
+NbOfProductBeforePeriod=Ilość produktów w magazynie% s przed wybrany okres (<% s)
+NbOfProductAfterPeriod=Ilość produktów w magazynie% s po wybraniu okres (>% s)
+MassMovement=Masowy ruch
+MassStockMovement=Msza ruch Zdjęcie
+SelectProductInAndOutWareHouse=Wybierz produkt, ilość, magazyn źródłowy i docelowy magazyn, a następnie kliknij przycisk "% s". Po wykonaniu tych wszystkich wymaganych ruchów, kliknij na "% s".
+RecordMovement=Rekord transfert
+ReceivingForSameOrder=Wpływy do tego celu
+StockMovementRecorded=Zbiory zapisane ruchy
+RuleForStockAvailability=Zasady dotyczące wymagań dotyczących
+StockMustBeEnoughForInvoice=Poziom zapasów musi być na tyle, aby dodać produkt / usługę na fakturze
+StockMustBeEnoughForOrder=Poziom zapasów musi być na tyle, aby dodać produkt / usługę na zamówienie
+StockMustBeEnoughForShipment= Poziom zapasów musi być na tyle, aby dodać produkt / usługę do wysyłki
+MovementLabel=Wytwórnia ruchu
+InventoryCode=Kod Ruch i inwentaryzacji
+IsInPackage=Zawarte w pakiecie
+ShowWarehouse=Pokaż magazyn
+MovementCorrectStock=Korekta treści Zdjęcie za produkt% s
+MovementTransferStock=Transfer Zdjęcie produktu% s do innego magazynu
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Magazyn źródłowy musi być zdefiniowany tu, gdy moduł partii jest. Będzie on wykorzystywany do listy Wich dużo / seryjny jest dostępna dla produktu, który wymaga partii / dane szeregowe do ruchu. Jeśli chcesz wysłać produkty z różnych magazynów, tak aby transport na kilka etapów.
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index bcf12754ec4..d27163f41e4 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Dostawcy
-AddSupplier=Create a supplier
+AddSupplier=Tworzenie dostawcy
 SupplierRemoved=Dostawca usunięty
 SuppliersInvoice=Faktury dostawców
 NewSupplier=Nowy dostawca
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Faktury i płatności dostawcy
 ExportDataset_fournisseur_3=Zamówienia dostawcy i pozycje na zamówieniu
 ApproveThisOrder=Zatwierdź to zamówienie
 ConfirmApproveThisOrder=Czy na pewno chcesz zatwierdzić zamówienie %s ?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Odmów tę kolejność
 ConfirmDenyingThisOrder=Czy na pewno chcesz odrzucić zamówienie %s ?
 ConfirmCancelThisOrder=Czy na pewno chcesz anulować zamówienie %s ?
 AddCustomerOrder=Stwórz zamówienie Klienta
@@ -39,7 +39,8 @@ AddSupplierInvoice=Stwórz fakturę dostawcy
 ListOfSupplierProductForSupplier=Wykaz produktów i cen dostawcy %s
 NoneOrBatchFileNeverRan=Brak lub partii  %s nie prowadził niedawno
 SentToSuppliers=Wysyłane do dostawców
-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
+ListOfSupplierOrders=Lista zleceń dostawca
+MenuOrdersSupplierToBill=Zamówienia dostawca do faktury
+NbDaysToDelivery=Opóźnienie dostawy w dni
+DescNbDaysToDelivery=Największe opóźnienie wyświetlania listy produktów wśród zamówienia
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
index 126fe2dda63..336aa514dc4 100644
--- a/htdocs/langs/pl_PL/trips.lang
+++ b/htdocs/langs/pl_PL/trips.lang
@@ -1,126 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
+ExpenseReport=Raport z wydatków
+ExpenseReports=Raporty wydatków
+Trip=Raport z wydatków
+Trips=Raporty wydatków
+TripsAndExpenses=Koszty raporty
+TripsAndExpensesStatistics=Statystyki raporty wydatków
+TripCard=Koszty karta raport
+AddTrip=Tworzenie raportu wydatków
+ListOfTrips=Lista raporcie wydatków
 ListOfFees=Wykaz opłat
-NewTrip=New expense report
+NewTrip=Nowy raport z wydatków
 CompanyVisited=Firm / fundacji odwiedzonych
 Kilometers=Kilometrów
 FeesKilometersOrAmout=Kwota lub kilometry
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
+DeleteTrip=Usuń raport wydatków
+ConfirmDeleteTrip=Czy na pewno chcesz usunąć ten raport wydatków?
+ListTripsAndExpenses=Wykaz raportów kosztowych
+ListToApprove=Czeka na zatwierdzenie
+ExpensesArea=Obszar raporty wydatków
+SearchATripAndExpense=Szukaj raport wydatków
 ClassifyRefunded=Zakfalifikowano do refundacji.
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripSalarie=Informations user
-TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
-ConfirmDeleteLine=Are you sure you want to delete this line ?
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+ExpenseReportWaitingForApproval=Nowy raport wydatek został przedłożony do zatwierdzenia
+ExpenseReportWaitingForApprovalMessage=Nowy raport wydatek został złożony i czeka na zatwierdzenie. - Użytkownika:% s - Czas:% s Kliknij tutaj aby sprawdzić:% s
+TripId=Raport z wydatków Id
+AnyOtherInThisListCanValidate=Osoba do informowania o jej potwierdzenie.
+TripSociete=Informacje o firmie
+TripSalarie=Informacje użytkownika
+TripNDF=Informacje raport z wydatków
+DeleteLine=Usuwanie ligne raportu wydatków
+ConfirmDeleteLine=Czy na pewno chcesz usunąć ten wiersz?
+PDFStandardExpenseReports=Standardowy szablon do generowania dokumentu PDF do raportu wydatków
+ExpenseReportLine=Linia raport z wydatków
 TF_OTHER=Inny
-TF_TRANSPORTATION=Transportation
+TF_TRANSPORTATION=Transport
 TF_LUNCH=Obiad
 TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_TRAIN=Pociąg
+TF_BUS=Autobus
+TF_CAR=Samochód
+TF_PEAGE=Myto
+TF_ESSENCE=Paliwo
+TF_HOTEL=Schronisko
 TF_TAXI=Taxi
 
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
-AucuneNDF=No expense reports found for this criteria
-AucuneLigne=There is no expense report declared yet
-AddLine=Add a line
-AddLineMini=Add
+ErrorDoubleDeclaration=Masz oświadczył kolejny raport wydatków do podobnego zakresu dat.
+ListTripsAndExpenses=Wykaz raportów kosztowych
+AucuneNDF=Brak raporty wydatków znalezione dla tych kryteriów
+AucuneLigne=Nie ma jeszcze raportu wydatki deklarowane
+AddLine=Dodaj linię
+AddLineMini=Dodać
 
-Date_DEBUT=Period date start
-Date_FIN=Period date end
-ModePaiement=Payment mode
-Note=Note
-Project=Project
+Date_DEBUT=Data okres rozruchu
+Date_FIN=Data zakończenia okresu
+ModePaiement=Sposób płatności
+Note=Uwaga
+Project=Projekt
 
-VALIDATOR=User to inform for approbation
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
-REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+VALIDATOR=Użytkownik poinformować o zatwierdzenie
+VALIDOR=Zatwierdzony przez
+AUTHOR=Nagrany przez
+AUTHORPAIEMENT=Paied przez
+REFUSEUR=Odmowa przez
+CANCEL_USER=Anulowane przez
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Powód
+MOTIF_CANCEL=Powód
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_VALIDE=Validation date
-DateApprove=Approving date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
+DATE_REFUS=Datę Deny
+DATE_SAVE=Data Validation
+DATE_VALIDE=Data Validation
+DateApprove=Data zatwierdzanie
+DATE_CANCEL=Anulowanie daty
+DATE_PAIEMENT=Termin płatności
 
-Deny=Deny
-TO_PAID=Pay
-BROUILLONNER=Reopen
-SendToValid=Sent to approve
-ModifyInfoGen=Edit
-ValidateAndSubmit=Validate and submit for approval
+Deny=Zaprzeczać
+TO_PAID=Płacić
+BROUILLONNER=Otworzyć na nowo
+SendToValid=Wysłany do zatwierdzenia
+ModifyInfoGen=Edycja
+ValidateAndSubmit=Weryfikacja i przedkłada do zatwierdzenia
 
-NOT_VALIDATOR=You are not allowed to approve this expense report
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_VALIDATOR=Nie masz uprawnień do zatwierdzania tego raportu wydatków
+NOT_AUTHOR=Nie jesteś autorem tego raportu wydatków. Operacja anulowana.
 
-RefuseTrip=Deny an expense report
-ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+RefuseTrip=Odmów raport wydatków
+ConfirmRefuseTrip=Czy na pewno chcesz odrzucić ten raport wydatków?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=Zatwierdzić raport wydatków
+ConfirmValideTrip=Czy na pewno chcesz, aby zatwierdzić ten raport wydatków?
 
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+PaidTrip=Zapłać raport wydatków
+ConfirmPaidTrip=Czy na pewno chcesz się status tego raportu wydatków do "Paid" zmienić?
 
-CancelTrip=Cancel an expense report
-ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+CancelTrip=Anuluj raport wydatków
+ConfirmCancelTrip=Czy na pewno chcesz anulować to raport wydatków?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+BrouillonnerTrip=Cofnąć raportu wydatków do statusu "Projekt" n
+ConfirmBrouillonnerTrip=Czy na pewno chcesz przenieść ten raport wydatków do statusu "projektu"?
 
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+SaveTrip=Weryfikacja raportu wydatków
+ConfirmSaveTrip=Czy na pewno chcesz, aby potwierdzić ten raport wydatków?
 
 Synchro_Compta=NDF <-> Compte
 
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+TripSynch=Synchronizacja: Uwagi de frais <-> courant Compte
+TripToSynch=Uwagi de frais à intégrer dans la COMPTA
+AucuneTripToSynch=Aucune pamiętać de Frais n'est pl Statut "odbiorca".
 ViewAccountSynch=Voir le compte
 
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
+ConfirmNdfToAccount=Êtes-vous Sur de vouloir intégrer cette pamiętać de frais dans le compte courant?
+ndfToAccount=Uwaga de frais - integracja
 
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
+ConfirmAccountToNdf=Êtes-vous Sur de vouloir retirer cette note de compte courant frais du?
+AccountToNdf=Uwaga de frais - Retrait
 
-LINE_NOT_ADDED=Ligne non ajoutée :
+LINE_NOT_ADDED=Ligne nie ajoutée:
 NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
+NO_DATE=Aucune data sélectionnée.
+NO_PRICE=Aucun prix Indique.
 
 TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
+TripForPaid=Płatnik
+TripPaid=Odbiorca płatności
 
-NoTripsToExportCSV=No expense report to export for this period.
+NoTripsToExportCSV=Nie raport z wydatków na eksport za ten okres.
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 467c34b1af8..c1208006aac 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=Obszaru HRM
 UserCard=Użytkownik karty
 ContactCard=Kontakt karty
 GroupCard=Grupa karty
@@ -86,7 +86,7 @@ MyInformations=Moje dane
 ExportDataset_user_1=Dolibarr Użytkownicy i właściwości
 DomainUser=Domena użytkownika %s
 Reactivate=Przywraca
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+CreateInternalUserDesc=Ta forma pozwala na stworzenie użytkownikowi wewnętrznego do firmy / fundacji. Aby utworzyć użytkownika zewnętrznego (klientami, dostawcami, ...), użyj przycisku "Utwórz Dolibarr użytkownika" z karty kontaktu osoby trzeciej.
 InternalExternalDesc=Wewnętrzny użytkownik jest użytkownikiem, który jest częścią Twojej firmy / fundacji. 
 Zewnętrzny użytkownik jest klientem, dostawcą lub innym kontrahentem. 

 W obu przypadkach uprawnienia określają prawa dostępu do Dolibarr; także zewnętrzny użytkownik może mieć inne menu niż użytkownik wewnętrzny (patrz Strona Główna - Konfiguracja - Wyświetlanie)
 PermissionInheritedFromAGroup=Zezwolenie udzielone ponieważ odziedziczył od jednego z użytkowników grupy.
 Inherited=Odziedziczone
@@ -102,7 +102,7 @@ UserDisabled=Użytkownik %s osób niepełnosprawnych
 UserEnabled=Użytkownik %s aktywowany
 UserDeleted=Użytkownik %s usunięto
 NewGroupCreated=Grupa %s tworzone
-GroupModified=Group %s modified
+GroupModified=Grupa% s zmodyfikowano
 GroupDeleted=Grupa %s usunięto
 ConfirmCreateContact=Czy na pewno chcesz yu Dolibarr utworzyć konto dla tego kontaktu?
 ConfirmCreateLogin=Czy na pewno chcesz, aby utworzyć konto dla tego Dolibarr członkiem?
@@ -113,10 +113,10 @@ YourRole=Swoje role
 YourQuotaOfUsersIsReached=Limitu aktywnych użytkowników został osiągnięty!
 NbOfUsers=Nb użytkowników
 DontDowngradeSuperAdmin=Tylko superadmin niższej wersji superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
-OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Weekly hours
-ColorUser=Color of the user
+HierarchicalResponsible=Kierownik
+HierarchicView=Hierarchiczny widok
+UseTypeFieldToChange=Użyj pola do zmiany Rodzaj
+OpenIDURL=Adres URL OpenID
+LoginUsingOpenID=Użyj do logowania OpenID
+WeeklyHours=Tygodniowy czas
+ColorUser=Kolor użytkownik
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index d1cb2e1ebb1..1fd493ae683 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -14,13 +14,13 @@ WithdrawalReceiptShort=Odbiór
 LastWithdrawalReceipts=Ostatnia %s wycofania wpływy
 WithdrawedBills=Withdrawed faktur
 WithdrawalsLines=Wycofania linie
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+RequestStandingOrderToTreat=Wniosek o stałych zleceń do przetwarzania
+RequestStandingOrderTreated=Wniosek o stałych zleceń przetworzonych
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Jeszcze nie możliwe. Wycofaj stan musi być ustawiony na "dobro", zanim uzna odrzucić na konkretnych liniach.
 CustomersStandingOrders=Stałych zleceń klienta
 CustomerStandingOrder=Klient zlecenie stałe
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
+NbOfInvoiceToWithdraw=Nb. z faktury z wycofania wniosku
+NbOfInvoiceToWithdrawWithInfo=Nb. z faktury z wycofać wniosek o klientów posiadających zdefiniowane dane konta bankowego
 InvoiceWaitingWithdraw=Faktura czeka na wycofać
 AmountToWithdraw=Kwota do wycofania
 WithdrawsRefused=Wycofuje odmówił
@@ -47,7 +47,7 @@ RefusedData=Od odrzucenia
 RefusedReason=Powodem odrzucenia
 RefusedInvoicing=Rozliczeniowych odrzucenia
 NoInvoiceRefused=Nie za odrzucenie
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Faktura odmówił (Naładuj odrzucenie do klienta)
 Status=Status
 StatusUnknown=Nieznany
 StatusWaiting=Czekanie
@@ -76,14 +76,14 @@ WithBankUsingRIB=Na rachunkach bankowych z wykorzystaniem RIB
 WithBankUsingBANBIC=Na rachunkach bankowych z wykorzystaniem IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Konto bankowe do odbioru odstępuje
 CreditDate=Kredyt na
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Nie można wygenerować plik paragon wycofania dla danego kraju:% s (Twój kraj nie jest obsługiwany)
 ShowWithdraw=Pokaż Wypłata
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jeśli jednak faktura nie co najmniej jeden wypłaty płatności jeszcze przetworzone, nie będzie ustawiony jako zapłaci, aby umożliwić zarządzanie wycofanie wcześniej.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
-StatisticsByLineStatus=Statistics by status of lines
+DoStandingOrdersBeforePayments=Zakładka ta pozwala na żądanie zlecenia stałego. Gdy to zrobisz, przejdź do menu bankowości> Wycofanie zarządzać zlecenia stałego. Gdy zlecenia stałego jest zamknięty, płatność na fakturze będą automatycznie zapisywane, a faktura zamknięte, jeśli pozostała do zapłaty jest null.
+WithdrawalFile=Plik Wycofanie
+SetToStatusSent=Ustaw status "Plik Wysłane"
+ThisWillAlsoAddPaymentOnInvoice=Odnosi się to także płatności faktur i będzie je sklasyfikować jako "Paid"
+StatisticsByLineStatus=Statystyki według stanu linii
 
 ### Notifications
 InfoCreditSubject=Płatność z %s zamówienia stojących przez bank
@@ -93,5 +93,5 @@ InfoTransMessage=Stojąc %s zamówienie zostało przesłanych do banku przez %s
 InfoTransData=Kwota: %s 
 Metode: %s 
 Data: %s
 InfoFoot=Jest to zautomatyzowany wiadomość wysłana przez Dolibarr
 InfoRejectSubject=Zlecenie stałe odmówił
-InfoRejectMessage=Hello,

the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s
+InfoRejectMessage=Witaj, 

 zlecenie stałe z faktury% s związany z firmą% s, z kwoty% s zostało odrzucone przez bank. 

 - 
 % S
 ModeWarning=Opcja dla trybu rzeczywistego nie był ustawiony, zatrzymujemy po tej symulacji
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 511241d55c0..4db200257e3 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -3,26 +3,26 @@ Foundation=Empresa/Instituição
 VersionProgram=Versão do programa
 VersionLastInstall=Versão da instalação inicial
 VersionLastUpgrade=Versão da última atualização
-SessionId=ID da sessao
+SessionId=ID da sessão
 SessionSaveHandler=Manipulador para salvar sessões.
-SessionSavePath=Localizacao da sessao guardada
+SessionSavePath=Localização da sessão guardada
 PurgeSessions=Remover sessões
 ConfirmPurgeSessions=Você tem certeza de que deseja desconectar todas as sessões? Isto irá desconectar TODOS usuários (exceto você).
 NoSessionListWithThisHandler=Salvar manipulador de sessão configurado no PHP não permite listar todas as sessões em execução.
 LockNewSessions=Bloquear novas conexões
 ConfirmLockNewSessions=Você tem certeza que quer restringir qualquer nova conexão Dolibarr para si mesmo. Apenas usuário %s será capaz de se conectar depois.
 UnlockNewSessions=Remover bloqueio conexão
-YourSession=Sua sessao
-Sessions=Sessão de usuarios
-WebUserGroup=usuario/grupo do servidor web
+YourSession=Sua sessão
+Sessions=Sessão de usuários
+WebUserGroup=Usuário/grupo do servidor web
 NoSessionFound=Seu PHP parece não permitir listar as sessões ativas. Diretório usado para salvar sessões (%s) pode ser protegido (por exemplo, pelas permissões do sistema operacional ou por diretiva PHP "open_basedir").
 HTMLCharset=Charset das páginas HTML geradas
 DBStoringCharset=Charset base de dados para armazenamento de dados
 DBSortingCharset=Charset base de dados para classificar os dados
 WarningModuleNotActive=Módulo %s deve ser ativado
 WarningOnlyPermissionOfActivatedModules=Atenção, somente as permissões relacionados com os módulos ativados que aparecem aqui. Pode ativar os outros módulos na página configuração->Módulos
-DolibarrSetup=Instalação do ERP
-DolibarrUser=Usuário ERP
+DolibarrSetup=Instalação ou atualização do Dolibarr
+DolibarrUser=Usuário do Dolibarr
 InternalUser=Usuário Interno
 ExternalUser=Usuário Externo
 InternalUsers=Usuários Internos
@@ -34,6 +34,8 @@ RemoveLock=Exclua o arquivo %s se tem permissão da ferramenta de atuali
 RestoreLock=Substituir o arquivo %s e apenas dar direito de ler a esse arquivo, a fim de proibir novas atualizações.
 ErrorModuleRequireDolibarrVersion=Erro, este módulo requer uma versão %s ou superior do ERP
 DictionarySetup=Configuração Dicionário
+Chartofaccounts=Plano de contas
+Fiscalyear=Exercícios Fiscais
 ErrorReservedTypeSystemSystemAuto=Valores 'system' e 'systemauto' para o tipo é reservado. Você pode usar "usuário" como valor para adicionar seu próprio registro
 ErrorCodeCantContainZero=Código não pode conter valor 0
 DisableJavascript=Desative as funções de JavaScript e Ajax (Recomendado para deficientes visuais ou navegadores somente texto)
@@ -69,7 +71,9 @@ MenuLimits=Limites e Precisão
 DetailPosition=Número de ordem para a posição do menu
 PersonalizedMenusNotSupported=Menus personalizados não são suportados
 NotConfigured=Modulo nao configurado
+Setup=Configuração do Sistema
 Activation=Ativação
+Active=Ativo
 SetupShort=Configuracao
 OtherSetup=Outras configuracoes
 CurrentValueSeparatorThousand=Separador milhar
@@ -207,7 +211,6 @@ MenuAdmin=Editor menu
 DoNotUseInProduction=Não utilizar em produção
 ThisIsProcessToFollow=Está aqui o procedimento a seguir:
 FindPackageFromWebSite=Encontre um pacote que oferece recurso desejado (por exemplo, no site oficial % s).
-DownloadPackageFromWebSite=Descarregar o pacote
 SetupIsReadyForUse=A Instalação está finalizada e o ERP está liberada para usar com o novo componente
 NotExistsDirect=O diretório alternativo para o root não foi definido
 InfDirAlt=Desde a versão 3, é possível definir um diretorio root alternativo. Esta funcoa permitepermite que você armazene, no mesmo lugar, plug-ins e templates personalizados 
 apenas crie um diretório na raiz do Dolibarr. (Por exemplo: custom) 

@@ -324,12 +327,13 @@ Module51Desc=Gestão de correspondência do massa
 Module52Name=Estoques de produtos
 Module52Desc=Administração de estoques de produtos
 Module53Desc=Administração de serviços
+Module54Name=Contratos/Assinaturas
+Module54Desc=Gerenciamento de contratos (serviços ou assinaturas recorrentes)
 Module55Name=Códigos de barra
 Module55Desc=Administração dos códigos de barra
 Module56Name=Telefonia
 Module56Desc=Administração da telefonia
 Module57Name=Débitos Diretos
-Module57Desc=Administração de débitos diretos e créditos bancários
 Module59Desc=Adicione função para gerar uma conta Bookmark4u desde uma conta do ERP
 Module70Desc=Administração de Intervenções
 Module75Name=Notas de despesas e deslocamentos
@@ -351,15 +355,13 @@ Module700Desc=Administração de Bolsas
 Module1200Desc=Interface com o sistema de seguimento de incidências Mantis
 Module1400Name=Contabilidade
 Module1400Desc=Gestão de Contabilidade (partes duplas)
-Module1780Name=Categorias
-Module1780Desc=Administração de categorias (produtos, Fornecedores e clientes)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permitir editar alguma área de texto usando um editor avançado
-Module2300Desc=Gerenciamento de tarefas agendadas
 Module2400Desc=Administração da agenda e das ações
 Module2500Name=Administração Eletrônica de Documentos
 Module2600Name=Webservices
 Module2600Desc=Ativar o servidor de serviços web Dolibarr
+Module2650Name=WebServices (cliente)
 Module2700Name=Sobrescrito
 Module2700Desc=Usar o serviço on-line Gravatar (www.gravatar.com) para mostrar fotos de usuários / membros (que se encontra com os seus e-mails). Precisa de um acesso à Internet
 Module2800Desc=Cliente de FTP
@@ -370,13 +372,11 @@ Module5000Desc=Permite-lhe gerenciar várias empresas
 Module6000Desc=Gestão de fluxo de trabalho
 Module20000Name=Sair da configuração de pedidos
 Module39000Name=Lote de produto
-Module39000Desc=Número do lote, para gestão da data de validade para venda dos produtos
 Module50000Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com PayBox
 Module50100Desc=Caixa registradora
 Module50200Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal
 Module50400Name=Contabilidade (avançada)
 Module50400Desc=Gestão de Contabilidade (partes duplas)
-Module54000Desc=Imprimir via Cups IPP Impressora.
 Module55000Name=Abrir Enquete
 Module55000Desc=Módulo para fazer pesquisas on-line (como Doodle, Studs, Rdvz ...)
 Module59000Name=Margems
@@ -397,10 +397,12 @@ Permission44=Eliminar projetos
 Permission91=Consultar Impostos e ICMS
 Permission92=Criar/Modificar Impostos e ICMS
 Permission93=Eliminar Impostos e ICMS
+Permission101=Consultar Expedições
+Permission102=Criar/Modificar Expedições
+Permission104=Confirmar Expedições
 Permission106=Envios de exportação
+Permission109=Eliminar Expedições
 Permission112=Criar/Modificar quantidade/eliminar registros bancários
-Permission113=Configurar contas financeiras (criar, controlar as categorias)
-Permission114=Exportar transações e registros bancários
 Permission115=Exportar transações e extratos
 Permission116=Captar transferências entre contas
 Permission117=Gerenciar envio de cheques
@@ -412,8 +414,11 @@ Permission151=Consultar Débitos Diretos
 Permission152=Configurar Débitos Diretos
 Permission153=Consultar Débitos Diretos
 Permission154=Crédito / recusar ordens permanentes recibos
+Permission161=Leia contratos / assinaturas
+Permission171=Leia viagens e despesas (próprios e de seus subordinados)
 Permission172=Criar/Modificar viagens e gastos
 Permission173=Remover viagens e gastos
+Permission174=Leia todas as viagens e despesas
 Permission178=Exportar viagens e gastos
 Permission194=Consultar Linhas da Lagura de Banda
 Permission205=Gerenciar Ligações
@@ -465,6 +470,8 @@ Permission701=Criar/Modificar Bolsas
 Permission702=Eliminar Bolsas
 Permission703=Excluir doações
 Permission1001=Consultar estoques
+Permission1002=Criar / modificar armazéns
+Permission1003=Excluir Armazéns
 Permission1004=Consultar movimentos de estoque
 Permission1005=Criar/Modificar movimentos de estoque
 Permission1101=Consultar ordens de envio
@@ -481,8 +488,6 @@ Permission1237=Pedidos a fornecedores Export e seus detalhes
 Permission1251=Execute as importações em massa de dados externos para o banco de dados (carga de dados)
 Permission1321=Exportar faturas a clientes, atributos e cobranças
 Permission1421=Exportar faturas de clientes e atributos
-Permission23002 =Criar/atualizar tarefa agendada
-Permission23003 =Apagar tarefa agendada
 Permission2401=Ler ações (eventos ou tarefas) vinculadas na sua conta
 Permission2402=Criar/Modificar/Eliminar ações (eventos ou tarefas) vinculadas na sua conta
 Permission2403=Consultar ações (acontecimientos ou tarefas) de outros
@@ -521,6 +526,7 @@ DictionaryOrderMethods=Métodos de compra
 DictionarySource=Origem das propostas / ordens
 DictionaryAccountancyplan=Plano de contas
 DictionaryAccountancysystem=Modelos para o plano de contas
+DictionaryEMailTemplates=Modelos de E-mails
 SetupSaved=configuração guardada
 BackToDictionaryList=Voltar para a lista de dicionários
 VATReceivedOnly=Impostos especiais não faturaveis
@@ -553,10 +559,13 @@ CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas
 NbOfDays=N� de Dias
 AlwaysActive=Sempre Ativo
 UpdateRequired=Parâmetros sistema necessita de uma atualização. Para atualizar click em  e-mail)
 OSCommerceErrorConnectOkButWrongDatabase=a login se ha estabelecido, mas a base de dados não parece de OSCommerce.
 OSCommerceTestOk=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' é correta.
 OSCommerceTestKo1=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' não se pode efetuar.
 OSCommerceTestKo2=a login à servidor '%s' por o Usuário '%s' ha falhado.
+StockSetup=Configuração do módulo Armazém / Warehouse
 Menu=Seleção dos menus
 MenuHandler=Gerente de menus
 HideUnauthorizedMenu=Esconder menus não autorizadas (cinza)
@@ -1016,4 +1023,8 @@ FiscalYear=Ano fiscal
 FiscalYearCard=Ficha ano fiscal
 DeleteFiscalYear=Remover ano fiscal
 ConfirmDeleteFiscalYear=Voçê tem certeza que quer deleitar este ano fical ?
+AlwaysEditable=Sempre pode ser editado
+NbMajMin=Número mínimo de caracteres maiúsculos
+NbNumMin=Número mínimo de caracteres numéricos
+NbSpeMin=Número mínimo de caracteres especiais
 TypePaymentDesc=0: Pagamento para Cliente, 1: Pagamento para Fornecedor, 2: Pagamentos para Clientes e Fornecedores
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 07a485a30f7..a1a02cb7e67 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -18,6 +18,7 @@ ActionsToDoBy=Eventos atribuídos à
 ActionsDoneBy=Eventos concluído por
 ActionsForUser=Eventos para o usuário
 ActionsForUsersGroup=Eventos para todos os usuários do grupo
+ActionAssignedTo=Evento atribuído a
 AllMyActions=Todos meus eventos/tarefas
 AllActions=Todas os eventos/tarefas
 ViewList=Exibir lista
@@ -32,18 +33,18 @@ AgendaExtSitesDesc=Esta página permite importar calendários de fontes externas
 ActionsEvents=Para qual eventos o Dolibarr irá criar uma atividade na agenda automaticamente
 PropalValidatedInDolibarr=Proposta %s validada
 InvoiceValidatedInDolibarr=Fatura %s validada
+InvoiceValidatedInDolibarrFromPos=Fatura %s validada no POS
 InvoiceBackToDraftInDolibarr=Fatura %s volta ao estado de rascunho
 OrderValidatedInDolibarr=Pedido %s validado
+OrderCanceledInDolibarr=Pedido %s cancelado
 OrderApprovedInDolibarr=Pedido %s aprovado
 OrderRefusedInDolibarr=Pedido %s recusado
 OrderBackToDraftInDolibarr=Pedido %s volta ao estado de rascunho
-OrderCanceledInDolibarr=Pedido %s cancelado
 ProposalSentByEMail=Proposta comercial %s enviada por e-mail
 OrderSentByEMail=Pedido do cliente %s enviado por e-mail
 InvoiceSentByEMail=Fatura do cliente %s enviada por e-mail
 SupplierOrderSentByEMail=Pedido do fornecedor %s enviado por e-mail
 SupplierInvoiceSentByEMail=Fatura do fornecedor %s enviada por e-mail
-ShippingSentByEMail=Entrega %s enviado por e-mail
 ShippingValidated=Envio %s validado
 NewCompanyToDolibarr=Fornecedor criado
 DateActionPlannedStart=Data de início do planejamento
@@ -52,7 +53,6 @@ DateActionDoneStart=Data real de início
 DateActionDoneEnd=Data real de fim
 DateActionEnd=Data de término
 AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros para filtrar o resultado:
-AgendaUrlOptions2=Usuário=%s permitir apenas resultados para atividades atribuídas, criadas ou concluídas pelo usuário %s.
 AgendaUrlOptions3=logina=%s para restringir açoes de propriedade do usuario %s.
 AgendaUrlOptions4=Usuário=%s permitir apenas resultados para atividades atribuídas ao usuário %s.
 AgendaUrlOptionsProject=project=PROJECT_ID para restringir a saida de açoes associadas ao projeto PROJECT_ID.
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 539954acb35..241cec78db8 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -1,50 +1,16 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Rubrica
-Rubriques=Rubricas
-categories=Categorias
 In=Em
-ThirdPartyCategoriesArea=Área Categorias de Fornecedores
-MembersCategoriesArea=Área categorias membros
-ContactsCategoriesArea=Contatos area categorias
 NoSubCat=Esta categoria não contém Nenhuma subcategoria.
-ErrSameCatSelected=Selecionou a mesma categoria varias vezes
-ErrForgotCat=Esqueceu de escolher a categoria
 ErrForgotField=Esqueceu de atribuir um campo
 ErrCatAlreadyExists=Este nome esta sendo utilizado
-ImpossibleAddCat=Impossível Adicionar a categoria
-ObjectAlreadyLinkedToCategory=O elemento já está associado a esta categoria
-MemberIsInCategories=Este membro deve as seguintes categorias de membros
-ContactIsInCategories=Este contato pertence as seguentes categorias contatos
-CompanyHasNoCategory=Esta empresa não se encontra em Nenhuma categoria em particular
-MemberHasNoCategory=Este membro nao esta em nenhuma categoria
-ContactHasNoCategory=Este contato nao esta em nenhuma categoria
-ClassifyInCategory=Esta categoria não contém clientes
 ContentsVisibleByAll=O Conteúdo Será Visivel por Todos?
 ContentsVisibleByAllShort=Conteúdo visivel por todos
 ContentsNotVisibleByAllShort=Conteúdo não visivel por todos
-CategoriesTree=Tipos de categoria
-ConfirmDeleteCategory=Tem certeza que quer eliminar esta categoria?
-RemoveFromCategoryConfirm=Tem certeza que quer eliminar o link entre a transação e a categoria?
-MembersCategoryShort=Categoria de membros
-MembersCategoriesShort=Categoria de membros
-ContactCategoriesShort=Categorias contatos
 ThisCategoryHasNoProduct=Esta categoria não contém nenhum produto.
 ThisCategoryHasNoSupplier=Esta categoria não contém a nenhum fornecedor.
 ThisCategoryHasNoCustomer=Esta categoria não contém a nenhum cliente.
 ThisCategoryHasNoMember=Esta categoria nao contem nenhum membro.
 ThisCategoryHasNoContact=Esta categoria nao contem nenhum contato.
-CatSupList=Lista de categorias de fornecedores
-CatCusList=Lista de Categorias de Clientes/Perspectivas
-CatProdList=Lista de Categorias de Produtos
-CatMemberList=Lista de membros categorias
-CatContactList=Lista de categorias contatos e do contato
-CatSupLinks=Linkes entre fornecedores e catogorias
-CatCusLinks=Linkes entre clientes/prospetivas e categorias
-CatProdLinks=Linkes entre produtos/servicos e categorias
-CatMemberLinks=Linkes entre membros e categorias
-DeleteFromCat=Excluir da categoria
 ExtraFieldsCategories=atributos complementares
-CategoriesSetup=Configuração de categorias
-CategorieRecursiv=Ligação com a categoria automaticamente
 CategorieRecursivHelp=Se ativado, o produto também será ligada a categoria original quando adicionando em uma subcategoria
 AddProductServiceIntoCategory=Adicione o seguinte produto / serviço
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 8dafd18f8ba..2c7721204b6 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -17,13 +17,6 @@ CronListInactive=Lista de trabalhos nao ativos
 CronDateLastRun=Ultimo acionamento
 CronLastOutput=Saida do ultimo acionamento
 CronLastResult=Codigo do ultimo resultado
-CronList=Lista trabalhos
-CronDelete=Apagar tarefas cron
-CronConfirmDelete=Tem certeza que deseja apagar este trabalho cron ?
-CronExecute=Lançar trabalho
-CronConfirmExecute=Tem certeza que quer executar esta tarefa agora ?
-CronInfo=Tarefas permitem de executar aòoes nao planejadas
-CronWaitingJobs=Trabalhos na espera
 CronTask=Trabalho
 CronNone=Nenhum
 CronDtStart=Data inicio
diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang
index 2d8c7d33d13..a4d3db1317d 100644
--- a/htdocs/langs/pt_BR/donations.lang
+++ b/htdocs/langs/pt_BR/donations.lang
@@ -4,11 +4,23 @@ Donations=Doações
 DonationRef=Doaçaõ ref.
 Donor=Dador
 Donors=Dadores
+AddDonation=Criar uma doação
+NewDonation=Nova Doação
 ShowDonation=Mostrar doaçaõ
 DonationsPaid=Doações pagas
+DonationsReceived=Doações Recebidas
+PublicDonation=Doação Pública
+DonationsNumber=Número de Doações
+DonationsArea=Área de Doações
 DonationStatusPaid=Doaçaõ recebida
+DonationStatusPromiseValidatedShort=Validada
 DonationReceipt=Recibo doaçaõ
+DonationsModels=Modelo de documento de recepção de Doação
 LastModifiedDonations=As ultimas %s doações modificadaas
 SearchADonation=Buscar doaçaõ
 DonationRecipient=Recipiente doaçaõ
 IConfirmDonationReception=Declaro o recebimento como doaçaõ, de seguinte montante.
+MinimumAmount=O montante mínimo é de %s
+DONATION_ART200=Mostrar o artigo 200 do CGI se você está preocupado
+DONATION_ART238=Mostrar o artigo 238 do CGI se você está preocupado
+DONATION_ART885=Mostrar o artigo 885 do CGI se você está preocupado
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index 5dddd399559..69d44f38411 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -2,6 +2,7 @@
 MailTargets=Destinatários
 MailRecipient=Destinatário
 MailTo=Destinatário(s)
+MailCC=Copiar para
 MailFile=Arquivo
 ResetMailing=Limpar Mailing
 MailingResult=Resultado do envio de e-mails
@@ -27,6 +28,7 @@ ConfirmCloneEMailing=Voce tem certeza que quer clonar este e-mailing ?
 CloneContent=Clonar mensagem
 CloneReceivers=Clonar recebidores
 DateLastSend=Data ultimo envio
+DateSending=Data envio
 CheckRead=Ler recebidor
 YourMailUnsubcribeOK=O e-mail %s foi removido com sucesso da lista
 MailtoEMail=Hyper-link ao e-mail
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index e7008da51cd..2c65942015a 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -40,6 +40,7 @@ ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição so
 ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
 SelectDate=Selecionar uma data
 SeeAlso=Ver tambem %s
+SeeHere=veja aqui
 BackgroundColorByDefault=Cor do fundo padrão
 FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder.
 NbOfEntries=Nr. de entradas
@@ -50,9 +51,12 @@ LevelOfFeature=Nível de funções
 DefinedAndHasThisValue=Definido e valor para
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr está configurado em modo de autenticação %s ao arquivo de configuração conf.php.
 Eso significa que a base de dados das Senhas é externa a Dolibarr, por eso toda modificação deste campo pode resultar sem efeito alguno.
 PasswordForgotten=Esqueceu de da sua senha?
+SeeAbove=Mencionar anteriormente
 LastConnexion=último login
 PreviousConnexion=último login
 ConnectedOnMultiCompany=Conectado no ambiente
+AuthenticationMode=Modo autenticação
+RequestedUrl=Url solicitada
 DatabaseTypeManager=Tipo de gerente de base de dados
 RequestLastAccess=Petição último acesso e a base de dados
 RequestLastAccessInError=Petição último acesso e a base de dados errado
@@ -71,22 +75,40 @@ Closed2=Encerrado
 Enabled=Ativado
 Disable=Desativar
 Disabled=Desativado
+AddLink=Adicionar link
+Update=Modificar
 AddActionToDo=Adicionar ação a realizar
 AddActionDone=Adicionar ação realizada
+ConfirmSendCardByMail=Quer enviar esta ficha por e-mail?
+Delete=Eliminar
+Remove=Retirar
+Validate=Confirmar
+ToValidate=A Confirmar
+SaveAs=Guardar como
 TestConnection=Teste a login
+ToClone=Cópiar
 ConfirmClone=Selecciones dados que deseja Cópiar.
+NoCloneOptionsSpecified=Não existem dados definidos para copiar
 Go=Ir
 Run=Attivo
+Show=Ver
+ShowCardHere=Mostrar cartão
 Upload=Enviar Arquivo
+ChooseLangage=Escolher o seu idioma
 Resize=Modificar tamanho
 Recenter=Recolocar no centro
 User=Usuário
 Users=Usuário
+NoUserGroupDefined=Nenhum grupo definido pelo usuário
 PasswordRetype=Repetir Senha
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
+PersonalValue=Valor Personalizado
 CurrentValue=Valor atual
+MultiLanguage=Multi Idioma
+RefOrLabel=Ref. da etiqueta
 DefaultModel=Modelo Padrão
 Action=Ação
+About=Acerca de
 NumberByMonth=Numero por mes
 Limit=Límite
 DevelopmentTeam=Equipe de Desenvolvimento
@@ -96,19 +118,30 @@ Connection=Login
 Now=Agora
 DateStart=Data Inicio
 DateEnd=Data Fim
+DateModification=Data Modificação
+DateModificationShort=Data Modif.
 DateLastModification=Data última Modificação
 DateValidation=Data Validação
+DateDue=Data Vencimento
+DateValue=Data Valor
+DateValueShort=Data Valor
+DateOperation=Data Operação
+DateOperationShort=Data Op.
 DateLimit=Data Límite
+DateRequest=Data Consulta
+DateProcess=Data Processo
 DurationDay=Día
 Day=Día
 days=Dias
+Weeks=Semandas
 Morning=Manha
 Quadri=Trimistre
 UseLocalTax=Incluindo taxa
-Copy=Cópiar
 Default=Padrao
 DefaultValue=Valor por default
+DefaultGlobalValue=Valor global
 UnitPrice=Preço Unit.
+UnitPriceHT=Preço Base
 UnitPriceTTC=Preço Unit. Total
 PriceU=Preço Unit.
 PriceUHT=Preço Unit.
@@ -154,10 +187,12 @@ ActionUncomplete=Imcompleto
 CompanyFoundation=Companhia/Fundação
 ContactsForCompany=Contatos desta empresa
 ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor
+AddressesForCompany=Endereços para este terceiro
 ActionsOnCompany=Ações nesta sociedade
 ActionsOnMember=Eventos deste membro
 NActions=%s ações
 RequestAlreadyDone=Pedido ja registrado
+RemoveFilter=Eliminar filtro
 GeneratedOn=Gerado a %s
 Available=Disponivel
 NotYetAvailable=Ainda não disponível
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 677d7eefba3..d816efbdacd 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -1,14 +1,21 @@
 # Dolibarr language file - Source file is en_US - orders
+OrdersArea=Área de Pedidos de Clientes
 OrderId=ID Pedido
 OrderLine=Linha de Comando
 OrderToProcess=Pedido a se processar
 CustomerOrder=Pedido de Cliente
-OrdersToBill=Pedidos por Faturar
+CustomersOrders=Pedidos de clientes
+OrdersToValid=Pedidos de Clientes a Confirmar
+OrdersToBill=Pedidos de Clientes Entregues
+OrdersInProcess=Pedidos de Clientes em Processo
+OrdersToProcess=Pedidos de Clientes à processar
 SuppliersOrdersToProcess=Pedidos de fornecedor a se processar
 StatusOrderSentShort=Em processo
 StatusOrderSent=Envio em processo
+StatusOrderOnProcessShort=Pedido
 StatusOrderToBillShort=Entregue
 StatusOrderToBill2Short=A se faturar
+StatusOrderOnProcess=Pedido - Aguardando Recebimento
 StatusOrderToBill=A Faturar
 StatusOrderToBill2=A Faturar
 ShippingExist=Existe envio
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 010797bc380..f946e4512e3 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -25,7 +25,6 @@ Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por e-mail
 Notify_BILL_PAYED=Fatura cliente paga
 Notify_BILL_CANCEL=Fatura cliente cancelada
 Notify_BILL_SENTBYMAIL=Fatura cliente enviada por e-mail
-Notify_ORDER_SUPPLIER_VALIDATE=Pedido fornecedor validado
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Pedido fornecedor enviado por e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Fatura fornecedor validada
 Notify_BILL_SUPPLIER_PAYED=Fatura fornecedor paga
@@ -41,7 +40,6 @@ Notify_PROJECT_CREATE=criação de projeto
 Notify_TASK_CREATE=Tarefa criada
 Notify_TASK_MODIFY=Tarefa alterada
 Notify_TASK_DELETE=Tarefa excluída
-SeeModuleSetup=Ver modulo configurações
 TotalSizeOfAttachedFiles=Tamanho Total dos Arquivos/Documentos Anexos
 LinkedObject=Arquivo Anexo
 PredefinedMailTest=Esse e um teste de envio.⏎\nAs duas linhas estao separadas por retono de linha.⏎\n⏎\n__SIGNATURE__
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 4822d5d1436..748c36ddb11 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separador
 ExtrafieldCheckBox=Caixa de verificação
 ExtrafieldRadio=Botão
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -494,6 +495,8 @@ Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salários
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notificações
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Bolsas
@@ -508,14 +511,14 @@ Module1400Name=Perito de Contabilidade
 Module1400Desc=Perido de gestão da Contabilidade (dupla posição)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categorías
-Module1780Desc=Gestão de categorías (produtos, Fornecedores e clientes)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Editor WYSIWYG
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Gestão de tarefas agendadas
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Gestão da agenda e das acções
 Module2500Name=Gestão Electrónica de Documentos
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Criar/modificar salários
 Permission514=Apagar salários
 Permission517=Exportar salários
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Ler serviços
 Permission532=Criar / modificar serviços
 Permission534=Apagar serviços
@@ -746,6 +754,7 @@ Permission1185=Aprovar pedidos a Fornecedores
 Permission1186=Enviar pedidos a Fornecedores
 Permission1187=Receber pedidos de Fornecedores
 Permission1188=Fechar pedidos a Fornecedores
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Obter resultado de uma exportação
 Permission1202=Criar/Modificar Exportações
 Permission1231=Consultar facturas de Fornecedores
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Executar importações em massa de dados externos em bases de dados (dados de carga)
 Permission1321=Exportar facturas a clientes, atributos e cobranças
 Permission1421=Exportar facturas de clientes e atributos
-Permission23001 = Ler tarefa agendada
-Permission23002 = Criar/alterar tarefa agendada
-Permission23003 = Eliminar tarefa agendada
-Permission23004 = Executar tarefa agendada
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Ler acções (eventos ou tarefas) vinculadas na sua conta
 Permission2402=Criar/Modificar/Eliminar acções (eventos ou tarefas) vinculadas na sua conta
 Permission2403=Consultar acções (acontecimientos ou tarefas) de outros
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Devolve um código contabilistico composto de 401 segu
 ModuleCompanyCodePanicum=Devolve um código contabilistico vazio.
 ModuleCompanyCodeDigitaria=Devolve um código contabilistico composto por o código do Terceiro. O código está formado por caracter ' C ' na primeira posição seguido dos 5 primeiros caracteres do código do Terceiro.
 UseNotifications=Usar Notificações
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Documentos modelos
 DocumentModelOdt=Crie documentos a partir dos modelos OpenDocuments (ficheiros .ODT ou .ODS para o KOffice, OpenOffice, TextEdit,...)
 WatermarkOnDraft=Marca d'
@@ -1557,6 +1566,7 @@ SuppliersSetup=Fornecedor de configuração do módulo
 SuppliersCommandModel=Complete modelo de ordem do fornecedor (logo. ..)
 SuppliersInvoiceModel=Modelo completo da factura do fornecedor (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=MaxMind GeoIP instalação do módulo
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 74a87737d21..3c906efba05 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factura Validada
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Factura %s voltou ao estado de rascunho
 InvoiceDeleteDolibarr=Fatura %s apagada
-OrderValidatedInDolibarr= Encomenda %s validada
+OrderValidatedInDolibarr=Encomenda %s validada
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Encomenda %s cancelada
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Encomenda %s aprovada
 OrderRefusedInDolibarr=Encomenda %s recusada
 OrderBackToDraftInDolibarr=Encomenda %s voltou ao estado de rascunho
@@ -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
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 4c18ada3752..b7a851ff0b0 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual
 ConfirmRemoveDiscount=Tem certeza de que deseja remover este desconto?
 RelatedBill=factura relacionados
 RelatedBills=facturas relacionadas
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Última fatura relacionada
 WarningBillExist=Aviso, já existe uma ou mais faturas
 
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 92a16ef7f3d..9fb4a949c6f 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categoria
-Categories=Categorias
-Rubrique=Categoria
-Rubriques=Categorias
-categories=categorias
-TheCategorie=A Categoria
-NoCategoryYet=Nenhuma Categoria Deste Tipo Criada
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=em
 AddIn=Adicionar em
 modify=Modificar
 Classify=Classificar
-CategoriesArea=Área Categorias
-ProductsCategoriesArea=Área Categorias de Produtos e Serviços
-SuppliersCategoriesArea=Área Categorias Fornecedores
-CustomersCategoriesArea=Área Categorias Clientes
-ThirdPartyCategoriesArea=Área Categorias de Terceiros
-MembersCategoriesArea=Os membros da zona categorias
-ContactsCategoriesArea=Área categorias dos contactos
-MainCats=Categorias Principais
+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=Sub-Categorias
 CatStatistics=Estatísticas
-CatList=Lista de Categorias
-AllCats=Todas as Categorias
-ViewCat=Ver Categoria
-NewCat=Nova Categoria
-NewCategory=Nova Categoria
-ModifCat=Modificar uma Categoria
-CatCreated=Categoria Criada
-CreateCat=Adicionar uma Categoria
-CreateThisCat=Adicionar esta 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=Confirmar os campos
 NoSubCat=Esta categoria não contem Nenhuma subcategoria.
 SubCatOf=Subcategoria
-FoundCats=Categorias Encontradas
-FoundCatsForName=Categorias Encontradas com o Nome:
-FoundSubCatsIn=Subcategorias Encontradas na Categoria
-ErrSameCatSelected=Seleccionou a mesma categoria varias vezes
-ErrForgotCat=Esqueceu-se escolher a 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=Esqueceu-se atribuir um campo
 ErrCatAlreadyExists=Este nome esta ser utilizado
-AddProductToCat=Adicionar este produto a uma categoria?
-ImpossibleAddCat=Impossivel adicionar a categoria
-ImpossibleAssociateCategory=Impossível associar a 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=Foi adicionado com êxito.
-ObjectAlreadyLinkedToCategory=O elemento já está emparelhado a esta categoria
-CategorySuccessfullyCreated=A Categoria %s foi inserida com sucesso
-ProductIsInCategories=Este produto/serviço encontra-se nas seguintes categorias
-SupplierIsInCategories=Este fornecedor encontra-se nas seguintes categorias
-CompanyIsInCustomersCategories=Esta empresa encontra-se nas seguintes categorias
-CompanyIsInSuppliersCategories=Esta empresa encontra-se nas seguintes categorias de Fornecedores
-MemberIsInCategories=Este membro possui a seguinte membros categorias
-ContactIsInCategories=Este contato pertence às seguintes categorias de contatos
-ProductHasNoCategory=Este produto/serviço não se encontra em nenhuma categoria em particular
-SupplierHasNoCategory=Este fornecedor não se encontra em Nenhuma categoria em particular
-CompanyHasNoCategory=Esta empresa não se encontra em nenhuma categoria em particular
-MemberHasNoCategory=Este membro não está em nenhuma categoria
-ContactHasNoCategory=Este contato não está em nenhuma categoria
-ClassifyInCategory=Esta categoria não contem clientes
+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=Nenhuma
-NotCategorized=Sem categoria
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Esta categoria já existe na mesma localização
 ReturnInProduct=Voltar à ficha produto/serviço
 ReturnInSupplier=Voltar à ficha fornecedor
@@ -66,22 +64,22 @@ ReturnInCompany=Voltar à ficha cliente/cliente potencial
 ContentsVisibleByAll=O conteúdo será visível por todos?
 ContentsVisibleByAllShort=Conteúdo visível por todos
 ContentsNotVisibleByAllShort=Conteúdo não visível por todos
-CategoriesTree=Árvore de Categorias
-DeleteCategory=Eliminar Categoria
-ConfirmDeleteCategory=Está seguro de querer eliminar esta categoria?
-RemoveFromCategory=Eliminar link com categoria
-RemoveFromCategoryConfirm=Está seguro de querer eliminar o link entre a transacção e a categoria?
-NoCategoriesDefined=Nenhuma Categoria Definida
-SuppliersCategoryShort=Categoria Fornecedores
-CustomersCategoryShort=Categoria Clientes
-ProductsCategoryShort=Categoria Produtos
-MembersCategoryShort=Membros da categoria
-SuppliersCategoriesShort=Categorias Fornecedores
-CustomersCategoriesShort=Categorias Clientes
+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=Cat. Clientes/Potenciais
-ProductsCategoriesShort=Categorias Produtos
-MembersCategoriesShort=categorias de membros
-ContactCategoriesShort=Categorias dos contactos
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Esta categoria não contem nenhum produto.
 ThisCategoryHasNoSupplier=Esta categoria não contem a nenhum fornecedor.
 ThisCategoryHasNoCustomer=Esta categoria não contem a nenhum cliente.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Esta categoria não contém qualquer contato.
 AssignedToCustomer=Atribuir a um cliente
 AssignedToTheCustomer=Atribuido a um cliente
 InternalCategory=Categoria Interna
-CategoryContents=Conteúdo da Categoria
-CategId=Id Categoria
-CatSupList=Lista de fornecedores categorias
-CatCusList=Lista de clientes / perspectiva categorias
-CatProdList=Lista dos produtos categorias
-CatMemberList=Categorias Lista de membros
-CatContactList=Lista de categorias de contato e contato
-CatSupLinks=Ligações entre os fornecedores e categorias
-CatCusLinks=Ligações entre os clientes/prospetos e categorias
-CatProdLinks=Ligações entre produtos/serviços e categorias
-CatMemberLinks=Ligações entre os membros e categorias
-DeleteFromCat=Remover da 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=Apagar Imagem
 ConfirmDeletePicture=Confirmar eliminação da imagem?
 ExtraFieldsCategories=Atributos Complementares
-CategoriesSetup=Configurar Categorias
-CategorieRecursiv=Ligar automaticamente com a categoria fonte 
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Se ativado, o produto também irá estar ligado à categoria fonte quando adicionar a uma subcategoria
 AddProductServiceIntoCategory=Adicioanr o produto/serviço seguinte
-ShowCategory=Mostrar categoria
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index 9c45da9a4da..bcac2727da0 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Resultado da última execução
 CronLastResult=Last result code
 CronListOfCronJobs=Lista de tarefas agendadas
 CronCommand=Comando
-CronList=Lista de tarefas
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Lançar tarefa
-CronConfirmExecute= Tem certeza que deseja executar esta tarefa agora
-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=Tarefa
-CronNone= Nenhuma
+CronNone=Nenhuma
 CronDtStart=Data de Início
 CronDtEnd=Data Fim
 CronDtNextLaunch=Próximo execução
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informação
 # Common
diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang
index 0c3c915fb2f..3f5bf5256c8 100644
--- a/htdocs/langs/pt_PT/donations.lang
+++ b/htdocs/langs/pt_PT/donations.lang
@@ -6,6 +6,8 @@ Donor=Doador
 Donors=Doadores
 AddDonation=Crie uma donativo
 NewDonation=Novo Donativo
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Mostrar Donativo
 DonationPromise=Promessa de Doação
 PromisesNotValid=Promessas Não Validadas
@@ -21,6 +23,8 @@ DonationStatusPaid=Donativo Recebido
 DonationStatusPromiseNotValidatedShort=Não Validada
 DonationStatusPromiseValidatedShort=Validado
 DonationStatusPaidShort=Recebido
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validar promessa
 DonationReceipt=Recibo do Donativo
 BuildDonationReceipt=Criar Recibo
@@ -36,3 +40,4 @@ FrenchOptions=Opções para França
 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
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 6ebfe918305..871b9d90af0 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/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=Os parâmetros de configuração obrigatórios ainda não estão definidos
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index cdcc999daa0..48a6a9a29e3 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista de todas as notificações de e-mail enviado
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index b017d2c856e..f010590cf30 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -352,6 +352,7 @@ Status=Estado
 Favorite=Favoritos
 ShortInfo=Informação
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. fornecedor
 RefPayment=Ref. pagamento
 CommercialProposalsShort=Orçamentos
@@ -394,8 +395,8 @@ Available=Disponível
 NotYetAvailable=Ainda não disponivel
 NotAvailable=Não disponivel
 Popularity=Popularidade
-Categories=Categorias
-Category=Categoria
+Categories=Tags/categories
+Category=Tag/category
 By=Por
 From=De
 to=Para
@@ -694,6 +695,7 @@ AddBox=Adicionar Caixa
 SelectElementAndClickRefresh=Selecione um elemento e actualize a pagina
 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=Segunda-feira
 Tuesday=Terça-feira
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 8b26b315b94..a361d438b1e 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Área de Pedidos de Clientes
+OrdersArea=Area de Pedidos de clientes
 SuppliersOrdersArea=Área de Pedidos a Fornecedores
 OrderCard=Ficha Pedido
 OrderId=Id da Encomenda
@@ -64,7 +64,8 @@ ShipProduct=Enviar Produto
 Discount=Desconto
 CreateOrder=Criar Pedido
 RefuseOrder=Rejeitar o Pedido
-ApproveOrder=Aceitar o Pedido
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Confirmar o Pedido
 UnvalidateOrder=Pedido inválido
 DeleteOrder=Eliminar o pedido
@@ -102,6 +103,8 @@ ClassifyBilled=Classificar "Facturado"
 ComptaCard=Ficha Contabilidade
 DraftOrders=Rascunhos de Pedidos
 RelatedOrders=Pedidos Anexos
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Pedidos em Processo
 RefOrder=Ref. Pedido
 RefCustomerOrder=Ref. Pedido Cliente
@@ -118,6 +121,7 @@ PaymentOrderRef=Pagamento de Pedido %s
 CloneOrder=Copiar pedido
 ConfirmCloneOrder=Tem certeza de que deseja copiar este fim %s?
 DispatchSupplierOrder=Para receber %s fornecedor
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representante ordem do cliente seguimento
 TypeContact_commande_internal_SHIPPING=Representante transporte seguimento
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 764d37222a5..058cd2eca8e 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validação Ficha Intervenção
 Notify_FICHINTER_SENTBYMAIL=Intervenções enviadas por correio
 Notify_BILL_VALIDATE=Validação factura
 Notify_BILL_UNVALIDATE=Fatura do cliente não validada
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Fornecedor fim aprovado
 Notify_ORDER_SUPPLIER_REFUSE=Fornecedor fim recusado
 Notify_ORDER_VALIDATE=Pedido do cliente validado
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por correio
 Notify_BILL_PAYED=Fatura de Cliente paga
 Notify_BILL_CANCEL=Fatura do cliente cancelada
 Notify_BILL_SENTBYMAIL=Fatura do cliente enviada pelo correio
-Notify_ORDER_SUPPLIER_VALIDATE=Para fornecedor validado
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Para fornecedor enviada por correio
 Notify_BILL_SUPPLIER_VALIDATE=Fatura do fornecedor validado
 Notify_BILL_SUPPLIER_PAYED=Fatura do fornecedor paga
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Criação do projeto
 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 Ficheiros/Documentos anexos
 TotalSizeOfAttachedFiles=Tamanho Total dos Ficheiros/Documentos anexos
 MaxSize=Tamanho Máximo
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Factura %s validados
 EMailTextProposalValidated=O %s proposta foi validada.
 EMailTextOrderValidated=O %s pedido foi validado.
 EMailTextOrderApproved=Pedido %s Aprovado
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Pedido %s Aprovado por %s
 EMailTextOrderRefused=Pedido %s Reprovado
 EMailTextOrderRefusedBy=Pedido %s Reprovado por %s
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index a543f3549d6..913d8cddb47 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index aa68d1907b8..b4bf887b4dd 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedores Associado
 ListContractAssociatedProject=Lista de Contratos Associados ao Projeto
 ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista de eventos associados ao projeto
 ActivityOnProjectThisWeek=Atividade do Projeto nesta Semana
 ActivityOnProjectThisMonth=Actividade do Projecto neste Mês
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index ca9bf9bce91..3ea181e8313 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. de Envio
 Sending=Envio
 Sendings=Envios
+AllSendings=All Shipments
 Shipment=Envio
 Shipments=Envios
 ShowSending=Show Sending
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index b57b823e0fd..81944fcd5a3 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/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)
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index d91192821e9..b9036a91790 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -8,9 +8,9 @@ VersionExperimental=Experimental
 VersionDevelopment=Dezvoltare
 VersionUnknown=Necunoscut
 VersionRecommanded=Recomandat
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
+FileCheck= Integritate Fișiere
+FilesMissing= Fișiere Lipsa
+FilesUpdated= Fișiere Actualizate
 FileCheckDolibarr=Check Dolibarr Files Integrity
 XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=ID Sesiune
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio buton
 ExtrafieldCheckBoxFromList= Checkbox din tabel
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Lista de parametri trebuie să fie ca cheie, valoare 

 pentru exemplul: 
 1, valoare1 
 2, valoare2 
 3, value3 
 ... 

 Pentru a avea listă în funcție de o alta:
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Lista de parametri trebuie să fie de tip cheie, valoare 

 pentru exemplul: 
 1, valoare1 
 2, valoare2 
 3, value3 
 ...
 ExtrafieldParamHelpradio=Lista de parametri trebuie să fie de tip  cheie, valoare 

 pentru exemplul: 
 1, valoare1 
 2, valoare2 
 3, value3 
 ...
@@ -494,11 +495,13 @@ Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende)
 Module500Desc=Managementul cheltuielilor speciale cum ar fi taxele , contribuţiile sociale, dividendele si salariile
 Module510Name=Salarii
 Module510Desc=Managementul salariilor angajatilor si a plaţiilor
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notificări
 Module600Desc=Trimite notificări prin email la unele evenimente de afaceri Dolibarr la contactele terților (configurare definită pe fiecare terţ)
 Module700Name=Donatii
 Module700Desc=MAnagementul Donaţiilor
-Module770Name=Expense Report
+Module770Name=Raport Cheltuieli
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -506,16 +509,16 @@ Module1200Name=Mantis
 Module1200Desc=Mantis integrare
 Module1400Name=Contabilitate
 Module1400Desc=Management Contabilitate de gestiune (partidă dublă)
-Module1520Name=Document Generation
+Module1520Name=Generare Document 
 Module1520Desc=Mass mail document generation
-Module1780Name=Categorii
-Module1780Desc=Categorii de "management (produse, furnizori şi clienţi)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
 Module2200Name=Preţuri dinamice
 Module2200Desc=Activați utilizarea expresii matematice pentru prețuri
 Module2300Name=Cron
-Module2300Desc=Managementul taskurilor programate
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Acţiuni / activităţi de ordine de zi şi de gestionare a
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Citeşte salarii
 Permission512=Creare / Modificare salarii
 Permission514=Şterge salarii
 Permission517=Export salarii
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Citeşte servicii
 Permission532=Creare / Modificare servicii
 Permission534=Ştergere servicii
@@ -746,6 +754,7 @@ Permission1185=Aprobaţi furnizor ordinelor
 Permission1186=Comanda furnizor ordinelor
 Permission1187=Confirmarea de primire de furnizor de comenzi
 Permission1188=Inchide furnizor ordinelor
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Obţineţi rezultatul unui export
 Permission1202=Creare / Modificare de export
 Permission1231=Citeşte facturile furnizor
@@ -758,10 +767,10 @@ Permission1237=Export comenzi furnizori şi alte detalii
 Permission1251=Run masa importurile de date externe în baza de date (date de sarcină)
 Permission1321=Export client facturi, atribute şi plăţile
 Permission1421=Export client ordinele şi atribute
-Permission23001 = Citeste sarcină programată
-Permission23002 = Creare/Modificare sarcină programată
-Permission23003 = Ştergeţi o sarcină programată
-Permission23004 = Execută sarcină programată
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Citeşte acţiuni (evenimente sau sarcini) legate de acest cont
 Permission2402=Crea / modifica / delete acţiuni (evenimente sau sarcini) legate de acest cont
 Permission2403=Citeşte acţiuni (evenimente sau sarcini) de alţii
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Întoarceţi-vă un cod de contabilitate construit de
 ModuleCompanyCodePanicum=Întoarceţi-vă un gol de contabilitate cod.
 ModuleCompanyCodeDigitaria=Contabilitate cod depinde de o terţă parte de cod. Acest cod este format din caractere "C" în prima poziţie, urmat de primele 5 caractere de-a treia parte de cod.
 UseNotifications=Utilizaţi notificări
-NotificationsDesc=Funcţia E-mailuri cu notificări vă permite să trimiteți în linişte mail automat, pentru unele evenimente Dolibarr. Targetele pot fi definite: 
 * Pe contactele terţilor  (clienti sau furnizori), un terţ terță o dată
 * Sau prin stabilirea unei adrese target de e-mail globală de la pagina de configurare a modulului.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Documente şabloane
 DocumentModelOdt=Generare din modelele OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…)
 WatermarkOnDraft=Watermark pe schiţa de document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Furnizorul modul de configurare
 SuppliersCommandModel=Finalizarea şablon de ordine furnizorul (logo. ..)
 SuppliersInvoiceModel=Model complet de factura furnizorului (logo. ..)
 SuppliersInvoiceNumberingModel=Modele numerotaţie al facturilor furnizori
+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 de configurare
 PathToGeoIPMaxmindCountryDataFile=Calea către fișierul care conține Maxmind  tranlatarea IP la  țară. 
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 50ca3ae994c..5e8e04e5de9 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factura %s validată
 InvoiceValidatedInDolibarrFromPos=Factura %s validată din POS
 InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul schiţă
 InvoiceDeleteDolibarr=Factura %s ştearsă
-OrderValidatedInDolibarr= Comanda %s validată
+OrderValidatedInDolibarr=Comanda %s validată
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Comanda  %s anulată
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Comanda %s aprobată
 OrderRefusedInDolibarr=Comanda %s refuzată
 OrderBackToDraftInDolibarr=Comanda %s revenită de statutul schiţă
@@ -91,3 +94,5 @@ WorkingTimeRange=Rang timp muncă
 WorkingDaysRange=Rang zile muncă
 AddEvent=Creare eveniment
 MyAvailability=Disponibilitatea mea
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 92e62558764..f642ec13a7b 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -74,9 +74,9 @@ PaymentsAlreadyDone=Plăţi deja efectuate
 PaymentsBackAlreadyDone=Plaţi Return  deja efectuate
 PaymentRule=Mod de Plată
 PaymentMode=Tip de plată
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentTerm=Conditii de plata
+PaymentConditions=Conditiile de plata
+PaymentConditionsShort=Conditiile de plata
 PaymentAmount=Sumă de plată
 ValidatePayment=Validează plata
 PaymentHigherThanReminderToPay=Plată mai mare decât restul de  plată
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Valoarea totală a celor două noi reduceri
 ConfirmRemoveDiscount=Sigur doriţi să eliminaţi acest discount?
 RelatedBill=Factură asociată
 RelatedBills=Facturi asociate
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Ultima Factură asociată
 WarningBillExist=Avertisment, una sau mai multe facturi există deja
 
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 89e052dbc09..56b08765c26 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categorie
-Categories=Categorii
-Rubrique=Categorie
-Rubriques=Categorii
-categories=categorii
-TheCategorie=Categoria
-NoCategoryYet=Nicio categorie de acest tip creată
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=În
 AddIn=Adăugă în
 modify=modifică
 Classify=Clasează
-CategoriesArea=CATEGORII
-ProductsCategoriesArea=Categorii Produse / Servicii
-SuppliersCategoriesArea=Categorii Furnizori
-CustomersCategoriesArea=Categorii Clienţii
-ThirdPartyCategoriesArea=Categorii Terţi
-MembersCategoriesArea=Categorii  Membrii
-ContactsCategoriesArea=Categorii Contacte
-MainCats=Categorii Principale
+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=Subcategorii
 CatStatistics=Statistici
-CatList=Listă categorii
-AllCats=Toate categoriile
-ViewCat=Vezi categoria
-NewCat=Adaugă categorie
-NewCategory=Categorie nouă
-ModifCat=Modifică categorie
-CatCreated=Categorie creată
-CreateCat=Crează categorie
-CreateThisCat=Crează această categorie
+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=Validează  câmpurile
 NoSubCat=Nicio subcategorie.
 SubCatOf=Subcategorie
-FoundCats=Categorii găsite
-FoundCatsForName=Categorii găsite pentru numele:
-FoundSubCatsIn=Subcategorii găsit în categoria
-ErrSameCatSelected=Le-aţi selectat în aceeaşi categorie de mai multe ori
-ErrForgotCat=Ai uitat să alegeţi 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=Ai uitat să completezi un câmp
 ErrCatAlreadyExists=Acest nume este deja folosit
-AddProductToCat=Adăugi acest produs la o categorie?
-ImpossibleAddCat=Imposibil de adăugat la categoria
-ImpossibleAssociateCategory=Imposibil de asociat 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 a fost adaugat cu succes.
-ObjectAlreadyLinkedToCategory=Elementul este deja legat de această categorie.
-CategorySuccessfullyCreated=Categoria %s a fost adăugată cu succes.
-ProductIsInCategories=Produsul/ serviciu este în următoarele categorii
-SupplierIsInCategories=Acest furnizorul este în următoarele categorii
-CompanyIsInCustomersCategories=Această societate este în următoarele  categorii de clienţi / perspecte
-CompanyIsInSuppliersCategories=Această societate este în următoarele  categorii de furnizori
-MemberIsInCategories=Acest membru este în următoarele categorii de membri
-ContactIsInCategories=Acest contact face parte din următoarele categorii de contacte
-ProductHasNoCategory=Acest produs / serviciu nu este în nicio categorie
-SupplierHasNoCategory=Acest furnizor nu este în nici o categorie
-CompanyHasNoCategory=Aceasta companie nu este în nici o categorie
-MemberHasNoCategory=Acest membru nu este în nici o categorie
-ContactHasNoCategory=Acest contact nu este în nici o categorie
-ClassifyInCategory=Clasează în 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=Niciunul
-NotCategorized=Fără categorie
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Această categorie  există deja cu această referinţă
 ReturnInProduct=Inapoi la  Fişa produs / serviciu
 ReturnInSupplier=Inapoi la Fişa furnizor
@@ -66,22 +64,22 @@ ReturnInCompany=Inapoi la  Fişa client / prospect
 ContentsVisibleByAll=Conţinutul va fi vizibil pentru toţi
 ContentsVisibleByAllShort=Conţinut vizibil de către toţi
 ContentsNotVisibleByAllShort=Conţinutul nu va fi vizibil pentru toţi
-CategoriesTree=Arborescenţă Categorii 
-DeleteCategory=Şterge categorie
-ConfirmDeleteCategory=Sigur  doriţi să ştergeţi această categorie?
-RemoveFromCategory=Eliminaţi link-ul cu Categoria
-RemoveFromCategoryConfirm=Sigur  doriţi să eliminaţi legătura dintre tranzacţie şi de categorie?
-NoCategoriesDefined=Nicio categorie definită
-SuppliersCategoryShort=Categorie Furnizori
-CustomersCategoryShort=Categorie Clienţii
-ProductsCategoryShort=Categorie Produse
-MembersCategoryShort=Categorie Membrii
-SuppliersCategoriesShort=Categorii Furnizori
-CustomersCategoriesShort=Categorii Clienţii
+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=Categorii  Clienţi / Prospecte
-ProductsCategoriesShort=Categorii Produse
-MembersCategoriesShort=Categorii Membrii
-ContactCategoriesShort=Categorii Contacte
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Această categorie nu conţine nici un produs.
 ThisCategoryHasNoSupplier=Această categorie nu conţine nici un furnizor.
 ThisCategoryHasNoCustomer=Această categorie nu conţine nici un client.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Această categorie nu conţine nici un contact
 AssignedToCustomer=Atribuie la un client
 AssignedToTheCustomer=Atribuit la clientul
 InternalCategory=Categorie internă
-CategoryContents=Conţinutul Categoriei
-CategId=ID Categorie
-CatSupList=Lista Categorii furnizori
-CatCusList=Lista Categorii clienţi / prospecte
-CatProdList=Lista Categorii  produse
-CatMemberList=Lista Categorii membrii
-CatContactList=Lista categoriilor de contacte şi contactelor
-CatSupLinks=Legături dintre furnizori şi categorii
-CatCusLinks=Legături dintre clienţi/prospecte şi categorii
-CatProdLinks=Legături dintre produse/servicii şi categorii
-CatMemberLinks=Legături dintre membrii şi categorii
-DeleteFromCat=Elimină din categorii
+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=Şterge Foto
 ConfirmDeletePicture=Confirmaţi ştergere foto ?
 ExtraFieldsCategories=Atribute complementare
-CategoriesSetup=Setare Categorii
-CategorieRecursiv=Link automat către categoria părinte
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Dacă este activat, produsul va fi legat către categoria părinte atunci când este adăugat în subcategorie
 AddProductServiceIntoCategory=Add  următoarele produseservicii
-ShowCategory=Arată categorie
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index 14370ebe680..971a22ca59c 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Prospecte contactate
 DateActionPlanned=Dată realizare prevăzută
 DateActionDone=Dată realizare efectivă
 ActionAskedBy=Eveniment înregistrat de
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Eveniment atribuit lui
 ActionDoneBy=Eveniment realizat de către
 ActionUserAsk=Raportat de
 ErrorStatusCantBeZeroIfStarted=Dacă câmpul "Data reală debut  realizare" este completat, acţiunea este începută  (sau terminată), astfel câmpul "Status" nu poate fi 0%%.
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 381d59c19bc..dc3786315b3 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Ieşirea ultimei rulări
 CronLastResult=Codul ultimului rezultat
 CronListOfCronJobs=Lista joburilor programate
 CronCommand=Comandă
-CronList=Lista joburi
-CronDelete= Sterge joburi cron
-CronConfirmDelete= Sunteţi sigur ca doriţi ştergerea acestui job cron ?
-CronExecute=Lansează job
-CronConfirmExecute= Sunteţi sigur de execuţia acestui job acum
-CronInfo= Joburile permit executarea sarcinilor care au fost planificate
-CronWaitingJobs=Joburi în aşteptare
+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= Niciunul
+CronNone=Niciunul
 CronDtStart=Dată începere
 CronDtEnd=Data de final
 CronDtNextLaunch=Urmatoarea execuţie
@@ -75,6 +75,7 @@ CronObjectHelp=Numele obiectului de încărcat. 
 De exemplu să aducă metod
 CronMethodHelp=Metoda obiectului de încărcat. 
 De exemplu să aducă metoda de obiect Produs Dolibarr  /htdocs/product/class/product.class.php, valoarea metodei  este  fecth
 CronArgsHelp=Argumentele metodei . 
 De exemplu să aducă metoda  obiect ului Produs Dolibarr  /htdocs/product/class/product.class.php, valoarea parametrilor pot fi este  0, ProductRef
 CronCommandHelp=Linia de comandă de sistem pentru a executa.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informatie
 # Common
diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
index 4037e2ffbb7..76fabb73acb 100644
--- a/htdocs/langs/ro_RO/donations.lang
+++ b/htdocs/langs/ro_RO/donations.lang
@@ -6,6 +6,8 @@ Donor=Donator
 Donors=Donatori
 AddDonation=Crează o donaţie
 NewDonation=Donaţie nouă
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Afişează donaţia
 DonationPromise=Promisiune Donaţie
 PromisesNotValid=Promisiune nevalidată
@@ -21,6 +23,8 @@ DonationStatusPaid=Donatie plătită
 DonationStatusPromiseNotValidatedShort=Schiţă
 DonationStatusPromiseValidatedShort=Validată
 DonationStatusPaidShort=Plătită
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validează promisiune
 DonationReceipt=Chitanţă donaţie
 BuildDonationReceipt=Crează chitanţa
@@ -36,3 +40,4 @@ FrenchOptions=Opțiuni pentru Franța
 DONATION_ART200=Afiseaza articolului 200 din CGI dacă sunteți îngrijorat
 DONATION_ART238=Afiseaza articolului 238 din CGI dacă sunteți îngrijorat
 DONATION_ART885=Afiseaza articol 885 din CGI dacă sunteți îngrijorat
+DonationPayment=Donation payment
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 8e73996c24d..18da25a1466 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Eroare Necunoscută '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere
 ErrorTryToMakeMoveOnProductRequiringBatchData=Eroare, se incerarca să se facă o mișcare de stoc, fără informații de lot / serie, pe un produs care necesită  informații de lot /serie
 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=Parametri de setare obligatorii nu sunt încă definiţi
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 0865602554a..81a2cb43ea9 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista toate notificările e-mail trimis
 MailSendSetupIs=Configurarea trimiterii  e-mail a fost de configurat la '%s'.  Acest mod nu poate fi utilizat pentru a trimite email-uri în masă.
 MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniu%sHome - Setup - EMails%s  pentru a schimba parametrul  '%s' de utilizare în modul '%s'.  Cu acest mod, puteți introduce configurarea serverului SMTP furnizat de furnizorul de servicii Internet și de a folosi facilitatea Mass email .
 MailSendSetupIs3=Daca aveti intrebari cu privire la modul de configurare al serverului SMTP, puteți cere la %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 0b2b2e1411c..4a16d72e5b1 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. furnizor
 RefPayment=Ref. plată
 CommercialProposalsShort=Oferte Comerciale
@@ -394,8 +395,8 @@ Available=Disponibil
 NotYetAvailable=Nedisponibil încă
 NotAvailable=Nedisponibil
 Popularity=Popularitate
-Categories=Categorii
-Category=Categorie
+Categories=Tags/categories
+Category=Tag/category
 By=Pe
 From=De la
 to=la
@@ -694,6 +695,7 @@ AddBox=Adauga box
 SelectElementAndClickRefresh=Selectează un element şi click Refresh
 PrintFile=Printeaza Fisierul %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Luni
 Tuesday=Marţi
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 90ef9c964c1..f1e88e8c9c2 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Expediază produs
 Discount=Discount
 CreateOrder=Crează Comanda
 RefuseOrder=Refuză comanda
-ApproveOrder=Acceptă comanda
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validează comanda
 UnvalidateOrder=Devalidează comandă
 DeleteOrder=Şterge comada
@@ -102,6 +103,8 @@ ClassifyBilled=Clasează facturată
 ComptaCard=Fişă Contabilitate
 DraftOrders=Comenzi schiţă
 RelatedOrders=Comenzi reatasate
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Comenzi în curs de tratare
 RefOrder=Ref. comanda
 RefCustomerOrder=Ref. Comandă Client
@@ -118,6 +121,7 @@ PaymentOrderRef=Plata comandă %s
 CloneOrder=Clonează comanda
 ConfirmCloneOrder=Sigur doriţi să clonaţi acestă comandă %s ?
 DispatchSupplierOrder=Recepţia comenzii furnizorul ui%s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsabil urmărire comandă client
 TypeContact_commande_internal_SHIPPING=Responsabil urmărire expediere comandă client
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 123684dfc4e..3daa906f181 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validate intervenţie
 Notify_FICHINTER_SENTBYMAIL=Intervenţie trimisă prin mail
 Notify_BILL_VALIDATE=Factura client validată
 Notify_BILL_UNVALIDATE=Factura client nevalidată
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Furnizor pentru a aprobat
 Notify_ORDER_SUPPLIER_REFUSE=Furnizor pentru a refuzat
 Notify_ORDER_VALIDATE=Comandă client validată
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Ofertă comercială  trimisă prin mail
 Notify_BILL_PAYED=Factura platita clienţilor
 Notify_BILL_CANCEL=Factura client anulat
 Notify_BILL_SENTBYMAIL=Factura client trimis prin e-mail
-Notify_ORDER_SUPPLIER_VALIDATE=Pentru furnizorul validate
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Pentru furnizorul trimis prin e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Factura furnizorului validate
 Notify_BILL_SUPPLIER_PAYED=Factura platita cu furnizorul
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Creare proiect
 Notify_TASK_CREATE=Task creat
 Notify_TASK_MODIFY=Task modificat
 Notify_TASK_DELETE=Task sters
-SeeModuleSetup=Vezi setare modul
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Numărul de ataşat fişiere / documente
 TotalSizeOfAttachedFiles=Total marimea ataşat fişiere / documente
 MaxSize=Mărimea maximă a
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Factura %s validată
 EMailTextProposalValidated=Oferta %s a fost validată.
 EMailTextOrderValidated=Comanda %s a fost validată
 EMailTextOrderApproved=Comanda %s a fost  aprobată
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Comanda %s aprobată de către %s
 EMailTextOrderRefused=Comanda %s a fost refuzată
 EMailTextOrderRefusedBy=Comanda %s a fost refuzată de către %s
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 0a803535194..9a4d95bef7f 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Preţul minim recomandat este: %s
 PriceExpressionEditor=Editor expresie preț
 PriceExpressionSelected=Expresie preț selectatată
 PriceExpressionEditorHelp1="pret = 2 + 2" sau "2 + 2" pentru setarea pretului. Foloseste ; tpentru separarea expresiilor
-PriceExpressionEditorHelp2=Puteți accesa ExtraFields cu variabile, cum ar fi  #options_myextrafieldkey# 
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In ambele preturi produs/serviciu si furnizori sunt disponibile variabilele:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In pret produs/serviciu numai: #supplier_min_price#
In pret furnizor numai: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Mod  preț
 PriceNumeric=Număr
 DefaultPrice=Preț Implicit
 ComposedProductIncDecStock=Mărește/micșorează stoc pe schimbări sintetice
 ComposedProduct=Sub-produs
 MinSupplierPrice=Preț Minim furnizor
+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
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 5138b13125f..075afb106c0 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Lista facturi furnizori  asociate  la proi
 ListContractAssociatedProject=Lista contracte  asociate  la  proiect
 ListFichinterAssociatedProject=Lista intervenţii  asociate  la  proiectului
 ListExpenseReportsAssociatedProject=Lista rapoartelor cheltuieli  asociate proiectului
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista evenimentelor  asociate la proiectului
 ActivityOnProjectThisWeek=Activitatea de pe proiect în această săptămână
 ActivityOnProjectThisMonth=Activitatea de pe proiect în această lună
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index fd669e5577a..94d4d7d5fe2 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. Livrare
 Sending=Livrare
 Sendings=Livrari
+AllSendings=All Shipments
 Shipment=Livrare
 Shipments=Livrari
 ShowSending=Arata expedieri
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 19ea854686f..b2d32356eee 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Lista comenzi furnizori
 MenuOrdersSupplierToBill=Comenzi Furnizor de facturat
 NbDaysToDelivery= Intârziere Livrare in zile
 DescNbDaysToDelivery=Cea mai mare intarziere este afisata in lista produsului comandat
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index bb9b358c045..c908cea5084 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -1,56 +1,56 @@
 # Dolibarr language file - en_US - Accounting Expert
-CHARSET=UTF-8
+CHARSET=Кодировка UTF-8
 
-Accounting=Accounting
-Globalparameters=Global parameters
+Accounting=Бухгалтерия
+Globalparameters=Глобальные параметры
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+Fiscalyear=Финансовые года
+Menuaccount=Учётные записи бухгалтерии
+Menuthirdpartyaccount=Учётные записи контрагентов
+MenuTools=Инструменты
 
 ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Export=Export
-Modelcsv=Model of export
+Journaux=Журналы
+JournalFinancial=Финансовые журналы
+Exports=Экспорт
+Export=Экспорт
+Modelcsv=Модель экспорта
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
+Selectmodelcsv=Выбрать модель экспорта
+Modelcsv_normal=Классический экспорт
 Modelcsv_CEGID=Export towards CEGID Expert
 BackToChartofaccounts=Return chart of accounts
-Back=Return
+Back=Назад
 
 Definechartofaccounts=Define a chart of accounts
 Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
+Validate=Подтвердить
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
+ToDispatch=На отправку
+Dispatched=Отправленный
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
+CustomersVentilation=Распределение клиентов
+SuppliersVentilation=Распределение поставщиков
+TradeMargin=Торговая наценка
+Reports=Отчёты
+ByCustomerInvoice=По счетам клиентов
+ByMonth=По месяцам
 NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
+Update=Обновить
+List=Список
+Create=Создать
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
+Bookkeeping=Главная книга
 AccountBalanceByMonth=Account balance by month
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
 AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+Line=Строка
 
 CAHTF=Total purchase supplier HT
 InvoiceLines=Lines of invoice to be ventilated
@@ -60,11 +60,11 @@ IntoAccount=In the accounting account
 Ventilate=Ventilate
 VentilationAuto=Automatic breakdown
 
-Processing=Processing
-EndProcessing=The end of processing
+Processing=Обрабатывается
+EndProcessing=Конец обработки
 AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
+SelectedLines=Выделенные строки
+Lineofinvoice=Строка счёта
 VentilatedinAccount=Ventilated successfully in the accounting account
 NotVentilatedinAccount=Not ventilated in the accounting account
 
@@ -79,12 +79,12 @@ AccountLengthDesc=Function allowing to feign a length of accounting account by r
 ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
 ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=Журнал продаж
+ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей
+ACCOUNTING_BANK_JOURNAL=Банковский журнал
+ACCOUNTING_CASH_JOURNAL=Журнал наличных средств
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Журнал "Разное"
+ACCOUNTING_SOCIAL_JOURNAL=Социальный журнал
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
@@ -94,57 +94,57 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
 
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Doctype=Тип документа
+Docdate=Дата
+Docref=Ссылка
+Numerocompte=Бухгалтерский счёт
+Code_tiers=Контрагент
+Labelcompte=Метка бухгалтерского счёта
+Debit=Дебит
+Credit=Кредит
+Amount=Количество
 Sens=Sens
-Codejournal=Journal
+Codejournal=Журнал
 
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Удалить записи главной книги
 
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
+SellsJournal=Журнал продаж
+PurchasesJournal=Журнал покупок
+DescSellsJournal=Журнал продаж
+DescPurchasesJournal=Журнал покупок
+BankJournal=Банковский журнал
+DescBankJournal=Банковский журнал включает в себя все платежи с типом оплаты отличным от "наличные".
+CashJournal=Журнал наличных средств
+DescCashJournal=Журнал наличных средств включает в себя тип оплаты -  "наличными"
 
-CashPayment=Cash Payment
+CashPayment=Платёж наличными средствами
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Платёж счёта поставщика
+CustomerInvoicePayment=Платёж счёта клиента
 
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Бухгалтерский счёт контрагента
 
 NewAccountingMvt=New movement
 NumMvts=Number of movement
 ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+ErrorDebitCredit=Дебит и кредит не могут иметь значения одновременно
 
-ReportThirdParty=List thirdparty account
+ReportThirdParty=Список бухгалтерских счетов контрагентов
 DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Список бухгалтерских счетов
 
 Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgtype=Класс бухгалтерского счёта
+Pcgsubtype=Подкласс бухгалтерского счёта
+Accountparent=Владелец бухгалтерского счёта
+Active=Официальный отчёт
 
-NewFiscalYear=New fiscal year
+NewFiscalYear=Новый финансовый год
 
 DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
-TotalMarge=Total sales margin
+TotalMarge=Итоговая наценка на продажи
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
@@ -153,7 +153,7 @@ DescVentilSupplier=Consult here the annual breakdown accounting of your invoices
 DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Подтверждать автоматически
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 9a7af148909..05a964942aa 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
+Foundation=Фонд
 Version=Версия
 VersionProgram=Версия программы
 VersionLastInstall=Версия первоначальной установки
@@ -8,11 +8,11 @@ VersionExperimental=Экспериментальная
 VersionDevelopment=Разработка
 VersionUnknown=Неизвестно
 VersionRecommanded=Рекомендуемые
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Целостность файлов
+FilesMissing=Отсутсвующие файлы
+FilesUpdated=Обновлённые файлы
+FileCheckDolibarr=Проверить целостность файлов системы Dolibarr
+XmlNotFound=Файл Xml, содержащий описание целостности файлов системы Dolibarr не найден  
 SessionId=ID сессии
 SessionSaveHandler=Обработчик для сохранения сессий
 SessionSavePath=Хранение сессии локализации
@@ -30,7 +30,7 @@ HTMLCharset=Кодировка для генерируемых HTML-страни
 DBStoringCharset=Кодировка базы данных для хранения данных
 DBSortingCharset=Кодировка базы данных для сортировки данных
 WarningModuleNotActive=Модуль %s должен быть включен
-WarningOnlyPermissionOfActivatedModules=в русском переводе нет "Главная->Установка->Модули". Есть "Начало->Настройка->Модули".
+WarningOnlyPermissionOfActivatedModules=Здесь приведены только права доступа, связанные с активированными модулями. Вы можете активировать другие модули на странице Главная->Установка->Модули.
 DolibarrSetup=Установка или обновление Dolibarr
 DolibarrUser=Пользователь Dolibarr
 InternalUser=Внутренний пользователь
@@ -50,8 +50,8 @@ ErrorModuleRequireDolibarrVersion=Ошибка, этот модуль требу
 ErrorDecimalLargerThanAreForbidden=Ошибка, точность выше, чем %s, не поддерживается.
 DictionarySetup=Настройка словаря
 Dictionary=Словари
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Chartofaccounts=Схема учётных записей
+Fiscalyear=Финансовые года
 ErrorReservedTypeSystemSystemAuto=Значение 'system' и 'systemauto' для типа зарезервировано. Вы можете использовать значение 'user' для добавления вашей собственной записи
 ErrorCodeCantContainZero=Код не может содержать значение 0
 DisableJavascript=Отключить JavaScript и Ajax (Рекомендуется если пользователи пользуются текстовыми браузерами)
@@ -74,7 +74,7 @@ ShowPreview=Предварительный просмотр
 PreviewNotAvailable=Предварительный просмотр не доступен
 ThemeCurrentlyActive=Активная тема
 CurrentTimeZone=Текущий часовой пояс в настройках PHP
-MySQLTimeZone=TimeZone MySql (database)
+MySQLTimeZone=Часовой пояс БД (MySQL)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Пробел
 Table=Таблица
@@ -84,8 +84,8 @@ Mask=Маска
 NextValue=Следующее значение
 NextValueForInvoices=Следующее значение (счета-фактуры)
 NextValueForCreditNotes=Следующее значение (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
+NextValueForDeposit=Следующее значение (депозиты)
+NextValueForReplacements=Следующее значение (замены)
 MustBeLowerThanPHPLimit=Примечание: ваш PHP ограничивает размер загружаемого файла до %s %s независимо от значения этого параметра
 NoMaxSizeByPHPLimit=Примечание: в вашей конфигурации PHP установлено no limit
 MaxSizeForUploadedFiles=Максимальный размер загружаемых файлов (0 для запрещения каких-либо загрузок)
@@ -113,9 +113,9 @@ OtherOptions=Другие опции
 OtherSetup=Другие настройки
 CurrentValueSeparatorDecimal=Десятичный разделитель
 CurrentValueSeparatorThousand=Разделитель разрядов
-Destination=Destination
+Destination=Назначение
 IdModule=ID модуля
-IdPermissions=Permissions ID
+IdPermissions=ID прав доступа
 Modules=Модули
 ModulesCommon=Основные модули
 ModulesOther=Другие модули
@@ -246,9 +246,9 @@ OfficialWebSiteFr=Французский официальный веб-сайт
 OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr Online Demo
 OfficialMarketPlace=Официальный рынок внешних модулей / дополнений
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OfficialWebHostingService=Связанные сервисы веб-хостинга (облачный хостинг)
+ReferencedPreferredPartners=Предпочитаемые партнёры
+OtherResources=Другие ресурсы
 ForDocumentationSeeWiki=Для документации пользователя или разработчика (Doc, FAQs...),
 взгляните на Dolibarr Wiki:
%s
 ForAnswersSeeForum=Для любых других вопросов / помощи, вы можете использовать Dolibarr форум:
%s
 HelpCenterDesc1=Этот раздел может помочь вам получить помощь службы поддержки по Dolibarr.
@@ -299,7 +299,7 @@ DoNotUseInProduction=Не используйте на Production-версии
 ThisIsProcessToFollow=Это установка для обработки:
 StepNb=Шаг %s
 FindPackageFromWebSite=Найти пакет, который обеспечивает функции вы хотите (например, на официальном веб-сайте %s).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Загрузить пакет %s.
 UnpackPackageInDolibarrRoot=Распакуйте пакет Dolibarr файл в корневой каталог %s
 SetupIsReadyForUse=Установка закончена, и Dolibarr готов к использованию с этого нового компонента.
 NotExistsDirect=Альтернативная root директория не определена.

@@ -309,13 +309,13 @@ YouCanSubmitFile=Выберите модуль:
 CurrentVersion=Текущая версия Dolibarr
 CallUpdatePage=Перейдите на страницу, которая обновляет структуру базы данных и данные %s.
 LastStableVersion=Последняя стабильная версия
-UpdateServerOffline=Update server offline
+UpdateServerOffline=Сервер обновления недоступен
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. 
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. 
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. 
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers. 

 GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).

 GenericMaskCodes3=Все другие символы в маске останутся нетронутыми. 
 Пространства, не допускается. 

 GenericMaskCodes4a=Пример на 99-м% х третья сторона TheCompany сделали 2007-01-31: 

 GenericMaskCodes4b=Пример на сторонних из 2007-03-01: 

-GenericMaskCodes4c=Example on product created on 2007-03-01:

+GenericMaskCodes4c=Например, товар созданный 2007-03-01:

 GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX
 GenericNumRefModelDesc=Возвращает настраиваемое число в соответствии с заданной маской.
 ServerAvailableOnIPOrPort=Сервер доступен по адресу %s порт %s
@@ -340,7 +340,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Файлы .lang, загружены в
 ExamplesWithCurrentSetup=Примеры с текущего запуска программы установки
 ListOfDirectories=Список каталогов с шаблонами OpenDocument
 ListOfDirectoriesForModelGenODT=Список каталогов, содержащих файлы с шаблонами формата OpenDocument. 

 Добавьте сюда полный путь к директории. 
 Добавить возврат каретки между ГБ каталога. 
 Чтобы добавить каталог GED модуль, добавить здесь DOL_DATA_ROOT / рэп / yourdirectoryname. 

 Файлы в этих каталогах должны заканчиваться. ODT.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+NumberOfModelFilesFound=Количество найденных файлов-шаблонов в форматах ODT/ODS , найденных в этих папках
 ExampleOfDirectoriesForModelGen=Примеры синтаксиса: 
 C: \\ MYDIR 
 / Главная / MYDIR 
 DOL_DATA_ROOT / рэп / ecmdir
 FollowingSubstitutionKeysCanBeUsed=
 Чтобы узнать, как создать свой ODT шаблоны документов, прежде чем хранение их в этих каталогах, прочитать вики документации:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
@@ -361,34 +361,35 @@ PDFDesc=Вы можете настроить каждый глобальные 
 PDFAddressForging=Правила подделать адрес коробки
 HideAnyVATInformationOnPDF=Скрыть все информацию, связанную с НДС на создаваемых PDF
 HideDescOnPDF=Скрыть описания продуктов в генерируемом PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide products lines details on generated PDF
+HideRefOnPDF=Скрывать артикул товара на созданном PDF файле
+HideDetailsOnPDF=Скрывать строки с товарами на созданном PDF файле
 Library=Библиотека
 UrlGenerationParameters=Параметры для обеспечения адресов
 SecurityTokenIsUnique=Используйте уникальный параметр securekey для каждого URL
 EnterRefToBuildUrl=Введите ссылку на объект %s
 GetSecuredUrl=Получить рассчитывается URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
+ButtonHideUnauthorized=Прятать кнопки, действия с которыми не разрешены, вместо того, чтобы делать их неактивными
+OldVATRates=Предыдущее значение НДС
+NewVATRates=Новое значение НДС
+PriceBaseTypeToChange=Изменить цены с базой их эталонного значения, определенной на
+MassConvert=Запустить массовое преобразование
 String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
+TextLong=Текст
+Int=Целое
+Float=С плавающей запятой
+DateAndTime=Дата и время
+Unique=Уникальный
+Boolean=Двоичный (флажок)
 ExtrafieldPhone = Телефон
 ExtrafieldPrice = Цена
-ExtrafieldMail = Email
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
+ExtrafieldMail = Адрес электронной почты
+ExtrafieldSelect = Выбрать список
+ExtrafieldSelectList = Выбрать из таблицы
 ExtrafieldSeparator=Разделитель
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
+ExtrafieldCheckBox=флажок
+ExtrafieldRadio=Переключатель
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -398,17 +399,17 @@ LibraryToBuildPDF=Библиотека, использованная для ге
 WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s
+LinkToTestClickToDial=Введите номер телефона для ссылки с целью тестирования ClickToDial  пользователя %s
 RefreshPhoneLink=Обновить ссылку
-LinkToTest=Clickable link generated for user %s (click phone number to test)
+LinkToTest=Ссылка создана для пользователя %s (нажмите на телефонный номер, чтобы протестировать)
 KeepEmptyToUseDefault=Оставьте пустым для использования значения по умолчанию
 DefaultLink=Ссылка по умолчанию
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ValueOverwrittenByUserSetup=Предупреждение: это значение может быть перезаписано в настройках пользователя (каждый пользователь может задать свои настройки ссылки clicktodial)
 ExternalModule=Внешний модуль - установлен в директорию %s
 BarcodeInitForThirdparties=Массовое создание штрих-кодов для Контрагентов
 BarcodeInitForProductsOrServices=Массовое создание или удаление штрих-кода для Товаров или Услуг
 CurrentlyNWithoutBarCode=На данный момент у вас есть %s записей в %s, %s без назначенного штрих-кода.
-InitEmptyBarCode=Init value for next %s empty records
+InitEmptyBarCode=Начальное значения для следующих %s пустых записей
 EraseAllCurrentBarCode=Стереть все текущие значения штрих-кодов
 ConfirmEraseAllCurrentBarCode=Вы уверены, что хотите стереть все текущие значения штрих-кодов?
 AllBarcodeReset=Все значения штрих-кодов были удалены
@@ -417,7 +418,7 @@ NoRecordWithoutBarcodeDefined=Нет записей без назначенно
 
 # Modules
 Module0Name=Пользователи и группы
-Module0Desc=Пользователи и группы управления
+Module0Desc=Управление пользователями и группами 
 Module1Name=Третьи стороны
 Module1Desc=Фирмы и контакты управления
 Module2Name=Коммерческие
@@ -448,14 +449,14 @@ Module52Name=Акции
 Module52Desc=Акции 'управлению продуктами
 Module53Name=Услуги
 Module53Desc=Услуги по управлению
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Контакты/Подписки
+Module54Desc=Управление договорами (услугами или связанными подписками)
 Module55Name=Штрих-коды
 Module55Desc=Штрих-коды управления
 Module56Name=Телефония
 Module56Desc=Телефония интеграции
 Module57Name=Постоянные заказы
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Регулярные заказы и управление отменами. Также включает в себя создание SEPA-файла для европейских стран.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial интеграции
 Module59Name=Bookmark4u
@@ -486,58 +487,60 @@ Module320Name=RSS Подача
 Module320Desc=Добавить RSS канал внутри Dolibarr экране страниц
 Module330Name=Закладки
 Module330Desc=Закладки управления
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Проекты/Возможности/Покупка
+Module400Desc=Управление проектами, возможностями или потенциальными клиентами. Вы можете назначить какой-либо элемент (счет, заказ, предложение, посредничество, ...) к проекту и получить вид  в представлении проекта.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграции
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Специальные расходы (налоги, социальные выплаты, дивиденды)
+Module500Desc=Управление специальными расходами, такими как налоги, социальные выплаты, дивиденды и зарплаты
 Module510Name=Зарплаты
-Module510Desc=Management of employees salaries and payments
+Module510Desc=Управление зарплатами сотрудников и платежами
+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)
+Module600Desc=Отправлять уведомления контактам контрагентов по электронной почте о некоторых бизнес-событиях системы Dolibarr (настройка задана для каждого контрагента)
 Module700Name=Пожертвования
 Module700Desc=Пожертвования управления
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Отчёт о затратах
+Module770Desc=Управление и утверждение отчётов о затратах (на транспорт, еду)
+Module1120Name=Коммерческое предложение поставщика
+Module1120Desc=Запросить у поставщика коммерческое предложение и цены
 Module1200Name=Mantis
 Module1200Desc=Mantis интеграции
 Module1400Name=Бухгалтерия эксперт
 Module1400Desc=Бухгалтерия управления для экспертов (двойная сторон)
-Module1520Name=Document Generation
+Module1520Name=Создание документов
 Module1520Desc=Mass mail document generation
-Module1780Name=Категории
-Module1780Desc=Категории управления (продукции, поставщиков и заказчиков)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG редактор
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Управление запланированными заданиями
+Module2200Name=Динамическое ценообразование
+Module2200Desc=Разрешить использовать математические операции для цен
+Module2300Name=Планировщик Cron
+Module2300Desc=Scheduled job management
 Module2400Name=Повестка дня
 Module2400Desc=Деятельность / задачи и программы управления
 Module2500Name=Электронное управление
 Module2500Desc=Сохранение и обмен документами
 Module2600Name=WebServices
 Module2600Desc=Включить сервер услуг Dolibarr Сети
-Module2650Name=WebServices (client)
+Module2650Name=модуль WebServices  (для клиента)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Использование онлайн Gravatar службы (www.gravatar.com), чтобы показать фото пользователей / участников (нашли с их электронной почты). Необходимость доступа в Интернет
-Module2800Desc=FTP Client
+Module2800Desc=Клиент FTP
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind возможности преобразования
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
+Module3100Desc=Добавить кнопку Skype в карточку сторонников / контрагентов/ контактов
 Module5000Name=Multi-компании
 Module5000Desc=Позволяет управлять несколькими компаниями
 Module6000Name=Бизнес-Процесс
-Module6000Desc=Workflow management
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
+Module6000Desc=Управление рабочим процессом
+Module20000Name=Управляение Заявлениями на отпуск
+Module20000Desc=Объявление и проверка заявлений на отпуск работников
+Module39000Name=Серийный номер товара
 Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с PayBox
@@ -547,16 +550,16 @@ Module50200Name=Paypal
 Module50200Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
+Module54000Name=Модуль PrintIPP
+Module54000Desc=Прямая печать (без открытия документа) использует интерфейс Cups IPP  (Принтер должен быть доступен с сервера, и система печати CUPS  должна быть установлена на сервере). 
 Module55000Name=Управление Бизнес-Процессами
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Desc=Модуль для проведения онлайн голосований (такой как  Doodle, Studs, Rdvz, ...)
 Module59000Name=Наценки
 Module59000Desc=Модуль управления наценками
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
+Module60000Name=Комиссионные
+Module60000Desc=Модуль для управления комиссионными
+Module150010Name=Серийный номер, срок годности и дата продажи
+Module150010Desc=Управление Серийным номером, сроком годности и датой продажи товара
 Permission11=Читать счета
 Permission12=Создание/Изменение счета-фактуры
 Permission13=Unvalidate счетов
@@ -586,7 +589,7 @@ Permission67=Экспорт мероприятий
 Permission71=Читать участники
 Permission72=Создать / изменить участники
 Permission74=Удалить участники
-Permission75=Setup types of membership
+Permission75=Настройка типов участия
 Permission76=Экспорт данных
 Permission78=Читать подписки
 Permission79=Создать / изменить подписку
@@ -605,12 +608,12 @@ Permission95=Читать сообщения
 Permission101=Читать отправок
 Permission102=Создать / изменить отправок
 Permission104=Проверка отправок
-Permission106=Export sendings
+Permission106=Экспортировать настройки
 Permission109=Удалить отправок
 Permission111=Читать финансовой отчетности
 Permission112=Создать / изменить / удалить и сравнить сделок
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission113=Настройка финансовых учётных записей (создание, изменение категорий)
+Permission114=Согласовать транзакции
 Permission115=Экспортные операции и выписки со счета
 Permission116=Перераспределение средств между счетами
 Permission117=Управление чеки диспетчерского
@@ -627,22 +630,22 @@ Permission151=Прочитайте Регламент
 Permission152=Настройка Регламент
 Permission153=Прочитайте Регламент поступления
 Permission154=Кредитные / отказаться регламент поступления
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission161=Открыть котракты/подписки
+Permission162=Создать/изменить котракты/подписки
+Permission163=Активировать усгулу/подписку на контракте
+Permission164=Отключить услугу/подписку на контракте
+Permission165=Удалить контракты/подписки
+Permission171=Просмотреть поездки и расходы (собсвенные и подразделений)
+Permission172=Создать/изменить поездки и расходы
+Permission173=Удалить поездки и расходы
+Permission174=Просмотр поездок и расходов
+Permission178=Экспорт поездок и расходов
 Permission180=Читать поставщиков
 Permission181=Читать поставщик заказов
 Permission182=Создать / изменить поставщика заказы
 Permission183=Проверка поставщиком заказов
 Permission184=Одобрить поставщик заказов
-Permission185=Order or cancel supplier orders
+Permission185=Поставновка в заказа или отмена заказов поставщиков
 Permission186=Прием заказов поставщику
 Permission187=Закрыть поставщик заказов
 Permission188=Отмена заказов поставщику
@@ -664,13 +667,13 @@ Permission222=Создать / изменить emailings (тема, получ
 Permission223=Проверка emailings (позволяет посылать)
 Permission229=Удалить emailings
 Permission237=Просмотреть получателей и информацию
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
+Permission238=Ручная отправка почты
+Permission239=Удалить почту после подтверждения или отправки
 Permission241=Читать категорий
 Permission242=Создать / изменить категорий
 Permission243=Удаление категории
 Permission244=Посмотреть содержание скрытых категорий
-Permission251=Читайте другие пользователи и группы
+Permission251=Просмотреть других пользователей и группы
 PermissionAdvanced251=Читайте другие пользователи
 Permission252=Создать / изменить другими пользователями, группами и ваш permisssions
 Permission253=Изменение пароля другого пользователя
@@ -693,7 +696,7 @@ Permission300=Читать штрих-коды
 Permission301=Создать / изменить штрих-коды
 Permission302=Удалить штрих-коды
 Permission311=Читать услуги
-Permission312=Assign service/subscription to contract
+Permission312=Назначить услугу/подписку договору
 Permission331=Читать закладок
 Permission332=Создать / изменить закладки
 Permission333=Удаление закладок
@@ -710,10 +713,15 @@ Permission401=Читать скидки
 Permission402=Создать / изменить скидки
 Permission403=Проверить скидку
 Permission404=Удалить скидки
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
+Permission510=Открыть Зарплаты
+Permission512=Создать/изменить зарплаты
+Permission514=Удалить зарплаты
+Permission517=Экспорт зарплат
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Читать услуги
 Permission532=Создать / изменить услуг
 Permission534=Удаление услуги
@@ -723,15 +731,15 @@ Permission701=Читать пожертвований
 Permission702=Создать / изменить пожертвований
 Permission703=Удалить пожертвований
 Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
+Permission772=Создание/изменение отчётов о затратах
+Permission773=Удаление отчётов о затратах
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission776=Оплата отчётов о затратах
+Permission779=Экспорт отчётов о затратах
 Permission1001=Читать запасов
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Создать/изменить склады
+Permission1003=Удалить склады
 Permission1004=Читать фондового движения
 Permission1005=Создать / изменить фондового движения
 Permission1101=Читать доставка заказов
@@ -746,6 +754,7 @@ Permission1185=Одобрить поставщик заказов
 Permission1186=Заказ поставщику заказов
 Permission1187=Подтвердить получение поставщиками заказов
 Permission1188=Закрыть поставщик заказов
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Получите результат экспорта
 Permission1202=Создать / Изменить экспорт
 Permission1231=Читать поставщиком счета-фактуры
@@ -754,14 +763,14 @@ Permission1233=Проверка счета-фактуры поставщика
 Permission1234=Удалить поставщиком счета-фактуры
 Permission1235=Отправить поставщиком счетов по электронной почте
 Permission1236=Экспорт поставщиком счета-фактуры, качества и платежей
-Permission1237=Export supplier orders and their details
+Permission1237=Детализированный экспорт заказов поставщика
 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=Читать мероприятия (задачи, события или) других
@@ -772,43 +781,43 @@ Permission2501=Читайте документы
 Permission2502=Добавить или удалить документы
 Permission2503=Отправить или удалять документы
 Permission2515=Настройка документов, справочников
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
+Permission2801=Использовать FTP  клиент в режиме только для чтения (просмотр и загрузка файлов)
+Permission2802=Использовать FTP клиент в режиме для записи (удаление или загрузка файлов)
 Permission50101=Использовать Торговую точку
 Permission50201=Прочитано сделок
 Permission50202=Импортных операций
 Permission54001=Печать
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
+Permission55001=Открыть опросы
+Permission55002=Создать/изменить опросы
+Permission59001=Открыть коммерческие маржи
+Permission59002=Задать коммерческие маржи
 Permission59003=Read every user margin
 DictionaryCompanyType=Тип Контрагента
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
+DictionaryCompanyJuridicalType=Юридические виды контрагентов
+DictionaryProspectLevel=Потенциальный уровень предполагаемого клиента
+DictionaryCanton=Штат/провинция
 DictionaryRegion=Регионы
 DictionaryCountry=Страны
 DictionaryCurrency=Валюты
 DictionaryCivility=Вежливое обращение
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
+DictionaryActions=Тип событий по повестке дня
+DictionarySocialContributions=Типы социальных выплат
+DictionaryVAT=Значения НДС или налога с продаж
+DictionaryRevenueStamp=Количество акцизных марок
 DictionaryPaymentConditions=Условия оплаты
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaymentModes=Режимы оплаты
+DictionaryTypeContact=Типы Контактов/Адресов
+DictionaryEcotaxe=Экологический налог Ecotax (WEEE)
 DictionaryPaperFormat=Форматы бумаги
 DictionaryFees=Тип оплаты
 DictionarySendingMethods=Способы доставки
 DictionaryStaff=Персонал
 DictionaryAvailability=Задержка доставки
-DictionaryOrderMethods=Ordering methods
+DictionaryOrderMethods=Методы заказов
 DictionarySource=Происхождение Коммерческих предложений / Заказов
 DictionaryAccountancyplan=План счетов
 DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=Шаблоны электронных писем
 SetupSaved=Настройки сохранены
 BackToModuleList=Вернуться к списку модулей
 BackToDictionaryList=Назад к списку словарей
@@ -819,7 +828,7 @@ VATIsNotUsedDesc=По умолчанию, предлагаемый НДС 0, к
 VATIsUsedExampleFR=Во Франции, это означает, компаний или организаций, имеющих реальной финансовой системы (упрощенное реальных или нормальный реальный). Система, в которой НДС не объявлены.
 VATIsNotUsedExampleFR=Во Франции, это означает, объединений, которые не объявили НДС или компаний, организаций и свободных профессий, которые выбрали микропредприятиях бюджетной системы (НДС в франшиза) и оплачивается франшиза НДС без НДС декларации. Этот выбор будет отображаться ссылка "не применимо НДС - арт-293B из CGI" на счетах-фактурах.
 ##### Local Taxes #####
-LTRate=Rate
+LTRate=Ставка
 LocalTax1IsUsed=Использовать второй налог
 LocalTax1IsNotUsed=Не использовать второй налог
 LocalTax1IsUsedDesc=Использовать второй тип налога (отличный от НДС)
@@ -835,21 +844,21 @@ LocalTax2Management=Третий тип налога
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= RE управления
-LocalTax1IsUsedDescES= RE ставка по умолчанию при создании перспективы, счета, заказы и т.д. последующей стандартных правил: 
 Если те покупатель не подвергается RE, RE по умолчанию = 0. Конец правления. 
 Если покупатель подвергается RE затем RE по умолчанию. Конец правления. 

+LocalTax1IsUsedDescES= RE ставка по умолчанию при создании потенциального клиента, счета, заказы и т.д. последующей стандартных правил: 
 Если те покупатель не подвергается RE, RE по умолчанию = 0. Конец правления. 
 Если покупатель подвергается RE затем RE по умолчанию. Конец правления. 

 LocalTax1IsNotUsedDescES= По умолчанию предлагается RE 0. Конец правления.
 LocalTax1IsUsedExampleES= В Испании они являются профессионалами с учетом некоторых конкретных разделов испанский ИАЭ.
 LocalTax1IsNotUsedExampleES= В Испании они являются профессиональными и общества и при условии соблюдения определенных слоев испанского ИАЭ.
 LocalTax2ManagementES= IRPF управления
-LocalTax2IsUsedDescES= RE ставка по умолчанию при создании перспективы, счета, заказы и т.д. последующей стандартных правил: 
 Если продавец не подвергается IRPF, то IRPF по умолчанию = 0. Конец правления. 
 Если продавец подвергается IRPF то IRPF по умолчанию. Конец правления. 

+LocalTax2IsUsedDescES= RE ставка по умолчанию при создании потенциального клиента, счета, заказы и т.д. последующей стандартных правил: 
 Если продавец не подвергается IRPF, то IRPF по умолчанию = 0. Конец правления. 
 Если продавец подвергается IRPF то IRPF по умолчанию. Конец правления. 

 LocalTax2IsNotUsedDescES= По умолчанию предлагается IRPF 0. Конец правления.
 LocalTax2IsUsedExampleES= В Испании, фрилансеры и независимые специалисты, которые оказывают услуги и компаний, которые выбрали налоговой системы модулей.
 LocalTax2IsNotUsedExampleES= В Испании они бизнес не облагается налогом на системе модулей.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Отчёты
+CalcLocaltax1ES=Продажи - Покупки
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2ES=Покупки
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3ES=Продажи
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Метки, используемые по умолчанию, если нет перевода можно найти код
 LabelOnDocuments=Этикетка на документах
@@ -918,7 +927,7 @@ PermanentLeftSearchForm=Постоянный поиск формы на лево
 DefaultLanguage=Язык по умолчанию (код языка)
 EnableMultilangInterface=Включить многоязычный интерфейс
 EnableShowLogo=Показать логотип на левом меню
-EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
+EnableHtml5=Включить Html5 (В разработке - отображается только при использовании темы от Eldy)
 SystemSuccessfulyUpdated=Система была успешно обновлена
 CompanyInfo=Информация о Компании / фонде
 CompanyIds=Компания / фундамент тождествам
@@ -963,14 +972,14 @@ EventsSetup=Настройка журналов событий
 LogEvents=Безопасность ревизии события
 Audit=Аудит
 InfoDolibarr=Информация о Dolibarr
-InfoBrowser=Infos Browser
+InfoBrowser=Информация браузера
 InfoOS=Информация об OS
 InfoWebServer=Информация о Web-Сервере
 InfoDatabase=Информация о базе данных
 InfoPHP=Информация о PHP
 InfoPerf=Информация о производительности
-BrowserName=Browser name
-BrowserOS=Browser OS
+BrowserName=Имя браузера
+BrowserOS=Операционная система браузера
 ListEvents=Аудит событий
 ListOfSecurityEvents=Список Dolibarr безопасность события
 SecurityEventsPurged=Безопасность событий очищены
@@ -1043,8 +1052,8 @@ MAIN_PROXY_PASS=Пароль для использования прокси-се
 DefineHereComplementaryAttributes=Определить здесь все атрибуты, а не уже доступны по умолчанию, и что вы хотите быть поддерживается %s.
 ExtraFields=Дополнительные атрибуты
 ExtraFieldsLines=Дополнительные атрибуты (строки)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Дополнительные атбрибуты (строки заказа)
+ExtraFieldsSupplierInvoicesLines=Дополнительные атрибуты (строки счёта)
 ExtraFieldsThirdParties=Дополнительные атрибуты (контрагенты)
 ExtraFieldsContacts=Дополнительные атрибуты (контакт/адрес)
 ExtraFieldsMember=Дополнительные атрибуты (Участник)
@@ -1055,7 +1064,7 @@ ExtraFieldsSupplierOrders=Дополнительные атрибуты (Зак
 ExtraFieldsSupplierInvoices=Дополнительные атрибуты (Счета-фактуры)
 ExtraFieldsProject=Дополнительные атрибуты (Проекты)
 ExtraFieldsProjectTask=Дополнительные атрибуты (Задачи)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+ExtraFieldHasWrongValue=Атрибут %s  имеет неправильное значение.
 AlphaNumOnlyCharsAndNoSpace=только буквы и цифры без пробелов
 AlphaNumOnlyLowerCharsAndNoSpace=только латинские строчные буквы и цифры без пробелов
 SendingMailSetup=Настройка отправки по электронной почте
@@ -1063,35 +1072,35 @@ SendmailOptionNotComplete=Предупреждение, на некоторых
 PathToDocuments=Путь к документам
 PathDirectory=Каталог
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
+TranslationSetup=Настройка перевода
 TranslationDesc=Выбор языка, видимого на экране, может быть изменен:
* Глобально из меню Главная - Настройка - Display
* Только для пользователя User display карточки пользователя (нажмите на Логин вверху экрана).
-TotalNumberOfActivatedModules=Total number of activated feature modules: %s
+TotalNumberOfActivatedModules=Полное количество активированных функций модулей: %s
 YouMustEnableOneModule=Вы должны включить минимум 1 модуль
 ClassNotFoundIntoPathWarning=Класс %s не найден по PHP пути
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
+OnlyFollowingModulesAreOpenedToExternalUsers=Примечание. Следующие модули открыты для внешних пользователей (Какими бы ни были права доступа для этих пользователей)  
+SuhosinSessionEncrypt=Хранилище сессий шифровано системой SUHOSIN
+ConditionIsCurrently=Текущее состояние %s
 YouUseBestDriver=Вы используете драйвер %s, который на текущий момент является самым подходящим
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
+YouDoNotUseBestDriver=Вы используете устройство %s, но драйвер этого устройства %s не рекомендуется ипользовать. 
 NbOfProductIsLowerThanNoPb=У вас только %s Товаров/Услуг в базе данных. Это не требует никакой оптимизации.
-SearchOptim=Search optimization
+SearchOptim=Поисковая оптимизация
 YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
+BrowserIsOK=Вы используете браузер %s. Это хороший выбор с точки зрения производительности и безопасности.
 BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+XDebugInstalled=XDebug загружен.
+XCacheInstalled=XCache загружен.
 AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+FieldEdition=Редакция поля %s
+FixTZ=Исправление часового пояса
+FillThisOnlyIfRequired=Например, +2 (заполняйте это поле только тогда, когда ваш часовой пояс отличается от того, который используется на сервере)
 GetBarCode=Получить штрих-код
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+EmptyNumRefModelDesc=Код свободен. Вы можете модифицировать этот код в любое время. 
 ##### Module password generation
 PasswordGenerationStandard=Возврат пароля, полученных в соответствии с внутренними Dolibarr алгоритма: 8 символов, содержащих общие цифры и символы в нижнем регистре.
 PasswordGenerationNone=Не предлагать любые сгенерированного пароля. Пароль необходимо ввести вручную.
 ##### Users setup #####
-UserGroupSetup=Пользователи и группы модуль настройки
+UserGroupSetup=Настройка модуля Пользователи и группы 
 GeneratePassword=Предложить генерируемого пароля
 RuleForGeneratedPasswords=Правило предложили генерировать пароли
 DoNotSuggest=Не предложить какой-либо пароль
@@ -1107,15 +1116,15 @@ 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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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,...)
+DocumentModelOdt=Создавать документы из шаблонов форматов OpenDocuments (.ODT or .ODS файлы для OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark по проекту документа
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=Активировать фунцию автозаполнения строк платежа в платёжной форме
 CompanyIdProfChecker=Профессиональные Id уникальным
 MustBeUnique=Должно быть уникальным?
 MustBeMandatory=Обязательно создавать Контрагентов?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
+MustBeInvoiceMandatory=Обязательно подтверждать счета?
 Miscellaneous=Разнообразный
 ##### Webcal setup #####
 WebCalSetup=Webcalendar ссылке Настройка
@@ -1129,7 +1138,7 @@ WebCalServer=Сервер хостинга календарных данных
 WebCalDatabaseName=Название базы данных
 WebCalUser=Пользователя для доступа к базе данных
 WebCalSetupSaved=Webcalendar настройки успешно сохранены.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
+WebCalTestOk=Соединение с сервером '%s' к БД '%s' с именем пользователя '%s' выполнено успешно.
 WebCalTestKo1=Соединение с сервером ' %s' успешными, но база данных ' %s' не может быть достигнута.
 WebCalTestKo2=Соединение с сервером ' %s' пользователя ' %s' провалилась.
 WebCalErrorConnectOkButWrongDatabase=Подключение удалось, но база данных не будет смотреть Webcalendar данных.
@@ -1171,9 +1180,9 @@ AddDeliveryAddressAbility=Добавить дату доставки спосо
 UseOptionLineIfNoQuantity=Соответствие продукта / услуги с нулевой суммой считается вариант
 FreeLegalTextOnProposal=Свободный текст на коммерческие предложения
 WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Запрос банковского счёта для предложения
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
+AskPriceSupplierSetup=Настройка модуля запросов цен поставщиков
 AskPriceSupplierNumberingModules=Price requests suppliers numbering models
 AskPriceSupplierPDFModules=Price requests suppliers documents models
 FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
@@ -1183,7 +1192,7 @@ BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination o
 OrdersSetup=Приказ 'Management Setup
 OrdersNumberingModules=Приказы нумерации модулей
 OrdersModelModule=Заказ документов моделей
-HideTreadedOrders=Hide the treated or cancelled orders in the list
+HideTreadedOrders=Прятать отменённые заказы в списке
 ValidOrderAfterPropalClosed=Чтобы проверить порядок после предложения ближе, позволяет не шаг за временное распоряжение
 FreeLegalTextOnOrders=Свободный текст распоряжения
 WatermarkOnDraftOrders=Водяные знаки на черновиках Заказов ("Нет" если пусто)
@@ -1196,15 +1205,15 @@ ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url,
 Bookmark4uSetup=Bookmark4u модуль настройки
 ##### Interventions #####
 InterventionsSetup=Выступления модуль настройки
-FreeLegalTextOnInterventions=В свободной форме о вмешательстве документов
+FreeLegalTextOnInterventions=Дополнительный текст на документах посредничества
 FicheinterNumberingModules=Вмешательство нумерации модулей
 TemplatePDFInterventions=Вмешательство карту документы моделей
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+WatermarkOnDraftInterventionCards=Водяной знак на документах посредничества (нет если не задано)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Настройка модуля Договоры/подписки
 ContractsNumberingModules=Контракты нумерации модулей
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
+TemplatePDFContracts=Модели документов контрактов
+FreeLegalTextOnContracts=Дополнительный текст к доворам
 WatermarkOnDraftContractCards=Водяной знак на черновиках контрактов ("Нет" если пусто)
 ##### Members #####
 MembersSetup=Члены модуль настройки
@@ -1248,7 +1257,7 @@ LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=Полное Д.Н.
 LDAPServerExample=Адрес сервера (например: lokalny_host, 192.168.0.2, LDAPS: / / ldap.example.com /)
 LDAPServerDnExample=Complete DN (ex: dc=company,dc=Полное DN (пример: компания DC=, DC= COM)
 LDAPPasswordExample=Пароль администратора
-LDAPDnSynchroActive=Пользователи и группы синхронизации
+LDAPDnSynchroActive=Пользователи и группы синхронизация
 LDAPDnSynchroActiveExample=LDAP для Dolibarr или Dolibarr LDAP для синхронизации
 LDAPDnContactActive=Контакты "синхронизации
 LDAPDnContactActiveYes=Активированное синхронизации
@@ -1274,15 +1283,15 @@ LDAPTestSynchroContact=Тест контакта синхронизации
 LDAPTestSynchroUser=Тест пользователя синхронизации
 LDAPTestSynchroGroup=Тест группы синхронизации
 LDAPTestSynchroMember=Тест участника синхронизации
-LDAPTestSearch= Test a LDAP search
+LDAPTestSearch= Тестировать поиск LDAP 
 LDAPSynchroOK=Синхронизация успешные испытания
 LDAPSynchroKO=Сбой синхронизации тест
 LDAPSynchroKOMayBePermissions=Сбой синхронизации испытания. Убедитесь, что соединение с сервером правильно настроен, и позволяет LDAP udpates
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP соединение с сервером LDAP успешного (Server= %s, Порт= %s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP соединение с сервером LDAP Failed (Server= %s, Порт= %s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Соединение и авторизация с сервером  LDAP прошла успешно (Сервер=%s, Порт=%s, Администратор=%s, Пароль=%s)
 LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=Подключение / Authentificate для LDAP-сервера Ошибка (Server= %s, Порт= %s, Admin= %s, Пароль= %s)
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Соединение остановлено успешно
 LDAPUnbindFailed=Разъединить Failed
 LDAPConnectToDNSuccessfull=Подключение АС Д.Н. ( %s) Russie
 LDAPConnectToDNFailed=Подключение АС Д.Н. ( %s) choue
@@ -1315,7 +1324,7 @@ LDAPFieldPhoneExample=Пример: telephonenumber
 LDAPFieldHomePhone=Личный номер телефона
 LDAPFieldHomePhoneExample=Пример: homephone
 LDAPFieldMobile=Сотовый телефон
-LDAPFieldMobileExample=Example : mobile
+LDAPFieldMobileExample=Например, мобильный
 LDAPFieldFax=Номер факса
 LDAPFieldFaxExample=Пример: facsimiletelephonenumber
 LDAPFieldAddress=Улица
@@ -1338,8 +1347,8 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Пример: objectsid
 LDAPFieldEndLastSubscription=Дата окончания подписки
 LDAPFieldTitle=Должность/Функция
-LDAPFieldTitleExample=Example: title
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPFieldTitleExample=Например, заголовок
+LDAPParametersAreStillHardCoded=Параметры авторизации LDAP  недоступны (заданы жёстко в php-классе контакта)
 LDAPSetupNotComplete=Установка не завершена (переход на другие вкладки)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Нет администратора или пароль предусмотрено. LDAP доступ будет анонимным и в режиме только для чтения.
 LDAPDescContact=Эта страница позволяет определить название атрибутов LDAP в LDAP дерева для каждого данных по Dolibarr контакты.
@@ -1348,23 +1357,23 @@ LDAPDescGroups=Эта страница позволяет определить 
 LDAPDescMembers=Эта страница позволяет определить название атрибутов LDAP в LDAP дерева для каждого данных по Dolibarr участники модуля.
 LDAPDescValues=Пример значения для OpenLDAP с загружены следующие схемы: core.schema, cosine.schema, inetorgperson.schema). Если вы используете thoose ценности и OpenLDAP, модифицировать LDAP конфигурационный файл slapd.conf, чтобы все thoose схемы загрузки.
 ForANonAnonymousAccess=Для аутентифицированных доступа (для записи, например)
-PerfDolibarr=Performance setup/optimizing report
+PerfDolibarr=Настройки производительности/отчёты о оптимизации
 YouMayFindPerfAdviceHere=На этой странице вы найдете некоторые заметки и советы по улучшению производительности.
 NotInstalled=Не установлено, так что ваш сервер не может "тормозить" из-за этого.
-ApplicativeCache=Applicative cache
+ApplicativeCache=Прикладной кеш
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+OPCodeCache=Кэш OPCode
+NoOPCodeCacheFound=Кэш OPCode не найден. Возможно, вы используете другой кеш (XCache или eAccelerator хорошее решение), может вы не используете кеш OPCode вовсе (это плохое решение).
+HTTPCacheStaticResources=Кеш HTTP  для статичных ресурсов (файлы стилей, изображений, скриптов)
+FilesOfTypeCached=Файлы типа  %s кешируются HTTP  сервером
+FilesOfTypeNotCached=Файлы типа  %s не кешируются HTTP  сервером
+FilesOfTypeCompressed=Файлы типа  %s  сжимаются HTTP  сервером
+FilesOfTypeNotCompressed=Файлы типа  %s  сжимаются не HTTP  сервером
 CacheByServer=Кэшируется сервером
 CacheByClient=Кэшируется броузером
-CompressionOfResources=Compression of HTTP responses
+CompressionOfResources=Сжатие HTTP заголовков
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Продукты модуль настройки
@@ -1392,7 +1401,7 @@ SyslogSimpleFile=Файл
 SyslogFilename=Имя файла и путь
 YouCanUseDOL_DATA_ROOT=Вы можете использовать DOL_DATA_ROOT / dolibarr.log в лог-файл в Dolibarr "документы" каталог. Вы можете установить различные пути для хранения этого файла.
 ErrorUnknownSyslogConstant=Постоянная %s не известны журнала постоянная
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=Windows© поддерживает только LOG_USER
 ##### Donations #####
 DonationsSetup=Пожертвования модуль настройки
 DonationsReceiptModel=Шаблон дарения получения
@@ -1410,33 +1419,33 @@ BarcodeDescUPC=Штрих-код типа СКП
 BarcodeDescISBN=Штрих-код типа ISBN
 BarcodeDescC39=Штрих-код типа C39
 BarcodeDescC128=Штрих-код типа C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
+GenbarcodeLocation=Путь для запуска к утилите генерации штри-кодов (используется для некоторых типов штрих-кодов). Должна быть совместима с командой "genbarcode".
Например, /usr/local/bin/genbarcode
+BarcodeInternalEngine=Внутренние средства управления
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
 WithdrawalsSetup=Снятие модуля настройки
 ##### ExternalRSS #####
 ExternalRSSSetup=Внешние RSS импорт установки
 NewRSS=Новые RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrl=Ссылка RSS
+RSSUrlExample=Интересные RSS-ленты
 ##### Mailing #####
 MailingSetup=Отправка модуля настройки
 MailingEMailFrom=Отправитель EMail (С) по электронной почте было отправлено по электронной почте: модуль
 MailingEMailError=Вернуться EMail (ошибки-до) для сообщений электронной почты с ошибками
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Время ожидания в секундах перед отправкой следующего сообщения
 ##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Настройка модуля уведомлений по электронной почте
 NotificationEMailFrom=Отправитель EMail (С) по электронной почте направил уведомление
-ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+ListOfAvailableNotifications=Список событий по которым вы можете отсылать уведомления, для каждого контрагента (используйте карточку контрагента для настройки) или формализованные письма (список зависит от активированных модулей)
 FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=Отправка модуля настройки
 SendingsReceiptModel=Отправка получения модели
 SendingsNumberingModules=Отправки нумерации модулей
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Поддержка листов отгрузки для доставок клиенту
 NoNeedForDeliveryReceipts=В большинстве случаев отправок поступления используются как бюллетени для заказчика поставки (перечень продуктов для передачи), и бюллетени, которые recevied и подписывается заказчиком. Поэтому поставки продукции квитанции является дублирует функции и редко активирована.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Дополнительный текст для поставок
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Продукция Поставки получения нумерации модуль
 DeliveryOrderModel=Продукция Поставки получения модели
@@ -1449,16 +1458,16 @@ FCKeditorForCompany=WYSIWIG создание / издание компаний 
 FCKeditorForProduct=WYSIWIG создания / выпуска продукции / услуг описание и сведения
 FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.
 FCKeditorForMailing= WYSIWIG создание / издание рассылок
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+FCKeditorForUserSignature=Редактор WYSIWIG  для создания/изменения подписи пользователя
+FCKeditorForMail=Редактор WYSIWIG для создания или редактирования всех сообщений электронной почты (кроме Опции->Сообщения эл. почты)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Подключение удалось, но база данных не будет смотреть на OSCommerce данных (Ключевые% не найдено в таблице %s).
 OSCommerceTestOk=Соединение с сервером ' %s' на базе ' %s' пользователя ' %s' успешно.
 OSCommerceTestKo1=Соединение с сервером ' %s' успешными, но база данных ' %s' не может быть достигнута.
 OSCommerceTestKo2=Соединение с сервером ' %s' пользователя ' %s' провалилась.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
+StockSetup=Конфигурация модуля Склад
+UserWarehouse=Использовать персональные склады для пользователя
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Меню исключить
@@ -1494,8 +1503,8 @@ ConfirmDeleteLine=Вы уверены, что хотите удалить эту
 ##### Tax #####
 TaxSetup=Налоги, социальные взносы и дивиденды модуль настройки
 OptionVatMode=Вариант d'exigibilit де TVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Кассовый
+OptionVATDebitOption=Принцип начисления
 OptionVatDefaultDesc=НДС из-за: 
 - По доставке / оплате товаров 
 - На оплату услуг
 OptionVatDebitOptionDesc=НДС из-за: 
 - По доставке / оплате товаров 
 - На счета (дебетовой) на услуги
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
@@ -1507,15 +1516,15 @@ SupposedToBeInvoiceDate=Счет дата, используемая
 Buy=Покупать
 Sell=Продавать
 InvoiceDateUsed=Счет дата, используемая
-YourCompanyDoesNotUseVAT=Ваша компания была определена не использовать НДС (начало - Настройка - компания / фонд), так что нет НДС на эту настройку.
+YourCompanyDoesNotUseVAT=Ваша компания была определена не использовать НДС (Главная - Настройка - компания / фонд), так что нет НДС на эту настройку.
 AccountancyCode=Бухгалтерия код
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Бух. код продаж
+AccountancyCodeBuy=Бух. код покупок
 ##### Agenda #####
 AgendaSetup=Акции и повестки модуль настройки
 PasswordTogetVCalExport=Ключевые разрешить экспорт ссылке
 PastDelayVCalExport=Не экспортировать события старше
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE=Использовать типы событий (управление в меню Настройки-Словари-Типы событий списка мероприятий)
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
@@ -1524,7 +1533,7 @@ ClickToDialDesc=Этот модуль позволяет добавлять ик
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Точка продаж
 CashDeskSetup=Кассовое модуль настройки
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Общий контрагент, используемый для продаж 
 CashDeskBankAccountForSell=Денежные счета, используемого для продает
 CashDeskBankAccountForCheque= Счет будет использоваться для получения выплат чеком
 CashDeskBankAccountForCB= Учетной записи для использования на получение денежных выплат по кредитным картам
@@ -1557,9 +1566,10 @@ SuppliersSetup=Поставщик модуля установки
 SuppliersCommandModel=Полный шаблон для поставщика (logo. ..)
 SuppliersInvoiceModel=Полный шаблон поставщиком счета-фактуры (logo. ..)
 SuppliersInvoiceNumberingModel=Способ нумерации счетов-фактур Поставщика
+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.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Путь к файлу Maxmind, который требуется для геолокации. 
Например,
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Обратите внимание, что Ваш IP, чтобы страны файл данных должен быть в директории вашего PHP может читать (Проверьте ваши установки PHP open_basedir и файловой системы разрешений).
 YouCanDownloadFreeDatFileTo=Вы можете скачать бесплатную демонстрационную версию страны GeoIP MaxMind файл на %s.
 YouCanDownloadAdvancedDatFileTo=Вы также можете скачать более полную версию, с обновлениями, в стране GeoIP MaxMind файл на %s.
@@ -1572,32 +1582,37 @@ TasksNumberingModules=Модуль нумерации Задач
 TaskModelModule=Tasks reports document model
 ##### ECM (GED) #####
 ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMAutoTree = Автоматическое дерево папок и документов
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-AlwaysEditable=Can always be edited
+FiscalYears=Финансовые года
+FiscalYear=Финансовый год
+FiscalYearCard=Карточка финансового года
+NewFiscalYear=Новый финансовый год
+EditFiscalYear=Изменить финансовый год
+OpenFiscalYear=Открыть финансовый год
+CloseFiscalYear=Закрыть финансовый год
+DeleteFiscalYear=Удалить финансовый год
+ConfirmDeleteFiscalYear=Вы точно хотите удалить этот финансовый год?
+Opened=Открыты
+Closed=Закрыты
+AlwaysEditable=Всегда может быть отредактировано
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
+NbMajMin=Минимальное количество символов в врехнем регистре
+NbNumMin=Минимальное количество цифр
+NbSpeMin=Минимальное количество специальных символов
+NbIteConsecutive=Максимальное количество повторяющихся повторяющихся одинаковых символов
 NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+SalariesSetup=Настройка модуля зарплат
+SortOrder=Порядок сортировки
 Format=Формат
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
+IncludePath=Путь к заголовочным файлам (задан в переменной %s)
+ExpenseReportsSetup=Настройка модуля Отчёты о затратах
+TemplatePDFExpenseReports=Шаблон документа для создания отчёта о затратах
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+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
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index 0b73270073e..907b0e05c15 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -6,11 +6,11 @@ Agenda=Повестка дня
 Agendas=Повестка дня
 Calendar=Календарь
 Calendars=Календари
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+LocalAgenda=Внутренний календарь
+ActionsOwnedBy=Событие принадлежит 
 AffectedTo=Ответств.
 DoneBy=Сделано
-Event=Event
+Event=Событие
 Events=События
 EventsNb=Количество событий
 MyEvents=Мои события
@@ -23,20 +23,20 @@ MenuToDoActions=Все незавершенные события
 MenuDoneActions=Все прекращенные события
 MenuToDoMyActions=Мои незавершенные события
 MenuDoneMyActions=Мои прекращенные события
-ListOfEvents=List of events (internal calendar)
-ActionsAskedBy=Действия зарегистрированы
-ActionsToDoBy=События назначенные
+ListOfEvents=Список событий из внутреннего календаря
+ActionsAskedBy=События созданы
+ActionsToDoBy=события назначены
 ActionsDoneBy=Действия, проделанную
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
-ActionAssignedTo=Event assigned to
+ActionsForUser=События пользователя
+ActionsForUsersGroup=События всех пользователей в группе
+ActionAssignedTo=Событие назначено для
 AllMyActions= Все мои действия / задачи
 AllActions= Все ле действия / задачи
 ViewList=Посмотреть список
 ViewCal=Просмотр календаря
 ViewDay=Обзор дня
 ViewWeek=Обзор недели
-ViewPerUser=Per user view
+ViewPerUser=Просмотр по пользователям
 ViewWithPredefinedFilters= Вид с встроенные фильтры
 AutoActions= Автоматическое заполнение дня
 AgendaAutoActionDesc= Определить здесь события, для которого вы хотите Dolibarr создать автоматическое действие в повестку дня. Если ничего не будет проверяться (по умолчанию), только вручную действия, будут включены в повестку дня.
@@ -45,12 +45,15 @@ AgendaExtSitesDesc=Эта страница позволяет настроить
 ActionsEvents=События, за которые Dolibarr создадут действий в повестку дня автоматически
 PropalValidatedInDolibarr=Предложение проверены
 InvoiceValidatedInDolibarr=Счет проверены
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Счёт %s подтверждён с платёжного терминала
 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
+OrderRefusedInDolibarr=Заказ %s  отклонён
 OrderBackToDraftInDolibarr=Заказ %s возращен в статус черновик
 OrderCanceledInDolibarr=Заказ %s отменен
 ProposalSentByEMail=Коммерческое предложение %s отправлены по электронной почте
@@ -58,8 +61,8 @@ OrderSentByEMail=Заказ покупателя %s отправлен по эл
 InvoiceSentByEMail=Счет-фактура клиента %s отправлен по электронной почте
 SupplierOrderSentByEMail=Поставщик порядке %s отправлены по электронной почте
 SupplierInvoiceSentByEMail=Поставщиком счета %s отправлены по электронной почте
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
+ShippingSentByEMail=Посылка %s отправлена с помощью EMail
+ShippingValidated= Отправка %s  подтверждена
 InterventionSentByEMail=Intervention %s sent by EMail
 NewCompanyToDolibarr= Третья группа создала
 DateActionPlannedStart= Планируемая дата начала
@@ -73,21 +76,23 @@ AgendaUrlOptions2=login=%s to restrict output to actions created by or as
 AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s.
 AgendaUrlOptions4=logint=logint= %s ограничить выход на действия пользователя, пострадавших %s.
 AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID.
-AgendaShowBirthdayEvents=Показать рождения контакты
+AgendaShowBirthdayEvents=Показывать дни рождения контактов
 AgendaHideBirthdayEvents=Скрыть рождения контакты
 Busy=Занят
 ExportDataset_event1=Список запланированных мероприятий
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Диапазон рабочих дней в неделе по умолчанию (Например, 1-5 или 1-6)
+DefaultWorkingHours=Диапазон рабочих часов в день (Например, с 9-18)
 # External Sites ical
 ExportCal=Экспорт календаря
 ExtSites=Внешние календари
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Показывать внешние календари (заданные в глобальных настройках) в повестке дня. Не окажет влияния на внешние календари, заданные пользователями.
 ExtSitesNbOfAgenda=Количество календарей
 AgendaExtNb=Календарь NB %s
 ExtSiteUrlAgenda=URL для доступа. Ческих файлов
 ExtSiteNoLabel=Нет описания
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
-AddEvent=Create event
-MyAvailability=My availability
+WorkingTimeRange=Диапазон рабочего времени
+WorkingDaysRange=Диапазон рабочих дней
+AddEvent=Создать событие
+MyAvailability=Моя доступность
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 7325c4e6538..22beeaf591f 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -8,7 +8,7 @@ FinancialAccount=Учетная запись
 FinancialAccounts=Счета
 BankAccount=Банковский счет
 BankAccounts=Банковские счета
-ShowAccount=Show Account
+ShowAccount=Показать учётную запись
 AccountRef=Финансовые счета исх
 AccountLabel=Финансовые счета этикетки
 CashAccount=Денежные счета
@@ -33,11 +33,11 @@ AllTime=Сначала
 Reconciliation=Примирение
 RIB=Bank Account Number
 IBAN=IBAN номера
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=Номер счета IBAN верный
+IbanNotValid=Номер счета IBAN не верный
 BIC=BIC / SWIFT число
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=Номер BIC/SWIFT верный
+SwiftNotValid=Номер BIC/SWIFT не верный
 StandingOrders=Постоянные заказы
 StandingOrder=Постоянная порядка
 Withdrawals=Снятие
@@ -110,7 +110,7 @@ ConciliatedBy=Conciliated путем
 DateConciliating=Согласительную дата
 BankLineConciliated=Сделка conciliated
 CustomerInvoicePayment=Заказчиком оплаты
-CustomerInvoicePaymentBack=Customer payment back
+CustomerInvoicePaymentBack=Банк для платежей клиента
 SupplierInvoicePayment=Поставщик оплаты
 WithdrawalPayment=Снятие оплаты
 SocialContributionPayment=Социальный вклад оплаты
@@ -153,13 +153,13 @@ ShowAllAccounts=Шоу для всех учетных записей
 FutureTransaction=Сделки в Futur. Ни в коем случае к согласительной процедуре.
 SelectChequeTransactionAndGenerate=Выбор / фильтр проверяет, включать в получении депозита проверки и нажмите кнопку "Создать".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
+EventualyAddCategory=Укажите категорию для классификации записей
 ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-BankDashboard=Bank accounts summary
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+ThenCheckLinesAndConciliate=Проверьте последние строки в выписке по счёту из банка и нажмите
+BankDashboard=Суммарная информация по банковским счетам
+DefaultRIB=Номер счета BAN по умолчанию
+AllRIB=Все номера счетов BAN
+LabelRIB=Метка номера счета BAN
+NoBANRecord=Нет записи с номером счета BAN
+DeleteARib=Удалить запись в номером счета BAN
+ConfirmDeleteRib=Вы точно хотите удалить запись с номером счета BAN ?
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index a7eac867c68..5b8e7625201 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -1,33 +1,33 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Счет-фактура
-Bills=Счета-фактуры
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+Bill=Счёт
+Bills=Счета
+BillsCustomers=Счета клиентов
+BillsCustomer=Счёт клиентов
+BillsSuppliers=Счета поставщиков
+BillsCustomersUnpaid=Неоплаченные счета клиентов
 BillsCustomersUnpaidForCompany=Неоплаченные счета-фактуры Покупателю для %s
 BillsSuppliersUnpaid=Неоплаченные счетов-фактуры Поставщиков
 BillsSuppliersUnpaidForCompany=Неоплаченные счета-фактуры поставщика для %s
 BillsLate=Просроченные платежи
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Статистика счетов клиентов
+BillsStatisticsSuppliers=Статистика счетов поставщиков
 DisabledBecauseNotErasable=Неактивны, потому что не могут быть стерты
 InvoiceStandard=Стандартный счет-фактура
 InvoiceStandardAsk=Стандартный счет-фактура
-InvoiceStandardDesc=Такой вид счета-фактуры является общим.
+InvoiceStandardDesc=Такой вид счёта является общим.
 InvoiceDeposit=Счета-фактура на взнос
 InvoiceDepositAsk=Счета-фактура на взнос
 InvoiceDepositDesc=Этот вид счета-фактуры оформляется при получении взноса.
-InvoiceProForma=Формальный счет-фактура
+InvoiceProForma=Формальный счёт
 InvoiceProFormaAsk=Формальный счет-фактура
 InvoiceProFormaDesc=Формальный счет-фактура является образом подлинного счета-фактуры, но не имеет бухгалтерской учетной стоимости.
 InvoiceReplacement=Замена счета-фактуры
 InvoiceReplacementAsk=Замена счета-фактуры на другой
-InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=Замена счёта  используется для отмены и замены всего счёта, когда оплата по нему ещё не получена. \n

 Примечание: только неоплаченные счета могут быть заменены. Если счёт, который вы заменяете, ещё не закрыт, он будет автоматически закрыт и помечен "потерянный".  
 InvoiceAvoir=Кредитовое авизо
 InvoiceAvoirAsk=Кредитовое авизо для исправления счета-фактуры
 InvoiceAvoirDesc=Кредитовое авизо - это 'обратный' счет-фактура, который используется для решения проблемы, когда выставлен счета-фактуры в сумме отличной от действительно оплаченной (если клиентом оплатил слишком много по ошибке, или не наоборот - не оплатил счет-фактуру полностью, поскольку он вернулся некоторые продукты, например).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithLines=Создать кредитное авизо со строками из оригинального счёта
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=Заменить счет-фактуру %s
@@ -58,7 +58,7 @@ Payment=Платеж
 PaymentBack=Возврат платежа
 Payments=Платежи
 PaymentsBack=Возвраты платежа
-PaidBack=Paid back
+PaidBack=Возврат платежа
 DatePayment=Дата платежа
 DeletePayment=Удалить платеж
 ConfirmDeletePayment=Вы уверены, что хотите удалить этот платеж?
@@ -71,14 +71,14 @@ ReceivedCustomersPaymentsToValid=Полученные платежи покуп
 PaymentsReportsForYear=Отчеты о платежах за %s
 PaymentsReports=Отчеты о платежах
 PaymentsAlreadyDone=Платежи уже сделаны
-PaymentsBackAlreadyDone=Payments back already done
+PaymentsBackAlreadyDone=Возврат платежа произведён.
 PaymentRule=Правила оплаты
 PaymentMode=Тип платежа
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentTerm=Условия платежа
+PaymentConditions=Условия платежа
+PaymentConditionsShort=Условия платежа
 PaymentAmount=Сумма платежа
-ValidatePayment=Validate payment
+ValidatePayment=Подтвердть платёж
 PaymentHigherThanReminderToPay=Платеж больше, чем в напоминании об оплате
 HelpPaymentHigherThanReminderToPay=Внимание, сумма оплаты по одному или нескольким документам выше остатка к оплате. 
 Измените вашу запись, или подтвердите и подумать о создании кредитового авизо на превышения, полученные за каждый переплаченный счет-фактуру.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. 
 Edit your entry, otherwise confirm.
@@ -88,8 +88,8 @@ ClassifyCanceled=Классифицировать как 'Аннулирован
 ClassifyClosed=Классифицировать как 'Закрыт'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Создать счет-фактуру
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
+AddBill=Создать счёт или кредитное авизо
+AddToDraftInvoices=Добавить проект счёта
 DeleteBill=Удалить счет-фактуру
 SearchACustomerInvoice=Поиск счета-фактуры Покупателю
 SearchASupplierInvoice=Поиск счета-фактуры Поставщика
@@ -100,7 +100,7 @@ DoPaymentBack=Возвратить платеж
 ConvertToReduc=Преобразовать в будущую скидку
 EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя
 EnterPaymentDueToCustomer=Произвести платеж за счет Покупателя
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Отключено, потому что оставшаяся оплата нулевая
 Amount=Сумма
 PriceBase=Ценовая база
 BillStatus=Статус счета-фактуры
@@ -155,9 +155,9 @@ ConfirmCancelBill=Вы уверены, что хотите отменить сч
 ConfirmCancelBillQuestion=Почему вы хотите классифицировать этот счет-фактуру как 'Аннулирован'?
 ConfirmClassifyPaidPartially=Вы  уверены, что хотите изменить статус счет-фактуры %s  на 'Оплачен'?
 ConfirmClassifyPaidPartiallyQuestion=Этот счет-фактура не оплачен полностью. Укажите причины закрытия счета-фактуры?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Оставить неоплаченной (%s %s) предоставленную скидку, потому что платёж был сделан перед соглашением. Я уплачу НДС с помощью кредитного авизо.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Оставить неоплаченной (%s %s) предоставленную скидку, потому что платёж был сделан перед соглашением. Я подтверждаю потерю НДС на этой скидке.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Оставить неоплаченной (%s %s) предоставленную скидку, потому что платёж был сделан перед соглашением. Я восстановлю НДС на этой скидке без кредитного авизо.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Плохой Покупатель
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукция частично возвращена
 ConfirmClassifyPaidPartiallyReasonOther=Сумма, аннулированная по другим причинам
@@ -190,20 +190,20 @@ AlreadyPaid=Уже оплачен
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Уже оплачен (без кредитовых авизо и взносов)
 Abandoned=Брошен
-RemainderToPay=Remaining unpaid
+RemainderToPay=Оставить неоплаченным
 RemainderToTake=Remaining amount to take
 RemainderToPayBack=Remaining amount to pay back
-Rest=Pending
+Rest=В ожидании
 AmountExpected=Заявленная сумма
 ExcessReceived=Полученный излишек
 EscompteOffered=Предоставлена скидка (за досрочный платеж)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=Представление счёта %s
+SendReminderBillRef=Представление счёта %s (напоминание)
 StandingOrders=Регламенты
 StandingOrder=Регламент
 NoDraftBills=Нет проектов счетов-фактур
 NoOtherDraftBills=Нет других проектов счетов-фактур
-NoDraftInvoices=No draft invoices
+NoDraftInvoices=Нет проектов счетов
 RefBill=Референс Счета-фактуры
 ToBill=Для выставления
 RemainderToBill=Остаток к выставлению
@@ -223,13 +223,13 @@ NonPercuRecuperable=Не подлежащий взысканию
 SetConditions=Установить условия оплаты
 SetMode=Установить режим оплаты
 Billed=Выставлен
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Шаблоны счёта
+RepeatableInvoices=Шаблоны счетов
+Repeatable=Шаблон
+Repeatables=Шаблоны
+ChangeIntoRepeatableInvoice=Конвертировать в шаблон счёта
+CreateRepeatableInvoice=Создать шаблон счёта
+CreateFromRepeatableInvoice=Создать из шаблона счёта
 CustomersInvoicesAndInvoiceLines=Счета-фактуры Покупателям и строки счетов-фактур
 CustomersInvoicesAndPayments=Счета-фактуры Покупателям и платежи
 ExportDataset_invoice_1=Счета-фактуры Покупателям и строки счетов-фактур
@@ -243,12 +243,12 @@ Discount=Скидка
 Discounts=Скидки
 AddDiscount=Создать абсолютную скидку
 AddRelativeDiscount=Создать относительная скидка
-EditRelativeDiscount=Edit relative discount
+EditRelativeDiscount=Отредактировать относительную скидку
 AddGlobalDiscount=Добавить скидку
 EditGlobalDiscounts=Редактировать абсолютной скидки
 AddCreditNote=Создать кредитовое авизо
 ShowDiscount=Показать скидку
-ShowReduc=Show the deduction
+ShowReduc=Показать вычет
 RelativeDiscount=Относительная скидка
 GlobalDiscount=Глобальная скидка
 CreditNote=Кредитовое авизо
@@ -285,7 +285,7 @@ InvoiceNotChecked=Счет-фактура не выбран
 CloneInvoice=Дублировать счет-фактуру
 ConfirmCloneInvoice=Вы уверены, что хотите дублировать счет-фактуру %s?
 DisabledBecauseReplacedInvoice=Действия отключены поскольку счет-фактура был заменен
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+DescTaxAndDividendsArea=Эта зона представляет суммарную информацию по платежам на специальные расходы. Только записи с платежами в течении фиксированного года будут показаны.
 NbOfPayments=Кол-во платежей
 SplitDiscount=Разделить скидку на две
 ConfirmSplitDiscount=Вы уверены, что хотите разделить эту скидку %s %s на 2 меньшие скидки?
@@ -294,8 +294,10 @@ TotalOfTwoDiscountMustEqualsOriginal=Сумма двух новых скидок
 ConfirmRemoveDiscount=Вы уверены, что хотите удалить эту скидку?
 RelatedBill=Связанный счет-фактура
 RelatedBills=Связанные счета-фактуры
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Предупреждение! Счёт (или счета) уже существуют
 
 # PaymentConditions
 PaymentConditionShortRECEP=Немедленно
@@ -310,12 +312,12 @@ PaymentConditionShort60DENDMONTH=60 дней в конце месяца
 PaymentCondition60DENDMONTH=60 дней в конце месяца
 PaymentConditionShortPT_DELIVERY=Доставка
 PaymentConditionPT_DELIVERY=О доставке
-PaymentConditionShortPT_ORDER=On order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_ORDER=В заказе
+PaymentConditionPT_ORDER=В заказе
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-FixAmount=Fix amount
-VarAmount=Variable amount (%% tot.)
+PaymentConditionPT_5050=50%% аванс, 50%% после доставки
+FixAmount=Фиксированное значение
+VarAmount=Произвольное значение (%% от суммы)
 # PaymentType
 PaymentTypeVIR=Взнос в Банк
 PaymentTypeShortVIR=Взнос в Банк
@@ -349,7 +351,7 @@ ChequeNumber=Чек N
 ChequeOrTransferNumber=Чек/Перевод N
 ChequeMaker=Проверьте отправителя
 ChequeBank=Банк чека
-CheckBank=Check
+CheckBank=Проверить
 NetToBePaid=Чистыми к оплате
 PhoneNumber=Тел.
 FullPhoneNumber=Телефон
@@ -393,11 +395,11 @@ PayedByThisPayment=Оплачен этим платежом
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
 AllCompletelyPayedInvoiceWillBeClosed=Все счета, без остатка к оплате будут автоматически закрыты со статусом "Оплачен".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+ToMakePayment=Платить
+ToMakePaymentBack=Возврат платежа
+ListOfYourUnpaidInvoices=Список неоплаченных счетов
+NoteListOfYourUnpaidInvoices=Примечание: Этот список содержит счета только тех контрагентов, которые связаны с нами, как представители по сбыту.
+RevenueStamp=Штамп о уплате налогов
 YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
 PDFCrabeDescription=Шаблон Счета-фактуры Crabe. Полный шаблон (вспомогательные опции НДС, скидки, условия платежей, логотип и т.д. ..)
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -421,11 +423,11 @@ InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 Progress=Progress
-ModifyAllLines=Modify all lines
+ModifyAllLines=Изменить все строки
 CreateNextSituationInvoice=Create next situation
 NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No opened situations
-InvoiceSituationLast=Final and general invoice
+InvoiceSituationLast=Финальный и основной счёт
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index eacd9d94a10..7cdba89fb3f 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Информация RSS
 BoxLastProducts=Последние %s товары / услуги
-BoxProductsAlertStock=Products in stock alert
+BoxProductsAlertStock=Предупреждение о появлении товара на складе
 BoxLastProductsInContract=Последние %s проданные товары / услуги
 BoxLastSupplierBills=Последние счета-фактуры от поставщиков
 BoxLastCustomerBills=Последние счета-фактуры покупателям
@@ -12,13 +12,14 @@ BoxLastProspects=Последние измененные потенциальн
 BoxLastCustomers=Последние измененные покупатели
 BoxLastSuppliers=Последние измененные поставщики
 BoxLastCustomerOrders=Последние заказы покупателей
+BoxLastValidatedCustomerOrders=Последние проверенные заказы клиента
 BoxLastBooks=Последние сделки
 BoxLastActions=Последние действия
 BoxLastContracts=Последние договоры
 BoxLastContacts=Последние контакты / адреса
 BoxLastMembers=Последнее участники
 BoxFicheInter=Последние мероприятия
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Открытые остатки на счетах
 BoxSalesTurnover=Оборот по продажам
 BoxTotalUnpaidCustomerBills=Общая сумма неоплаченных счетов-фактур покупателям
 BoxTotalUnpaidSuppliersBills=Общая сумма неоплаченных счетов-фактур поставщиков
@@ -26,27 +27,30 @@ BoxTitleLastBooks=Последние %s зарегистрированных с
 BoxTitleNbOfCustomers=Кол-во покупателей
 BoxTitleLastRssInfos=Последние %s новостей от %s
 BoxTitleLastProducts=Последние %s измененные товары / услуги
-BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Последние %s измененные заказы покупателей
+BoxTitleProductsAlertStock=Предупреждение о появлении товара на складе
+BoxTitleLastCustomerOrders=Последние %s  заказы клиента
+BoxTitleLastModifiedCustomerOrders=Последние %s  изменённых заказов клиента
 BoxTitleLastSuppliers=Последние %s зарегистрированных поставщиков
 BoxTitleLastCustomers=Последние %s зарегистрированных покупателей
 BoxTitleLastModifiedSuppliers=Последнее %s измененных поставщиков
 BoxTitleLastModifiedCustomers=Последнее %s измененных покупателей
-BoxTitleLastCustomersOrProspects=Последние %s зарегистрированных покупателей и потенциальных клиентов
-BoxTitleLastPropals=Последние %s зарегистрированных предложений
+BoxTitleLastCustomersOrProspects=Последние %s  клиенты или потенциальные клиенты
+BoxTitleLastPropals=Последние %s  предложений
+BoxTitleLastModifiedPropals=Последние %s  изменённых предложений
 BoxTitleLastCustomerBills=Последние %s счетов-фактур покупателям
+BoxTitleLastModifiedCustomerBills=Последние %s  изменённых счетов клиентов
 BoxTitleLastSupplierBills=Последние %s счетов-фактур поставщиков
-BoxTitleLastProspects=Последние %s зарегистрированных потенциальных клиентов
+BoxTitleLastModifiedSupplierBills=Последние %s  изменённых счетов поставщика
 BoxTitleLastModifiedProspects=Последнее %s измененных потенциальных клиентов
 BoxTitleLastProductsInContract=Последние %s товаров / услуг в договорах
-BoxTitleLastModifiedMembers=Последние %s измененных участников
+BoxTitleLastModifiedMembers=Последние %s  участников
 BoxTitleLastFicheInter=%s последних измененных мероприятий
-BoxTitleOldestUnpaidCustomerBills=%s самых старых неоплаченных счетов-фактур покупателям
-BoxTitleOldestUnpaidSupplierBills=%s самых старых неоплаченных счетов-фактур поставщиков
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleOldestUnpaidCustomerBills=%s самых старых неоплаченных счетов клиентов
+BoxTitleOldestUnpaidSupplierBills=%s самых старых неоплаченных счетов поставщиков
+BoxTitleCurrentAccounts=Открытые остатки на счетах
 BoxTitleSalesTurnover=Оборот по продажам
-BoxTitleTotalUnpaidCustomerBills=Неоплаченные счета-фактуры покупателям
-BoxTitleTotalUnpaidSuppliersBills=Неоплаченные счета-фактуры поставщиков
+BoxTitleTotalUnpaidCustomerBills=Неоплаченные счета клиента
+BoxTitleTotalUnpaidSuppliersBills=Не оплаченные счета  поставщица
 BoxTitleLastModifiedContacts=Последние %s измененных контактов / адресов
 BoxMyLastBookmarks=Мои последние %s закладок
 BoxOldestExpiredServices=Старейшие активных истек услуги
@@ -74,18 +78,19 @@ NoRecordedProducts=Нет зарегистрированных товаров /
 NoRecordedProspects=Нет зарегистрированных потенциальных клиентов
 NoContractedProducts=Нет законтрактованных товаров / услуг
 NoRecordedContracts=Нет введенных договоров
-NoRecordedInterventions=No recorded interventions
+NoRecordedInterventions=Нет записанных мероприятий
 BoxLatestSupplierOrders=Последние заказы поставщикам
-BoxTitleLatestSupplierOrders=%s последних заказов поставщикам
-NoSupplierOrder=No recorded supplier order
-BoxCustomersInvoicesPerMonth=Customer invoices per month
-BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-BoxCustomersOrdersPerMonth=Customer orders per month
-BoxSuppliersOrdersPerMonth=Supplier orders per month
+BoxTitleLatestSupplierOrders=Последние %s заказов поставщика 
+BoxTitleLatestModifiedSupplierOrders=Последние %s  изменённых заказов поставщика
+NoSupplierOrder=Нет записанные заказов поставщика
+BoxCustomersInvoicesPerMonth=Счета клиентов по месяцам
+BoxSuppliersInvoicesPerMonth=Счета поставщиков по месяцам
+BoxCustomersOrdersPerMonth=Заказы клиента по месяцам
+BoxSuppliersOrdersPerMonth=Заказы поставщика по месяцам
 BoxProposalsPerMonth=Предложений в месяц
 NoTooLowStockProducts=Ни один из продуктов не достиг минимума складского запаса
-BoxProductDistribution=Products/Services distribution
-BoxProductDistributionFor=Distribution of %s for %s
+BoxProductDistribution=РаспространениеТоваров/Услуг
+BoxProductDistributionFor=Распространение %s  для %s
 ForCustomersInvoices=Счета-фактуры Покупателей
-ForCustomersOrders=Customers orders
+ForCustomersOrders=Заказы клиентов
 ForProposals=Предложения
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 221d09fdfc2..cf56a703dd7 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -9,10 +9,10 @@ CashDeskBankCheque=Банковский счет (чек)
 CashDeskWarehouse=Склад
 CashdeskShowServices=Продажа услуг
 CashDeskProducts=Продукты
-CashDeskStock=Акции
+CashDeskStock=Запасы на складе
 CashDeskOn=на
 CashDeskThirdParty=Третье лицо
-# CashdeskDashboard=Point of sale access
+CashdeskDashboard=Доступ к точкам продажи
 ShoppingCart=Корзина
 NewSell=Новые продать
 BackOffice=Бэк-офис
@@ -36,5 +36,5 @@ BankToPay=Пополнять счета
 ShowCompany=Показать компании
 ShowStock=Показать склад
 DeleteArticle=Нажмите, чтобы удалить эту статью
-# FilterRefOrLabelOrBC=Search (Ref/Label)
-# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+FilterRefOrLabelOrBC=Поиск (ссылке/метке)
+UserNeedPermissionToEditStockToUsePos=Вы просите уменьшить запас на складе при создании счёта, поэтому пользователь, использующий POS-терминал, должен иметь права доступа для редактирования запаса на складе.
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index 7def19ba998..8da468cf547 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/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=%s успешно добавлена.
-ObjectAlreadyLinkedToCategory=Элемент уже связан с этой категорией.
-CategorySuccessfullyCreated=Категория %s успешно добавлена.
-ProductIsInCategories=Товар/услуга принадлежит к следующим категориям
-SupplierIsInCategories=Контрагент принадлежит к следующим категориям поставщиков
-CompanyIsInCustomersCategories=Этот контрагент принадлежит к следующим категориям покупателей/потенциальных клиентов
-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=Назад к карточке покупателя/потенц
 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=Категории Покупателей/Потенц. клиентов
-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=Код категории
-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
+AddProductServiceIntoCategory=Добавить следующий товар/услугу
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang
index f60182a8f80..b105861f7da 100644
--- a/htdocs/langs/ru_RU/commercial.lang
+++ b/htdocs/langs/ru_RU/commercial.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Коммерческие
-CommercialArea=Коммерческие площади
-CommercialCard=Коммерческая карту
-CustomerArea=Клиенты область
+Commercial=Коммерция
+CommercialArea=Раздел коммерции
+CommercialCard=Карточка коммерции
+CustomerArea=Раздел клиентов
 Customer=Клиент
-Customers=Заказчики
-Prospect=Проспект
-Prospects=Перспективы
-DeleteAction=Удалить действия / задачи
-NewAction=Новые меры / задачи
-AddAction=Create event/task
-AddAnAction=Create an event/task
-AddActionRendezVous=Create a Rendez-vous event
-Rendez-Vous=Свидание
-ConfirmDeleteAction=Вы уверены, что хотите удалить эту задачу?
-CardAction=Действия карточки
+Customers=Клиенты
+Prospect=Потенциальный клиент
+Prospects=Потенциальные клиенты
+DeleteAction=Удалить событие / задачу
+NewAction=Новое событие / задача
+AddAction=Создать событие/задачу
+AddAnAction=Создать событие/задачу
+AddActionRendezVous=Создать назначенное событие
+Rendez-Vous=Назначенное
+ConfirmDeleteAction=Вы уверены, что хотите удалить эту задачу/событие?
+CardAction=Карточка события
 PercentDone=Процент завершенности
 ActionOnCompany=Задача о компании
 ActionOnContact=Задача о контакте
@@ -33,7 +33,7 @@ ErrorWrongCode=Неверный код
 NoSalesRepresentativeAffected=Нет частности торговый представитель пострадавших
 ShowCustomer=Показать заказчика
 ShowProspect=Показать проспект
-ListOfProspects=Список перспективы
+ListOfProspects=Список потенциальных клиентов
 ListOfCustomers=Список клиентов
 LastDoneTasks=Последние %s завершенных задач
 LastRecordedTasks=Последние зарегистрированные задач
@@ -44,8 +44,8 @@ DoneActions=Совершено действия
 DoneActionsFor=Совершено меры для %s
 ToDoActions=Неполные действия
 ToDoActionsFor=Неполные действия %s
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
+SendPropalRef=Представление коммерческого предложения %s
+SendOrderRef=Представление заказа %s
 StatusNotApplicable=Не применяется
 StatusActionToDo=Чтобы сделать
 StatusActionDone=Готово
@@ -62,7 +62,7 @@ LastProspectContactDone=Контакт сделали
 DateActionPlanned=Сроки действия, запланированные на
 DateActionDone=Сроки действия сделали
 ActionAskedBy=Действий, заданных
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Событие связано с
 ActionDoneBy=Действий, проделанную
 ActionUserAsk=Зарегистрировано
 ErrorStatusCantBeZeroIfStarted=Если поле 'Дата сделали' заполнен, действие начинается (или закончили), так что поле "Статус" не может быть 0%%.
@@ -71,7 +71,7 @@ ActionAC_FAX=Отправить факс
 ActionAC_PROP=Отправить предложение по Email
 ActionAC_EMAIL=Отправить электронное письмо
 ActionAC_RDV=Встречи
-ActionAC_INT=Intervention on site
+ActionAC_INT=Вмешательство на сайте
 ActionAC_FAC=Отправить платежную
 ActionAC_REL=Отправить платежную (напоминание)
 ActionAC_CLO=Закрыть
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index d453f1b3fba..31d81132f6a 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -18,7 +18,7 @@ NewCompany=Новая компания (проспект, покупатель,
 NewThirdParty=Новые третьей стороне (проспект, клиента, поставщика)
 NewSocGroup=Новая группа компаний
 NewPrivateIndividual=Новое физическое лицо (проспект, клиента, поставщика)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateDolibarrThirdPartySupplier=Создать контрагента (поставщика)
 ProspectionArea=Область потенциальных клиентов
 SocGroup=Группа компаний
 IdThirdParty=Код контрагента
@@ -37,7 +37,7 @@ ThirdParty=Контрагент
 ThirdParties=Контрагенты
 ThirdPartyAll=Контрагенты (все)
 ThirdPartyProspects=Потенциальные клиенты
-ThirdPartyProspectsStats=Перспективы
+ThirdPartyProspectsStats=Потенциальные клиенты
 ThirdPartyCustomers=Покупатели
 ThirdPartyCustomersStats=Заказчики
 ThirdPartyCustomersWithIdProf12=Покупатели с %s или %s
@@ -82,8 +82,8 @@ Poste= Должность
 DefaultLang=Язык по умолчанию
 VATIsUsed=НДС используется
 VATIsNotUsed=НДС не используется
-CopyAddressFromSoc=Fill address with thirdparty address
-NoEmailDefined=There is no email defined
+CopyAddressFromSoc=Заполните адрес адресом контагента
+NoEmailDefined=Не задан адрес элетронной почты
 ##### Local Taxes #####
 LocalTax1IsUsedES= RE используется
 LocalTax1IsNotUsedES= RE не используется
@@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF используется
 LocalTax2IsNotUsedES= IRPF не используется
 LocalTax1ES=Повторно
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=Тип налога RE
+TypeLocaltax2ES=Тип налога IRPF 
+TypeES=Тип
 ThirdPartyEMail=%s
 WrongCustomerCode=Неверный код Покупателя
 WrongSupplierCode=Неверный код Поставщика
@@ -101,18 +101,18 @@ CustomerCodeModel=Шаблон кода Покупателя
 SupplierCodeModel=Шаблон кода Поставщика
 Gencod=Штрих-код
 ##### Professional ID #####
-ProfId1Short=Проф ID 1
-ProfId2Short=Проф ID 2
-ProfId3Short=Проф ID 3
-ProfId4Short=Проф ID 4
-ProfId5Short=Проф ID 5
-ProfId6Short=Prof. id 5
+ProfId1Short=Основной государственный регистрационный номер
+ProfId2Short=Идентификационный номер налогоплательщика 
+ProfId3Short=Код причины постановки на учет
+ProfId4Short=Код общероссийского классификатора предприятий и организаций
+ProfId5Short=Код 5
+ProfId6Short=Код 5
 ProfId1=Профессиональный ID 1
 ProfId2=Профессиональный ID 2
 ProfId3=Профессиональный ID 3
 ProfId4=Профессиональный ID 4
 ProfId5=Профессиональный ID 5
-ProfId6=Professional ID 6
+ProfId6=Профессиональный ID 6
 ProfId1AR=Проф Id 1 (CUIL)
 ProfId2AR=Проф Id 2 (Revenu скоты)
 ProfId3AR=-
@@ -132,9 +132,9 @@ ProfId4BE=-
 ProfId5BE=-
 ProfId6BE=-
 ProfId1BR=-
-ProfId2BR=IE (Inscricao Estadual)
-ProfId3BR=IM (Inscricao Municipal)
-ProfId4BR=CPF
+ProfId2BR=Номер IE (Для Бразилии, государственной регистрации юридических лиц) 
+ProfId3BR=Номер IM (для Бразилии)
+ProfId4BR=Номер CPF (Для Бразилии)
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=-
@@ -259,17 +259,17 @@ AvailableGlobalDiscounts=Доступны абсолютные скидки
 DiscountNone=Нет
 Supplier=Поставщик
 CompanyList=Список компаний
-AddContact=Добавить контакт/адрес
-AddContactAddress=Add contact/address
+AddContact=Создать контакт
+AddContactAddress=Создать контакт/адрес
 EditContact=Изменить контакт / адреса
-EditContactAddress=Edit contact/address
+EditContactAddress=Редактировать контакт/адрес
 Contact=Контакт
 ContactsAddresses=Контакты/Адреса
-NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefinedForThirdParty=Не задан контакт для этого контрагента
 NoContactDefined=У этого контрагента не указаны контакты
 DefaultContact=Контакт по умолчанию
-AddCompany=Добавить компанию
-AddThirdParty=Добавить контрагента
+AddCompany=Создать компанию
+AddThirdParty=Создать контрагента
 DeleteACompany=Удалить компанию
 PersonalInformations=Личные данные
 AccountancyCode=Бухгалтерский код
@@ -287,7 +287,7 @@ LastProspect=Последний
 ProspectToContact=Потенциальный клиент для связи
 CompanyDeleted=Компания " %s" удалена из базы данных.
 ListOfContacts=Список контактов/адресов
-ListOfContactsAddresses=List of contacts/adresses
+ListOfContactsAddresses=Список контактов/адресов
 ListOfProspectsContacts=Список контактов потенциальных клиентов
 ListOfCustomersContacts=Список контактов покупателей
 ListOfSuppliersContacts=Список контактов поставщиков
@@ -306,7 +306,7 @@ NoContactForAnyProposal=Этот контакт не является конта
 NoContactForAnyContract=Этот контакт не является контактом договора
 NoContactForAnyInvoice=Этот контакт не является контактом счета-фактуры
 NewContact=Новый контакт/адрес
-NewContactAddress=New contact/address
+NewContactAddress=Новый контакт/адрес
 LastContacts=Последние контакты
 MyContacts=Мои контакты
 Phones=Телефоны
@@ -367,10 +367,10 @@ ExportCardToFormat=Экспорт карточки в формате
 ContactNotLinkedToCompany=Контакт не связан с каким-либо контрагентом
 DolibarrLogin=Имя пользователя Dolibarr
 NoDolibarrAccess=Нет доступа к Dolibarr
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
 ExportDataset_company_2=Контакты и свойства
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
+ImportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
+ImportDataset_company_2=Контакты/Адреса (контрагенты и другие) и атрибуты
 ImportDataset_company_3=Банковские реквизиты
 PriceLevel=Уровень цен
 DeliveriesAddress=Адреса доставки
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Бирка с адресом доставки
 DeleteDeliveryAddress=Удалить адрес доставки
 ConfirmDeleteDeliveryAddress=Вы уверены, что хотите удалить этот адрес доставки?
 NewDeliveryAddress=Новый адрес доставки
-AddDeliveryAddress=Добавить адрес
-AddAddress=Добавить адрес
+AddDeliveryAddress=Создать адрес
+AddAddress=Создать адрес
 NoOtherDeliveryAddress=Альтернативный адрес доставки не задан
 SupplierCategory=Категория поставщика
 JuridicalStatus200=Независимый
@@ -397,18 +397,18 @@ YouMustCreateContactFirst=Вы должны сначала создать кон
 ListSuppliersShort=Список поставщиков
 ListProspectsShort=Список потенц. клиентов
 ListCustomersShort=Список покупателей
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Область контрагентов и контактов
 LastModifiedThirdParties=Последние %s измененных контрагентов
 UniqueThirdParties=Всего уникальных контрагентов
 InActivity=Открыто
 ActivityCeased=Закрыто
 ActivityStateFilter=Статус активности
-ProductsIntoElements=List of products into %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Reached max. for outstanding bill
+ProductsIntoElements=Список товаров в %s
+CurrentOutstandingBill=Валюта неуплаченного счёта
+OutstandingBill=Максимальный неуплаченный счёт
+OutstandingBillReached=Достигнут максимум неуплаченного счёта
 MonkeyNumRefModelDesc=Вернуть номер с форматом %syymm-NNNN для кода покупателя и %syymm NNNN-код для кода поставщиков, где yy - это год, мм - месяц и NNNN - непрерывная последовательность без возврата к 0.
 LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+ManagingDirectors=Имя управляющего или управляющих (Коммерческого директора, директора, президента...)
+SearchThirdparty=Поиск контрагента
+SearchContact=Поиск контакта
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index f6c71001a14..2b8adba6916 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - compta
 Accountancy=Бухгалтерия
-AccountancyCard=Бухгалтерия карту
+AccountancyCard=Карточка бухгалтерии 
 Treasury=Казначейство
 MenuFinancial=Финансовые
 TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation
@@ -19,8 +19,8 @@ AmountToBeCharged=Общая сумма для оплаты:
 AccountsGeneral=Счета
 Account=Учетная запись
 Accounts=Счета
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Исходный счёт
+Accountsparent=Исходные счета
 BillsForSuppliers=Законопроекты для поставщиков
 Income=Поступления
 Outcome=Итог
@@ -50,8 +50,8 @@ LT2PaidES=Платные IRPF
 LT1PaidES=RE Paid
 LT2CustomerES=IRPF продаж
 LT2SupplierES=IRPF покупки
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=Продажи ранее проданного товара/услуги
+LT1SupplierES=Покупки ранее проданного товара/услуги
 VATCollected=НДС собрали
 ToPay=Для оплаты
 ToGet=Чтобы вернуться
@@ -74,7 +74,7 @@ PaymentCustomerInvoice=Заказчиком оплаты счетов-факту
 PaymentSupplierInvoice=Поставщик оплате счета-фактуры
 PaymentSocialContribution=Социальный вклад оплаты
 PaymentVat=НДС платеж
-PaymentSalary=Salary payment
+PaymentSalary=Выплата зарплаты
 ListPayment=Список платежей
 ListOfPayments=Список платежей
 ListOfCustomerPayments=Список клиентов платежи
@@ -84,11 +84,11 @@ DateStartPeriod=Дата начала периода
 DateEndPeriod=Дата окончания периода
 NewVATPayment=Новые оплаты НДС
 newLT2PaymentES=Новые IRPF оплаты
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Новое полашение
 LT2PaymentES=IRPF оплаты
 LT2PaymentsES=IRPF платежей
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=Погашение
+LT1PaymentsES=Погашения
 VATPayment=Оплата НДС
 VATPayments=НДС Платежи
 SocialContributionsPayments=Социальные отчисления платежей
@@ -101,9 +101,9 @@ AccountNumberShort=Номер счета
 AccountNumber=Номер счета
 NewAccount=Новый счет
 SalesTurnover=Оборот по продажам
-SalesTurnoverMinimum=Minimum sales turnover
+SalesTurnoverMinimum=Минимальный товарооборот
 ByThirdParties=Бу-третьих сторон
-ByUserAuthorOfInvoice=На счету автора
+ByUserAuthorOfInvoice=По счету автора
 AccountancyExport=Бухгалтерия экспорт
 ErrorWrongAccountancyCodeForCompany=Плохо заказчику бухгалтерские код %s
 SuppliersProductsSellSalesTurnover=Генерируемый оборот по продажам поставщиков продукции.
@@ -115,7 +115,7 @@ NewCheckDeposit=Новая проверка депозит
 NewCheckDepositOn=Новый депозит проверить на счету: %s
 NoWaitingChecks=Не дожидаясь проверок на хранение.
 DateChequeReceived=Чек при ввода даты
-NbOfCheques=Nb чеков
+NbOfCheques=Кол-во чеков
 PaySocialContribution=Оплатить социального взноса
 ConfirmPaySocialContribution=Вы уверены, что хотите классифицировать этот социальный вклад, как оплачивается?
 DeleteSocialContribution=Удалить социального взноса
@@ -146,14 +146,14 @@ DepositsAreNotIncluded=- Депозитные счета-фактуры и не
 DepositsAreIncluded=- Депозитные счета включены
 LT2ReportByCustomersInInputOutputModeES=Доклад третьей стороной IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+VATReportByCustomersInInputOutputMode=Отчёт по собранному и оплаченному НДС клиента
+VATReportByCustomersInDueDebtMode=Отчёт по собранному и оплаченному НДС клиента
+VATReportByQuartersInInputOutputMode=Отчёт по собранной и оплаченной ставке НДС 
+LT1ReportByQuartersInInputOutputMode=Отчёт по ставке RE
+LT2ReportByQuartersInInputOutputMode=Отчёт по ставке IRPF
+VATReportByQuartersInDueDebtMode=Отчёт по собранной и оплаченной ставке НДС 
+LT1ReportByQuartersInDueDebtMode=Отчёт по ставке RE
+LT2ReportByQuartersInDueDebtMode=Отчёт по ставке IRPF
 SeeVATReportInInputOutputMode=См. LE отношения %sTVA encaissement %s для режима де CALCUL стандарт
 SeeVATReportInDueDebtMode=См. LE отношения %sTVA сюр dbit %s для режима де CALCUL AVEC вариант SUR LES dbits
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
@@ -183,9 +183,9 @@ DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than o
 Pcg_version=Pcg version
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
+InvoiceLinesToDispatch=Строки счёта для отправки
+InvoiceDispatched=Отправленные счета
+AccountancyDashboard=Суммарная информация по бухгалтерии
 ByProductsAndServices=По продуктам и услугам
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
@@ -204,4 +204,4 @@ ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdpartie
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
 CloneTax=Clone a social contribution
 ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+CloneTaxForNextMonth=Клонировать для следующего месяца
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index d64ad647ab7..6b4dbd73495 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Раздел договоров
 ListOfContracts=Список договоров
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Последние %s изменённых контактов
 AllContracts=Все договоры
 ContractCard=Карточка договора
 ContractStatus=Статус договора
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Истек
 ServiceStatusClosed=Закрытые
 ServicesLegend=Услуги легенда
 Contracts=Договоры
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Контракты и строка с контрактами
 Contract=Договор
 NoContracts=Нет договоров
 MenuServices=Услуги
@@ -28,33 +28,33 @@ MenuRunningServices=Запуск служб
 MenuExpiredServices=Истекшим сроком службы
 MenuClosedServices=Закрытые услуги
 NewContract=Новый договор
-AddContract=Create contract
+AddContract=Создать контракт
 SearchAContract=Искать договор
 DeleteAContract=Удалить договор
-CloseAContract=Закрыть контракта
+CloseAContract=Закрыть договор
 ConfirmDeleteAContract=Вы уверены, что хотите удалить этот контракт, и на все свои услуги?
 ConfirmValidateContract=Вы уверены, что хотите проверить этот договор?
 ConfirmCloseContract=Это позволит закрыть все услуги (активный или нет). Вы уверены, что хотите закрыть этот договор?
 ConfirmCloseService=Вы действительно хотите закрыть эту услугу с даты %s?
-ValidateAContract=Проверить контракт
+ValidateAContract=Проверить договор
 ActivateService=Активировать услугу
 ConfirmActivateService=Вы уверены, что хотите, чтобы активировать данную услугу с даты %s?
-RefContract=Contract reference
+RefContract=Справка о договоре
 DateContract=Дата договора
 DateServiceActivate=Дата активации услуги
-DateServiceUnactivate=Сроки службы unactivation
-DateServiceStart=Дата начала службы
-DateServiceEnd=Дата окончания службы
+DateServiceUnactivate=Дата деактивации услуги
+DateServiceStart=Дата начала услуги
+DateServiceEnd=Дата окончания услуги
 ShowContract=Показать договор
 ListOfServices=Список услуг
 ListOfInactiveServices=Перечень услуг не активен
 ListOfExpiredServices=Список с истекшим сроком службы
 ListOfClosedServices=Список закрытых услуги
-ListOfRunningContractsLines=Список запуска контракта линий
+ListOfRunningContractsLines=Список запущенных линий по договору
 ListOfRunningServices=Список запущенных служб
 NotActivatedServices=Не активируется услуг (в том числе утверждены контракты)
-BoardNotActivatedServices=Услуги для активации среди утверждены контракты
-LastContracts=Last %s contracts
+BoardNotActivatedServices=Услуги для активации среди подтвержденных договоров
+LastContracts=Последние %s контрактов
 LastActivatedServices=Последнее %s активированных услуг
 LastModifiedServices=Последнее% с измененными услуги
 EditServiceLine=Изменить направление
@@ -68,16 +68,16 @@ DateStartReal=Реальная дата начала
 DateStartRealShort=Реальная дата начала
 DateEndReal=Реальная дата окончания
 DateEndRealShort=Реальная дата окончания
-NbOfServices=Nb услуг
-CloseService=Закрыть службы
-ServicesNomberShort=%s служба (ы)
-RunningServices=Запуск служб
-BoardRunningServices=Истекшие Запуск услуги
-ServiceStatus=Положение о службе
-DraftContracts=Проекты контрактов
-CloseRefusedBecauseOneServiceActive=Контракт не может быть закрыто, пока, по крайней мере один открытый службе по нему
-CloseAllContracts=Закрыть все контракты
-DeleteContractLine=Удалить контракт линия
+NbOfServices=Кол-во услуг
+CloseService=Закрыть услугу
+ServicesNomberShort=%s услуга (услуги)
+RunningServices=Запущенные услуги
+BoardRunningServices=Истекшие запущенные услуги
+ServiceStatus=Статус услуги
+DraftContracts=Проекты договоров
+CloseRefusedBecauseOneServiceActive=Договор не может быть закрыт, пока, по крайней мере, существует одна открытая услуга по нему.
+CloseAllContracts=Закрыть все строки договора
+DeleteContractLine=Удалить строку договора
 ConfirmDeleteContractLine=Вы уверены, что хотите удалить этот контракт линию?
 MoveToAnotherContract=Переместите службу в другой договор.
 ConfirmMoveToAnotherContract=Я выбранного новая цель договора и подтвердить, я хочу перейти эту услугу в этом договоре.
@@ -87,12 +87,12 @@ ExpiredSince=Срок действия
 RelatedContracts=Связанные договоры
 NoExpiredServices=Не истек активных услуг
 ListOfServicesToExpireWithDuration=Список услуг, истекающих в ближайшие %s дней
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpireWithDurationNeg=Список услуг истёк более %s дней назад
 ListOfServicesToExpire=Список истекающих услуг
 NoteListOfYourExpiredServices=Этот список содержит только услуги по договорам с Контрагентами, с которыми связаны как торговый представитель
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+StandardContractsTemplate=Стандартный шаблон контракта
+ContactNameAndSignature=Для %s,  имя и подпись
+OnlyLinesWithTypeServiceAreUsed=Только строки с типом "Услуга" могут быть клонированы.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Торговый представитель подписания контракта
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index 9cfdaf5e1d9..9cef3657708 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -1,46 +1,46 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 About = О
-CronAbout = About Cron
-CronAboutPage = Cron about page
+CronAbout = О Планировщике
+CronAboutPage = Страница о планировщике
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
+Permission23101 = Открыть запланированную задачу
+Permission23102 = Создать/удалить запланированное задание
 Permission23103 = Удалить запланированное задание
 Permission23104 = Выполнить запланированное задание
 # Admin
 CronSetup= Настройки запланированных заданий
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to launch cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+URLToLaunchCronJobs=Ссылка для проверки и запуска заданий планировщика cron (если требуется)
+OrToLaunchASpecificJob=Или проверить и запустить специальную задачу
+KeyForCronAccess=Ключ безопасности для запуска запланированных заданий
+FileToLaunchCronJobs=Командная строка для запуска запланированных заданий. 
+CronExplainHowToRunUnix=В системах Unix-like вы должны задать crontab для выполнения команды каждые 5 минут.
+CronExplainHowToRunWin=В Майкрософт Windows © вы должны использовать Планировщик для запуска команды каждые 5 минут. 
 # Menu
 CronJobs=Запланированные задания
-CronListActive=List of active/scheduled jobs
+CronListActive=Список активных/запланированных заданий
 CronListInactive=Список неактивных заданий
 # Page list
 CronDateLastRun=Последний раз выполнено
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Последний вывод команды
+CronLastResult=Последний код возврата команды
 CronListOfCronJobs=Список запланированных заданий
 CronCommand=Команда
-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
-CronTask=Job
-CronNone= Никакой
+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=Задание
+CronNone=Никакой
 CronDtStart=Начальная дата
 CronDtEnd=Конечная дата
 CronDtNextLaunch=Следующий запуск
 CronDtLastLaunch=Последний запуск
 CronFrequency=Частота
-CronClass=Classe
+CronClass=Класс
 CronMethod=Метод
 CronModule=Модуль
 CronAction=Действие
@@ -50,14 +50,14 @@ CronStatusInactive=Выключено
 CronNoJobs=Нет зарегистрированных заданий
 CronPriority=Приоритет
 CronLabel=Описание
-CronNbRun=Nb. launch
+CronNbRun=Кол-во запусков
 CronEach=Каждый
 JobFinished=Задание запущено и завершено
 #Page card
 CronAdd= Добавить задание
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Время и дата для запуска задачи
+CronEvery= И выполнять задачу каждые
+CronObject= Экземпляр / объект для создания
 CronArgs=Параметры
 CronSaveSucess=Сохранено успешно
 CronNote=Комментарий
@@ -65,23 +65,24 @@ CronFieldMandatory=Поле %s является обязательным
 CronErrEndDateStartDt=Дата окончания не может быть раньше даты начала
 CronStatusActiveBtn=Включено
 CronStatusInactiveBtn=Выключать
-CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
-CronId=Id
-CronClassFile=Classes (filename.class.php)
+CronTaskInactive=Задание отключено
+CronDtLastResult=Дата последнего выполнения
+CronId=ID
+CronClassFile=Классы (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product
 CronClassFileHelp=The file name to load. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php
 CronObjectHelp=The object name to load. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
-CronCommandHelp=The system command line to execute.
+CronCommandHelp=Команда для выполнения
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Информация
 # Common
 CronType=Тип задачи
-CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
-CronMenu=Cron
-CronCannotLoadClass=Cannot load class %s or object %s
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+CronType_method=Вызов метода из класса системы Dolibarr 
+CronType_command=Команда командной строки
+CronMenu=Планировщик
+CronCannotLoadClass=Невозможно загрузить класс %s или объект %s
+UseMenuModuleToolsToAddCronJobs=Используйте меню "Главная - Настройки модулей -Список заданий"  для просмотра и редактирования запланированных заданий. 
+TaskDisabled=Задача отключена
diff --git a/htdocs/langs/ru_RU/deliveries.lang b/htdocs/langs/ru_RU/deliveries.lang
index 86064863ed2..adf4353859c 100644
--- a/htdocs/langs/ru_RU/deliveries.lang
+++ b/htdocs/langs/ru_RU/deliveries.lang
@@ -23,4 +23,6 @@ GoodStatusDeclaration=Указанные выше товары получены
 Deliverer=Доставщик:
 Sender=Отправитель
 Recipient=Получатель
-# ErrorStockIsNotEnough=There's not enough stock
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Возможно к отправке
+NonShippable=Не возможно к отправке
diff --git a/htdocs/langs/ru_RU/dict.lang b/htdocs/langs/ru_RU/dict.lang
index 5da032e8b7e..c22717d4ef4 100644
--- a/htdocs/langs/ru_RU/dict.lang
+++ b/htdocs/langs/ru_RU/dict.lang
@@ -290,7 +290,9 @@ CurrencySingXOF=Франк КФА ЦБЗАГ
 CurrencyXPF=CFP франков
 CurrencySingXPF=Франк КФП
 CurrencyCentSingEUR=цент
-CurrencyThousandthSingTND=thousandth
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=тысячный
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Интернет
 DemandReasonTypeSRC_CAMP_MAIL=Почтовый кампании
@@ -299,27 +301,27 @@ DemandReasonTypeSRC_CAMP_PHO=Телефон кампании
 DemandReasonTypeSRC_CAMP_FAX=Факс кампании
 DemandReasonTypeSRC_COMM=Коммерческие контакты
 DemandReasonTypeSRC_SHOP=Магазин контакт
-DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_WOM=Из уст в уста
 DemandReasonTypeSRC_PARTNER=Партнер
 DemandReasonTypeSRC_EMPLOYEE=Сотрудник
 DemandReasonTypeSRC_SPONSORING=Спонсорство
 #### Paper formats ####
-PaperFormatEU4A0=Format 4A0
-PaperFormatEU2A0=Format 2A0
-PaperFormatEUA0=Format A0
-PaperFormatEUA1=Format A1
-PaperFormatEUA2=Format A2
-PaperFormatEUA3=Format A3
-PaperFormatEUA4=Format A4
-PaperFormatEUA5=Format A5
-PaperFormatEUA6=Format A6
-PaperFormatUSLETTER=Format Letter US
-PaperFormatUSLEGAL=Format Legal US
-PaperFormatUSEXECUTIVE=Format Executive US
-PaperFormatUSLEDGER=Format Ledger/Tabloid
-PaperFormatCAP1=Format P1 Canada
-PaperFormatCAP2=Format P2 Canada
-PaperFormatCAP3=Format P3 Canada
-PaperFormatCAP4=Format P4 Canada
-PaperFormatCAP5=Format P5 Canada
-PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Формат 4A0
+PaperFormatEU2A0=Формат 2A0
+PaperFormatEUA0=Формат A0
+PaperFormatEUA1=Формат А1
+PaperFormatEUA2=Формат А2
+PaperFormatEUA3=Формат А3
+PaperFormatEUA4=Формат А4
+PaperFormatEUA5=Формат А5
+PaperFormatEUA6=Формат А6
+PaperFormatUSLETTER=Формат Letter US
+PaperFormatUSLEGAL=Формат Legal US
+PaperFormatUSEXECUTIVE=Формат Executive US
+PaperFormatUSLEDGER=Формат таблоида
+PaperFormatCAP1=Формат P1  Канада
+PaperFormatCAP2=Формат P2  Канада
+PaperFormatCAP3=Формат P3 Канада
+PaperFormatCAP4=Формат P4  Канада
+PaperFormatCAP5=Формат P5 Канада
+PaperFormatCAP6=Формат P6  Канада
diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang
index e8339fe9701..40e38961a45 100644
--- a/htdocs/langs/ru_RU/donations.lang
+++ b/htdocs/langs/ru_RU/donations.lang
@@ -1,12 +1,14 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Пожертвование
 Donations=Пожертвования
-DonationRef=Donation ref.
+DonationRef= ref. пожертвования
 Donor=Донор
 Donors=Доноры
-AddDonation=Create a donation
+AddDonation=Создать пожертование
 NewDonation=Новое пожертвование
-ShowDonation=Show donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
+ShowDonation=Показать пожертование
 DonationPromise=Обещание пожертвования
 PromisesNotValid=Неподтвержденные обещания
 PromisesValid=Подтвержденные обещания
@@ -21,18 +23,21 @@ DonationStatusPaid=Полученное пожертвование
 DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Подтверждено
 DonationStatusPaidShort=Получено
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Подтвердить обещание
-DonationReceipt=Donation receipt
+DonationReceipt=Получатель пожертования
 BuildDonationReceipt=Создать подтверждение получения
 DonationsModels=Модели документов для подтверждение получения пожертвования
 LastModifiedDonations=Последние %s измененных пожертвований
 SearchADonation=Поиск пожертвования
-DonationRecipient=Donation recipient
-ThankYou=Thank You
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-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
+DonationRecipient=Получатель пожертования
+ThankYou=Спасибо
+IConfirmDonationReception=Получатель объявляет приём, как пожертвование, в следующем размере
+MinimumAmount=Минимальное пожертвование %s
+FreeTextOnDonations=Текст для показа в нижней части 
+FrenchOptions=Настройки для Франции
+DONATION_ART200=Если вы обеспокоены, показывать выдержку статьи 200 из CGI
+DONATION_ART238=Если вы обеспокоены, показывать выдержку статьи 238 из CGI
+DONATION_ART885=Если вы обеспокоены, показывать выдержку статьи 885 из CGI
+DonationPayment=Donation payment
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index 18e063ef298..07ce2ffd803 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -1,57 +1,57 @@
 # Dolibarr language file - Source file is en_US - ecm
 MenuECM=Документы
 DocsMine=Мои документы
-DocsGenerated=Сгенерирована документы
-DocsElements=Элементы документы
-DocsThirdParties=Документы третьих сторон
+DocsGenerated=Сгенерированые документы
+DocsElements=Элементы документов
+DocsThirdParties=Документы контрагентов
 DocsContracts=Документы контрактов
-DocsProposals=Документы предложения
-DocsOrders=Документы, приказы
-DocsInvoices=Документы, счета-фактуры
-ECMNbOfDocs=Nb документов в директории
-ECMNbOfDocsSmall=Nb документа.
-ECMSection=Каталог
-ECMSectionManual=Руководство по каталогу
-ECMSectionAuto=Автоматический каталог
-ECMSectionsManual=Руководство по каталогам
-ECMSectionsAuto=Автоматическое каталоги
-ECMSections=Каталоги
+DocsProposals=Документы предложений
+DocsOrders=Документы заказов
+DocsInvoices=Документы счетов
+ECMNbOfDocs=Кол-во документов в директории
+ECMNbOfDocsSmall=Кол-во док-в.
+ECMSection=Директория
+ECMSectionManual=Директория в ручном режиме
+ECMSectionAuto=Директория в автоматическом режиме
+ECMSectionsManual=Ручное дерево директории
+ECMSectionsAuto=Автоматическое дерево директории
+ECMSections=Директории
 ECMRoot=Корневая
-ECMNewSection=Новый каталог
-ECMAddSection=Добавить руководства каталог
+ECMNewSection=Новая директория
+ECMAddSection=Добавить директорию
 ECMNewDocument=Новый документ
 ECMCreationDate=Дата создания
 ECMNbOfFilesInDir=Количество файлов в каталоге
-ECMNbOfSubDir=Количество суб-директории
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMNbOfSubDir=Количество поддиректорий
+ECMNbOfFilesInSubDir=Количество файлов в поддиректориях
+ECMCreationUser=Создатель
+ECMArea=Зона электронного документооборота
+ECMAreaDesc=Зона ЭД (Электронный документооборот) позволяет вам сохранять, распространять, быстро искать все типы документов в системе   Dolibarr.
 ECMAreaDesc2=* Автоматическая справочники заполняются автоматически при добавлении документов с карточкой элемента. 
 * Руководство каталогов можно использовать для сохранения документов, не связанных с конкретным элементом.
 ECMSectionWasRemoved=Каталог %s удален.
-ECMDocumentsSection=Документ каталога
+ECMDocumentsSection=Документ из директории
 ECMSearchByKeywords=Поиск по ключевым словам
-ECMSearchByEntity=Поиск объекта
-ECMSectionOfDocuments=Справочные документы
-ECMTypeManual=Руководство
-ECMTypeAuto=Автоматическая
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMSearchByEntity=Поиск по объекту
+ECMSectionOfDocuments=Директории документов
+ECMTypeManual=Ручной
+ECMTypeAuto=Автоматический
+ECMDocsBySocialContributions=Документы, связанные с отчислениями на социальные нужды
 ECMDocsByThirdParties=Документы, связанные с третьими сторонами
 ECMDocsByProposals=Документы, связанные с предложениями
 ECMDocsByOrders=Документы, связанные с заказчиками заказов
 ECMDocsByContracts=Документы, связанные с контрактами
 ECMDocsByInvoices=Документы, связанные с заказчиками счетами
 ECMDocsByProducts=Документы, связанные с продуктами
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMNoDirectoryYet=Нет создали каталог
-ShowECMSection=Показать каталог
+ECMDocsByProjects=Документы, связанные с проектрами
+ECMDocsByUsers=Документы, связанные с пользователями
+ECMDocsByInterventions=Документы, связанные с меропрятиями
+ECMNoDirectoryYet=Директория не создана
+ShowECMSection=Показать директорию
 DeleteSection=Удаление директории
-ConfirmDeleteSection=Можете ли вы подтвердить, вы хотите удалить каталог %s?
-ECMDirectoryForFiles=Относительная каталог файлов
-CannotRemoveDirectoryContainsFiles=Удалена не представляется возможным, поскольку в нем содержатся некоторые файлы
+ConfirmDeleteSection=Вы точно хотите удалить директорию %s?
+ECMDirectoryForFiles=Относительная директория для файлов
+CannotRemoveDirectoryContainsFiles=Директория не может быть удалена, потому что содержит файлы
 ECMFileManager=Файловый менеджер
-ECMSelectASection=Выберите каталог на левом дереве ...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+ECMSelectASection=Выберите директорию на левом дереве ...
+DirNotSynchronizedSyncFirst=Эта директория была создана или изменена не с помощью модуля электронного документооборота. Вы должны нажать "Обновить", чтобы синхронизировать данные на диске и базу данных и иметь возможность их использования. 
 
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 839f620bd6c..6f7e5cc2210 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Нет ошибок, мы принимаем
 # Errors
 Error=Ошибка
 Errors=Ошибки
-ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorButCommitIsDone=Обнаружены ошибки, но мы подтвердиле несмотря на это
 ErrorBadEMail=EMail %s неправильно
 ErrorBadUrl=Url %s неправильно
 ErrorLoginAlreadyExists=Логин %s уже существует.
@@ -27,7 +27,7 @@ ErrorProdIdIsMandatory=%s является обязательным
 ErrorBadCustomerCodeSyntax=Плохо синтаксис для заказчика код
 ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=Требуется код клиента
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Требуется штрих-код
 ErrorCustomerCodeAlreadyUsed=Код клиента уже используется
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Префикс обязателен
@@ -61,13 +61,13 @@ ErrorFileSizeTooLarge=Размер файла слишком велик.
 ErrorSizeTooLongForIntType=Размер слишком долго для целого типа (%s цифр максимум)
 ErrorSizeTooLongForVarcharType=Размер слишком долго для струнного типа (%s символов максимум)
 ErrorNoValueForSelectType=Пожалуйста, заполните значение для выпадающего списка
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
+ErrorNoValueForCheckBoxType=Пожалуйста, заполните значение для списка флажков
+ErrorNoValueForRadioType=Пожалуйста, заполните  значени для списка переключателей
 ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores
 ErrorFieldCanNotContainSpecialCharacters=Поле %s не содержит специальных символов.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
 ErrorNoAccountancyModuleLoaded=Нет бухгалтерского модуля активируется
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Имя этого профиля уже сущесвует для этого набора для экспорта.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP соответствия не является полной.
 ErrorLDAPMakeManualTest=. LDIF файл был создан в директории %s. Попробуйте загрузить его вручную из командной строки, чтобы иметь больше информации об ошибках.
 ErrorCantSaveADoneUserWithZeroPercentage=Не удается сохранить действие с "Статут не началась", если поле "проделанной" также заполнены.
@@ -92,7 +92,7 @@ ErrorBadMask=Ошибка на маску
 ErrorBadMaskFailedToLocatePosOfSequence=Ошибка, маска без порядкового номера
 ErrorBadMaskBadRazMonth=Ошибка, плохое значение сброса
 ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorCounterMustHaveMoreThan3Digits=Счётчик должен иметь более 3 цифр
 ErrorSelectAtLeastOne=Ошибка. Выберите хотя бы одну запись.
 ErrorProductWithRefNotExist=Изделие с %s ссылки не существуют
 ErrorDeleteNotPossibleLineIsConsolidated=Удаление невозможно, потому что запись связана с банком transation, который согласован
@@ -116,51 +116,57 @@ ErrorLoginDoesNotExists=Пользователь с логином %s н
 ErrorLoginHasNoEmail=Этот пользователь не имеет адреса электронной почты. Процесс прерван.
 ErrorBadValueForCode=Плохо значения типов кода. Попробуйте еще раз с новой стоимости ...
 ErrorBothFieldCantBeNegative=Поля %s и %s не может быть и отрицательным
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Количество строк в счетах клиента не может быть отрицательным
 ErrorWebServerUserHasNotPermission=Учетная запись пользователя %s используется для выполнения веб-сервер не имеет разрешения для этого
 ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrUnzipFails=Невозможно распаковать %s с помощью  ZipArchive
+ErrNoZipEngine=Нет доступного модуля в PHP для распаковки файла %s
+ErrorFileMustBeADolibarrPackage=Файл %s  должен быть архивом zip системы Dolibarr 
 ErrorFileRequired=It takes a package Dolibarr file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorPhpCurlNotInstalled=Модуль CURL для PHP  не установлен, он необходим для работы с PayPal
+ErrorFailedToAddToMailmanList=Невозможно добавить запись %s в список %s  системы Mailman или в базу  SPIP
+ErrorFailedToRemoveToMailmanList=Невозможно удалить  запись %s из  списка %s  системы Mailman или  базы  SPIP
 ErrorNewValueCantMatchOldValue=Новое значение не может быть равно старому
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
+ErrorFailedToValidatePasswordReset=Невозможно обновить пароль. Может быть, обновление пароля уже выполнено (так как вы использовали одноразовую ссылку). Если это не так, попробуйте обновить пароль ещё раз. 
+ErrorToConnectToMysqlCheckInstance=Не удалось соединиться с БД. Проверьте, запущен ли сервер БД MySQL (в большинстве случаев, вы можете запустить его командой  'sudo /etc/init.d/mysql start')  
 ErrorFailedToAddContact=Ошибка при добавлении контакта
 ErrorDateMustBeBeforeToday=Дата не может быть больше сегодняшней
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature.
+ErrorPHPNeedModule=Ошибка. Ваш PHP  должен иметь модуль %s для использования этой функции. 
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorWarehouseMustDiffers=Исходящий и входящий склад должны отличаться
 ErrorBadFormat=Неправильный формат!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
+ErrorCantDeletePaymentSharedWithPayedInvoice=Не удается удалить платёж, поскольку есть по крайней мере один счет со статусом 'оплачен'
+ErrorPriceExpression1=Невозможно назначить константой '%s'
+ErrorPriceExpression2=Невозможно задать заново встроенную функцию  '%s'
+ErrorPriceExpression3=Необъявленная переменная  '%s' в задании функции
+ErrorPriceExpression4=Недопустимый символ '%s'
+ErrorPriceExpression5=Непредвиденный '%s'
+ErrorPriceExpression6=Неверное количество аргументов  (%s задано, %s ожидалось)
+ErrorPriceExpression8=Непредвиденные оператор '%s'
+ErrorPriceExpression9=Произошла неожиданная ошибка
 ErrorPriceExpression10=Iperator '%s' lacks operand
 ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorPriceExpression14=Деление на ноль
+ErrorPriceExpression17=Необъявленная переменная  '%s'
+ErrorPriceExpression19=Выражение не найдено
+ErrorPriceExpression20=Пустое выражение
+ErrorPriceExpression21=Пустой результат  '%s'
+ErrorPriceExpression22=Отрицательный результат  '%s'
+ErrorPriceExpressionInternal=Внутренняя ошибка '%s'
+ErrorPriceExpressionUnknown=Неизвестная ошибка '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Исходящий и входящий склад должны отличаться
 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=Обязательные параметры не определены
@@ -172,12 +178,12 @@ WarningPassIsEmpty=Внимание, базы данных пароль пуст
 WarningConfFileMustBeReadOnly=Внимание, ваш конфигурационный файл (htdocs / CONF / conf.php) может быть переписан на веб-сервере. Это серьезная дыра в безопасности. Изменение разрешений на файл находится в режиме только для чтения для операционной системы пользователя используется веб-сервер. Если вы используете Windows FAT и формат для Вашего диска, вы должны знать, что эта файловая система не позволяет добавить разрешения на файл, поэтому не может быть полностью безопасным.
 WarningsOnXLines=Предупреждения об источнике %s линий
 WarningNoDocumentModelActivated=Ни одна из моделей, для генерации документов, была активирована. Модель будет выбранные по умолчанию, пока вы не проверить ваш модуль установки.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole.
+WarningLockFileDoesNotExists=Передупреждение. Как только установка завершена, вы должны отключить возможности установки/переноса. Это возможно сделать, добавив файл install.lock в каталог %s. Если вы не сделаете это, это будет являться брешью в безопасности. 
 WarningUntilDirRemoved=Это предупреждение остается активным до тех пор, пока эта директория присутствует (отображается только для администратора пользователей).
 WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
 WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
 WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningNotRelevant=Irrelevant operation for this dataset
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningNotRelevant=Ненужная операция для этого набора данных
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Функция отключена, когда отображение оадптировано для слабовидящих или текстовых браузеров. 
+WarningPaymentDateLowerThanInvoiceDate=Дата платежа (%s)  меньше, чем дата  (%s)  счёта  %s.
+WarningTooManyDataPleaseUseMoreFilters=Слишком много данных. Пожалуйста, используйте дополнительные фильтры 
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index 8b787afcef0..bd8d61a5a9f 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Экспорт области
-ImportArea=Импорт области
+ExportsArea=Раздел экспорта
+ImportArea=Раздел импорта
 NewExport=Новый экспорт
 NewImport=Новые импортные
 ExportableDatas=Экспортировать данные
@@ -64,7 +64,7 @@ ChooseFormatOfFileToImport=Выберите формат файла для ис
 ChooseFileToImport=Выберите файл для импорта выберите пункт о picto %s ...
 SourceFileFormat=Формат исходного файла
 FieldsInSourceFile=Поля в исходном файле
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Целевые поля в БД системы Dolibarr  (жирным - обязательные)
 Field=Поле
 NoFields=Нет поля
 MoveField=Перемещение поля %s номер столбца
@@ -111,14 +111,14 @@ SourceExample=Пример возможных значений данных
 ExampleAnyRefFoundIntoElement=Любая ссылка на элемент найден %s
 ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s
 CSVFormatDesc=Разделителями-запятыми файл (формат. CSV). 
 Это текстовый формат файла, в котором поля разделены сепаратором [%s]. Если разделитель находится внутри области содержания, поля окружены круглый характер [%s]. Escape характер бежать вокруг характер [%s].
-Excel95FormatDesc=Excel file format (.xls)
This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=Excel file format (.xlsx)
This is native Excel 2007 format (SpreadsheetML).
+Excel95FormatDesc=Формат файла Excel (.xls)
Это формат Excel 95  (BIFF5).
+Excel2007FormatDesc=Формат файла Excel  (.xlsx)
Это формат Excel версий старше 2007  (SpreadsheetML).
 TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by a tabulator [tab].
 ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ).
 CsvOptions=Csv Options
-Separator=Separator
+Separator=Разделитель
 Enclosure=Enclosure
-SuppliersProducts=Suppliers Products
+SuppliersProducts=Товары поставщиков
 BankCode=Код банка
 DeskCode=Код описания
 BankAccountNumber=Номер счета
@@ -131,4 +131,4 @@ ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Champs Filtrables
 FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+FilteredFieldsValues=Значение для фильтрации
diff --git a/htdocs/langs/ru_RU/ftp.lang b/htdocs/langs/ru_RU/ftp.lang
index 157293d09da..cb2cf6926e1 100644
--- a/htdocs/langs/ru_RU/ftp.lang
+++ b/htdocs/langs/ru_RU/ftp.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ftp
 FTPClientSetup=Настройка модуля FTP-клиента
 NewFTPClient=Настройка нового соединения FTP
-FTPArea=FTP-область
-FTPAreaDesc=На этом экране вам показано содержимое FTP-сервера
-SetupOfFTPClientModuleNotComplete=Установка модуля FTP-клиента, по-видимому, не завершена
-FTPFeatureNotSupportedByYourPHP=Ваша версия PHP не поддерживает FTP-функций
+FTPArea=Раздел FTP
+FTPAreaDesc=На этом экране вам показано представление содержимого FTP-сервера
+SetupOfFTPClientModuleNotComplete=Настройка модуля FTP-клиента, по-видимому, не завершена
+FTPFeatureNotSupportedByYourPHP=Ваша версия PHP не поддерживает функции FTP
 FailedToConnectToFTPServer=Не удалось подключиться к FTP-серверу (сервер %s, порт %s)
-FailedToConnectToFTPServerWithCredentials=Не удалось войти на FTP-сервер с указанными Логином и паролем
+FailedToConnectToFTPServerWithCredentials=Не удалось войти на FTP-сервер с указанными логином и паролем
 FTPFailedToRemoveFile=Не удалось удалить файл %s.
-FTPFailedToRemoveDir=Не удалось удалить каталог %s (Проверьте разрешения и убедитесь, что каталог пуст).
-# FTPPassiveMode=Passive mode
+FTPFailedToRemoveDir=Не удалось удалить каталог %s (Проверьте права доступа и убедитесь, что каталог пуст).
+FTPPassiveMode=Пассивный режим
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 5d133e0bbf7..941e40ee0b4 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -1,41 +1,41 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
-MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this,  click here .
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+HRM=Отдел кадров
+Holidays=Отпуска
+CPTitreMenu=Отпуска
+MenuReportMonth=Ежемесячная выписка
+MenuAddCP=Подать аявление на отпуск
+NotActiveModCP=Вы должны включить модуль "Отпуска" для просмотра этой страницы
+NotConfigModCP=Вы должны настроить модуль "Отпуска" для просмотра этой страницы. Для этого нажмите здесь .
+NoCPforUser=У вас нет доступных дней отдыха.
+AddCP=Подать заявление на отпуск
 Employe=Сотрудник
 DateDebCP=Начальная дата
 DateFinCP=Конечная дата
 DateCreateCP=Дата создания
 DraftCP=Проект
-ToReviewCP=Awaiting approval
+ToReviewCP=Ожидают утверждения
 ApprovedCP=Утверждено
 CancelCP=Отменено
 RefuseCP=Отказано
 ValidatorCP=Утвердивший
-ListeCP=List of leaves
+ListeCP=Список отпусков
 ReviewedByCP=Проверит
 DescCP=Описание
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least %s day(s) before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is %s days.
+SendRequestCP=Создать заявление на отпуск
+DelayToRequestCP=Заявления об отпуске могут создаваться не ранее чем через %s (дней)
+MenuConfCP=Отредактировать график отпусков
+UpdateAllCP=Обновить отпуска
+SoldeCPUser=График отпусков  %s дней.
 ErrorEndDateCP=Выберите конечную дату позже чем начальную.
 ErrorSQLCreateCP=Ошибка SQL возникла во время создания:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ErrorIDFicheCP=Возникла ошибка, заявление на отпуск отсутствует.
 ReturnCP=Вернуться на предыдущую страницу
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+ErrorUserViewCP=У вас нет прав доступа для просмотра этого заявления на отпуск
+InfosCP=Информация о заявление на отпуск
+InfosWorkflowCP=Информация о рабочем процессе
+RequestByCP=Запрошен 
+TitreRequestCP=Оставить запрос
+NbUseDaysCP=Количество истраченных дней отпуска
 EditCP=Редактировать
 DeleteCP=Удалить
 ActionValidCP=Проверить
@@ -43,106 +43,106 @@ ActionRefuseCP=Отказать
 ActionCancelCP=Отмена
 StatutCP=Статус
 SendToValidationCP=Отправить на проверку
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-CantUpdate=You cannot update this leave request.
-NoDateDebut=Вы должны выбрать начальную дату
-NoDateFin=Вы должны выбрать конечную дату
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
+TitleDeleteCP=Удалить заявление на отпуск
+ConfirmDeleteCP=Подтверждаете удаление этого заявления на отпуск?
+ErrorCantDeleteCP=У вас нет прав доступа для удаления этого заявления на отпуск.
+CantCreateCP=У вас нет прав доступа для создания заявлений на отпуск.
+InvalidValidatorCP=Вы должны выбрать того, кто будет утверждать ваше заявление на отпуск.
+CantUpdate=Вы не можете обновить это заявление на отпуск.
+NoDateDebut=Вы должны выбрать начальную дату.
+NoDateFin=Вы должны выбрать конечную дату.
+ErrorDureeCP=Ваше заявление на отпуск не включает в себя рабочие дни. 
+TitleValidCP=Утвердить заявление на отпуск
+ConfirmValidCP=Вы точно хотите утвердить заявление на отпуск?
 DateValidCP=Дата утверждена
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=Вы должны выбрать причину отказа на запрос о выходных днях
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+TitleToValidCP=Отправить заявление на отпуск
+ConfirmToValidCP=Вы точно хотите отправить заявление на отпуск?
+TitleRefuseCP=Отклонить заявление на отпуск
+ConfirmRefuseCP=Вы точно хотите отклонить  заявление на отпуск?
+NoMotifRefuseCP=Вы должны выбрать причину отказа принять заявление на отпуск.
+TitleCancelCP=Отменить  заявление на отпуск
+ConfirmCancelCP=Вы точно хотите отменить  заявление на отпуск?
 DetailRefusCP=Причина отказа
 DateRefusCP=Дата отказа
 DateCancelCP=Дата отмены
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+DefineEventUserCP=Задать исключительный отпуск для пользователя
+addEventToUserCP=Задать отпуск
 MotifCP=Причина
 UserCP=Пользователь
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
+ErrorAddEventToUserCP=Возникла ошибка при добавлении исключительного отпуска.
+AddEventToUserOkCP=Добавление исключительного отпуска успешно завершено. 
+MenuLogCP=Посмотреть журнал заявлений на отпуск
+LogCP=Журнал обновлений доступных выходных дней
+ActionByCP=Выполнено 
 UserUpdateCP=Для пользователя
 PrevSoldeCP=Предыдущий баланс
 NewSoldeCP=Новый баланс
-alreadyCPexist=A leave request has already been done on this period.
+alreadyCPexist=Заявление на отпуск в этот период уже существует.
 UserName=Имя
 Employee=Сотрудник
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Первый день отпуска
+LastDayOfHoliday=Последний день отпуска
 HolidaysMonthlyUpdate=Ежемесячное обновление
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
+ManualUpdate=Ручное обновление
+HolidaysCancelation=Отмена заявления на отпуск
 
 ## Configuration du Module ##
-ConfCP=Configuration of leave request module
+ConfCP=Настройки модуля заявлений на отпуск
 DescOptionCP=Описание опции
 ValueOptionCP=Значение
-GroupToValidateCP=Group with the ability to approve leave requests
+GroupToValidateCP=Группа с возможностями для утверждения заявлений на отпуск
 ConfirmConfigCP=Проверить конфигурацию
-LastUpdateCP=Last automatic update of leaves allocation
+LastUpdateCP=Последнее автоматическое обновление распределения отпусков
 UpdateConfCPOK=Обновлено успешно
 ErrorUpdateConfCP=Во время обновления произошла ошибка. Пожалуйста, попробуйте еще раз.
-AddCPforUsers=Please add the balance of leaves allocation of users by clicking here.
-DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of leave days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of leave request
-TitleOptionEventCP=Settings of leave requets for events
+AddCPforUsers=Пожалуйста, задайте баланс распределения  отпусков пользователей. Для этого,  нажмите сюда.
+DelayForSubmitCP=Крайний срок подачи заявлений на отпуск
+AlertapprobatortorDelayCP=Предупреждать утверждающего, если заявление на отпуск подано после крайнего срока
+AlertValidatorDelayCP=Предупреждать утверждающего, если заявление на отпуск подано после крайнего срока
+AlertValidorSoldeCP=Предупреждать утверждающего, если заявление на отпуск нарушает график отпусков
+nbUserCP=Количество пользователей в модуле "Отпуска"
+nbHolidayDeductedCP=Количество вычитаемых выходных из дней отпуска ринимаем
+nbHolidayEveryMonthCP=Количество дней отдыха, добавляемых  каждый месяц
+Module27130Name= Управление заявлениями на отпуск
+Module27130Desc= Управление заявлениями на отпуск
+TitleOptionMainCP=Основные настройки заявления на отпуск
+TitleOptionEventCP=Настройка заявлений на отпуск для модуля "События"
 ValidEventCP=Проверить
-UpdateEventCP=Update events
+UpdateEventCP=Обновить события
 CreateEventCP=Создать
-NameEventCP=Event name
-OkCreateEventCP=The addition of the event went well.
-ErrorCreateEventCP=Error creating the event.
-UpdateEventOkCP=The update of the event went well.
-ErrorUpdateEventCP=Error while updating the event.
-DeleteEventCP=Delete Event
-DeleteEventOkCP=The event has been deleted.
-ErrorDeleteEventCP=Error while deleting the event.
-TitleDeleteEventCP=Delete a exceptional leave
-TitleCreateEventCP=Create a exceptional leave
-TitleUpdateEventCP=Edit or delete a exceptional leave
+NameEventCP=Имя события
+OkCreateEventCP=Добавление событие прошло успешно.
+ErrorCreateEventCP=Ошибка при создании события
+UpdateEventOkCP=Обновление события прошло успешно.
+ErrorUpdateEventCP=Ошибка при обновлении события
+DeleteEventCP=Удалить событие
+DeleteEventOkCP=Событие удалено. 
+ErrorDeleteEventCP=Ошибка  при удалении данного события.
+TitleDeleteEventCP=Удалить исключительный отпуск
+TitleCreateEventCP=Создать исключительный отпуск
+TitleUpdateEventCP=Изменить или удалить исключительный отпуск
 DeleteEventOptionCP=Удалить
 UpdateEventOptionCP=Обновить
-ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
-nbJours=Number days
-TitleAdminCP=Configuration of Leaves
+ErrorMailNotSend=Произошла ошибка при отправке электронного письма:
+NoCPforMonth=Нет отпуска в этом месяце
+nbJours=Количество дней
+TitleAdminCP=Настройка модуля "Отпуска"
 #Messages
-Hello=Hello
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Hello=Здравствуйте
+HolidaysToValidate=Подтверждение заявления на отпуск
+HolidaysToValidateBody=Ниже список заявлений на отпуск, которые требуют подтверждения
+HolidaysToValidateDelay=Это заявление на отпуск будет рассмотрено в период менее, чем %s дней.
+HolidaysToValidateAlertSolde=У пользователя, который оставил это заявление на отпуск нет достаточного количество доступных дней. 
+HolidaysValidated=Подтверждённые заявления на отпуск
+HolidaysValidatedBody=Ваше заявление на отпуск с  %s по %s  подтверждено.
+HolidaysRefused=Заявление отклонено.
+HolidaysRefusedBody=Ваше заявление на отпуск с  %s по %s отклонено по следующей причине: 
+HolidaysCanceled=Отменённые заявления на отпуск
+HolidaysCanceledBody=Ваше заявление на отпуск с  %s по %s отменено. 
+Permission20000=Посмотреть мои заявления на отпуск
+Permission20001=Создать/изменить мои заявления на отпуск
+Permission20002=Создать/изменить заявления на отпуск для всех
+Permission20003=Удалить заявления на отпуск
+Permission20004=Настройка доступных дней отпуска для пользователей
+Permission20005=посмотреть журнал изменённых заявлений на отпуск
+Permission20006=Посмотреть отчёт  о отпусках по месяцам
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index 2d2279104f8..854a530bc0f 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Мы постарались сделать Dolibarr настройки настолько прост, насколько это возможно. Просто следуйте инструкциям, шаг за шагом.
+InstallEasy=Мы постарались сделать установку Dolibarr настолько простой, насколько это возможно. Просто следуйте инструкциям по установке, шаг за шагом.
 MiscellaneousChecks=Условия проверки
 DolibarrWelcome=Добро пожаловать на Dolibarr
 ConfFileExists=Файл конфигурации %s существует.
 ConfFileDoesNotExists=Файл конфигурации %s не существует!
 ConfFileDoesNotExistsAndCouldNotBeCreated=Файл конфигурации %s не существует и не может быть создан!
 ConfFileCouldBeCreated=Файл конфигурации %s может быть создан.
-ConfFileIsNotWritable=Файл конфигурации %s не для записи. Проверка разрешений. Для первой установки, Ваш веб-сервер должен быть предоставлен чтобы иметь возможность писать в этом файле конфигурации во время процесса ( "Chmod 666", например, Unix подобные ОС).
-ConfFileIsWritable=Файл конфигурации %s на запись.
+ConfFileIsNotWritable=Файл конфигурации %s недоступен для записи. Проверьте права доступа. Для первой установки, Ваш веб-сервер должен быть предоставлен чтобы иметь права доступа для записи в этот файл во время всего процесса установки ( Используйте команду "сhmod" в ОС типа Unix, c маской 666).
+ConfFileIsWritable=Файл конфигурации %s доступен для записи.
 ConfFileReload=Перезагрузить всю информацию из файла конфигурации.
-PHPSupportSessions=Это PHP поддерживает сессии.
-PHPSupportPOSTGETOk=Это PHP поддерживает переменные POST и GET.
-PHPSupportPOSTGETKo=Можно настроить ваш PHP не поддерживает переменные и POST или GET. Проверьте параметр variables_order в php.ini.
-PHPSupportGD=Эта поддержка PHP GD графические функции.
-PHPSupportUTF8=Эта поддержка UTF8 PHP функций.
-PHPMemoryOK=Ваш PHP макс сессии памяти установлен в %s. Это должно быть достаточно.
+PHPSupportSessions=Эта версия PHP поддерживает сессии.
+PHPSupportPOSTGETOk=Эта версия PHP поддерживает переменные POST и GET.
+PHPSupportPOSTGETKo=Возможно,  ваша версия PHP не поддерживает переменные и POST или GET. Проверьте параметр variables_order в php.ini.
+PHPSupportGD=Эта версия PHP  поддерживает библиотеку.
+PHPSupportUTF8=Эта версия PHP поддерживает UTF8 функции.
+PHPMemoryOK= Максимально допустимый размер памяти для сессии установлен в %s. Это должно быть достаточно.
 PHPMemoryTooLow=Ваш PHP макс сессии памяти установлен в %s байт. Это должно быть слишком низким. Измените свой php.ini установить параметр memory_limit, по крайней мере %s байт.
 Recheck=Нажмите здесь для более significative тест
 ErrorPHPDoesNotSupportSessions=Ваш PHP установки не поддерживает сессии. Эта функция требует, чтобы Dolibarr работает. Проверьте настройки PHP.
@@ -111,7 +111,7 @@ FreshInstall=Свежие установить
 FreshInstallDesc=Используйте этот режим, если это ваш первый установке. Если нет, то этот режим можно восстановить предыдущий неполной установке, но если вы хотите обновить версию, выберите "Обновить" режиме.
 Upgrade=Обновление
 UpgradeDesc=Используйте этот режим, если вы заменили старый Dolibarr файлы с файлами из новой версии. Это позволит обновить базу данных и данных.
-Start=Начало
+Start=Главная
 InstallNotAllowed=Установка не разрешено conf.php разрешений
 NotAvailable=Не имеется
 YouMustCreateWithPermission=Вы должны создать файл %s и установить запись по этому вопросу для веб-сервера во время установки.
@@ -154,9 +154,9 @@ MigrationShippingDelivery2=Oppgrader lagring av shipping 2
 MigrationFinished=Миграция завершена
 LastStepDesc=Последний шаг: Определить здесь Логин и пароль, которые вы планируете использовать для подключения к программному обеспечению. Как не потерять эту, как это внимание, чтобы управлять всеми другими.
 ActivateModule=Активировать модуль %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+ShowEditTechnicalParameters=Показать расширенные параметры (для опытных пользователей)
+WarningUpgrade=Предупреждение!\nВы уже сделали резервную копию вашей БД?\nМы рекомендуем вам сделать это. Например, в случае каких-то ошибок в СУБД (например, в mysql версии 5.5.40), часть данных или таблиц может быть потеряна в результате этого действия. Сделайте резервную копию вашей БД прямо сейчас, перед запуском процесса миграции. \nНажмите ОК для запуска процесса миграции.. 
+ErrorDatabaseVersionForbiddenForMigration=Версия вашей СУБД %s. Она содержит критическую ошибку, которая приводит к потере данных, если вы меняете структуру БД, как это требуется в процессе миграции. По этой причине, перенос не будет осуществлён до момента, пока вы не обновите вашу СУБД до работоспособной версии (версии с критическими ошибками %s)
 
 #########
 # upgrade
@@ -208,7 +208,7 @@ MigrationProjectTaskTime=Oppdater tid i sekunder
 MigrationActioncommElement=Обновление данных о действиях
 MigrationPaymentMode=Миграция данных для оплаты режим
 MigrationCategorieAssociation=Миграция категорий
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Перенос событий для добавления владельца в таблицу присваиванья
 
 ShowNotAvailableOptions=Показать недоступные опции
 HideNotAvailableOptions=Скрыть недоступные опции
diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
index 8e5b1d3c14f..4801bb8b554 100644
--- a/htdocs/langs/ru_RU/interventions.lang
+++ b/htdocs/langs/ru_RU/interventions.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Вмешательство
+Intervention=Посредничество
 Interventions=Мероприятия
-InterventionCard=Вмешательство карту
-NewIntervention=Новая интервенция
-AddIntervention=Create intervention
+InterventionCard=Карточка посредничества
+NewIntervention=Новое посредничество
+AddIntervention=СОздать посредничество
 ListOfInterventions=Перечень мероприятий
-EditIntervention=Editer вмешательства
-ActionsOnFicheInter=Действия по вмешательству
+EditIntervention=Редактировать посредничество
+ActionsOnFicheInter=Действия над посредничеством
 LastInterventions=Последнее% с мероприятиями
 AllInterventions=Все мероприятия
 CreateDraftIntervention=Создание проекта
 CustomerDoesNotHavePrefix=Клиент не имеет префикс
-InterventionContact=Вмешательство контакт
-DeleteIntervention=Удалить вмешательства
-ValidateIntervention=Проверка вмешательства
-ModifyIntervention=Изменить вмешательства
-DeleteInterventionLine=Исключить вмешательство линия
+InterventionContact=Контакт посредничества
+DeleteIntervention=Удалить посредничество
+ValidateIntervention=Подтверждение посредничества
+ModifyIntervention=Изменение посредничества
+DeleteInterventionLine=Удалить строку посредничества
 ConfirmDeleteIntervention=Вы уверены, что хотите удалить это вмешательство?
-ConfirmValidateIntervention=Вы уверены, что хотите проверить это вмешательство?
-ConfirmModifyIntervention=Вы уверены, что хотите изменить это вмешательство?
-ConfirmDeleteInterventionLine=Вы уверены, что хотите удалить эту строку вмешательства?
-NameAndSignatureOfInternalContact=Имя и подпись вмешательства:
+ConfirmValidateIntervention=Вы уверены, что хотите проверить это посредничество %s?
+ConfirmModifyIntervention=Вы уверены, что хотите изменить это посредничество?
+ConfirmDeleteInterventionLine=Вы уверены, что хотите удалить эту строку посредничества?
+NameAndSignatureOfInternalContact=Имя и подпись посредничества:
 NameAndSignatureOfExternalContact=Имя и подпись клиента:
 DocumentModelStandard=Стандартная модель документа для выступлений
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
@@ -28,20 +28,20 @@ InterventionClassifyBilled=Classify "Billed"
 InterventionClassifyUnBilled=Classify "Unbilled"
 StatusInterInvoiced=Объявленный
 RelatedInterventions=Связанные с ней мероприятия
-ShowIntervention=Показать вмешательства
+ShowIntervention=Показать посредничества
 SendInterventionRef=Submission of intervention %s
 SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+InterventionCreatedInDolibarr=Посредничество %s создано
+InterventionValidatedInDolibarr=Посредничество %s проверено
+InterventionModifiedInDolibarr=Посредничество %s изменено
+InterventionClassifiedBilledInDolibarr=Посредничество %s готово к созданию счёта.
+InterventionClassifiedUnbilledInDolibarr=Посредничество %s не готово к созданию счёта.
+InterventionSentByEMail=Посредничество %s отправлено по электронной почте.
+InterventionDeletedInDolibarr=Посредничество %s  удалено
+SearchAnIntervention=Поиск посредничества
 ##### Types de contacts #####
-TypeContact_fichinter_internal_INTERREPFOLL=Представители следующих мер вмешательства
-TypeContact_fichinter_internal_INTERVENING=Вмешательство
+TypeContact_fichinter_internal_INTERREPFOLL=Представители следующие  посредничества
+TypeContact_fichinter_internal_INTERVENING=Посредничество
 TypeContact_fichinter_external_BILLING=Платежная заказчика контакт
 TypeContact_fichinter_external_CUSTOMER=После деятельность заказчика контакт
 # Modele numérotation
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index 81ba28a1c8f..726045b2701 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -10,10 +10,10 @@ Language_da_DA=Датский
 Language_da_DK=Датский
 Language_de_DE=Немецкий
 Language_de_AT=Немецкий (Австрия)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Немецкий (Швейцария)
 Language_el_GR=Греческий
 Language_en_AU=Английский (Австралия)
-Language_en_CA=English (Canada)
+Language_en_CA=Английский (Канада)
 Language_en_GB=Английский (Великобритания)
 Language_en_IN=Английский (Индия)
 Language_en_NZ=Английский (Новая Зеландия)
diff --git a/htdocs/langs/ru_RU/mailmanspip.lang b/htdocs/langs/ru_RU/mailmanspip.lang
index 391592018f8..634208bb91c 100644
--- a/htdocs/langs/ru_RU/mailmanspip.lang
+++ b/htdocs/langs/ru_RU/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanSpipSetup=Настройка модуля систем Mailman и SPIP
+MailmanTitle=Система управления электронными рассылками Mailman
+TestSubscribe=Для проверки подписки  на лист рассылки системы Mailman 
+TestUnSubscribe=Для проверки отказа от подписки  на лист рассылки системы Mailman 
 MailmanCreationSuccess=Тест подписки выполнен успешно
-MailmanDeletionSuccess=Тест отписки завершен успешно
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
-SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
+MailmanDeletionSuccess=Тест отказа от подписки завершен успешно
+SynchroMailManEnabled=Будет выполнено обновление системы Mailman 
+SynchroSpipEnabled=Будет выполнено обновление системы SPIP
+DescADHERENT_MAILMAN_ADMINPW=Пароль администратора системы Mailman 
+DescADHERENT_MAILMAN_URL=Ссылка на рассылки системы Mailman 
+DescADHERENT_MAILMAN_UNSUB_URL=Ссылка на отказ от рассылки системы Mailman
+DescADHERENT_MAILMAN_LISTS=Список (списки) для автоматический подписки новых участников (разделитель - запятая)
+SPIPTitle=Система управления публикациями SPIP 
+DescADHERENT_SPIP_SERVEUR=Сервер системы SPIP 
+DescADHERENT_SPIP_DB=Имя БД системы SPIP 
+DescADHERENT_SPIP_USER=Логин БД системы SPIP 
+DescADHERENT_SPIP_PASS=Пароль БД системы SPIP 
+AddIntoSpip=Добавить в систему SPIP 
+AddIntoSpipConfirmation=Вы точно хотите добавить этого участника в систему SPIP?
+AddIntoSpipError=Не удалось добавить участника в систему SPIP 
+DeleteIntoSpip=Удалить из системы SPIP
+DeleteIntoSpipConfirmation=Вы точно хотите удалить этого участника из системы SPIP?
+DeleteIntoSpipError=Не удалось удалить участника из системы SPIP
+SPIPConnectionFailed=Не удалось установить соединение с системой SPIP 
+SuccessToAddToMailmanList=Добавление %s  в список рассылки системы Mailman %s или в БД системы SPIP успешно выполнено
+SuccessToRemoveToMailmanList=Удаление %s  из списка рассылки системы Mailman %s или из БД системы SPIP успешно выполнено
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 670a7e81b4c..d3aa823b20d 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -43,7 +43,7 @@ MailingStatusSentCompletely=Отправлено полностью
 MailingStatusError=Ошибка
 MailingStatusNotSent=Не отправлено
 MailSuccessfulySent=Электронная почта успешно отправлено (% от S в %s)
-MailingSuccessfullyValidated=EMailing successfully validated
+MailingSuccessfullyValidated=Электронная почта успешно подтверждена 
 MailUnsubcribe=Отказаться от рассылки
 Unsuscribe=Отказаться от рассылки
 MailingStatusNotContact=Не писать
@@ -73,7 +73,7 @@ DateLastSend=Дата последней отправки
 DateSending=Дата отправки
 SentTo=Направлено в %s
 MailingStatusRead=Читать
-CheckRead=Read Receipt
+CheckRead=Открыть получателя
 YourMailUnsubcribeOK=The email %s  is correctly unsubcribe from mailing list
 MailtoEMail=Ссылка на email
 ActivateCheckRead=Разрешить использовать ссылку "Отказаться от подписки"
@@ -81,7 +81,7 @@ ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcri
 EMailSentToNRecipients=Email отправлено %s получателям.
 XTargetsAdded=%s recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
-MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s)
+MailTopicSendRemindUnpaidInvoices=Уведомление по счёту %s (%s)
 SendRemind=Отправить напоминание по Email
 RemindSent=%s напоминания(й) отправлено
 AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
@@ -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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index e98cf570ed8..3e780d1aa50 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -14,7 +14,7 @@ FormatDateShortJava=dd.MM.yyyy
 FormatDateShortJavaInput=dd.MM.yyyy
 FormatDateShortJQuery=dd.mm.yy
 FormatDateShortJQueryInput=dd.mm.yy
-FormatHourShortJQuery=HH:MI
+FormatHourShortJQuery=ЧЧ:ММ
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -26,7 +26,7 @@ FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Подключение к базе данных
 NoTranslation=Нет перевода
 NoRecordFound=Запись не найдена
-NoError=Ошибок нет
+NoError=Нет ошибки
 Error=Ошибка
 ErrorFieldRequired=Поле '%s' обязательно для заполнения
 ErrorFieldFormat=Поле '%s' имеет неверное значение
@@ -46,7 +46,7 @@ ErrorFileNotUploaded=Файл не был загружен. Убедитесь,
 ErrorInternalErrorDetected=Обнаружена ошибка
 ErrorNoRequestRan=Никаких запросов не было запущено
 ErrorWrongHostParameter=Неверный параметр хоста
-ErrorYourCountryIsNotDefined=Ваша страна не определена. Перейдите Начало-Настройки-Редактировать и снова отправьте форму.
+ErrorYourCountryIsNotDefined=Ваша страна не определена. Перейдите Главная-Настройки-Редактировать и снова отправьте форму.
 ErrorRecordIsUsedByChild=Не удалось удалить эту запись. Эта запись используется, по крайней мере, одной дочерней записью.
 ErrorWrongValue=Неправильное значение
 ErrorWrongValueForParameterX=Неправильное значение параметра %s
@@ -62,10 +62,10 @@ ErrorFailedToSaveFile=Ошибка, не удалось сохранить фа
 SetDate=Установить дату
 SelectDate=Выбрать дату
 SeeAlso=Смотрите также %s
-SeeHere=See here
+SeeHere=Посмотрите сюда
 BackgroundColorByDefault=Цвет фона по умолчанию
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
+FileNotUploaded=Файл не загружен
+FileUploaded=Файл успешно загружен
 FileWasNotUploaded=Файл выбран как вложение, но пока не загружен. Для этого нажмите "Вложить файл".
 NbOfEntries=Кол-во записей
 GoToWikiHelpPage=Читать он-лайн помощь (нужен доступ к Интернету)
@@ -83,7 +83,7 @@ PasswordForgotten=Забыли пароль?
 SeeAbove=См. выше
 HomeArea=Начальная область
 LastConnexion=Последнее подключение
-PreviousConnexion=Предыдущее подключение
+PreviousConnexion=Предыдущий вход
 ConnectedOnMultiCompany=Подключено к объекту
 ConnectedSince=Подключено с
 AuthenticationMode=Режим аутентификации
@@ -108,7 +108,7 @@ Yes=Да
 no=нет
 No=Нет
 All=Все
-Home=Начало
+Home=Главная
 Help=Помощь
 OnlineHelp=Он-лайн помощь
 PageWiki=Страница Wiki
@@ -141,7 +141,7 @@ Cancel=Отмена
 Modify=Изменить
 Edit=Редактировать
 Validate=Проверить
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Проверить и Утвердить
 ToValidate=На проверке
 Save=Сохранить
 SaveAs=Сохранить как
@@ -150,7 +150,7 @@ ToClone=Дублировать
 ConfirmClone=Выберите данные, которые вы хотите дублировать:
 NoCloneOptionsSpecified=Данные для дублирования не определены.
 Of=из
-Go=Go
+Go=Выполнить
 Run=Выполнить
 CopyOf=Копия
 Show=Показать
@@ -159,7 +159,7 @@ Search=Поиск
 SearchOf=Поиск
 Valid=Действительный
 Approve=Одобрить
-Disapprove=Disapprove
+Disapprove=Не утверждать
 ReOpen=Переоткрыть
 Upload=Отправить файл
 ToLink=Ссылка
@@ -173,7 +173,7 @@ User=Пользователь
 Users=Пользователи
 Group=Группа
 Groups=Группы
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=Не задана группа для пользователя
 Password=Пароль
 PasswordRetype=Повторите ваш пароль
 NoteSomeFeaturesAreDisabled=Обратите внимание, что многие возможности/модули отключены в этой демонстрации.
@@ -211,8 +211,8 @@ Limit=Лимит
 Limits=Лимиты
 DevelopmentTeam=Команда разработчиков
 Logout=Выход
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s
-Connection=Подключение
+NoLogoutProcessWithAuthMode=Нет возможности разрыва соединения с этим режимим аунтетификации %s
+Connection=Войти
 Setup=Настройка
 Alert=Оповещение
 Previous=Предыдущий
@@ -221,7 +221,7 @@ Cards=Карточки
 Card=Карточка
 Now=Сейчас
 Date=Дата
-DateAndHour=Date and hour
+DateAndHour=Дата и час
 DateStart=Дата начала
 DateEnd=Дата окончания
 DateCreation=Дата создания
@@ -264,7 +264,7 @@ days=дней
 Hours=Часов
 Minutes=Минут
 Seconds=Секунд
-Weeks=Weeks
+Weeks=Недели
 Today=Сегодня
 Yesterday=Вчера
 Tomorrow=Завтра
@@ -273,7 +273,7 @@ Afternoon=После полудня
 Quadri=Квадри
 MonthOfDay=Месяц дня
 HourShort=ч
-MinuteShort=mn
+MinuteShort=мин.
 Rate=Курс
 UseLocalTax=Включить налог
 Bytes=Байт
@@ -298,7 +298,7 @@ UnitPriceHT=Цена за единицу (нетто)
 UnitPriceTTC=Цена за единицу
 PriceU=Цена ед.
 PriceUHT=Цена ед. (нетто)
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=Запрошена цена единицы за вычетом налогов
 PriceUTTC=Цена ед.
 Amount=Сумма
 AmountInvoice=Сумма счета-фактуры
@@ -324,7 +324,7 @@ SubTotal=Итого
 TotalHTShort=Всего (без налога)
 TotalTTCShort=Всего (вкл-я налог)
 TotalHT=Всего (без налога)
-TotalHTforthispage=Total (net of tax) for this page
+TotalHTforthispage=Итог (с вычетом налогов) для этой страницы
 TotalTTC=Всего (вкл-я налог)
 TotalTTCToYourCredit=Всего (вкл-я налог) с Вашей кредитной
 TotalVAT=Всего НДС
@@ -349,9 +349,10 @@ FullList=Полный список
 Statistics=Статистика
 OtherStatistics=Другие статистические данные
 Status=Статус
-Favorite=Favorite
+Favorite=Любимые
 ShortInfo=Инфо
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. поставщика
 RefPayment=Ref. оплаты
 CommercialProposalsShort=Коммерческие предложения
@@ -366,7 +367,7 @@ ActionNotApplicable=Не применяется
 ActionRunningNotStarted=Не начато
 ActionRunningShort=Начато
 ActionDoneShort=Завершено
-ActionUncomplete=Uncomplete
+ActionUncomplete=Не завершено
 CompanyFoundation=Компания/Организация
 ContactsForCompany=Контакты/адреса контрагента
 ContactsAddressesForCompany=Контак/Адреса для этого стороннего лица
@@ -375,7 +376,7 @@ ActionsOnCompany=Действия для этого контрагента
 ActionsOnMember=События об этом члене
 NActions=%s действий
 NActionsLate=% с опозданием
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Запрос уже зарегистрован
 Filter=Фильтр
 RemoveFilter=Удалить фильтр
 ChartGenerated=Диаграмма сгенерирована
@@ -394,8 +395,8 @@ Available=Доступно
 NotYetAvailable=Пока не доступно
 NotAvailable=Не доступно
 Popularity=Популярность
-Categories=Категории
-Category=Категория
+Categories=Tags/categories
+Category=Tag/category
 By=Автор
 From=От
 to=к
@@ -503,7 +504,7 @@ Keyword=Ключевое слово
 Legend=Легенда
 FillTownFromZip=Заполнить город по индексу
 Fill=Заполнить
-Reset=Reset
+Reset=Сбросить
 ShowLog=Показать журнал
 File=Файл
 Files=Файлы
@@ -519,13 +520,13 @@ NbOfCustomers=Количество клиентов
 NbOfLines=Количество строк
 NbOfObjects=Количество объектов
 NbOfReferers=Количество реферралов
-Referers=Refering objects
+Referers=Ссылающиеся объекты
 TotalQuantity=Общее количество
 DateFromTo=С %s по %s
 DateFrom=С %s
 DateUntil=До %s
 Check=Проверить
-Uncheck=Uncheck
+Uncheck=Снять 
 Internal=Внутренний
 External=Внешний
 Internals=Внутренние
@@ -564,7 +565,7 @@ MailSentBy=Отправлено по Email
 TextUsedInTheMessageBody=Текст Email
 SendAcknowledgementByMail=Отправить Подтверждение по Email
 NoEMail=Нет Email
-NoMobilePhone=No mobile phone
+NoMobilePhone=Нет мобильного телефона
 Owner=Владелец
 DetectedVersion=Обнаруженная версия
 FollowingConstantsWillBeSubstituted=Следующие константы будут подменять соответствующие значения.
@@ -601,7 +602,7 @@ MenuECM=Документы
 MenuAWStats=AWStats
 MenuMembers=Члены
 MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Лимит Dolibarr (Меню Начало-Настройки-Безопасность): %s Кб, лимит PHP: %s Кб
+ThisLimitIsDefinedInSetup=Лимит Dolibarr (Меню Главная-Настройки-Безопасность): %s Кб, лимит PHP: %s Кб
 NoFileFound=Нет документов, сохраненных в этом каталоге
 CurrentUserLanguage=Текущий язык
 CurrentTheme=Текущая тема
@@ -620,7 +621,7 @@ AddNewLine=Добавить новую строку
 AddFile=Добавить файл
 ListOfFiles=Список доступных файлов
 FreeZone=Беспошлинный ввоз
-FreeLineOfType=Free entry of type
+FreeLineOfType=Свободная запись типа
 CloneMainAttributes=Клонирование объекта с его основными атрибутами
 PDFMerge=Слияние PDF
 Merge=Слияние
@@ -657,7 +658,7 @@ OptionalFieldsSetup=Дополнительная настройка атрибу
 URLPhoto=Адрес фотографии/логотипа
 SetLinkToThirdParty=Ссылка на другой третьей стороне
 CreateDraft=Создать проект
-SetToDraft=Back to draft
+SetToDraft=Назад к черновику
 ClickToEdit=Нажмите, чтобы изменить
 ObjectDeleted=Объект удален %s
 ByCountry=По стране
@@ -668,7 +669,7 @@ ByYear=По годам
 ByMonth=по месяцам
 ByDay=Днем
 BySalesRepresentative=По торговым представителем
-LinkedToSpecificUsers=Linked to a particular user contact
+LinkedToSpecificUsers=Связан с особым контактом пользователя
 DeleteAFile=Удалить файл
 ConfirmDeleteAFile=Вы уверены, что хотите удалить файл?
 NoResults=Нет результатов
@@ -676,8 +677,8 @@ ModulesSystemTools=Настройки модулей
 Test=Тест
 Element=Элемент
 NoPhotoYet=Пока недо доступных изображений
-HomeDashboard=Home summary
-Deductible=Deductible
+HomeDashboard=Суммарная информация
+Deductible=Подлежащий вычету
 from=от
 toward=к
 Access=Доступ
@@ -685,15 +686,16 @@ HelpCopyToClipboard=Для копировани в буфер обмена ис
 SaveUploadedFileWithMask=Сохранить файл на сервер под именем "%s" (иначе "%s")
 OriginFileName=Изначальное имя файла
 SetDemandReason=Установить источник
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Задать счёт в банке
+AccountCurrency=Валюта счёта
 ViewPrivateNote=Посмотреть заметки
 XMoreLines=%s строк(и) скрыто
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show transaction
+PublicUrl=Публичная ссылка
+AddBox=Добавить бокс
+SelectElementAndClickRefresh=Выберите элемент и нажмите обновить
+PrintFile=Печать файл %s
+ShowTransaction=Показать транзакции
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Понедельник
 Tuesday=Вторник
diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
index 15722615c4a..433e46a3a1c 100644
--- a/htdocs/langs/ru_RU/margins.lang
+++ b/htdocs/langs/ru_RU/margins.lang
@@ -5,30 +5,30 @@ Margins=Наценки
 TotalMargin=Общая наценка
 MarginOnProducts=Наценка / Товары
 MarginOnServices=Наценка / Услуги
-MarginRate=Margin rate
+MarginRate=Ставка наценки
 MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
+DisplayMarginRates=Отобразить ставки наценки
 DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
+InputPrice=Исходная цена
+margin=Управление доходом с наценок
+margesSetup=Настройка управления доходомом с наценок
 MarginDetails=Детали наценки
-ProductMargins=Product margins
-CustomerMargins=Customer margins
+ProductMargins=Товарные наценки
+CustomerMargins=Наценки клиентов
 SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
+UserMargins=Пользовательские наценки
 ProductService=Продукт или Услуга
 AllProducts=Все продукты и услуги
 ChooseProduct/Service=Выберите продукт или услугу
 StartDate=Начальная дата
 EndDate=Конечная дата
-Launch=Начало
+Launch=Главная
 ForceBuyingPriceIfNull=Force buying price if null
 ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
+UseDiscountAsProduct=Как товар
+UseDiscountAsService=Как услуга
+UseDiscountOnTotal=Включить подитог
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Тип наценки
 MargeBrute=Наценка по строке
@@ -40,6 +40,6 @@ UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
 AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
+rateMustBeNumeric=Ставка должна быть числом
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+ShowMarginInfos=Показать инф-цию о наценке
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index b7750075fd8..77d60e90402 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -8,7 +8,7 @@ Members=Участники
 MemberAccount=Вход для зарегистрированных участников
 ShowMember=Показать карточку участника
 UserNotLinkedToMember=Пользователь не связан с участником
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Контр-агент не связан с участником
 MembersTickets=Члены Билеты
 FundationMembers=Члены фонда
 Attributs=Атрибуты
@@ -85,7 +85,7 @@ SubscriptionLateShort=Поздно
 SubscriptionNotReceivedShort=Никогда не получил
 ListOfSubscriptions=Список подписчиков
 SendCardByMail=Отправить карту
-AddMember=Create member
+AddMember=Создать участника
 NoTypeDefinedGoToSetup=Ни один из членов определенных типов. Переход к установке - членов типов
 NewMemberType=Новый член типа
 WelcomeEMail=Приветственное Email-письмо
@@ -125,12 +125,12 @@ Date=Свидание
 DateAndTime=Дата и время
 PublicMemberCard=Член общественного карту
 MemberNotOrNoMoreExpectedToSubscribe=Члены, не больше и не ожидается, подписаться
-AddSubscription=Create subscription
+AddSubscription=Создать подписку
 ShowSubscription=Показать подписки
 MemberModifiedInDolibarr=Член Изменения в Dolibarr
 SendAnEMailToMember=Отправить по электронной почте информацию члена
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Тема письма, которое будет получено в случае автоматически подписки гостя
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Тело письма, которое будет получено в случае автоматическоей подписки гостя
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Тема сообщения для государств-членов autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=EMail для государств-членов autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=EMail тему член валидации
@@ -141,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail тему член resiliation
 DescADHERENT_MAIL_RESIL=EMail для членов resiliation
 DescADHERENT_MAIL_FROM=Отправитель EMail для автоматического письма
 DescADHERENT_ETIQUETTE_TYPE=Этикетки формате
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Текст, который будет напечетан на адресном листе пользователя
 DescADHERENT_CARD_TYPE=Формат карт страницы
 DescADHERENT_CARD_HEADER_TEXT=Текст печатается на верхней части членов карты
 DescADHERENT_CARD_TEXT=Текст печатается на члена карты
@@ -155,7 +155,7 @@ NoThirdPartyAssociatedToMember=Никакая третья сторона, св
 ThirdPartyDolibarr=Dolibarr третья сторона
 MembersAndSubscriptions= Участники и Подписки
 MoreActions=Дополнительные меры по записи
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Дополнительные действия, предложенные по умолчанию, которые будут производтся при новой подписке
 MoreActionBankDirect=Создание прямой записи транзакций на счета
 MoreActionBankViaInvoice=Создание счета-фактуры и оплаты по счету
 MoreActionInvoiceOnly=Создание счета без каких-либо оплаты
@@ -170,8 +170,8 @@ LastSubscriptionAmount=Последняя сумма подписки
 MembersStatisticsByCountries=Члены статистику по странам
 MembersStatisticsByState=Члены статистики штата / провинции
 MembersStatisticsByTown=Члены статистики города
-MembersStatisticsByRegion=Members statistics by region
-MemberByRegion=Members by region
+MembersStatisticsByRegion=Статистика участников по регионам
+MemberByRegion=Участники по регионам
 NbOfMembers=Количество членов
 NoValidatedMemberYet=Нет проверки члены найдены
 MembersByCountryDesc=Этот экран покажет вам статистику членов странами. Графический зависит однако от Google сервис график онлайн и доступна, только если подключение к Интернету работает.
@@ -197,10 +197,10 @@ Collectivités=Организаций
 Particuliers=Личный
 Entreprises=Компании
 DOLIBARRFOUNDATION_PAYMENT_FORM=Чтобы сделать вашу подписку оплаты с помощью банковского перевода, см. стр. http://wiki.dolibarr.org/index.php/Subscribe . 
 Для оплаты с помощью кредитной карты или Paypal, нажмите на кнопку в нижней части этой страницы. 

-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+ByProperties=По характеристикам
+MembersStatisticsByProperties=Стастистика участников по характеристикам
+MembersByNature=Участники по природе
+VATToUseForSubscriptions=Значение НДС, для ипользования в подписках
+NoVatOnSubscription=Нет НДС для подписок
+MEMBER_PAYONLINE_SENDEMAIL=Адрес электронно почты, куда будут отправляться предупреждения, когда будет получено подтверждение о завершенном платеже за подписку
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Товар, который будет использован, чтобы включить подписку в счёт: %s
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index aec90dd9d16..45a378e74c6 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -16,20 +16,20 @@ SupplierOrder=Для поставщиков
 SuppliersOrders=Поставщики заказ
 SuppliersOrdersRunning=Текущие поставщиков заказов
 CustomerOrder=Для клиентов
-CustomersOrders=Customers orders
+CustomersOrders=Заказы клиентов
 CustomersOrdersRunning=Текущие клиентов заказы
 CustomersOrdersAndOrdersLines=Клиент приказов и распоряжений линий
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
+OrdersToValid=Заказы клиентов для подтверждения
+OrdersToBill=Доставленные заказы клиентов
+OrdersInProcess=Заказы клиентов в обработке
+OrdersToProcess=Заказы клиентов для обработки
 SuppliersOrdersToProcess=Поставщика заказов для обработки
 StatusOrderCanceledShort=Отменен
 StatusOrderDraftShort=Черновик
 StatusOrderValidatedShort=Подтвержденные
 StatusOrderSentShort=В процессе
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
+StatusOrderSent=Поставки в процессе
+StatusOrderOnProcessShort=Заказано
 StatusOrderProcessedShort=Обработано
 StatusOrderToBillShort=В законопроекте
 StatusOrderToBill2Short=Для выставления
@@ -41,8 +41,8 @@ StatusOrderReceivedAllShort=Все полученные
 StatusOrderCanceled=Отменен
 StatusOrderDraft=Проект (должно быть подтверждено)
 StatusOrderValidated=Подтвержденные
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=Заказано - ожидает приёма
+StatusOrderOnProcessWithValidation=Заказано - ожидает приёма или подтверждения
 StatusOrderProcessed=Обработано
 StatusOrderToBill=В законопроекте
 StatusOrderToBill2=Для выставления
@@ -51,32 +51,33 @@ StatusOrderRefused=Отказался
 StatusOrderReceivedPartially=Частично получил
 StatusOrderReceivedAll=Все полученные
 ShippingExist=Отгрузки существует
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraft=Количество товаров в проектах заказов
+ProductQtyInDraftOrWaitingApproved=Количество товаров в проектах или одобренных заказах, но не со статусом "заказан"
 DraftOrWaitingApproved=Проект или утверждены еще не заказал
 DraftOrWaitingShipped=Проект или подтверждены не отгружен
 MenuOrdersToBill=Заказы на законопроект
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Оплачиваемые заказы
 SearchOrder=Поиск тем
-SearchACustomerOrder=Search a customer order
-SearchASupplierOrder=Search a supplier order
+SearchACustomerOrder=Поиск заказа клиента
+SearchASupplierOrder=Поиск заказа поставщика
 ShipProduct=Судно продукта
 Discount=Скидка
 CreateOrder=Создать заказ
 RefuseOrder=Отписаться порядка
-ApproveOrder=Принять порядок
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Проверка порядка
 UnvalidateOrder=Unvalidate порядке
 DeleteOrder=Удалить тему
 CancelOrder=Отмена порядка
-AddOrder=Create order
+AddOrder=Создать заказ
 AddToMyOrders=Добавить в мои заказы
 AddToOtherOrders=Добавить в других заказов
-AddToDraftOrders=Add to draft order
+AddToDraftOrders=Добавить проект заказа
 ShowOrder=Показать порядок
 NoOpenedOrders=Нет открыл заказов
 NoOtherOpenedOrders=Никакие другие открыли заказов
-NoDraftOrders=No draft orders
+NoDraftOrders=Нет проектов заказов
 OtherOrders=Другие заказы
 LastOrders=Последнее %s заказов
 LastModifiedOrders=Последнее% с измененными заказов
@@ -86,7 +87,7 @@ NbOfOrders=Количество заказов
 OrdersStatistics=Приказы Статистика
 OrdersStatisticsSuppliers=Поставщик заказов статистика
 NumberOfOrdersByMonth=Количество заказов в месяц
-AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Количество заказов по месяцам (за вычетом налогов)
 ListOfOrders=Список заказов
 CloseOrder=Закрыть тему
 ConfirmCloseOrder=Вы уверены, что хотите, чтобы закрыть эту тему? После того, как заказ является закрытым, он может быть выставлен счет.
@@ -97,11 +98,13 @@ ConfirmUnvalidateOrder=Вы уверены, что хотите, чтобы во
 ConfirmCancelOrder=Вы уверены, что хотите отменить этот заказ?
 ConfirmMakeOrder=Вы уверены, что хотите, чтобы подтвердить вы сделали этот заказ на %s?
 GenerateBill=Создать счет-фактуру
-ClassifyShipped=Classify delivered
+ClassifyShipped=Отметить доставленным
 ClassifyBilled=Классифицировать "Billed"
 ComptaCard=Бухгалтерия карту
 DraftOrders=Проект распоряжения
 RelatedOrders=Похожие заказов
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=В процессе заказов
 RefOrder=Ref. заказ
 RefCustomerOrder=Ref. Для клиента
@@ -118,6 +121,7 @@ PaymentOrderRef=Оплата заказа %s
 CloneOrder=Клон порядка
 ConfirmCloneOrder=Вы уверены, что хотите клон этого приказа %s?
 DispatchSupplierOrder=Прием %s поставщиком для
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Представитель следующие меры для клиентов
 TypeContact_commande_internal_SHIPPING=Представитель следующие меры судоходства
@@ -134,7 +138,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Постоянная COMMANDE_SUPPLIER_
 Error_COMMANDE_ADDON_NotDefined=Постоянная COMMANDE_ADDON не определена
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Не удалось загрузить модуль файл ' %s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Не удалось загрузить модуль файл ' %s'
-Error_OrderNotChecked=No orders to invoice selected
+Error_OrderNotChecked=Не выбраны заказы для выставления счёта
 # Sources
 OrderSource0=Коммерческое предложение
 OrderSource1=Интернет
@@ -148,19 +152,19 @@ AddDeliveryCostLine=Добавить доставки Стоимость лин
 # Documents models
 PDFEinsteinDescription=Для полной модели (logo. ..)
 PDFEdisonDescription=Простая модель для
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=Целиком заполненный  счёт (логотип...)
 # Orders modes
 OrderByMail=Почта
 OrderByFax=Факс
 OrderByEMail=EMail
 OrderByWWW=Интернет
 OrderByPhone=Телефон
-CreateInvoiceForThisCustomer=Bill orders
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Оплатить заказы
+NoOrdersToInvoice=Нет заказов для оплаты
+CloseProcessedOrdersAutomatically=Отметить "В обработке" все выделенные заказы
+OrderCreation=Создание заказа
+Ordered=Заказано
+OrderCreated=Ваши заказы созданы
+OrderFail=Возникла ошибка при создании заказов
+CreateOrders=Создать заказы
+ToBillSeveralOrderSelectCustomer=Для создания счёта на несколько заказов, сначала нажмите на клиента, затем выберете  "%s".
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 867240f9b84..d920d4cb765 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -8,10 +8,11 @@ BirthdayDate=День рождения
 DateToBirth=Дата рождения
 BirthdayAlertOn= рождения активного оповещения
 BirthdayAlertOff= рождения оповещения неактивные
-Notify_FICHINTER_VALIDATE=Проверка вмешательства
+Notify_FICHINTER_VALIDATE=Посредничество подтверждено
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Проверка векселя
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=Счёт клиента не подтверждён
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Поставщик утвердил порядок
 Notify_ORDER_SUPPLIER_REFUSE=Поставщик порядке отказалась
 Notify_ORDER_VALIDATE=Kundeordre validert
@@ -28,33 +29,33 @@ 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=Поставщик оплачен счет-фактура
 Notify_BILL_SUPPLIER_SENTBYMAIL=Поставщиком счета по почте
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Счёт поставщика отменён
 Notify_CONTRACT_VALIDATE=Договор проверку
-Notify_FICHEINTER_VALIDATE=Вмешательство проверку
+Notify_FICHEINTER_VALIDATE=Посредничество проверено.
 Notify_SHIPPING_VALIDATE=Доставка проверку
 Notify_SHIPPING_SENTBYMAIL=Доставка по почте
 Notify_MEMBER_VALIDATE=Член проверки
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=Участник изменён
 Notify_MEMBER_SUBSCRIPTION=Член подписки
 Notify_MEMBER_RESILIATE=Член resiliated
 Notify_MEMBER_DELETE=Член удален
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+Notify_PROJECT_CREATE=Создание проекта
+Notify_TASK_CREATE=Задача создана
+Notify_TASK_MODIFY=Задача изменена
+Notify_TASK_DELETE=Задача удалена
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Количество прикрепленных файлов / документов
 TotalSizeOfAttachedFiles=Общий размер присоединенных файлов / документы
 MaxSize=Максимальный размер
 AttachANewFile=Присоединить новый файл / документ
 LinkedObject=Связанные объект
 Miscellaneous=Разное
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Количество адресов (количество адресов электронной почты получателей)
 PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur.
 PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift). 
 De to linjene er skilt med en vognretur.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
@@ -81,16 +82,16 @@ ModifiedBy=Модифицированное% по S
 ValidatedBy=Подтверждено %s
 CanceledBy=Отменена %s
 ClosedBy=Закрытые% по S
-CreatedById=User id who created
-ModifiedById=User id who made last change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made last change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
+CreatedById=ID пользователя, который создал
+ModifiedById=ID пользователя, который сделал последнее изменение
+ValidatedById=ID пользователя, который подтвердил
+CanceledById=ID пользователя, который отменил
+ClosedById=ID пользователя, который закрыл
+CreatedByLogin=Логин пользователя, который создал
+ModifiedByLogin=Логин пользователя, который сделал последнее изменение
+ValidatedByLogin=Логин пользователя, который подтвердил
+CanceledByLogin=Логин пользователя, который отменил
+ClosedByLogin=Логин пользователя, который закрыл
 FileWasRemoved=Файл был удален
 DirWasRemoved=Каталог был удален
 FeatureNotYetAvailableShort=Имеющиеся в следующей версии
@@ -158,22 +159,23 @@ StatsByNumberOfEntities=Статистика в ряде организаций
 NumberOfProposals=Количество предложений на последние 12 месяцев
 NumberOfCustomerOrders=Количество заказов на последние 12 месяцев
 NumberOfCustomerInvoices=Количество клиентских счетов в последние 12 месяцев
-NumberOfSupplierOrders=Number of supplier orders on last 12 month
+NumberOfSupplierOrders=Количество заказов поставщиков за последние 12 месяцев
 NumberOfSupplierInvoices=Количество поставщиком счета-фактуры на последние 12 месяцев
 NumberOfUnitsProposals=Antall enheter på forslag på siste 12 mnd
 NumberOfUnitsCustomerOrders=Количество единиц по заказам на последние 12 месяцев
 NumberOfUnitsCustomerInvoices=Количество единиц на счетах клиента в последние 12 месяцев
-NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
+NumberOfUnitsSupplierOrders=Количество единиц в заказах поставщиков за последние 12 месяцев
 NumberOfUnitsSupplierInvoices=Количество единиц по поставщиком счета-фактуры на последние 12 месяцев
-EMailTextInterventionValidated=Вмешательство %s проверены
+EMailTextInterventionValidated=Посредничество %s проверено.
 EMailTextInvoiceValidated=Счет %s проверены
 EMailTextProposalValidated=Forslaget %s har blitt validert.
 EMailTextOrderValidated=Ordren %s har blitt validert.
 EMailTextOrderApproved=Приказ% с утвержденными
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Приказ %s одобрен %s
 EMailTextOrderRefused=Приказ %s отказала
 EMailTextOrderRefusedBy=Приказ %s отказано %s
-EMailTextExpeditionValidated=The shipping %s has been validated.
+EMailTextExpeditionValidated=Отправка %s подтверждена
 ImportedWithSet=Импорт данных
 DolibarrNotification=Автоматические уведомления
 ResizeDesc=Skriv inn ny bredde eller ny høyde. Forhold vil bli holdt under resizing ...
@@ -195,35 +197,35 @@ StartUpload=Начать загрузку
 CancelUpload=Отмена загрузки
 FileIsTooBig=Файлы слишком велик
 PleaseBePatient=Пожалуйста, будьте терпеливы ...
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+RequestToResetPasswordReceived=Получен запрос на изменение вашего пароля в системе Dolibarr
+NewKeyIs=Ваши новые ключи для доступа
+NewKeyWillBe=Ваш новый ключ для доступа к ПО будет
+ClickHereToGoTo=Нажмите сюда, чтобы перейти к %s
+YouMustClickToChange=Однако, вы должны сначала нажать на ссылку для подтверждения изменения пароля
+ForgetIfNothing=Если вы не запрашивали эти изменения, забудьте про это электронное письмо.  Ваши данные в безопасности.
 
 ##### Calendar common #####
 AddCalendarEntry=Добавить запись в календаре %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
+NewCompanyToDolibarr=Компания %s  добавлена
+ContractValidatedInDolibarr=Контакт %s подтверждён
+ContractCanceledInDolibarr=Контакт %s отменён
+ContractClosedInDolibarr=Контакт %s закрыт
+PropalClosedSignedInDolibarr=Ком. предложение  %s подписано
+PropalClosedRefusedInDolibarr=Ком. предложение %s отклонено
+PropalValidatedInDolibarr=Ком. предложение %s  подтвердено
+PropalClassifiedBilledInDolibarr=Коммерческое предложение  %s  отмечено оплаченным
+InvoiceValidatedInDolibarr=Счёт %s подтверждён
+InvoicePaidInDolibarr=Счёт %s  оплачен
+InvoiceCanceledInDolibarr=Счёт %s  отменён
+PaymentDoneInDolibarr=Платёж  %s  завершён
+CustomerPaymentDoneInDolibarr=Платёж клиента %s  завершён
+SupplierPaymentDoneInDolibarr=Платёж поставщика %s  завершён
+MemberValidatedInDolibarr=Участник %s  подтверждён
 MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+MemberDeletedInDolibarr=Участник  %s удалён
+MemberSubscriptionAddedInDolibarr=Подписка участника %s  добавлена
+ShipmentValidatedInDolibarr=Отправка %s  проверена
+ShipmentDeletedInDolibarr=Отправка %s удалена
 ##### Export #####
 Export=Экспорт
 ExportsArea=Экспорт области
diff --git a/htdocs/langs/ru_RU/paybox.lang b/htdocs/langs/ru_RU/paybox.lang
index ffa474a9646..0e9bf7ca0d1 100644
--- a/htdocs/langs/ru_RU/paybox.lang
+++ b/htdocs/langs/ru_RU/paybox.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox модуль настройки
+PayBoxSetup=Настройка модуля PayBox 
 PayBoxDesc=Этот модуль предложить страниц, чтобы платеж по Paybox клиентами. Это может быть использовано для свободного платежа или за плату по тому или иному объекту Dolibarr (счетов-фактур, порядка, ...)
 FollowingUrlAreAvailableToMakePayments=После URL, можно предложить страницу к клиенту сделать платеж по Dolibarr объектов
 PaymentForm=Форма оплаты
@@ -10,10 +10,10 @@ ToComplete=Для завершения
 YourEMail=Электронная почта для подтверждения оплаты
 Creditor=Кредитор
 PaymentCode=Код платежа
-PayBoxDoPayment=Перейти на оплату
+PayBoxDoPayment=Перейти к оплате
 YouWillBeRedirectedOnPayBox=Вы будете перенаправлены по обеспеченным Paybox страницу для ввода данных кредитной карточки
 PleaseBePatient=Пожалуйста, будьте терпеливы
-Continue=Следующий
+Continue=Далее
 ToOfferALinkForOnlinePayment=URL-адрес для оплаты %s
 ToOfferALinkForOnlinePaymentOnOrder=URL предложить %s онлайн платежей пользовательский интерфейс для заказа
 ToOfferALinkForOnlinePaymentOnInvoice=URL предложить %s онлайн платежей пользовательский интерфейс для счета
@@ -32,9 +32,9 @@ VendorName=Имя поставщика
 CSSUrlForPaymentForm=CSS-стилей URL для оплаты форме
 MessageOK=Сообщение на странице проверки возвращение оплаты
 MessageKO=Сообщение на странице отменен возврат оплаты
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+NewPayboxPaymentReceived=Новый платёж Paybox поулчен.
+NewPayboxPaymentFailed=Попытка нового платежа Paybox не удалась
+PAYBOX_PAYONLINE_SENDEMAIL=Адрес электронной почты, куда будет высылаться уведомление о платеже (успешном или нет)
+PAYBOX_PBX_SITE=Значение PBX SITE
+PAYBOX_PBX_RANG=Значение PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Значение PBX ID
diff --git a/htdocs/langs/ru_RU/paypal.lang b/htdocs/langs/ru_RU/paypal.lang
index 09164b84068..cdf9c920b88 100644
--- a/htdocs/langs/ru_RU/paypal.lang
+++ b/htdocs/langs/ru_RU/paypal.lang
@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal модуль установки
+PaypalSetup=Настройка модуля PayPal 
 PaypalDesc=Этот модуль предлагает страниц, чтобы выплаты по PayPal клиентами. Это может быть использовано для свободного оплаты или оплаты на определенный объект Dolibarr (счет-фактура, заказ, ...)
 PaypalOrCBDoPayment=Оплатить с помощью кредитной карты или Paypal
 PaypalDoPayment=Оплатить с помощью Paypal
 PaypalCBDoPayment=Оплата кредитной картой
-PAYPAL_API_SANDBOX=Режим тестирования / песочнице
+PAYPAL_API_SANDBOX=Режим тестирования / песочницы
 PAYPAL_API_USER=API имя пользователя
 PAYPAL_API_PASSWORD=API пароль
 PAYPAL_API_SIGNATURE=API подпись
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Предложение платежа "Интеграл" (кредитные карточки + Paypal) или "PayPal", только
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-PAYPAL_CSS_URL=Optionnal адрес таблицы стилей CSS на странице оплаты
-ThisIsTransactionId=Это идентификатор сделки: %s
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Предлагает платеж "Интегральный" (кредитные карты + Paypal) или только "PayPal"
+PaypalModeIntegral=Интегральный
+PaypalModeOnlyPaypal=только PayPal
+PAYPAL_CSS_URL=Ссылка на собственные стили CSS на странице оплаты (необязательная)
+ThisIsTransactionId=Это идентификатор транзакции: %s
 PAYPAL_ADD_PAYMENT_URL=Добавить адрес Paypal оплата при отправке документа по почте
 PAYPAL_IPN_MAIL_ADDRESS=Адрес электронной почты для мгновенного уведомления об оплате (IPN)
-PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n
-YouAreCurrentlyInSandboxMode=Вы в настоящее время в "песочнице" режим
-NewPaypalPaymentReceived=New Paypal payment received
-NewPaypalPaymentFailed=New Paypal payment tried but failed
-PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+PredefinedMailContentLink=Вы можете нажать на защищённую ссылку нижи для совершения платежа (PayPal), если вы ещё его не производили.\n\n%s\n
+YouAreCurrentlyInSandboxMode=В настоящее время вы в режиме "песочницы"
+NewPaypalPaymentReceived=Получен новый платёж Paypal 
+NewPaypalPaymentFailed=Попытка нового Paypal  платежа не удалась
+PAYPAL_PAYONLINE_SENDEMAIL=Адрес электронной почты, куда будут высылаться уведомления о платежах (успешных или нет)
+ReturnURLAfterPayment=Ссылка, куда будет возвращаться пользователь после оплаты
+ValidationOfPaypalPaymentFailed=Проверка платежа  Paypal не удалась
+PaypalConfirmPaymentPageWasCalledButFailed=Вызвана страница подтверждения платежа Paypal, но подтверждение от  Paypal не поулчено.
diff --git a/htdocs/langs/ru_RU/printipp.lang b/htdocs/langs/ru_RU/printipp.lang
index 835e6827f12..13656b20f47 100644
--- a/htdocs/langs/ru_RU/printipp.lang
+++ b/htdocs/langs/ru_RU/printipp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
+PrintIPPSetup=Установка модуля Прямой Печати
+PrintIPPDesc=Этот модуль добавляет кнопку Печати c последующей отправкой документов напрямую на принтер. Для этого требуется система Linux с установленным CUPS.
+PRINTIPP_ENABLED=Показать иконку "Прямая печать" в списке документов
+PRINTIPP_HOST=Сервер печати
+PRINTIPP_PORT=Порт
+PRINTIPP_USER=Логин
+PRINTIPP_PASSWORD=Пароль
+NoPrinterFound=Ни один принтер не найден (проверьте настройки CUPS)
+FileWasSentToPrinter=Файл %s был отправлен на печать
+NoDefaultPrinterDefined=Принтер по умолчанию не установлен
+DefaultPrinter=Принтер по умолчанию
+Printer=Принтер
+CupsServer=Сервер CUPS
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index 45263681965..9fd48b424d4 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -1,21 +1,21 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
-ProductStatusOnBatchShort=Yes
-ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
-l_eatby=Eat-by date
-l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ManageLotSerial=Использовать номер партии/серийный номер
+ProductStatusOnBatch=Да (требуется номер партии/серийный номер)
+ProductStatusNotOnBatch=Нет (номер партии/серийный номер не требуется)
+ProductStatusOnBatchShort=Да
+ProductStatusNotOnBatchShort=Нет
+Batch=Номер партии/Серийный номер
+atleast1batchfield=Дата окончания срока годности или дата продажи или номер партии
+batch_number=Номер партии/серийный номер
+l_eatby=Дата окончания срока годности
+l_sellby=Дата продажи
+DetailBatchNumber=Детали по номеру партии/серийному номеру
+DetailBatchFormat=Номер партии/Серийный номер: %s - Дата окончания срока годности : %s - Дата продажи: %s (Кол-во : %d)
+printBatch=Номер партии: %s
+printEatby=Дата окончания срока годности: %s
+printSellby=Дата продажи: %s
+printQty=Кол-во:%d
+AddDispatchBatchLine=Добавить строку Срока годности
+BatchDefaultNumber=Не задана
+WhenProductBatchModuleOnOptionAreForced=Когда модуль Номер партии/Серийный номер включен, увеличение или уменьшение запаса на складе будет сброшено к последнему выбору и не может быть отредактировано. Другие настройки вы можете задавать по вашему желанию.
+ProductDoesNotUseBatchSerial=Этот товар не использует номер партии/серийный номер
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index b777ee9ed23..f87ac582067 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -1,131 +1,131 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Продукт исх.
-ProductLabel=Продукт этикетки
-ProductServiceCard=Товары / Услуги-карты
-Products=Продукция
+ProductLabel=Этикетка товара
+ProductServiceCard=Карточка Товаров/Услуг
+Products=Товары
 Services=Услуги
-Product=Продукт
-Service=Службы
-ProductId=Товар / услуга ID
+Product=Товар
+Service=Услуга
+ProductId=ID товара / услуги 
 Create=Создать
 Reference=Справка
-NewProduct=Новый продукт
+NewProduct=Новый товар
 NewService=Новая услуга
-ProductCode=Код продукта
-ServiceCode=Служба код
-ProductVatMassChange=Mass VAT change
+ProductCode=Код товара
+ServiceCode=Код услуги
+ProductVatMassChange=Массовое изменение НДС
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Бухгалтерия код (купить)
-ProductAccountancySellCode=Бухгалтерия код (продать)
-ProductOrService=Продукт или услуга
-ProductsAndServices=Продукты и услуги
-ProductsOrServices=Продукты и услуги
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductAccountancyBuyCode=Код бухгалтерии  (купли)
+ProductAccountancySellCode=Код бухгалтерии (продажи)
+ProductOrService=Товар или Услуга
+ProductsAndServices=Товары и Услуги
+ProductsOrServices=Товары  или Услуги
+ProductsAndServicesOnSell=Товары и Услуги для покупки или продажи
+ProductsAndServicesNotOnSell=Товары или Услуги не для продажи
 ProductsAndServicesStatistics=Продукты и услуги статистика
 ProductsStatistics=Продукты статистика
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
+ProductsOnSell=Товар для покупки или продажи
+ProductsNotOnSell=Товар не для покупки и не для продажи
+ProductsOnSellAndOnBuy=Товар для продажи и покупки
+ServicesOnSell=Услуга для покупки или для продажи
+ServicesNotOnSell=Услуга не для продажи
+ServicesOnSellAndOnBuy=Услуга для продажи и покупки
 InternalRef=Внутренние ссылки
 LastRecorded=Последние продукты / услуги по продаже зарегистрировано
-LastRecordedProductsAndServices=Последнее %s зарегистрированные продукции / услуг
-LastModifiedProductsAndServices=Последнее %s модифицированных продуктов / услуг
-LastRecordedProducts=Последнее% с продуктами зарегистрировано
-LastRecordedServices=Последнее %s услуги зарегистрированы
-LastProducts=Последние продукты
-CardProduct0=Продукт-карты
-CardProduct1=Служба карту
-CardContract=Контракт карту
+LastRecordedProductsAndServices=Последние %s зарегистрированные товары / услуги
+LastModifiedProductsAndServices=Последние %s изменённые товары / услуги
+LastRecordedProducts=Последние %s   зарегистрированные товары
+LastRecordedServices=Последние %s зарегистрированные услуги 
+LastProducts=Последние товары
+CardProduct0=Карточка товара
+CardProduct1=Карточка услуги
+CardContract=Карточка контакта
 Warehouse=Склад
 Warehouses=Склады
 WarehouseOpened=Склад открыт
-WarehouseClosed=Склад закрыто
-Stock=Фондовый
-Stocks=Акции
+WarehouseClosed=Склад закрыт
+Stock=Склад
+Stocks=Склады
 Movement=Движение
-Movements=Перевозкой
-Sell=Реализация
+Movements=Движения
+Sell=Продажи
 Buy=Покупает
 OnSell=На продажу
 OnBuy=Приобретенная
-NotOnSell=Из Продать
+NotOnSell=Не для продажи
 ProductStatusOnSell=На продажу
-ProductStatusNotOnSell=За продажу
+ProductStatusNotOnSell=Не для продажи
 ProductStatusOnSellShort=На продажу
-ProductStatusNotOnSellShort=За продажу
-ProductStatusOnBuy=Доступный
-ProductStatusNotOnBuy=Устаревший
-ProductStatusOnBuyShort=Доступный
-ProductStatusNotOnBuyShort=Устаревший
-UpdatePrice=Обновление цен
-AppliedPricesFrom=Прикладная ценам от
+ProductStatusNotOnSellShort=Не для продажи
+ProductStatusOnBuy=Для покупки
+ProductStatusNotOnBuy=Не для покупки
+ProductStatusOnBuyShort=Для покупки
+ProductStatusNotOnBuyShort=Не для покупки
+UpdatePrice=Обновить  цену
+AppliedPricesFrom=Применить цены от
 SellingPrice=Продажная цена
 SellingPriceHT=Продажная цена (за вычетом налогов)
 SellingPriceTTC=Продажная цена (вкл. налоги)
-PublicPrice=Государственные цены
+PublicPrice=Официальные цены
 CurrentPrice=Текущая цена
 NewPrice=Новая цена
 MinPrice=Миним. продажная цена
 MinPriceHT=Минимальная цена продажи (net of tax)
 MinPriceTTC=Минимальная цена продажи (inc. tax)
-CantBeLessThanMinPrice=В продаже цена не может быть ниже минимального позволило этот продукт (S% без учета налогов)
-ContractStatus=Контракт статус
+CantBeLessThanMinPrice=Продажная цена не может быть ниже минимальной для этого товара (%s без налогов). Это сообщение также возникает, если вы задаёте слишком большую скидку.
+ContractStatus=Статус контакта
 ContractStatusClosed=Закрытые
-ContractStatusRunning=Запуск
-ContractStatusExpired=истек
-ContractStatusOnHold=Не работает
+ContractStatusRunning=В работе
+ContractStatusExpired=истекли
+ContractStatusOnHold=Не в работе
 ContractStatusToRun=To get running
-ContractNotRunning=Этот контракт не выполняется
+ContractNotRunning=Этот контракт не в работе
 ErrorProductAlreadyExists=Продукции с учетом% уже существует.
 ErrorProductBadRefOrLabel=Неправильное значение для справки или этикетку.
 ErrorProductClone=Возникла проблема при попытке дублирования продукта или услуги
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Ошибка. Цена не может быть ниже минимальной цены. 
 Suppliers=Поставщики
 SupplierRef=Поставщик исх.
-ShowProduct=Показать продукта
-ShowService=Показать служба
-ProductsAndServicesArea=Продукты и услуги области
-ProductsArea=Продукт области
+ShowProduct=Показать товар
+ShowService=Показать услугу
+ProductsAndServicesArea=Раздел товаров и услуг
+ProductsArea=Раздел товаров
 ServicesArea=Службы района
 AddToMyProposals=Добавить к моим предложениям
 AddToOtherProposals=Добавить к другим предложениям
 AddToMyBills=Добавить к моим законопроектов
 AddToOtherBills=Добавить к другим законопроектам
-CorrectStock=Правильно запас
+CorrectStock=Исправить склад
 AddPhoto=Добавить фото
 ListOfStockMovements=Список акций движения
 BuyingPrice=Покупка цене
-SupplierCard=Поставщик карту
-CommercialCard=Коммерческая карту
-AllWays=Путь найти свой продукт в запасе
+SupplierCard=Карточка поставщика
+CommercialCard=Коммерческая карточка
+AllWays=Путь для поиска вашего товара на складе
 NoCat=Ваш продукт не находится в какой-либо категории
-PrimaryWay=Первичный путь
-PriceRemoved=Цена удален
+PrimaryWay=Основной путь
+PriceRemoved=Цена удалена
 BarCode=Штрих-код
 BarcodeType=Штрих-код типа
 SetDefaultBarcodeType=Установить тип штрих-кода
-BarcodeValue=Баркод стоимости
-NoteNotVisibleOnBill=Примечание (не видимые на счетах-фактурах, предложения ...)
+BarcodeValue=Значение штрих-кода
+NoteNotVisibleOnBill=Примечание (не видимые на счетах-фактурах, предложениях ...)
 CreateCopy=Создать копию
 ServiceLimitedDuration=Если продукт является услугой с ограниченной длительности:
-MultiPricesAbility=Several level of prices per product/service
-MultiPricesNumPrices=Кол-во Цена
-MultiPriceLevelsName=Цена категорий
-AssociatedProductsAbility=Activate the virtual package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+MultiPricesAbility=Несколько уровней цен для товаров/услуг
+MultiPricesNumPrices=Кол-во цен
+MultiPriceLevelsName=Категории цен
+AssociatedProductsAbility=Включить режим виртуальной упаковки товара
+AssociatedProducts=Упаковка товара
+AssociatedProductsNumber=Количество товаров в этой виртуальной упоковке
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=Если задан 0, то этот товар не виртуальная упаковка
+IfZeroItIsNotUsedByVirtualProduct=Если задан 0, то этот товар не будет использован ни в какой виртуальной упаковке
 EditAssociate=Ассоциированные
 Translation=Перевод
-KeywordFilter=Ключевое слово фильтр
+KeywordFilter=Фильтр ключевых слов
 CategoryFilter=Категория фильтр
 ProductToAddSearch=Поиск продукта для добавления
 AddDel=Добавить / Удалить
@@ -139,14 +139,14 @@ ConfirmDeleteProduct=Вы уверены, что хотите удалить э
 ProductDeleted=Товар / Услуга " %s" исключены из базы данных.
 DeletePicture=Удалить изображение
 ConfirmDeletePicture=Вы уверены, что хотите удалить эту фотографию?
-ExportDataset_produit_1=Продукты и услуги
+ExportDataset_produit_1=Товары
 ExportDataset_service_1=Услуги
-ImportDataset_produit_1=Продукты
+ImportDataset_produit_1=Товары
 ImportDataset_service_1=Услуги
-DeleteProductLine=Удалить продукции
-ConfirmDeleteProductLine=Вы уверены, что хотите удалить этот продукт линии?
-NoProductMatching=Нет продукта / услуги соответствуют Вашим критериям
-MatchingProducts=Соответствие продукции / услуг
+DeleteProductLine=Удалить строку товара
+ConfirmDeleteProductLine=Вы уверены, что хотите удалить эту строку с товаром?
+NoProductMatching=Нет товара / услуги соответствующих Вашим критериям
+MatchingProducts=Соответствие товаров / услуг
 NoStockForThisProduct=Нет запасов для данного продукта
 NoStock=Нет фондовая
 Restock=Пополнять
@@ -154,19 +154,19 @@ ProductSpecial=Специальные
 QtyMin=Минимальное кол-во
 PriceQty=Цена на такое количество
 PriceQtyMin=Цена для этого мин. кол-ва (без скидки)
-VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
+VATRateForSupplierProduct=Значение НДС (для этого поставщика/товара)
+DiscountQtyMin=Скидка по умолчанию за количество
 NoPriceDefinedForThisSupplier=Нет цена / Qty определенных для этого поставщика / продукта
 NoSupplierPriceDefinedForThisProduct=Нет поставщиком цена / Qty определенных для этого продукта
 RecordedProducts=Продукты зарегистрировано
-RecordedServices=Services recorded
+RecordedServices=Услуги записаны
 RecordedProductsAndServices=Товары / услуги зарегистрированы
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
+PredefinedProductsToSell=Определённый заранее товар для  продажи
+PredefinedServicesToSell=Определённая заранее услуга для  продажи
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
+PredefinedProductsToPurchase=Определённый заранее товар для  покупки
+PredefinedServicesToPurchase=Определённая заранее услуга для покупки
+PredefinedProductsAndServicesToPurchase=Определённые заранее товары/услуги для  покупки
 GenerateThumb=Генерируйте пальца
 ProductCanvasAbility=Используйте специальные "холст" аддонами
 ServiceNb=Служба # %s
@@ -184,13 +184,13 @@ ProductIsUsed=Этот продукт используется
 NewRefForClone=Ссылка нового продукта / услуги
 CustomerPrices=Клиенты цены
 SuppliersPrices=Поставщики цены
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Цены поставщика (за товары или услуги)
 CustomCode=Пользовательский код
 CountryOrigin=Страна происхождения
 HiddenIntoCombo=Скрытые в списках выбора
 Nature=Природа
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=Ссылка на шаблон товара
+ServiceCodeModel=Ссылка на шаблон услуги
 AddThisProductCard=Создать карточку товара
 HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
 AddThisServiceCard=Создать карточку услуги
@@ -198,9 +198,9 @@ HelpAddThisServiceCard=This option allows you to create or clone a service if it
 CurrentProductPrice=Текущая цена
 AlwaysUseNewPrice=Всегда использовать текущую цену продукта/услуги
 AlwaysUseFixedPrice=Использовать фиксированную цену
-PriceByQuantity=Different prices by quantity
-PriceByQuantityRange=Quantity range
-ProductsDashboard=Products/Services summary
+PriceByQuantity=Разные цены по количеству
+PriceByQuantityRange=Диапазон количества
+ProductsDashboard=Товары/услуги в общем
 UpdateOriginalProductLabel=Modify original label
 HelpUpdateOriginalProductLabel=Позволяет изменить название товара
 ### composition fabrication
@@ -214,7 +214,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Производство завершено
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Цены клиенты (за товары, услуги, совместные цены)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=I квартал
@@ -223,34 +223,47 @@ Quarter3=III квартал
 Quarter4=IV квартал
 BarCodePrintsheet=Печать штрих-кода
 PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+NumberOfStickers=Количество стикеров для печати на странице
+PrintsheetForOneBarCode=Печатать несколько стикеров для одного штрих-кода
+BuildPageToPrint=Создать страницу для печати
+FillBarCodeTypeAndValueManually=Заполнить тип и значение штрих-кода вручную.
+FillBarCodeTypeAndValueFromProduct=Заполнить тип и значение из штрих-кода товара.
+FillBarCodeTypeAndValueFromThirdParty=Заполнить тип и значение из штрих-кода контрагента.
+DefinitionOfBarCodeForProductNotComplete=Тип и значение штрих-кода не заданы для товара %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Тип и значение штрих-кода не заданы для контрагента %s.
 BarCodeDataForProduct=Информация по штрих-коду продукта %s:
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different price for each customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+BarCodeDataForThirdparty=Информация штрих-кода контрагента %s 
+ResetBarcodeForAllRecords=Задать значение штри х-кода ля всех записей (это также установит значение штрих-кода для тех записей, где он был уже задан)
+PriceByCustomer=Различная цена для каждого клиента
+PriceCatalogue=Уникальная цена для товара/услуги
+PricingRule=Правила для цен клиента
+AddCustomerPrice=Добавить цену клиента
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceByCustomerLog=Цена по журналу клиента
+MinimumPriceLimit=Минимальная цена не может быть ниже %s
+MinimumRecommendedPrice=Минимальная рекомендованная цена : %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 #options_myextrafieldkey#
+PriceExpressionEditorHelp1="price = 2+2" или "2 + 2"  для задания цены. Используйте ; в качестве разделителя выражений.
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
+PriceNumeric=Номер
+DefaultPrice=Цена по умолчанию
 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
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 6fcad543512..aa51b63ec92 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
+RefProject=Ref. проект
 ProjectId=ID Проекта
 Project=Проект
 Projects=Проекты
-ProjectStatus=Project status
+ProjectStatus=Статус проекта
 SharedProject=Общий проект
 PrivateProject=Контакты проекта
 MyProjectsDesc=Эта точка зрения ограничена проекты, которые Вы контакте (что бы это тип).
 ProjectsPublicDesc=Эта точка зрения представлены все проекты, которые Вы позволили читать.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Это представление всех проектов и задач, к которым у вас есть доступ.
 ProjectsDesc=Эта точка зрения представляет все проекты (разрешений пользователей предоставить вам разрешение для просмотра всего).
 MyTasksDesc=Эта точка зрения ограничена на проекты или задачи, которые являются для контакта (что бы это тип).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Видны только открытые проекты (проекты на стадии черновика или закрытые проекты не видны)
 TasksPublicDesc=Эта точка зрения представляет всех проектов и задач, которые могут читать.
 TasksDesc=Эта точка зрения представляет всех проектов и задач (разрешений пользователей предоставить вам разрешение для просмотра всего).
 ProjectsArea=Проекты области
 NewProject=Новый проект
-AddProject=Create project
+AddProject=Создать проект
 DeleteAProject=Удаление проекта
 DeleteATask=Удалить задание
 ConfirmDeleteAProject=Вы уверены, что хотите удалить этот проект?
@@ -31,8 +31,8 @@ NoProject=Нет проекта определена
 NbOpenTasks=Nb открытых задач
 NbOfProjects=Nb проектов
 TimeSpent=Время, затраченное
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Затраченное мной время
+TimeSpentByUser=Затраченное пользователем время
 TimesSpent=Время, проведенное
 RefTask=Ref. задача
 LabelTask=Этикетка задачи
@@ -40,8 +40,8 @@ TaskTimeSpent=Время, потраченное на задачи
 TaskTimeUser=Пользователь
 TaskTimeNote=Заметка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Tasks on opened projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=Задачи на открытых проектах
+WorkloadNotDefined=Рабочая нагрузка не задана
 NewTimeSpent=Новое время
 MyTimeSpent=Мое время
 MyTasks=Мои задачи
@@ -51,7 +51,7 @@ TaskDateStart=Дата начала задачи
 TaskDateEnd=Дата завершения задачи
 TaskDescription=Описание задачи
 NewTask=Новые задачи
-AddTask=Create task
+AddTask=Создать задачу
 AddDuration=Добавить продолжительность
 Activity=Мероприятие
 Activities=Задачи / мероприятия
@@ -60,8 +60,8 @@ MyActivities=Мои задачи / мероприятия
 MyProjects=Мои проекты
 DurationEffective=Эффективная длительность
 Progress=Прогресс
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Заданный ход выполнения проекта
+ProgressCalculated=Вычисленный  ход выполнения проекта
 Time=Время
 ListProposalsAssociatedProject=Списки коммерческих предложений, связанных с проектом
 ListOrdersAssociatedProject=Списки заказы, связанные с проектом
@@ -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=Деятельность по проектам в этом месяце
@@ -91,13 +92,13 @@ ActionsOnProject=Действия по проекту
 YouAreNotContactOfProject=Вы не контакт этого частного проекта
 DeleteATimeSpent=Удалить времени
 ConfirmDeleteATimeSpent=Вы уверены, что хотите удалить этот раз провели?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Также видеть  задачи, не назначенные мне
+ShowMyTasksOnly=Видеть только задачи, назначенные мне
 TaskRessourceLinks=Библиография
 ProjectsDedicatedToThisThirdParty=Проектов, посвященных этой третьей стороне
 NoTasks=Нет задач, для этого проекта
 LinkedToAnotherCompany=Связь с другими третий участник
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Задачи, не назначенные вам
 ErrorTimeSpentIsEmpty=Время, проведенное пуста
 ThisWillAlsoRemoveTasks=Это действие приведет к удалению всех задач проекта (%s задач на данный момент), и все входы затраченного времени.
 IfNeedToUseOhterObjectKeepEmpty=Если некоторые объекты (счет-фактура, заказ, ...), принадлежащей другому третьему лицу, должна быть увязана с проектом по созданию, держать этот пустой иметь проект, несколько третьих лиц.
@@ -106,11 +107,11 @@ CloneTasks=Дублировать задачи
 CloneContacts=Дублировать контакты
 CloneNotes=Дублировать заметки
 CloneProjectFiles=Дублировать файлы, связанные с проектом
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
+CloneTaskFiles=Клонировать задачу (задачи), объединять файлы (если задача клонирована)
+CloneMoveDate=Обновить даты проекта/задач на текущую дату?
 ConfirmCloneProject=Вы уверены, что хотите дублировать этот проект?
 ProjectReportDate=Изменить дату задачи в соответствии с датой начала проекта
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ErrorShiftTaskDate=Невозможно сдвинуть дату задачи по причине новой даты начала проекта
 ProjectsAndTasksLines=Проекты и задачи
 ProjectCreatedInDolibarr=Проект %s создан
 TaskCreatedInDolibarr=Задача %s создана
@@ -119,24 +120,24 @@ TaskDeletedInDolibarr=Задача %s удалена
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Руководитель проекта
 TypeContact_project_external_PROJECTLEADER=Руководитель проекта
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Содействующий
+TypeContact_project_external_PROJECTCONTRIBUTOR=Содействующий
 TypeContact_project_task_internal_TASKEXECUTIVE=Целевая исполнительной
 TypeContact_project_task_external_TASKEXECUTIVE=Целевая исполнительной
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Содействующий
+TypeContact_project_task_external_TASKCONTRIBUTOR=Содействующий
 SelectElement=Выберите элемент
-AddElement=Link to element
-UnlinkElement=Unlink element
+AddElement=Ссылка на элемент
+UnlinkElement=Убрать ссылку на элемент
 # Documents models
 DocumentModelBaleine=доклад полной проекта модели (logo. ..)
 PlannedWorkload=Запланированная нагрузка
-PlannedWorkloadShort=Workload
-WorkloadOccupation=Workload assignation
-ProjectReferers=Refering objects
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+PlannedWorkloadShort=Рабочая нагрузка
+WorkloadOccupation=Задание рабочей нагрузки
+ProjectReferers=Ссылающиеся объекты
+SearchAProject=Поиск проекта
+ProjectMustBeValidatedFirst=Проект должен быть сначала подтверждён
+ProjectDraft=Черновики проектов
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 8c932b56578..74aa5773852 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -8,24 +8,24 @@ ProposalsOpened=Открытие коммерческих предложений
 Prop=Коммерческие предложения
 CommercialProposal=Коммерческое предложение
 CommercialProposals=Коммерческие предложения
-ProposalCard=Предложение карты
+ProposalCard=Карточка предложения
 NewProp=Новое коммерческое предложение
 NewProposal=Новое коммерческое предложение
 NewPropal=Новое предложение
 Prospect=Проспект
-ProspectList=Проспект список
+ProspectList=Список проспектов
 DeleteProp=Удалить коммерческого предложения
 ValidateProp=Проверка коммерческого предложения
-AddProp=Добавить предложение
+AddProp=Создать предложение
 ConfirmDeleteProp=Вы уверены, что хотите удалить это коммерческое предложение?
 ConfirmValidateProp=Вы уверены, что хотите проверить эту коммерческое предложение?
-LastPropals=Последнее% с предложениями
+LastPropals=Последние %s  предложений
 LastClosedProposals=Последнее% с закрытых предложений
 LastModifiedProposals=Последнее% с измененными предложения
 AllPropals=Все предложения
 LastProposals=Последние предложения
 SearchAProposal=Поиск предложений
-ProposalsStatistics=Коммерческие предложения Статистика
+ProposalsStatistics=Статистика коммерческих предложений 
 NumberOfProposalsByMonth=Количество в месяц
 AmountOfProposalsByMonthHT=Сумма в месяц (за вычетом налогов)
 NbOfProposals=Количество коммерческих предложений
@@ -55,8 +55,6 @@ NoOpenedPropals=Нет открыли коммерческие предложе
 NoOtherOpenedPropals=Никакие другие открыли коммерческие предложения
 RefProposal=Коммерческие предложения исх
 SendPropalByMail=Отправить коммерческое предложение по почте
-FileNotUploaded=Файл не был загружен
-FileUploaded=Этот файл был успешно загружен
 AssociatedDocuments=Документы, связанные с предложением:
 ErrorCantOpenDir=Не удается открыть каталог
 DatePropal=Дата предложения
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Пропал% не найдены
 Estimate=Оценка:
 EstimateShort=Расчетный показатель
 OtherPropals=Другие предложения
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Добавить проект коммерческого предложения
+NoDraftProposals=Нет проектов коммерческих дредложений
 CopyPropalFrom=Создание коммерческого предложения, копируя существующие предложения
 CreateEmptyPropal=Создайте пустую коммерческих предложений vierge либо из списка товаров / услуг
 DefaultProposalDurationValidity=По умолчанию коммерческого предложения действительности продолжительность (в днях)
@@ -97,6 +95,6 @@ TypeContact_propal_external_CUSTOMER=Абонентский отдел след
 # Document models
 DocModelAzurDescription=Полный текст предложения модели (logo. ..)
 DocModelJauneDescription=Желтый предложение модель
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Шаблон по умолчанию, когда закрывается коммерческое предложение (для создания счёта)
+DefaultModelPropalClosed=Шаблон по умолчанию, когда закрывается коммерческое предложение (не оплаченное)
diff --git a/htdocs/langs/ru_RU/resource.lang b/htdocs/langs/ru_RU/resource.lang
index 32bdd92f884..fa071f1bdd7 100644
--- a/htdocs/langs/ru_RU/resource.lang
+++ b/htdocs/langs/ru_RU/resource.lang
@@ -1,34 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Ресурсы
+MenuResourceAdd=Новый ресурс
+MenuResourcePlanning=Планирование ресурсов
+DeleteResource=Удалить ресурс
+ConfirmDeleteResourceElement=Подтвердите удаление ресурса для этого элемента
+NoResourceInDatabase=Нет ресурсов в базе данных
+NoResourceLinked=Нет связанных ресурсов
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Список ресурсов
+ResourceSingular=Ресурс
+ResourceCard=Карточка ресурса
+AddResource=Создать ресурс
+ResourceFormLabel_ref=Имя ресурса
+ResourceType=Тип ресурса
+ResourceFormLabel_description=Описание ресурса
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Ресурс связан с элементом
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Показать карту планирования ресурсов
+GotoDate=К дате
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Элемент ресурсов
+ResourceCreatedWithSuccess=Ресурс успешно создан
+RessourceLineSuccessfullyDeleted=Ресурс успешно удалён
+RessourceLineSuccessfullyUpdated=Ресурс успешно обновлён
+ResourceLinkedWithSuccess=Связь ресурса установлена успешно
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Карточка ресурса
+ConfirmDeleteResource=Подтвердите удаление ресурса
+RessourceSuccessfullyDeleted=Ресурс успешно удалён
+DictionaryResourceType=Тип ресурсов
 
-SelectResource=Select resource
+SelectResource=Выберете ресурс
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index 6ec5eaae2fd..8429f995703 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - users
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Бухгалтерский код для выплат зарплаты
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Бухгалтерский код для финансовых выплат
 Salary=Зарплата
 Salaries=Зарплаты
 Employee=Сотрудник
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
-CurrentSalary=Current salary
+NewSalaryPayment=Новая выплата зарплаты
+SalaryPayment=Выплата зарплаты
+SalariesPayments=Выплата зарплат
+ShowSalaryPayment=Показать выплату зарплаты
+THM=Средняя расценка почасовой оплаты
+TJM=Средняя расценка дневной оплаты
+CurrentSalary=Текущая зарплата
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index efb3246b409..5266b0bc135 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -1,85 +1,86 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. отправка
-Sending=Отправка
-Sendings=Отправок
-Shipment=Отправка
+RefSending=Ref. поставки
+Sending=Поставки
+Sendings=Поставки
+AllSendings=All Shipments
+Shipment=Поставка
 Shipments=Поставки
-ShowSending=Show Sending
-Receivings=Receipts
-SendingsArea=Отправок области
-ListOfSendings=Список отправок
-SendingMethod=Отправка метод
-SendingReceipt=Отправка получения
-LastSendings=Последнее %s отправок
-SearchASending=Поиск направления
-StatisticsOfSendings=Статистика отправок
-NbOfSendings=Число отправок
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
-NewSending=Новые направления
-CreateASending=Создать отправке
-CreateSending=Создать отправке
+ShowSending=Показать Отправку
+Receivings=Получатели
+SendingsArea=Раздел поставок
+ListOfSendings=Список поставок
+SendingMethod=Метод отправки
+SendingReceipt=Получатель
+LastSendings=Последнее %s поставок
+SearchASending=Поиск поставки
+StatisticsOfSendings=Статистика поставок
+NbOfSendings=Число поставок
+NumberOfShipmentsByMonth=Количество поставок по месяцам
+SendingCard=Карточка поставки
+NewSending=Новая поставка
+CreateASending=Создать поставку
+CreateSending=Создать поставку
 QtyOrdered=Количество заказанных
-QtyShipped=Количество отгружен
-QtyToShip=Количество судов
-QtyReceived=Количество получил
-KeepToShip=Remain to ship
-OtherSendingsForSameOrder=Другие отправок с этой целью
-DateSending=Дата отправки порядка
-DateSendingShort=Дата отправки порядка
-SendingsForSameOrder=Отправок с этой целью
-SendingsAndReceivingForSameOrder=Отправок и receivings в таком порядке
-SendingsToValidate=Отправка на проверку
-StatusSendingCanceled=Отменен
+QtyShipped=Количество отгруженных
+QtyToShip=Количество для отправки
+QtyReceived=Количество получено
+KeepToShip=Осталось отправить
+OtherSendingsForSameOrder=Другие поставки для этого заказа
+DateSending=Дата отправки заказа
+DateSendingShort=Дата отправки заказа
+SendingsForSameOrder=Поставок для этого заказа
+SendingsAndReceivingForSameOrder=Поставки и получения для этого заказа
+SendingsToValidate=Поставки для проверки
+StatusSendingCanceled=Отменена
 StatusSendingDraft=Черновик
-StatusSendingValidated=Удостоверенная (продукты для судна или уже отгружен)
+StatusSendingValidated=Утверждена (товары для отправки или уже отправлены)
 StatusSendingProcessed=Обработано
-StatusSendingCanceledShort=Отменен
+StatusSendingCanceledShort=Отменена
 StatusSendingDraftShort=Черновик
-StatusSendingValidatedShort=Подтвержденные
+StatusSendingValidatedShort=Утверждена
 StatusSendingProcessedShort=Обработано
-SendingSheet=Shipment sheet
+SendingSheet=Лист поставки
 Carriers=Перевозчики
 Carrier=Перевозчик
-CarriersArea=Перевозчики области
+CarriersArea=Раздел перевозчика
 NewCarrier=Новый перевозчик
-ConfirmDeleteSending=Вы уверены, что хотите удалить эту отправку?
-ConfirmValidateSending=Вы уверены, что хотите valdate этой передаче?
-ConfirmCancelSending=Вы уверены, что хотите отменить отправку?
-GenericTransport=Общие транспорт
-Enlevement=Полученной клиентом
+ConfirmDeleteSending=Вы уверены, что хотите удалить эту поставку?
+ConfirmValidateSending=Вы уверены, что хотите подтвердить эту поставку со ссылкой %s ?
+ConfirmCancelSending=Вы уверены, что хотите отменить эту поставку?
+GenericTransport=Основной транспорт
+Enlevement=Получен клиентом
 DocumentModelSimple=Простая модель документа
-DocumentModelMerou=Mérou модели A5
-WarningNoQtyLeftToSend=Внимание, без продуктов, ожидающих отправки.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Планируемая дата поставки
-DateReceived=Дата доставки получили
-SendShippingByEMail=Отправить доставкой по EMail
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=Acions на судоходство
-LinkToTrackYourPackage=Ссылка на дорожку ваш пакет
-ShipmentCreationIsDoneFromOrder=На данный момент, создание новой партии производится с целью карту.
-RelatedShippings=Related shipments
-ShipmentLine=Shipment line
-CarrierList=List of transporters
-SendingRunning=Product from ordered customer orders
-SuppliersReceiptRunning=Product from ordered supplier orders
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+DocumentModelMerou=Модель A5
+WarningNoQtyLeftToSend=Внимание, нет товаров ожидающих отправки.
+StatsOnShipmentsOnlyValidated=Статистика собирается только на утверждённые поставки. Используемая дата - дата утверждения поставки (планируемая дата доставки не всегда известна)
+DateDeliveryPlanned=Планируемая дата доставки
+DateReceived=Дата доставки получена
+SendShippingByEMail=Отправить поставкой по EMail
+SendShippingRef=Представление поставки %s
+ActionsOnShipping=События поставки
+LinkToTrackYourPackage=Ссылка на номер для отслеживания посылки
+ShipmentCreationIsDoneFromOrder=На данный момент, создание новой поставки закончено из карточки заказа.
+RelatedShippings=Связанные поставки
+ShipmentLine=Линия поставки
+CarrierList=Список перевозчиков
+SendingRunning=Товар из уже заказанных клиентом
+SuppliersReceiptRunning=Товар из уже  заказанных поставщиком
+ProductQtyInCustomersOrdersRunning=Количество товара в открытых заказах клиента
+ProductQtyInSuppliersOrdersRunning=Количество товара в открытых заказах поставщика
+ProductQtyInShipmentAlreadySent=Количество товара из открытого заказа клиента уже отправлено. 
+ProductQtyInSuppliersShipmentAlreadyRecevied=Количество товара из открытого заказа поставщика уже получено. 
 
 # Sending methods
-SendingMethodCATCH=Catch заказчиком
-SendingMethodTRANS=Transporter
+SendingMethodCATCH=Получено заказчиком
+SendingMethodTRANS=Перевозчик
 SendingMethodCOLSUI=Colissimo
 # ModelDocument
 DocumentModelSirocco=Простая модель документа для доставки квитанций
 DocumentModelTyphon=Более полная модель документа для доставки квитанций (logo. ..)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Постоянное EXPEDITION_ADDON_NUMBER не определена
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Сумма сторон товара
+SumOfProductWeights=Вес товара в сумме
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= Детали склада
+DetailWarehouseFormat= В:%s (Кол-во : %d)
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index d89cb572fa1..4a7251f66e2 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -9,7 +9,7 @@ WarehouseOpened=Склад открыт
 WarehouseClosed=Склад закрыт
 WarehouseSource=Источник склад
 WarehouseSourceNotDefined=Склад не определен,
-AddOne=Add one
+AddOne=Добавить
 WarehouseTarget=Целевой показатель на складе
 ValidateSending=Удалить отправку
 CancelSending=Отменить отправку
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Склад этикетке необходимо
 CorrectStock=Правильно запас
 ListOfWarehouses=Список складов
 ListOfStockMovements=Список акций движения
-StocksArea=Warehouses area
+StocksArea=Раздел "Склад"
 Location=Вместо
 LocationSummary=Сокращенное наименование расположение
 NumberOfDifferentProducts=Кол-во различных продуктов
@@ -36,7 +36,7 @@ StockCorrection=Правильно запас
 StockTransfer=Перевод остатков
 StockMovement=Трансфер
 StockMovements=Фондовый переводы
-LabelMovement=Movement label
+LabelMovement=Отметка о перемещении
 NumberOfUnit=Количество единиц
 UnitPurchaseValue=Себестоимость единицы
 TotalStock=Всего на складе
@@ -47,10 +47,10 @@ PMPValue=Значение
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Склады стоимости
 UserWarehouseAutoCreate=Создать запас автоматически при создании пользователя
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Запас товара на складе и запас суб-товара на складе не связаны
 QtyDispatched=Количество направил
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
+QtyDispatchedShort=Кол-во отправлено
+QtyToDispatchShort=Кол-во на отправку
 OrderDispatch=Приказ диспетчерского
 RuleForStockManagementDecrease=Правило для управления запасами сокращение
 RuleForStockManagementIncrease=Правило для управления запасами увеличить
@@ -62,11 +62,11 @@ ReStockOnValidateOrder=Увеличение реальных запасов по
 ReStockOnDispatchOrder=Увеличение реальных запасов на ручной посылаем в склады, после получения заказа поставщиком
 ReStockOnDeleteInvoice=Увеличить реальные остатки при удалении счета-фактуры
 OrderStatusNotReadyToDispatch=Заказ еще не или не более статуса, который позволяет отправку товаров на складе склады.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Объяснение разницы между физическим и теоретическими запасами на складе
 NoPredefinedProductToDispatch=Нет предопределенного продуктов для данного объекта. Так что не диспетчеризации в акции не требуется.
 DispatchVerb=Отправка
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Граница предупреждения
+StockLimit=Граница предупреждения о запасе на складе
 PhysicalStock=Физическая запас
 RealStock=Real фондовая
 VirtualStock=Виртуальный запас
@@ -92,21 +92,21 @@ ThisWarehouseIsPersonalStock=Этот склад представляет соб
 SelectWarehouseForStockDecrease=Выберите хранилище, чтобы использовать для снижения акции
 SelectWarehouseForStockIncrease=Выберите склад для использования в запас увеличения
 NoStockAction=No stock action
-LastWaitingSupplierOrders=Orders waiting for receptions
+LastWaitingSupplierOrders=Заказы, ожидающие приёма
 DesiredStock=Желаемый запас
 StockToBuy=На заказ
 Replenishment=Пополнение
 ReplenishmentOrders=Заказ на пополнение
 VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStockByDefault=Использовать виртуальный запас на складе вместо имеющего место быть, для функции наполнения
 UseVirtualStock=Использовать виртуальный склад
 UsePhysicalStock=Использовать физические запасы
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Текущий режим выделения
 CurentlyUsingVirtualStock=Виртуальный запас
 CurentlyUsingPhysicalStock=Физический запас
 RuleForStockReplenishment=Правило для пополнения запасов
 SelectProductWithNotNullQty=Выберите как минимум один продукт с ненулевым кол-вом и Поставщика
-AlertOnly= Alerts only
+AlertOnly= Только предупреждения
 WarehouseForStockDecrease=Склад %s будет использован для уменьшения остатка
 WarehouseForStockIncrease=Склад %s будет использован для увеличения остатка
 ForThisWarehouse=Для этого склада
@@ -115,20 +115,20 @@ ReplenishmentOrdersDesc=This is list of all opened supplier orders including pre
 Replenishments=Пополнения
 NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s)
 NbOfProductAfterPeriod=Количество продукта %s в остатке на конец выбранного периода (< %s)
-MassMovement=Mass movement
+MassMovement=Массовое перемещение
 MassStockMovement=Массовое перемещение остатков
 SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfert
-ReceivingForSameOrder=Receipts for this order
+ReceivingForSameOrder=Получатели заказа
 StockMovementRecorded=Перемещения остатков записаны
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+RuleForStockAvailability=Правила и требования к запасу на складе
+StockMustBeEnoughForInvoice=Достаточный запас товара/услуг на складе, чтобы  добавить в счёт
+StockMustBeEnoughForOrder=Достаточный запас товара/услуг на складе, чтобы  добавить в заказ
+StockMustBeEnoughForShipment= Достаточный запас товара/услуг на складе, чтобы  добавить в поставку
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
+ShowWarehouse=Просмотр склада
 MovementCorrectStock=Stock content correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
+MovementTransferStock=Перевозка товара %s на другой склад
 WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index cb0690f2bdf..552d52955a5 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Поставщики
-AddSupplier=Create a supplier
+AddSupplier=Создать поставщика
 SupplierRemoved=Поставщик удален
 SuppliersInvoice=Счета-фактуры от поставщиков
 NewSupplier=Новый поставщик
@@ -11,26 +11,26 @@ OrderDate=Дата заказа
 BuyingPrice=Закупочная цена
 BuyingPriceMin=Минимальная закупочная цена
 BuyingPriceMinShort=Мин. закупочная цена
-TotalBuyingPriceMin=Total of subproducts buying prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Итог закупочных цен субтоваров
+SomeSubProductHaveNoPrices=Для субтоваров  товаров не указана цена
 AddSupplierPrice=Добавить цену поставщика
-ChangeSupplierPrice=Измеенить цену поставщика
+ChangeSupplierPrice=Изменить цену поставщика
 ErrorQtyTooLowForThisSupplier=Количество слишком мало для данного поставщика или не определена цена на этот продукт для этого поставщика
 ErrorSupplierCountryIsNotDefined=Страна для данного поставщика не определена. Сначала исправьте это.
 ProductHasAlreadyReferenceInThisSupplier=Этот продукт уже ссылку на этот поставщик
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Эта ссылка поставщиком уже связан с ссылкой: %s
 NoRecordedSuppliers=Нет зарегистрированных поставщиков
-SupplierPayment=Поставщик оплаты
-SuppliersArea=Поставщики области
+SupplierPayment=Оплаты поставщика
+SuppliersArea=Раздел поставщиков
 RefSupplierShort=Ref. Поставщик
 Availability=Доступность
-ExportDataset_fournisseur_1=Поставщик списка счетов и счетов-фактур линий
+ExportDataset_fournisseur_1=Список счетов поставщика  и строки счета
 ExportDataset_fournisseur_2=Поставщиком счета-фактуры и платежи
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Заказы поставщика и строки заказа
 ApproveThisOrder=Утвердить этот заказ
-ConfirmApproveThisOrder=Вы уверены, что хотите утвердить этот порядок?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Вы уверены, что хотите лишить этого заказа?
+ConfirmApproveThisOrder=Вы уверены, что хотите утвердить этот заказ %s ?
+DenyingThisOrder=Отменить этот заказ
+ConfirmDenyingThisOrder=Вы уверены, что хотите отменить этот заказ  %s ?
 ConfirmCancelThisOrder=Вы уверены, что хотите отменить этот заказ?
 AddCustomerOrder=Создать клиента порядка
 AddCustomerInvoice=Создать счет-фактуру заказчику
@@ -39,7 +39,8 @@ AddSupplierInvoice=Создать поставщику счет-фактуру
 ListOfSupplierProductForSupplier=Перечень продукции и цен для поставщиков %s
 NoneOrBatchFileNeverRan=Ни одна партия или% не побежал в последнее время
 SentToSuppliers=Отправлено поставщикам
-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
+ListOfSupplierOrders=Список заказов поставщиков
+MenuOrdersSupplierToBill=Заказы поставщика для выписки счёта
+NbDaysToDelivery=Задержка доставки в днях
+DescNbDaysToDelivery=Самая большая задержка отображается среди списка товаров в заказе
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index ceb0857662a..90d1d087ec6 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -1,126 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
+ExpenseReport=Отчёт о затратах
+ExpenseReports=Отчёты о затратах
+Trip=Отчёт о затратах
+Trips=Отчёты о затратах
+TripsAndExpenses=Отчёты о затратах
+TripsAndExpensesStatistics=Статистика отчётов о затратах
+TripCard=Карточка отчётов о затратах
+AddTrip=Создать отчёт о затратах
+ListOfTrips=Список отчёта о затратах
 ListOfFees=Список сборов
-NewTrip=New expense report
+NewTrip=Новый отчёт о затртатах
 CompanyVisited=Посещенная организация
 Kilometers=Километры
 FeesKilometersOrAmout=Сумма или километры
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
+DeleteTrip=Удалить отчёт о затратах
+ConfirmDeleteTrip=Вы точно хотите удалить этот отчёт о затратах?
+ListTripsAndExpenses=Список отчётов о затратах
+ListToApprove=Ждёт утверждения
+ExpensesArea=Поле отчётов о затратах
+SearchATripAndExpense=Поиск отчёта о затратах
 ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripSalarie=Informations user
-TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
-ConfirmDeleteLine=Are you sure you want to delete this line ?
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+ExpenseReportWaitingForApproval=Новый отчёт о затратах направлен на утверждение
+ExpenseReportWaitingForApprovalMessage=Новый отчёт отчёт о затратах отправлен и ждёт утверждения. \nОт пользователя %s\nЗа период %s\nНажмите для проверки: %s
+TripId=ID отчёта о затратах
+AnyOtherInThisListCanValidate=Кого уведомлять для подтверждения.
+TripSociete=Информация о компании
+TripSalarie=Информация о пользователе
+TripNDF=Информация о отчёте о затратах
+DeleteLine=Удалить строку из отчёта о затратах
+ConfirmDeleteLine=Вы точно хотите удалить эту строку?
+PDFStandardExpenseReports=Шаблон отчёта о затратах для создания документа в формате PDF
+ExpenseReportLine=Строка отчёта о затратах
 TF_OTHER=Другое
-TF_TRANSPORTATION=Transportation
+TF_TRANSPORTATION=Транспортировка
 TF_LUNCH=Обед
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
-TF_TAXI=Taxi
+TF_METRO=Метро
+TF_TRAIN=Поезд
+TF_BUS=Автобус
+TF_CAR=Машина
+TF_PEAGE=Троллейбус
+TF_ESSENCE=Топливо
+TF_HOTEL=Хостел
+TF_TAXI=Такси
 
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
-AucuneNDF=No expense reports found for this criteria
-AucuneLigne=There is no expense report declared yet
-AddLine=Add a line
-AddLineMini=Add
+ErrorDoubleDeclaration=Вы должны задекларировать другой отчёт о затратах в этом временном диапазоне. 
+ListTripsAndExpenses=Список отчётов о затратах
+AucuneNDF=Нет отчётов о затратах по этому критерию
+AucuneLigne=Нет задекларированных отчётов о затратах
+AddLine=Добавить строку
+AddLineMini=Добавить
 
-Date_DEBUT=Period date start
-Date_FIN=Period date end
-ModePaiement=Payment mode
-Note=Note
-Project=Project
+Date_DEBUT=Дата начала периода
+Date_FIN=Дата конца периода
+ModePaiement=Режим оплаты
+Note=Примечание
+Project=Проект
 
-VALIDATOR=User to inform for approbation
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
-REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+VALIDATOR=Уведомить пользователя о опробации
+VALIDOR=Утверждено
+AUTHOR=Записано
+AUTHORPAIEMENT=Оплачено
+REFUSEUR=Отклонено
+CANCEL_USER=Отменено
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Причина
+MOTIF_CANCEL=Причина
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_VALIDE=Validation date
-DateApprove=Approving date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
+DATE_REFUS=Дата отклонения
+DATE_SAVE=Дата проверки
+DATE_VALIDE=Дата проверки
+DateApprove=Дата утверждения
+DATE_CANCEL=Дата отмены
+DATE_PAIEMENT=Дата платежа
 
-Deny=Deny
-TO_PAID=Pay
-BROUILLONNER=Reopen
-SendToValid=Sent to approve
-ModifyInfoGen=Edit
-ValidateAndSubmit=Validate and submit for approval
+Deny=Отменить
+TO_PAID=Оплатить
+BROUILLONNER=Открыть заново
+SendToValid=Отправить запрос на утверждение
+ModifyInfoGen=Редактировать
+ValidateAndSubmit=Проверить и отправить запрос на утверждение
 
-NOT_VALIDATOR=You are not allowed to approve this expense report
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_VALIDATOR=Вы не можете утвердить этот отчёт о затратах
+NOT_AUTHOR=Вы не автор этого отчёта о затратах. Операция отменена.
 
-RefuseTrip=Deny an expense report
-ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+RefuseTrip=Отклонить отчёт о затратах
+ConfirmRefuseTrip=Вы точно хотите отклонить этот отчёт о затратах?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=Одобрить отчёт о затратах
+ConfirmValideTrip=Вы точно хотите одобрить отчёт о затратах?
 
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+PaidTrip=Оплатить отчёт о затратах
+ConfirmPaidTrip=Вы точно хотите изменит статус этого отчёта о затратах на "Оплачен"?
 
-CancelTrip=Cancel an expense report
-ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+CancelTrip=Отменить отчёт о затратах
+ConfirmCancelTrip=Вы точно хотите отменить отчёт о затратах?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+BrouillonnerTrip=Вернуть отчёту о затратах статус "Черновик"
+ConfirmBrouillonnerTrip=Вы точно хотите изменить статус этого отчёта о затратах на "Черновик"?
 
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+SaveTrip=Проверить отчёт о завтратах
+ConfirmSaveTrip=Вы точно хотите проверить данный отчёт о затратах?
 
-Synchro_Compta=NDF <-> Compte
+Synchro_Compta=NDF <-> Учётная запись
 
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
+TripSynch=Синхронизация: Расходы <-> текущий счёт
+TripToSynch=Примечание: оплата должна быть включена в расчёт
+AucuneTripToSynch=Состояние отчёта о затратах не  "Оплачен".
+ViewAccountSynch=Посмотреть аккаунт
 
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
+ConfirmNdfToAccount=Вы уверены, что хотите включить этот отчет о расходах в текущем счете?
+ndfToAccount=Отчет о расходах - Интеграция
 
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
+ConfirmAccountToNdf=Вы уверены, что хотите удалить этот отчет о расходах текущего счета?
+AccountToNdf=Оценка затрат - вывод
 
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
+LINE_NOT_ADDED=Номер строки добавил:
+NO_PROJECT=Ни один проект не выбран.
+NO_DATE=Ни одна дата не выбрана. 
+NO_PRICE=Цена не указана.
 
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
+TripForValid=Подтвердивший
+TripForPaid=Плательщик
+TripPaid=Плательщик
 
-NoTripsToExportCSV=No expense report to export for this period.
+NoTripsToExportCSV=Нет отчёта о затратах за этот период.
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 7824adbfa51..4df93b40a8c 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=Пользователь карточки
-ContactCard=Контакт-карты
-GroupCard=Группа карту
+HRMArea=Область отдела кадров
+UserCard=Карточка пользователя
+ContactCard=Карточка контакта
+GroupCard=Карточка группы
 NoContactCard=Нет контактов между картой
-Permission=Разрешение
-Permissions=Разрешения
+Permission=Права доступа
+Permissions=Права доступа
 EditPassword=Изменить пароль
-SendNewPassword=Отправить новый пароль
-ReinitPassword=Создать новый пароль
+SendNewPassword=Сгенерировать и отправить новый пароль
+ReinitPassword=Сгенерировать новый пароль
 PasswordChangedTo=Пароль изменен на: %s
 SubjectNewPassword=Ваш новый пароль для Dolibarr
-AvailableRights=Доступные разрешения
-OwnedRights=Собственное разрешение
-GroupRights=Группа разрешений
-UserRights=Пользователь разрешений
+AvailableRights=Доступные права доступа
+OwnedRights=Права доступа владельца
+GroupRights=Права доступа группы
+UserRights=Права доступа пользователя
 UserGUISetup=Пользователь Настройка дисплея
 DisableUser=Выключать
-DisableAUser=Отключение пользователя
+DisableAUser=Отключить пользователя
 DeleteUser=Удалить
 DeleteAUser=Удалить пользователя
 DisableGroup=Отключить
@@ -37,15 +37,15 @@ ConfirmSendNewPassword=Вы уверены, что хотите создать 
 NewUser=Новый пользователь
 CreateUser=Создать пользователя
 SearchAGroup=Поиск группы
-SearchAUser=Поиск пользователей
-LoginNotDefined=Логин не определены.
+SearchAUser=Поиск пользователя
+LoginNotDefined=Логин не определен.
 NameNotDefined=Имя не определено.
 ListOfUsers=Список пользователей
 Administrator=Администратор
 SuperAdministrator=Супер Администратор
 SuperAdministratorDesc=Администратор со всеми правами
 AdministratorDesc=Администратора лица
-DefaultRights=По умолчанию разрешения
+DefaultRights=Права доступа по умолчанию
 DefaultRightsDesc=Определить здесь умолчанию разрешения, что автоматически предоставляются новые созданные пользователем.
 DolibarrUsers=Пользователи Dolibarr
 LastName=Имя
@@ -56,7 +56,7 @@ CreateGroup=Создать группу
 RemoveFromGroup=Удалить из группы
 PasswordChangedAndSentTo=Пароль изменен и направил в %s.
 PasswordChangeRequestSent=Запрос на изменение пароля для %s направлено %s.
-MenuUsersAndGroups=И Пользователи Группы
+MenuUsersAndGroups=Пользователи и Группы
 LastGroupsCreated=Последнее %s созданы группы
 LastUsersCreated=Последнее %s пользователей создаются
 ShowGroup=Показать группы
@@ -86,8 +86,8 @@ MyInformations=Мои данные
 ExportDataset_user_1=Dolibarr пользователей и свойства
 DomainUser=Домен пользователя %s
 Reactivate=Возобновить
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=Внутреннего пользователя является пользователем, который является частью вашей компании / Фонд. 
 Внешний пользователь клиента, поставщика или другого. 

 В обоих случаях разрешение определяет права на Dolibarr, а также внешних пользователей могут иметь разные меню менеджера, чем внутреннего пользователя (См. начало - настройки - дисплей)
+CreateInternalUserDesc=Эта форма позволяет вам создать внутреннего пользователя для вашей компании/фонда. Для создания внешнего пользователя (клиент, поставщик) используйте кнопку "Создать пользователя Dolibarr" из карточки контрагента.
+InternalExternalDesc=Внутреннего пользователя является пользователем, который является частью вашей компании / Фонд. 
 Внешний пользователь клиента, поставщика или другого. 

 В обоих случаях разрешение определяет права на Dolibarr, а также внешних пользователей могут иметь разные меню менеджера, чем внутреннего пользователя (См. Главная - Настройки - дисплей)
 PermissionInheritedFromAGroup=Разрешение предоставляется, поскольку унаследовал от одного из пользователей в группы.
 Inherited=Унаследованный
 UserWillBeInternalUser=Созданный пользователь будет внутреннего пользователя (потому что не связаны с определенным третьим лицам)
@@ -113,10 +113,10 @@ YourRole=Ваша роль
 YourQuotaOfUsersIsReached=Квота активных пользователей будет достигнута!
 NbOfUsers=Кол-во пользователей
 DontDowngradeSuperAdmin=Только суперамин может понизить суперамин
-HierarchicalResponsible=Supervisor
+HierarchicalResponsible=Руководитель
 HierarchicView=Иерархический вид
-UseTypeFieldToChange=Use field Type to change
+UseTypeFieldToChange=Использьзуйте поле Тип для изменения
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Использовать OpenID для входа
-WeeklyHours=Weekly hours
+WeeklyHours=Часов в неделю
 ColorUser=Цвет пользователя
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index e8450fccbba..d05d5fffd61 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-StandingOrdersArea=Постоянные заказы области
-CustomersStandingOrdersArea=Клиенты Регламента области
+StandingOrdersArea=Раздел постоянных заказов
+CustomersStandingOrdersArea=Раздел постоянных заказов клиентов
 StandingOrders=Постоянные заказы
 StandingOrder=Постоянные заказы
-NewStandingOrder=Новый постоянный порядок
+NewStandingOrder=Новый постоянный заказ
 StandingOrderToProcess=Для обработки
 StandingOrderProcessed=Обработано
 Withdrawals=Снятие
@@ -14,15 +14,15 @@ WithdrawalReceiptShort=Квитанция
 LastWithdrawalReceipts=Последнее% с выводом квитанции
 WithdrawedBills=Withdrawed счетов-фактур
 WithdrawalsLines=Снятие линии
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+RequestStandingOrderToTreat=Запрос на обработку постоянных заказов
+RequestStandingOrderTreated=Запрос на обработку постоянных заказов выполнен
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
 CustomersStandingOrders=Клиент Регламент
 CustomerStandingOrder=Для постоянных клиентов
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
+NbOfInvoiceToWithdraw=Номер счёта с запросом на снятие
 NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Счет ждет снимать
-AmountToWithdraw=Сумма снять
+InvoiceWaitingWithdraw=Счет ожидает снятия
+AmountToWithdraw=Сумма снятия
 WithdrawsRefused=Отзывает отказала
 NoInvoiceToWithdraw=Нет счета клиента в оплате режиме "отозвать" ждет. Переход на "Вывод 'вкладки на счету карточки сделать запрос.
 ResponsibleUser=Ответственный пользователь
@@ -35,11 +35,11 @@ ThirdPartyBankCode=Третьей стороной банковский код
 ThirdPartyDeskCode=Третий участник стол код
 NoInvoiceCouldBeWithdrawed=Нет счета withdrawed с успехом. Убедитесь в том, что счета-фактуры на компании с действительным запрета.
 ClassCredited=Классифицировать зачисленных
-ClassCreditedConfirm=Вы уверены, что хотите классифицировать этот вывод получения как кредитуются на ваш счет в банке?
+ClassCreditedConfirm=Вы уверены, что хотите классифицировать это изъятие   как кредит на вашем счету в банке?
 TransData=Дата передачи
 TransMetod=Метод передачи
 Send=Отправить
-Lines=Линии
+Lines=Строки
 StandingOrderReject=Выпуск отклонить
 WithdrawalRefused=Выплаты Refuseds
 WithdrawalRefusedConfirm=Вы уверены, что вы хотите ввести снятия отказа общества
@@ -47,7 +47,7 @@ RefusedData=Дата отказа
 RefusedReason=Причина для отказа
 RefusedInvoicing=Счета отказ
 NoInvoiceRefused=Не заряжайте отказ
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Счёт отклонён (отказ платежа клиентом)
 Status=Статус
 StatusUnknown=Неизвестный
 StatusWaiting=Ожидание
@@ -79,11 +79,11 @@ CreditDate=Кредит на
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Показать Вывод
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если счет-фактура имеет по крайней мере один вывод оплаты еще не обработан, то он не будет установлен, как оплачиваются, чтобы управлять снятие ранее.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
-StatisticsByLineStatus=Statistics by status of lines
+DoStandingOrdersBeforePayments=Эта вкладка позволяет сделать запрос на постоянный заказ. Используйте меню Банк-Постоянные заказы для управления постоянными заказами. Когда постоянный заказ закрыт, платёж по счёту будет автоматически записан, и счёт будет закрыть, если нет уведомления о платеже.
+WithdrawalFile=Файл изъятия средств
+SetToStatusSent=Установить статус "Файл отправлен"
+ThisWillAlsoAddPaymentOnInvoice=Это также применит оплату по счетам и установит статус счетов на "Оплачен"
+StatisticsByLineStatus=Статистика статуса по строкам
 
 ### Notifications
 InfoCreditSubject=Оплата постоянных %s порядке банк
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index b312c499df5..97816ff6d9d 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Установка модуля Рабочих процессов
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
+WorkflowDesc=Этот модуль спроектирован для изменения поведения автоматических действий в приложении. По умолчанию, рабочий процесс открыт (вы можете делать вещи в том порядке, в каком желаете). Вы можете включить режим автоматических действий, в которых вы заинтересованы. 
 ThereIsNoWorkflowToModify=Существует не рабочий процесс можно изменить для модуля активации.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Создать заказ клиента автоматически после коммерческое предложение подписано
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Создать счет клиента автоматически после коммерческое предложение подписано
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Создать счет клиента автоматически после контракт проверяется
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Создать счет клиента автоматически после заказа клиента закрыт
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Классифицировать связанные коммерческие предложения оплаченными, когда заказ клиента обозначен, как оплаченный
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Классифицировать связанные заказы клиента оплаченными, когда счёт клиента оплачен. 
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Классифицировать связанные заказы клиента оплаченными, когда счёт клиента подтверждён.
diff --git a/htdocs/langs/ru_UA/ecm.lang b/htdocs/langs/ru_UA/ecm.lang
index 48756faaa0b..cb1cb0b6d7c 100644
--- a/htdocs/langs/ru_UA/ecm.lang
+++ b/htdocs/langs/ru_UA/ecm.lang
@@ -1,14 +1,11 @@
 # Dolibarr language file - Source file is en_US - ecm
 MenuECM=Документация
-DocsOrders=Документы заказов
-DocsInvoices=Документы счетов
 ECMNbOfDocs=Кол-во документов в каталоге
 ECMNbOfDocsSmall=Кол-во док.
 ECMSectionManual=Руководство каталог
 ECMSectionsManual=Руководство дерево
 ECMSectionsAuto=Автоматическая дерево
 ECMNbOfSubDir=Количество подкаталогах
-ECMCreationUser=Создатель
 ECMAreaDesc2=* Автоматическое каталоги заполняется автоматически при добавлении документов с карты элемента. 
 * Руководство каталоги могут быть использованы для сохранения документов, не связанных с определенного элемента.
 ECMSectionWasRemoved=Каталог %s была удалена.
 ECMDocumentsSection=Документ каталог
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 93790b6a9c3..8397120c94a 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Oddeľovač
 ExtrafieldCheckBox=Zaškrtávacie políčko
 ExtrafieldRadio=Prepínač
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=Upozornenie
 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=Účtovníctvo
 Module1400Desc=Vedenie účtovníctva (dvojité strany)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategórie
-Module1780Desc=Category management (produkty, dodávatelia a odberatelia)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Nechajte upraviť niektoré textové pole pomocou pokročilého editora
 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=Program rokovania
 Module2400Desc=Udalosti / úlohy a agendy vedenie
 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=Prečítajte služby
 Permission532=Vytvoriť / upraviť služby
 Permission534=Odstrániť služby
@@ -746,6 +754,7 @@ Permission1185=Schváliť dodávateľských objednávok
 Permission1186=Objednávky Objednať dodávateľ
 Permission1187=Potvrdenie prijatia dodávateľských objednávok
 Permission1188=Odstrániť dodávateľských objednávok
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Získajte výsledok exportu
 Permission1202=Vytvoriť / Upraviť vývoz
 Permission1231=Prečítajte si dodávateľskej faktúry
@@ -758,10 +767,10 @@ Permission1237=Export dodávateľské objednávky a informácie o nich
 Permission1251=Spustiť Hmotné dovozy externých dát do databázy (načítanie dát)
 Permission1321=Export zákazníkov faktúry, atribúty a platby
 Permission1421=Export objednávok zákazníkov a atribúty
-Permission23001 = Prečítajte si naplánovaná úloha
-Permission23002 = Vytvoriť / aktualizovať naplánovanú úlohu
-Permission23003 = Odstrániť naplánovaná úloha
-Permission23004 = Vykonať naplánované úlohy,
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Prečítajte akcie (udalosti alebo úlohy) ktoré súvisia s jeho účet
 Permission2402=Vytvoriť / upraviť akcie (udalosti alebo úlohy) ktoré súvisia s jeho účet
 Permission2403=Odstrániť akcie (udalosti alebo úlohy) ktoré súvisia s jeho účet
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Vrátiť evidencia kód postavený podľa: 
 %s nas
 ModuleCompanyCodePanicum=Späť prázdny evidencia kód.
 ModuleCompanyCodeDigitaria=Účtovníctvo kód závisí na kóde tretích strán. Kód sa skladá zo znaku "C" na prvom mieste nasleduje prvých 5 znakov kódu tretích strán.
 UseNotifications=Použitie oznámenia
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Dokumenty šablóny
 DocumentModelOdt=Generovanie dokumentov z OpenDocuments šablón (. ODT alebo ODS. Súbory OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vodoznak na návrhu dokumentu
@@ -1557,6 +1566,7 @@ SuppliersSetup=Dodávateľ modul nastavenia
 SuppliersCommandModel=Kompletná šablóna sa s dodávateľmi poriadku (logo. ..)
 SuppliersInvoiceModel=Kompletná šablóna dodávateľskej faktúry (logo. ..)
 SuppliersInvoiceNumberingModel=Dodávateľských faktúr číslovanie modelov
+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 nastavenia
 PathToGeoIPMaxmindCountryDataFile=Cesta k súboru obsahujúci MaxMind IP pre krajiny preklade. 
 Príklady: 
 / Usr / local / share / GeoIP / GeoIP.dat 
 / 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
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 36445b83775..9504ee53600 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktúra %s overená
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktúra %s vrátiť do stavu návrhu
 InvoiceDeleteDolibarr=Faktúra %s zmazaná
-OrderValidatedInDolibarr= Objednať %s overená
+OrderValidatedInDolibarr=Objednať %s overená
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Objednať %s zrušený
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Objednať %s schválený
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Objednať %s vrátiť do stavu návrhu
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Vytvoriť udalosť
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 583a431a013..955cfee9f0f 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Celkom dva nové zľavy musí byť rovný p
 ConfirmRemoveDiscount=Ste si istí, že chcete odstrániť túto zľavu?
 RelatedBill=Súvisiace faktúra
 RelatedBills=Súvisiace faktúry
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 36369689d28..699d1137662 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategórie
-Categories=Kategórie
-Rubrique=Kategórie
-Rubriques=Kategórie
-categories=kategórie
-TheCategorie=Kategórie
-NoCategoryYet=Žiadne kategórii tohto typu od
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=V
 AddIn=Pridajte
 modify=upraviť
 Classify=Klasifikovať
-CategoriesArea=Kategórie plocha
-ProductsCategoriesArea=Produkty / služby kategórie oblasti
-SuppliersCategoriesArea=Dodávatelia kategórie oblastí
-CustomersCategoriesArea=Zákazníci kategórie oblastí
-ThirdPartyCategoriesArea=Tretie strany Kategórie plocha
-MembersCategoriesArea=Členovia kategórie oblastí
-ContactsCategoriesArea=Kontakty Kategórie plocha
-MainCats=Hlavné kategórie
+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=Podkategórie
 CatStatistics=Štatistika
-CatList=Zoznam kategórií
-AllCats=Všetky kategórie
-ViewCat=Zobraziť kategóriu
-NewCat=Pridať kategóriu
-NewCategory=Nová kategória
-ModifCat=Zmeniť kategóriu
-CatCreated=Kategórie vytvoril
-CreateCat=Vytvorenie kategórie
-CreateThisCat=Vytvorenie tejto kategórie
+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=Overenie poľa
 NoSubCat=Podkategórie.
 SubCatOf=Podkategórie
-FoundCats=Nájdené kategórie
-FoundCatsForName=Kategórie nájdených pre výraz názve:
-FoundSubCatsIn=Podkategórie nájdené v kategórii
-ErrSameCatSelected=Vybrali ste rovnakej kategórie niekoľkokrát
-ErrForgotCat=Zabudli ste si vybrať kategóriu
+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=Zabudli ste informovať polia
 ErrCatAlreadyExists=Tento názov sa už používa
-AddProductToCat=Pridať tento produkt do kategórie?
-ImpossibleAddCat=Nemožno pridať kategóriu
-ImpossibleAssociateCategory=Nemožno priradiť kategóriu
+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 bolo úspešne pridané.
-ObjectAlreadyLinkedToCategory=Element je už pripojený do tejto kategórie.
-CategorySuccessfullyCreated=Táto kategória %s bola pridaná s úspechom.
-ProductIsInCategories=Produktu / služby je vlastníkom nasledujúcich kategóriách
-SupplierIsInCategories=Tretia strana vlastní nasledovanie dodávateľov kategórií
-CompanyIsInCustomersCategories=Táto tretia strana vlastní pre nasledujúce zákazníkov / vyhliadky kategórií
-CompanyIsInSuppliersCategories=Táto tretia strana vlastní nasledovanie dodávateľov kategórií
-MemberIsInCategories=Tento člen je vlastníkom, aby títo členovia kategórií
-ContactIsInCategories=Tento kontakt je vlastníkom do nasledujúcich kategórií kontakty
-ProductHasNoCategory=Tento produkt / služba nie je v žiadnej kategórii
-SupplierHasNoCategory=Tento dodávateľ nie je v žiadnom kategóriách
-CompanyHasNoCategory=Táto spoločnosť nie je v žiadnom kategóriách
-MemberHasNoCategory=Tento člen nie je v žiadnom kategóriách
-ContactHasNoCategory=Tento kontakt nie je v žiadnom kategóriách
-ClassifyInCategory=Zaradenie do kategórie
+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=Nikto
-NotCategorized=Bez kategórii
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Táto kategória už existuje s týmto čj
 ReturnInProduct=Späť na produkt / službu kartu
 ReturnInSupplier=Späť na dodávateľa karty
@@ -66,22 +64,22 @@ ReturnInCompany=Späť na zákazníka / Vyhliadka karty
 ContentsVisibleByAll=Obsah bude vidieť všetci
 ContentsVisibleByAllShort=Obsah viditeľné všetkými
 ContentsNotVisibleByAllShort=Obsah nie je vidieť všetci
-CategoriesTree=Categories tree
-DeleteCategory=Odstrániť kategóriu
-ConfirmDeleteCategory=Ste si istí, že chcete zmazať túto kategóriu?
-RemoveFromCategory=Odstráňte spojenie s kategóriách
-RemoveFromCategoryConfirm=Ste si istí, že chcete odstrániť väzbu medzi transakcie a kategórie?
-NoCategoriesDefined=Žiadne definované kategórie
-SuppliersCategoryShort=Dodávatelia kategórie
-CustomersCategoryShort=Zákazníci kategórie
-ProductsCategoryShort=Kategórie produktov
-MembersCategoryShort=Členovia kategórie
-SuppliersCategoriesShort=Dodávatelia kategórie
-CustomersCategoriesShort=Zákazníci kategórie
+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. / Prospech. kategórie
-ProductsCategoriesShort=Kategórie produktov
-MembersCategoriesShort=Členovia kategórie
-ContactCategoriesShort=Kontakty kategórie
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Táto kategória neobsahuje žiadny produkt.
 ThisCategoryHasNoSupplier=Táto kategória neobsahuje žiadne dodávateľa.
 ThisCategoryHasNoCustomer=Táto kategória neobsahuje žiadne zákazníka.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Táto kategória neobsahuje žiadny kontakt.
 AssignedToCustomer=Pripísané k zákazníkovi
 AssignedToTheCustomer=Priradené zákazníkovi
 InternalCategory=Vnútorné kategórie
-CategoryContents=Kategórie obsah
-CategId=Kategórie id
-CatSupList=Zoznam dodávateľských kategórií
-CatCusList=Zoznam zákazníkov / vyhliadky kategórií
-CatProdList=Zoznam kategórií produktov
-CatMemberList=Zoznam členov kategórií
-CatContactList=Zoznam kontaktných kategórií a kontakt
-CatSupLinks=Väzby medzi dodávateľmi a kategórií
-CatCusLinks=Väzby medzi zákazníkmi / vyhliadky a kategórií
-CatProdLinks=Väzby medzi produktov / služieb a kategórií
-CatMemberLinks=Väzby medzi členmi a kategórií
-DeleteFromCat=Odobrať z kategórie
+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
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 5161517c219..4217c1002b6 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Posledný beh výstup
 CronLastResult=Posledný kód výsledku
 CronListOfCronJobs=Zoznam naplánovaných úloh
 CronCommand=Príkaz
-CronList=Jobs list
-CronDelete= Odstrániť cron
-CronConfirmDelete= Ste si istí, že chcete zmazať tento cron?
-CronExecute=Začatie práce
-CronConfirmExecute= Naozaj chcete vykonať túto prácu teraz
-CronInfo= Práca umožňujú vykonávať úlohy, ktoré boli plánované
-CronWaitingJobs=Wainting pracovných miest
+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áca
-CronNone= Nikto
+CronNone=Nikto
 CronDtStart=Dátum začatia
 CronDtEnd=Dátum ukončenia
 CronDtNextLaunch=Ďalšie prevedenie
@@ -75,6 +75,7 @@ CronObjectHelp=Názov objektu načítať. 
 Napr načítať metódy objektu v
 CronMethodHelp=Objekt spôsob štartu. 
 Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, hodnota metódy je fecth
 CronArgsHelp=Metóda argumenty. 
 Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, môže byť hodnota paramters byť 0, ProductRef
 CronCommandHelp=Systém príkazového riadka spustiť.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informácie
 # Common
diff --git a/htdocs/langs/sk_SK/donations.lang b/htdocs/langs/sk_SK/donations.lang
index 4c7165f68d3..955c3e3caad 100644
--- a/htdocs/langs/sk_SK/donations.lang
+++ b/htdocs/langs/sk_SK/donations.lang
@@ -6,6 +6,8 @@ Donor=Darca
 Donors=Darcovia
 AddDonation=Create a donation
 NewDonation=Nový darcovstvo
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Zobraziť dar
 DonationPromise=Darčekové sľub
 PromisesNotValid=Nevaliduje sľuby
@@ -21,6 +23,8 @@ DonationStatusPaid=Dotácie prijaté
 DonationStatusPromiseNotValidatedShort=Návrh
 DonationStatusPromiseValidatedShort=Overené
 DonationStatusPaidShort=Prijaté
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Overiť sľub
 DonationReceipt=Darovanie príjem
 BuildDonationReceipt=Build prijatie
@@ -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
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index dc5032cc33a..5a2bb06cb02 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/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é parametre sú doteraz stanovené
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index fa0c8ce1506..4b82f3d6326 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Vypísať všetky e-maily odosielané oznámenia
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 12ea65a49b3..4efea27615a 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -352,6 +352,7 @@ Status=Postavenie
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref
+ExternalRef=Ref. extern
 RefSupplier=Ref dodávateľ
 RefPayment=Ref platba
 CommercialProposalsShort=Komerčné návrhy
@@ -394,8 +395,8 @@ Available=Dostupný
 NotYetAvailable=Zatiaľ nie je k dispozícii
 NotAvailable=Nie je k dispozícii
 Popularity=Popularita
-Categories=Kategórie
-Category=Kategórie
+Categories=Tags/categories
+Category=Tag/category
 By=Podľa
 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=Pondelok
 Tuesday=Utorok
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index baa18258b8c..fb9ac7fdd5e 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Loď produkt
 Discount=Zľava
 CreateOrder=Vytvoriť objednávku
 RefuseOrder=Odmietnuť objednávku
-ApproveOrder=Prijať objednávku
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Potvrdenie objednávky
 UnvalidateOrder=Unvalidate objednávku
 DeleteOrder=Zmazať objednávku
@@ -102,6 +103,8 @@ ClassifyBilled=Klasifikovať účtované
 ComptaCard=Účtovníctvo karty
 DraftOrders=Návrh uznesenia
 RelatedOrders=Súvisiace objednávky
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=V procese 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=Ste si istí, že chcete kopírovať túto objednávku %s?
 DispatchSupplierOrder=Príjem %s dodávateľských objednávok
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Zástupca nasledujúce-up, aby zákazník
 TypeContact_commande_internal_SHIPPING=Zástupca nasledujúce-up doprava
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index f89916a11c2..ef3ca5bf087 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervencie overená
 Notify_FICHINTER_SENTBYMAIL=Intervencie poštou
 Notify_BILL_VALIDATE=Zákazník faktúra overená
 Notify_BILL_UNVALIDATE=Zákazník faktúra unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Dodávateľ aby schválila
 Notify_ORDER_SUPPLIER_REFUSE=Dodávateľ aby odmietol
 Notify_ORDER_VALIDATE=Zákazníka overená
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Komerčné návrh zaslať poštou
 Notify_BILL_PAYED=Zákazník platí faktúry
 Notify_BILL_CANCEL=Zákazník faktúra zrušená
 Notify_BILL_SENTBYMAIL=Zákazník faktúra zaslaná poštou
-Notify_ORDER_SUPPLIER_VALIDATE=Dodávateľ validované, aby
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Dodávateľ odoslaná poštou
 Notify_BILL_SUPPLIER_VALIDATE=Dodávateľ faktúru overená
 Notify_BILL_SUPPLIER_PAYED=Dodávateľ faktúru 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 pripojených súborov / dokumentov
 TotalSizeOfAttachedFiles=Celková veľkosť pripojených súborov / dokumentov
 MaxSize=Maximálny rozmer
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Faktúra %s bol overený.
 EMailTextProposalValidated=Návrh %s bol overený.
 EMailTextOrderValidated=Aby %s bol overený.
 EMailTextOrderApproved=Aby %s bol schválený.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Aby %s bol schválený %s.
 EMailTextOrderRefused=Aby %s bola zamietnutá.
 EMailTextOrderRefusedBy=Aby %s bolo odmietnuté podľa %s.
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 667875f4e17..a18d6578662 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index d1405991f2f..084f8e57941 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Zoznam dodávateľských faktúr súvisiac
 ListContractAssociatedProject=Zoznam zákaziek súvisiacich s projektom
 ListFichinterAssociatedProject=Zoznam výkonov spojených s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Zoznam udalostí spojených s projektom
 ActivityOnProjectThisWeek=Aktivita na projekte tento týždeň
 ActivityOnProjectThisMonth=Aktivita na projekte tento mesiac
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 1d57822a222..96cb8b60d61 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref náklad
 Sending=Náklad
 Sendings=Zásielky
+AllSendings=All Shipments
 Shipment=Náklad
 Shipments=Zásielky
 ShowSending=Show Sending
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 8917cbe8b4e..cbef03935a5 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/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)
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index e214389ecea..20e5c2ece1a 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Ločilo
 ExtrafieldCheckBox=Potrditveno polje
 ExtrafieldRadio=Radijski gumb
 ExtrafieldCheckBoxFromList= Potrditveno polje iz tabele
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Seznam parametrov mora biti kot ključ,vrednost

 na primer : 
1,vrednost1
2,vrednost2
3,vrednost3
...

Če želite imeti seznam odvisen od drugega :
1,vrednost1|parent_list_code:parent_key
2,vrednost2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Seznam parametrov mora biti kot ključ,vrednost

 na primer : 
1,vrednost1
2,vrednost2
3,vrednost3
...
 ExtrafieldParamHelpradio=Seznam parametrov mora biti kot ključ,vrednost

 na primer : 
1,vrednost1
2,vrednost2
3,vrednost3
...
@@ -494,6 +495,8 @@ Module500Name=Posebni stroški (davki, socialni prispevki, dividende)
 Module500Desc=Upravljanje posebnih stroškov, kot so davki, socialni prispevki, dividende in plače
 Module510Name=Plače
 Module510Desc=Upravljanje plač in plačil zaposlenim
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Obvestila
 Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih (nastavitev je določena za vsakega partnerja)
 Module700Name=Donacije
@@ -508,14 +511,14 @@ Module1400Name=Računovodstvo
 Module1400Desc=Upravljanje računovodstva (dvostavno)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorije
-Module1780Desc=Upravljanje kategorij (proizvodi, dobavitelji in kupci)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fck urejevalnik
 Module2000Desc=WYSIWYG urejevalnik
 Module2200Name=Dinamične cene
 Module2200Desc=Omogoči uporabo matematičnih formul za izračun cen
 Module2300Name=Periodično opravilo
-Module2300Desc=Načrtovano upravljanje nalog
+Module2300Desc=Scheduled job management
 Module2400Name=Dnevni red
 Module2400Desc=Upravljanje aktivnosti/nalog in dnevnih redov
 Module2500Name=Upravljanje elektronskih vsebin
@@ -714,6 +717,11 @@ Permission510=Branje plač
 Permission512=Ustvari/spremeni plače
 Permission514=Izbris plač
 Permission517=Izvoz plač
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Branje storitev
 Permission532=Kreiranje/spreminjanje storitev
 Permission534=Brisanje storitev
@@ -746,6 +754,7 @@ Permission1185=Odobritev naročil pri dobaviteljih
 Permission1186=Naročanje naročil pri dobaviteljih
 Permission1187=Prevzemanje naročil pri dobaviteljih
 Permission1188=Zaključevanje naročil pri dobaviteljih
+Permission1190=Approve (second approval) supplier orders
 Permission1201=pregled rezultatov izvoza
 Permission1202=Kreiranje/spreminjanje izvoza
 Permission1231=Branje računov dobavitelja
@@ -758,10 +767,10 @@ Permission1237=Izvoz naročil pri dobavitelju in podrobnosti
 Permission1251=Izvajanje masovnega izvoza zunanjih podatkov v bazo podatkov (nalaganje podatkov)
 Permission1321=Izvoz računov za kupce, atributov in plačil
 Permission1421=Izvoz naročil kupcev in atributov
-Permission23001 = Preberi načrtovano nalogo
-Permission23002 = Ustvari/posodobi načrtovano nalogo
-Permission23003 = Izbriši načrtovano nalogo
-Permission23004 = Izvedi načrtovano nalogo
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Branje aktivnosti (dogodki ali naloge) povezanih s tem uporabnikom
 Permission2402=Kreiranje/spreminjanje aktivnosti (dogodki ali naloge) povezanih s tem uporabnikom
 Permission2403=Brisanje aktivnosti (dogodki ali naloge) povezanih s tem uporabnikom
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Predlaga računovodsko kodo, sestavljeno iz "401" in k
 ModuleCompanyCodePanicum=Predlaga prazno računovodsko kodo.
 ModuleCompanyCodeDigitaria=Računovodska koda je odvisna od kode partnerja. Koda je sestavljena iz črke "C" prvih 5 znakov kode partnerja.
 UseNotifications=Uporaba sporočil
-NotificationsDesc=Funkcija sporočil po E-pošti omogoča tiho pošiljanje avtomatskih e-mailov o nekaterih Dolibarr dogodkih. Ciljo obvestil so lahko definirani kot:
* kontakti pri partnerjih (kupcih ali dobaviteljih), en partner naenkrat.
* ali z nastavitvijo globalnega ciljnega email naslova na strani za nastavitev modula.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Predloge dokumentov
 DocumentModelOdt=Ustvari dokumente iz predlog OpenDocuments (.ODT ali .ODS datoteke v programih OpenOffice, KOffice, TextEdit ,...)
 WatermarkOnDraft=Vodni žig na osnutku dokumenta
@@ -1557,6 +1566,7 @@ SuppliersSetup=Nastavitev modula za dobavitelje
 SuppliersCommandModel=Celotna predloga naročila dobavitelja (logo...)
 SuppliersInvoiceModel=Celotna predloga računa dobavitelja (logo...)
 SuppliersInvoiceNumberingModel=Modeli številčenja računov dobaviteljev
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Nastavitev modula GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Pot do datoteke, ki vsebuje Maxmind ip za prevode po državah.
Primer:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index 56f78042248..fb6ebe53903 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Potrjen račun %s
 InvoiceValidatedInDolibarrFromPos=Račun %s je potrjen preko POS
 InvoiceBackToDraftInDolibarr=Račun %s se vrača v status osnutka
 InvoiceDeleteDolibarr=Račun %s izbrisan
-OrderValidatedInDolibarr= Potrjeno naročilo %s
+OrderValidatedInDolibarr=Potrjeno naročilo %s
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Naročilo %s odpovedano
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Naročilo %s odobreno
 OrderRefusedInDolibarr=Naročilo %s zavrnjeno
 OrderBackToDraftInDolibarr=Naročilo %s se vrača v status osnutka
@@ -91,3 +94,5 @@ WorkingTimeRange=Delovni čas
 WorkingDaysRange=Delovni dnevi
 AddEvent=Ustvari dogodek
 MyAvailability=Moja dostopnost
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 7f5c104ae7a..f9a76966115 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Vsota obeh novih popustov mora biti enaka o
 ConfirmRemoveDiscount=Ali zares želite odstraniti ta popust ?
 RelatedBill=Podobni račun
 RelatedBills=Povezani računi
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Zadnji povezan račun
 WarningBillExist=Pozor, obstaja že en ali več računov
 
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 53f17b73fa9..3da509d2dd8 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorija
-Categories=Kategorije
-Rubrique=Rubrika
-Rubriques=Rubrike
-categories=kategorije
-TheCategorie=Kategorija
-NoCategoryYet=Ni kreirana nobena kategorija te vrste
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=V
 AddIn=Dodaj v
 modify=spremeni
 Classify=Razvrsti
-CategoriesArea=Področje kategorij
-ProductsCategoriesArea=Področje kategorij proizvodov/storitev
-SuppliersCategoriesArea=Področje kategorij dobaviteljev
-CustomersCategoriesArea=Področje kategorij kupcev
-ThirdPartyCategoriesArea=Področje kategorij partnerjev
-MembersCategoriesArea=Področje kategorij članov
-ContactsCategoriesArea=Področje kategorij kontaktov
-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=Seznam kategorij
-AllCats=Vse kategorije
-ViewCat=Glej kategorijo
-NewCat=Dodaj kategorijo
-NewCategory=Nova kategorija
-ModifCat=Spremeni kategorijo
-CatCreated=Kreirana kategorija
-CreateCat=Kreiraj kategorijo
-CreateThisCat=Kreiraj to kategorijo
+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=Potrdi polja
 NoSubCat=Ni podkategorije.
 SubCatOf=Podkategorija
-FoundCats=Najdi kategorije
-FoundCatsForName=Najdena kategorija za ime :
-FoundSubCatsIn=Najdena podkategorija v kategoriji
-ErrSameCatSelected=Večkrat ste izbrali enako kategorijo
-ErrForgotCat=Pozabili ste izbrati kategorijo
+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=Pozabili ste izbrati polje
 ErrCatAlreadyExists=To ime je že uporabljeno
-AddProductToCat=Želite dodati ta proizvod v kategorijo?
-ImpossibleAddCat=Ni možno dodati kategorije
-ImpossibleAssociateCategory=Ni možno vezati kategorije na
+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 je bil uspešno dodan.
-ObjectAlreadyLinkedToCategory=Element je že povezan na to kategorijo.
-CategorySuccessfullyCreated=Ta kategorija %s je bila uspešno dodana.
-ProductIsInCategories=Proizvod/storitev pripada naslednji kategoriji
-SupplierIsInCategories=Partner pripada naslednjim kategorijam dobaviteljev
-CompanyIsInCustomersCategories=Ta partner pripada naslednjim kategorijam kupcev/možnih strank
-CompanyIsInSuppliersCategories=Ta partner pripada naslednjim kategorijam dobaviteljev
-MemberIsInCategories=Ta član pripada naslednjim kategorijam
-ContactIsInCategories=Ta kontakt pripada naslednjim kategorijam kontaktov
-ProductHasNoCategory=Ta proizvod/storitev ni vključen v nobeno kategorijo
-SupplierHasNoCategory=Ta dobavitelj ni vključen v nobeno kategorijo
-CompanyHasNoCategory=To podjetje ni vključeno v nobeno kategorijo
-MemberHasNoCategory=Ta član ni v nobeni kategoriji
-ContactHasNoCategory=Ta kontakt ni v nobeni kategoriji
-ClassifyInCategory=Razvrsti v kategorijo
+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=Nobena
-NotCategorized=Brez kategorije
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Kategorija s to referenco že obstaja
 ReturnInProduct=Nazaj na kartico proizvodov/storitev
 ReturnInSupplier=Nazaj na kartico dobaviteljev
@@ -66,22 +64,22 @@ ReturnInCompany=Nazaj na kartico kupcev/možnih strank
 ContentsVisibleByAll=Vsebina bo vidna vsem
 ContentsVisibleByAllShort=Vsebina vidna vsem
 ContentsNotVisibleByAllShort=Vsebina ni vidna vsem
-CategoriesTree=Drevesna struktura kategorij
-DeleteCategory=Izbriši kategorijo
-ConfirmDeleteCategory=Ali zares želite izbrisati to kategorijo?
-RemoveFromCategory=Odstranite povezavo s kategorijo
-RemoveFromCategoryConfirm=Ali zares želite odstraniti povezavo med transakcijo in kategorijo?
-NoCategoriesDefined=Ni izbrana kategorija
-SuppliersCategoryShort=Kategorija dobaviteljev
-CustomersCategoryShort=Kategorija kupcev
-ProductsCategoryShort=Kategorija proizvodov
-MembersCategoryShort=Kategorija članov
-SuppliersCategoriesShort=Kategorije dobaviteljev
-CustomersCategoriesShort=Kategorije kupcev
+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=Kategorije kupcev/možnih strank
-ProductsCategoriesShort=Kategorije proizvodov
-MembersCategoriesShort=Kategorije članov
-ContactCategoriesShort=Kategorije kontaktov
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoSupplier=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoCustomer=Ta kategorija ne vsebuje nobenega kupca.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Ta kategorija ne vsebuje nobenega kontakta.
 AssignedToCustomer=Dodeljeno kupcu
 AssignedToTheCustomer=Dodeljeno kupcu
 InternalCategory=Interna kategorija
-CategoryContents=Vsebina kategorije
-CategId=ID kategorije
-CatSupList=Seznam kategorij dobaviteljev
-CatCusList=Seznam kategorij kupcev/možnih strank
-CatProdList=Seznam kategorij proizvodov
-CatMemberList=Seznam kategorij članov
-CatContactList=Seznam kategorij kontaktov in kontaktov
-CatSupLinks=Povezave med dobavitelji in kategorijami
-CatCusLinks=Povezave med kupci/možnimi strankami in kategorijami
-CatProdLinks=Povezave med proizvodi/storitvami in kategorijami
-CatMemberLinks=Povezave med člani in kategorijami
-DeleteFromCat=Odstrani 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=Izbriši sliko
 ConfirmDeletePicture=Potrdi izbris slike?
 ExtraFieldsCategories=Koplementarni atributi
-CategoriesSetup=Nastavitve kategorij
-CategorieRecursiv=Avtomatsko poveži z nadrejeno kategorijo
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Če je aktivirano, bo proizvod po dodajanju v podkategorijo povezan tudi z nadrejeno kategorijo
 AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev
-ShowCategory=Prikaži kategorijo
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index a6e87be5cfe..e33e79c5442 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Ukaz
-CronList=Seznam nalog
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Zaženi nalogo
-CronConfirmExecute= Si prepričan prekiniti to nalogo sedaj
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Dela na čakanju
+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=Naloga
-CronNone= Nič
+CronNone=Nič
 CronDtStart=Začetni datum
 CronDtEnd=Končni datum
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informacija
 # Common
diff --git a/htdocs/langs/sl_SI/donations.lang b/htdocs/langs/sl_SI/donations.lang
index b906a96ec9f..f032b3f8706 100644
--- a/htdocs/langs/sl_SI/donations.lang
+++ b/htdocs/langs/sl_SI/donations.lang
@@ -6,6 +6,8 @@ Donor=Donator
 Donors=Donatorji
 AddDonation=Ustvari donacijo
 NewDonation=Nova donacija
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Prikaži donacijo
 DonationPromise=Obljuba darila
 PromisesNotValid=Nepotrjene obljube
@@ -21,6 +23,8 @@ DonationStatusPaid=Prejeta donacija
 DonationStatusPromiseNotValidatedShort=Osnutek
 DonationStatusPromiseValidatedShort=Potrjena
 DonationStatusPaidShort=Prejeta
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Potrjena obljuba
 DonationReceipt=Prejem donacije
 BuildDonationReceipt=Izdelava potrdila
@@ -36,3 +40,4 @@ FrenchOptions=Opcije za Francijo
 DONATION_ART200=Prikaži člen 200 iz CGI, če se vas tiče
 DONATION_ART238=Prikaži člen 238 iz CGI, če se vas tiče
 DONATION_ART885=Prikaži člen 885 iz CGI, če se vas tiče
+DonationPayment=Donation payment
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 8417f316e28..8f449cc1891 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/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
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index e4700cda0c7..22bd3d694f3 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Seznam vseh poslanih e-poštnih obvestil
 MailSendSetupIs=Konfiguracij pošiljanja e-pošte je bila nastavljena na '%s'. Ta način ne more biti uporabljen za masovno pošiljanje.
 MailSendSetupIs2=Najprej morate kot administrator preko menija %sDomov - Nastavitve - E-pošta%s spremeniti parameter '%s' za uporabo načina '%s'. V tem načinu lahko odprete nastavitve SMTP strežnika, ki vam jih omogoča vaš spletni oprerater in uporabite masovno pošiljanje.
 MailSendSetupIs3=Če imate vprašanja o nastavitvi SMTP strežnika, lahko vprašate %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 0b0e4a38d9a..188b3ac0440 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Priljubljen
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. dobavitelj
 RefPayment=Ref. plačilo
 CommercialProposalsShort=Komercialne ponudbe
@@ -394,8 +395,8 @@ Available=Na voljo
 NotYetAvailable=Še ni na voljo
 NotAvailable=Ni na voljo
 Popularity=Priljubljenost
-Categories=Kategorije
-Category=Kategorija
+Categories=Tags/categories
+Category=Tag/category
 By=Z
 From=Od
 to=do
@@ -694,6 +695,7 @@ AddBox=Dodaj okvir
 SelectElementAndClickRefresh=Izberi element in klikni osveži
 PrintFile=Natisni datoteko %s
 ShowTransaction=Prikaži transakcijo
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Ponedeljek
 Tuesday=Torek
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index eb4d92ac319..087279cc90a 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Pošlji izdelek
 Discount=Popust
 CreateOrder=Kreiraj naročilo
 RefuseOrder=Zavrni naročilo
-ApproveOrder=Odobri naročilo
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Potrdi naročilo
 UnvalidateOrder=Unvalidate red
 DeleteOrder=Briši naročilo
@@ -102,6 +103,8 @@ ClassifyBilled=Označi kot "Fakturiran"
 ComptaCard=Računovodska kartica
 DraftOrders=Osnutki naročil
 RelatedOrders=Odvisna naročila
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Naročila v obdelavi
 RefOrder=Ref. naročilo
 RefCustomerOrder=Ref. naročilo kupca
@@ -118,6 +121,7 @@ PaymentOrderRef=Plačilo naročila %s
 CloneOrder=Kloniraj naročilo
 ConfirmCloneOrder=Ali zares želite klonirati to naročilo %s ?
 DispatchSupplierOrder=Prejem naročila od dobavitelja %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Referent za sledenje naročila kupca
 TypeContact_commande_internal_SHIPPING=Referent za sledenje odpreme
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 7b22d4ec296..c10628fb136 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Potrjena intervencija
 Notify_FICHINTER_SENTBYMAIL=Intervencija poslana po EMailu
 Notify_BILL_VALIDATE=Potrjen račun
 Notify_BILL_UNVALIDATE=Račun za kupca ni potrjen
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Odobreno naročilo pri dobavitelju
 Notify_ORDER_SUPPLIER_REFUSE=Zavrnjeno naročilo pri dobavitelju
 Notify_ORDER_VALIDATE=Potrjeno naročilo kupca
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Komercialna ponudba poslana po e-pošti
 Notify_BILL_PAYED=Plačan račun kupca
 Notify_BILL_CANCEL=Preklican račun kupca
 Notify_BILL_SENTBYMAIL=Račun poslan po e-pošti
-Notify_ORDER_SUPPLIER_VALIDATE=Potrjeno naročilo pri dobavitelju
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Naročilo pri dobavitelju poslano po pošti
 Notify_BILL_SUPPLIER_VALIDATE=Potrjen račun dobavitelja
 Notify_BILL_SUPPLIER_PAYED=Plačan račun dobavitelja
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Ustvarjanje projekta
 Notify_TASK_CREATE=Ustvarjena naloga
 Notify_TASK_MODIFY=Spremenjena naloga
 Notify_TASK_DELETE=Izbrisana naloga
-SeeModuleSetup=Glejte nastavitev modula
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Število pripetih datotek/dokumentov
 TotalSizeOfAttachedFiles=Skupna velikost pripetih datotek/dokumentov
 MaxSize=Največja velikost
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Potrjen račun %s
 EMailTextProposalValidated=Potrjena ponudba %s
 EMailTextOrderValidated=Potrjeno naročilo %s
 EMailTextOrderApproved=Odobreno naročilo %s
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Naročilo %s odobril %s
 EMailTextOrderRefused=Zavrnjeno naročilo %s
 EMailTextOrderRefusedBy=Naročilo %s zavrnil %s
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 66b438442e1..2a861958aca 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimalna priporočena cena je : %s
 PriceExpressionEditor=Urejevalnik prikaza cene
 PriceExpressionSelected=Izbran prikaz cene
 PriceExpressionEditorHelp1="cena = 2 + 2" ali "2 + 2" za nastavitev cene. Uporabite ; za ločitev izrazov
-PriceExpressionEditorHelp2=Lahko dostopate do EkstraPolj s spremenljivkami kot #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=Tako za proizvode/storitve, kot za nabavne cene, so na voljo naslednje spremenljivke:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Samo za cene proizvodov/storitev: #supplier_min_price#
Samo za nabavne cene: #supplier_quantity# in #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Način cene
 PriceNumeric=Številka
 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
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index ece1a228e71..d0cd6e6d556 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Seznam računov dobaviteljev, povezanih s
 ListContractAssociatedProject=Seznam pogodb, povezanih s projektom
 ListFichinterAssociatedProject=Seznam intervencij, povezanih s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Seznam aktivnosti, povezanih s projektom
 ActivityOnProjectThisWeek=Aktivnosti na projektu v tem tednu
 ActivityOnProjectThisMonth=Aktivnosti na projektu v tem mesecu
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 5a318a13eb8..21aa1dc06bf 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Referenca pošiljke
 Sending=Odprema
 Sendings=Pošiljke
+AllSendings=All Shipments
 Shipment=Odprema
 Shipments=Odpreme
 ShowSending=Show Sending
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index ef34fc2ba1b..e3604ebde33 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Seznam naročil dobaviitelja
 MenuOrdersSupplierToBill=Zaračunavanje naročil dobavitelja
 NbDaysToDelivery=Zakasnitev dobave v dnevih
 DescNbDaysToDelivery=Največja zakasnitev je prikazana med seznami naročenih proizvodov
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/sq_AL/donations.lang
+++ b/htdocs/langs/sq_AL/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/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
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index c9794e8b2ed..f73388ef0cd 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/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 %s ?
 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
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/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.
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/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)
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index ae34d563120..69454f180a5 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Avskiljare
 ExtrafieldCheckBox=Kryssruta
 ExtrafieldRadio=Radioknapp
 ExtrafieldCheckBoxFromList= Kryssruta från tabell
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parametrar listan måste vara som nyckel, värde 

 till exempel: 
 1, value1 
 2, värde2 
 3, value3 
 ... 

 För att få en lista beroende på en annan: 
 1, value1 | parent_list_code: parent_key 
 2, värde2 | parent_list_code: parent_key
 ExtrafieldParamHelpcheckbox=Parametrar listan måste vara som nyckel, värde 

 till exempel: 
 1, value1 
 2, värde2 
 3, value3 
 ...
 ExtrafieldParamHelpradio=Parametrar listan måste vara som nyckel, värde 

 till exempel: 
 1, value1 
 2, värde2 
 3, value3 
 ...
@@ -494,6 +495,8 @@ Module500Name=Speciella utgifter (skatt, sociala avgifter, utdelningar)
 Module500Desc=Förvaltning av särskilda kostnader som skatter, sociala avgifter, utdelningar och löner
 Module510Name=Löner
 Module510Desc=Förvaltning av de anställdas löner och betalningar
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Anmälningar
 Module600Desc=Skicka e-postmeddelanden på vissa Dolibarr affärshändelser till kontakter tredjeparts (inställnings definieras på varje tredjeparts)
 Module700Name=Donationer
@@ -508,14 +511,14 @@ Module1400Name=Bokföring
 Module1400Desc=Bokföring och redovisning (dubbel part)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorier
-Module1780Desc=Categorie ledning (produkter, leverantörer och kunder)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
 Module2200Name=Dynamiska priser
 Module2200Desc=Aktivera användningen av matematiska uttryck för priser
 Module2300Name=Cron
-Module2300Desc=Hantera planlagda uppgifter
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Åtgärder / uppgifter och dagordning förvaltning
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Läs Löner
 Permission512=Skapa / ändra löner
 Permission514=Radera löner
 Permission517=Export löner
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Läs tjänster
 Permission532=Skapa / modifiera tjänster
 Permission534=Ta bort tjänster
@@ -746,6 +754,7 @@ Permission1185=Godkänn leverantör order
 Permission1186=Beställ leverantör order
 Permission1187=Bekräfta mottagandet av leverantör order
 Permission1188=Radera leverantör order
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Få resultat av en export
 Permission1202=Skapa / ändra en export
 Permission1231=Läs leverantörsfakturor
@@ -758,10 +767,10 @@ Permission1237=Export leverantörsorder och tillhörande information
 Permission1251=Kör massiv import av externa data till databasen (data last)
 Permission1321=Export kundfakturor, attribut och betalningar
 Permission1421=Export kundorder och attribut
-Permission23001 = Läs planlagd uppgift
-Permission23002 = Skapa / redigera planlagd uppgift
-Permission23003 = Radera planlagd uppgift
-Permission23004 = Utför planlagda uppgifter
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Läs åtgärder (händelser eller uppgifter) kopplade till sitt konto
 Permission2402=Skapa / ändra åtgärder (händelser eller uppgifter) kopplade till sitt konto
 Permission2403=Radera åtgärder (händelser eller uppgifter) kopplade till sitt konto
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Avkastningen en bokföring kod byggd med %s följt av
 ModuleCompanyCodePanicum=Avkastningen en tom bokföring kod.
 ModuleCompanyCodeDigitaria=Bokföring kod beror på tredje part kod. Koden består av tecknet "C" i den första positionen och därefter det första fem bokstäver av tredje part koden.
 UseNotifications=Använd anmälningar
-NotificationsDesc=E-post meddelanden funktionen kan du tyst skicka automatiska e-post, för vissa Dolibarr händelser. Mål av anmälningar kan definieras: 
 * Per tredje parter kontakter (kunder eller leverantörer), en tredje part vid tidpunkten. 
 * Eller genom att sätta ett globalt mål e-postadress på modulens inställningssida.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Dokument mallar
 DocumentModelOdt=Generera dokument från OpenDocuments mallar (.odt eller .ods filer för Openoffice, KOffice, Textedit, ...)
 WatermarkOnDraft=Vattenstämpel utkast
@@ -1557,6 +1566,7 @@ SuppliersSetup=Leverantör modul setup
 SuppliersCommandModel=Fullständig mall av leverantör för (logo. ..)
 SuppliersInvoiceModel=Komplett mall leverantörsfaktura (logo. ..)
 SuppliersInvoiceNumberingModel=Leverantörsfakturor numrerings modeller
+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 setup
 PathToGeoIPMaxmindCountryDataFile=Sökväg till fil innehåller MaxMind ip till land översättning. 
 Exempel: 
 /usr/local/share/GeoIP/GeoIP.dat 
 /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
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index fce76b40e62..366c6dfb486 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura %s validerade
 InvoiceValidatedInDolibarrFromPos=Faktura %s validerats från POS
 InvoiceBackToDraftInDolibarr=Faktura %s gå tillbaka till förslaget status
 InvoiceDeleteDolibarr=Faktura %s raderas
-OrderValidatedInDolibarr= Beställ %s validerade
+OrderValidatedInDolibarr=Beställ %s validerade
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Beställ %s avbryts
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Ordningens %s godkänd
 OrderRefusedInDolibarr=Order %s vägrade
 OrderBackToDraftInDolibarr=Beställ %s gå tillbaka till förslaget status
@@ -91,3 +94,5 @@ WorkingTimeRange=Arbetstid intervall
 WorkingDaysRange=Arbetsdagar sträcker
 AddEvent=Skapa event
 MyAvailability=Min tillgänglighet
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 549fcce7940..4ffc34b5e39 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Totalt för två nya rabatt måste vara lik
 ConfirmRemoveDiscount=Är du säker på att du vill ta bort denna rabatt?
 RelatedBill=Relaterade faktura
 RelatedBills=Relaterade fakturor
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Senast relaterad faktura
 WarningBillExist=Varning, en eller flera fakturor finns redan
 
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 8d653226bc1..7963867f0be 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategori
-Categories=Kategorier
-Rubrique=Kategori
-Rubriques=Kategorier
-categories=kategorier
-TheCategorie=I kategorin
-NoCategoryYet=Ingen kategori av denna typ skapades
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=I
 AddIn=Lägg till i
 modify=modifiera
 Classify=Klassificera
-CategoriesArea=Kategorier område
-ProductsCategoriesArea=Produkter / tjänster kategorier område
-SuppliersCategoriesArea=Leverantörer kategorier område
-CustomersCategoriesArea=Kunder kategorier område
-ThirdPartyCategoriesArea=Tredje part kategorier område
-MembersCategoriesArea=Medlemmar kategorier område
-ContactsCategoriesArea=Område för kontaktkategorier
-MainCats=Huvudkategorier
+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=Underkategorier
 CatStatistics=Statistik
-CatList=Lista över kategorier
-AllCats=Alla kategorier
-ViewCat=Visa kategori
-NewCat=Lägg till kategori
-NewCategory=Ny kategori
-ModifCat=Ändra kategori
-CatCreated=Kategori skapade
-CreateCat=Skapa kategori
-CreateThisCat=Skapa denna kategori
+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=Validera fält
 NoSubCat=Inga underkategori.
 SubCatOf=Underkategori
-FoundCats=Hittade kategorier
-FoundCatsForName=Kategorier hittades för namnet:
-FoundSubCatsIn=Underkategorier finns i kategorin
-ErrSameCatSelected=Du har valt samma kategori flera gånger
-ErrForgotCat=Du glömde att välja kategori
+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=Du glömde att informera fält
 ErrCatAlreadyExists=Detta namn används redan
-AddProductToCat=Lägg till denna produkt till en kategori?
-ImpossibleAddCat=Omöjligt att lägga till kategorin
-ImpossibleAssociateCategory=Omöjligt att associera den kategori
+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 har lagts till.
-ObjectAlreadyLinkedToCategory=Element är redan kopplad till denna kategori.
-CategorySuccessfullyCreated=Denna kategori %s har lagts med framgång.
-ProductIsInCategories=Produkt / tjänst äger till följande kategorier
-SupplierIsInCategories=Tredje part är att följande leverantörer kategorier
-CompanyIsInCustomersCategories=Denna tredje part äger att följande kunder / utsikter kategorier
-CompanyIsInSuppliersCategories=Denna tredje part äger att följande leverantörer kategorier
-MemberIsInCategories=Denna medlem äger till följande medlemmar kategorier
-ContactIsInCategories=Denna kontakt ingår i följande kontaktkategorier
-ProductHasNoCategory=Denna produkt / tjänst är inte på något kategorier
-SupplierHasNoCategory=Denna leverantör är inte på något kategorier
-CompanyHasNoCategory=Detta företag är inte på något kategorier
-MemberHasNoCategory=Denna medlem är inte på något kategorier
-ContactHasNoCategory=Denna kontakt tillhör inte någon kategori
-ClassifyInCategory=Klassificera i kategorin
+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=Ingen
-NotCategorized=Utan kategori
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denna kategori finns redan med denna ref
 ReturnInProduct=Tillbaka till produkt / tjänst kort
 ReturnInSupplier=Tillbaka till leverantör kort
@@ -66,22 +64,22 @@ ReturnInCompany=Tillbaka till kund / prospektering kort
 ContentsVisibleByAll=Innehållet kommer att vara synlig för alla
 ContentsVisibleByAllShort=Innehållsförteckning synlig för alla
 ContentsNotVisibleByAllShort=Innehåll inte synlig för alla
-CategoriesTree=Kategoriträd
-DeleteCategory=Ta bort kategori
-ConfirmDeleteCategory=Är du säker på att du vill ta bort denna kategori?
-RemoveFromCategory=Ta bort kopplingen till Categorie
-RemoveFromCategoryConfirm=Är du säker på att du vill ta bort koppling mellan transaktionen och den kategorin?
-NoCategoriesDefined=Ingen kategori som definieras
-SuppliersCategoryShort=Leverantörer kategori
-CustomersCategoryShort=Kunder kategori
-ProductsCategoryShort=Produkter kategori
-MembersCategoryShort=Medlemmar kategori
-SuppliersCategoriesShort=Leverantörer kategorier
-CustomersCategoriesShort=Kunder kategorier
+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. / kommande utvecklingen. kategorier
-ProductsCategoriesShort=Produkter kategorier
-MembersCategoriesShort=Medlemmar kategorier
-ContactCategoriesShort=Kontaktkategorier
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Denna kategori innehåller inte någon produkt.
 ThisCategoryHasNoSupplier=Denna kategori innehåller inte någon leverantör.
 ThisCategoryHasNoCustomer=Denna kategori innehåller inte någon kund.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Denna kategori innehåller inte någon kontakt.
 AssignedToCustomer=Avsatta till en kund
 AssignedToTheCustomer=Avsatta till kunden
 InternalCategory=Intern kategori
-CategoryContents=Kategori innehåll
-CategId=Kategori id
-CatSupList=Lista över leverantör kategorier
-CatCusList=Förteckning över kund / utsikterna kategorier
-CatProdList=Förteckning över produkter kategorier
-CatMemberList=Förteckning över medlemmar kategorier
-CatContactList=Lista över kontaktkategorier och kontakt
-CatSupLinks=Länkar mellan leverantörer och kategorier
-CatCusLinks=Länkar mellan kunder / möjliga kunder och kategorier
-CatProdLinks=Länkar mellan produkter / tjänster och kategorier
-CatMemberLinks=Länkar mellan medlemmar och kategorier
-DeleteFromCat=Ta bort från kategori
+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=Ta bort bild
 ConfirmDeletePicture=Bekräfta ta bort bild?
 ExtraFieldsCategories=Extra attibut
-CategoriesSetup=Kategorier, inställningar
-CategorieRecursiv=Länka automatiskt med förälderkategori
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Om aktiverad kommer produkten även länkas till förälderkategori när den läggs i en underkategori
 AddProductServiceIntoCategory=Lägg till följande produkt / tjänst
-ShowCategory=Visa kategori
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 1bb38438cc9..07ae8ba906a 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Sista loppet utgång
 CronLastResult=Senaste resultat code
 CronListOfCronJobs=Lista över schemalagda jobb
 CronCommand=Kommando
-CronList=Listan Jobb
-CronDelete= Radera cron-jobb
-CronConfirmDelete= Är du säker på att du vill ta bort denna cron-jobb?
-CronExecute=Starta jobb
-CronConfirmExecute= Är du säker på att utföra detta jobb nu
-CronInfo= Jobb möjligt att utföra uppgiften som har planerats
-CronWaitingJobs=Wainting jobb
+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=Jobb
-CronNone= Ingen
+CronNone=Ingen
 CronDtStart=Startdatum
 CronDtEnd=Slutdatum
 CronDtNextLaunch=Nästa exekvering
@@ -75,6 +75,7 @@ CronObjectHelp=Det objektnamn som ska läsas in. 
 För exemple att hämta me
 CronMethodHelp=Objektet metod för att starta. 
 För exemple att hämta metod för Dolibarr Produktobjekt /htdocs/product/class/product.class.php, värdet av metoden är är fecth
 CronArgsHelp=Metoden argument. 
 Till exemple att hämta förfarande för Dolibarr Produkt objekt /htdocs/product/class/product.class.php kan värdet av paramters vara 0, ProductRef
 CronCommandHelp=Systemet kommandoraden som ska köras.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang
index a66b54ae5af..e82473ddf20 100644
--- a/htdocs/langs/sv_SE/donations.lang
+++ b/htdocs/langs/sv_SE/donations.lang
@@ -6,6 +6,8 @@ Donor=Givare
 Donors=Givare
 AddDonation=Skapa en donation
 NewDonation=Ny donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Visa donation
 DonationPromise=Gift löfte
 PromisesNotValid=Inte validerade löften
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation fått
 DonationStatusPromiseNotValidatedShort=Förslag
 DonationStatusPromiseValidatedShort=Validerad
 DonationStatusPaidShort=Mottagna
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate löfte
 DonationReceipt=Donation kvitto
 BuildDonationReceipt=Bygg kvitto
@@ -36,3 +40,4 @@ FrenchOptions=Alternativ för Frankrike
 DONATION_ART200=Visar artikel 200 från CGI om du är orolig
 DONATION_ART238=Visar artikel 238 från CGI om du är orolig
 DONATION_ART885=Visar artikel 885 från CGI om du är orolig
+DonationPayment=Donation payment
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 2dfe10cfa08..e66c00e3397 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Okänt fel '%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=Obligatoriska inställningsparametrarna har ännu inte definierat
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 73f612bb83f..2dc5eb785cd 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista alla e-postmeddelanden skickas
 MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick.
 MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter '% s' för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen.
 MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 2c1bb7d593e..89622813889 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorit
 ShortInfo=Info
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. leverantör
 RefPayment=Ref. betalning
 CommercialProposalsShort=Kommersiella förslag
@@ -394,8 +395,8 @@ Available=Tillgängliga
 NotYetAvailable=Ännu inte tillgängligt
 NotAvailable=Inte tillgänglig
 Popularity=Populärast
-Categories=Kategorier
-Category=Kategori
+Categories=Tags/categories
+Category=Tag/category
 By=Genom att
 From=Från
 to=till
@@ -694,6 +695,7 @@ AddBox=Lägg till låda
 SelectElementAndClickRefresh=Välj ett element och klicka på uppdatera
 PrintFile=Skriv ut fil %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 6b67e495d3f..f7d101378d4 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship produkt
 Discount=Rabatt
 CreateOrder=Skapa ordning
 RefuseOrder=Vägra att
-ApproveOrder=Acceptera att
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Verifiera att
 UnvalidateOrder=Unvalidate För
 DeleteOrder=Radera ordning
@@ -102,6 +103,8 @@ ClassifyBilled=Klassificera "Fakturerade"
 ComptaCard=Bokföring kort
 DraftOrders=Förslag till beslut
 RelatedOrders=Relaterade order
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=I processen order
 RefOrder=Ref. För
 RefCustomerOrder=Ref. kundorder
@@ -118,6 +121,7 @@ PaymentOrderRef=Betalning av att %s
 CloneOrder=Klon för
 ConfirmCloneOrder=Är du säker på att du vill klona denna beställning %s?
 DispatchSupplierOrder=Ta emot leverantör för %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representanten följa upp kundorder
 TypeContact_commande_internal_SHIPPING=Representanten uppföljning sjöfart
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 3144d5f7412..78c95c5c6cd 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validerade
 Notify_FICHINTER_SENTBYMAIL=Ingripande skickas per post
 Notify_BILL_VALIDATE=Kundfaktura validerade
 Notify_BILL_UNVALIDATE=Kundfakturan Fraktpris saknas
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverantör för godkänd
 Notify_ORDER_SUPPLIER_REFUSE=Leverantör för vägrat
 Notify_ORDER_VALIDATE=Kundorder validerade
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kommersiell förslag skickas per post
 Notify_BILL_PAYED=Kundfaktura betalade
 Notify_BILL_CANCEL=Kundfaktura avbryts
 Notify_BILL_SENTBYMAIL=Kundfaktura skickas per post
-Notify_ORDER_SUPPLIER_VALIDATE=Leverantör för validerade
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverantör beställning skickas per post
 Notify_BILL_SUPPLIER_VALIDATE=Leverantörsfaktura validerade
 Notify_BILL_SUPPLIER_PAYED=Leverantörsfaktura betalas
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Projekt skapande
 Notify_TASK_CREATE=Task skapade
 Notify_TASK_MODIFY=Task modifierad
 Notify_TASK_DELETE=Uppgift utgår
-SeeModuleSetup=Se modul inställnings
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Antal bifogade filer / dokument
 TotalSizeOfAttachedFiles=Total storlek på bifogade filer / dokument
 MaxSize=Maximal storlek
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Fakturan %s har validerats.
 EMailTextProposalValidated=Förslaget %s har validerats.
 EMailTextOrderValidated=Ordern %s har validerats.
 EMailTextOrderApproved=Ordern %s har godkänts.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Ordern %s har godkänts av %s.
 EMailTextOrderRefused=Ordern %s har avslagits.
 EMailTextOrderRefusedBy=Ordern %s har avslagits %s.
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index e8f20528c1c..401789f8a22 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minsta rekommenderade priset är : %s
 PriceExpressionEditor=Pris uttryck redigerare
 PriceExpressionSelected=Valda pris uttryck
 PriceExpressionEditorHelp1="pris = 2 + 2" eller "2 + 2" för att sätta pris. Använd ; för att skilja uttryck
-PriceExpressionEditorHelp2=För att använda ExtraFields använd variabler som #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=I både produkt- / tjänste- och leverantörspriser är följande variabler tillgängliga:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Endast i produkt- / tjänstepris: #supplier_min_price#
Endast i leverantörspris: #supplier_quantity# och #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Prisläge
 PriceNumeric=Nummer
 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
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index af391db2150..4d55abdc67c 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Lista över leverantörens fakturor i samb
 ListContractAssociatedProject=Förteckning över avtal i samband med projektet
 ListFichinterAssociatedProject=Lista över åtgärder i samband med projektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Förteckning över åtgärder i samband med projektet
 ActivityOnProjectThisWeek=Aktivitet på projekt den här veckan
 ActivityOnProjectThisMonth=Aktivitet på projekt denna månad
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index 1f32d5bebb4..31de11fb426 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. transporten
 Sending=Sändning
 Sendings=Transporter
+AllSendings=All Shipments
 Shipment=Sändning
 Shipments=Transporter
 ShowSending=Visa skickade
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 34e27b7955e..d11b1ba05e7 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Lista över leverantörsorder
 MenuOrdersSupplierToBill=Leverantörs order att fakturera
 NbDaysToDelivery=Leveransförsening, dagar
 DescNbDaysToDelivery=Den största förseningen visas med produktbeställningslista
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/sw_SW/agenda.lang
+++ b/htdocs/langs/sw_SW/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/sw_SW/donations.lang b/htdocs/langs/sw_SW/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/sw_SW/donations.lang
+++ b/htdocs/langs/sw_SW/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/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
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index d40e28cb776..4b393ec50c5 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/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 %s ?
 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
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/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.
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/sw_SW/sendings.lang
+++ b/htdocs/langs/sw_SW/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/sw_SW/suppliers.lang
+++ b/htdocs/langs/sw_SW/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)
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index ed6d1b2709c..fcffe3a92bb 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/th_TH/donations.lang
+++ b/htdocs/langs/th_TH/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/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
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 18fbfefd1dd..c64c5bf88f0 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/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 %s ?
 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
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/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.
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/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)
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 17bc48b1142..a79c5689912 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -8,11 +8,11 @@ VersionExperimental=Deneysel
 VersionDevelopment=Geliştirme
 VersionUnknown=Bilinmeyen
 VersionRecommanded=Önerilen
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Dosya Bütünlüğü
+FilesMissing=Eksik dosyalar
+FilesUpdated=Güncellenmiş Dosyalar
+FileCheckDolibarr=Dolibarr Dosya Bütünlüğünü Denetle
+XmlNotFound=Dolibarr Bütünlüğü Xml Dosyası Bulınamadı
 SessionId=Oturum Kimliği
 SessionSaveHandler=Oturum kayıt yürütücüsü
 SessionSavePath=Oturum kayıt konumu
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Ayırıcı
 ExtrafieldCheckBox=Onay kutusu
 ExtrafieldRadio=Onay düğmesi
 ExtrafieldCheckBoxFromList= Tablodan açılır kutu
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parametre listesi anahtar.değer gibi olmalı, örneğin 

 : 
1,değer1
2,değer2
3,değer3
...

Başka bir listeye bağlı bir liste elde etmek için :
1,değer1|parent_list_code:parent_key
2,değer2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parametre listesi anahtar.değer gibi olmalı, örneğin 

 : 
1,değer1
2,değer2
3,değer3
...
 ExtrafieldParamHelpradio=Parametre listesi anahtar.değer gibi olmalı, örneğin 

 : 
1,değer1
2,değer2
3,değer3
...
@@ -494,28 +495,30 @@ Module500Name=Özel giderler (vergi, sosyal katkı payları, temettüler)
 Module500Desc=Vergiler, sosyal katkı payları, temettüler ve maaşlar gibi özel giderlerin yönetimi
 Module510Name=Ücretler
 Module510Desc=Çalışanların maaş ve ödeme yönetimi
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Duyurlar
 Module600Desc=Üçüncü parti kişilerine bazı Dolibarr iş etkinlikleriyle ilgili Eposta bildirimleri gönderin (her üçüncü parti için ayarlar tanımlanmıştır)
 Module700Name=Bağışlar
 Module700Desc=Bağış yönetimi
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Gider Raporu
+Module770Desc=Yönetim ve şikayet gider raporları )nakliye, yemek, ...)
+Module1120Name=Tedarikçi teklifi
+Module1120Desc=Tedarikçi teklifi ve fiyatlarını iste
 Module1200Name=Mantis
 Module1200Desc=Mantis entegrasyonu
 Module1400Name=Muhasebe
 Module1400Desc=Muhasebe yönetimi (her iki parti için)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Kategoriler
-Module1780Desc=Kategori yönetimi (ürünler, tedarikçiler ve müşteriler)
+Module1520Name=Belge Oluşturma
+Module1520Desc=Toplu posta belgesi oluşturma
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKdüzenleyici (FCKeditor)
 Module2000Desc=Gelişmiş editör kullanarak bazı metin alanlarının düzenlenmesini sağlar
 Module2200Name=Dinamik Fiyatlar
 Module2200Desc=Fiyatlar için matematik ifadelerin kullanımını etkinleştir
 Module2300Name=Kron
-Module2300Desc=Planlı görev yönetimi
+Module2300Desc=Scheduled job management
 Module2400Name=Gündem
 Module2400Desc=Etkinlikler/görevler ve gündem yönetimi
 Module2500Name=Elektronik İçerik Yönetimi
@@ -642,7 +645,7 @@ Permission181=Tedarikçi siparişi oku
 Permission182=Tedarikçi siparişi oluştur/değiştir
 Permission183=Tedarikçi siparişi doğrula
 Permission184=Tedarikçi siparişi onayla
-Permission185=Order or cancel supplier orders
+Permission185=Tedarikçi siparişlerini iptal et ya da ver
 Permission186=Tedarikçi siparişi al
 Permission187=Tedarikçi siparişi kapat
 Permission188=Tedarikçi siparişi iptal et
@@ -714,6 +717,11 @@ Permission510=Ücretleri oku
 Permission512=Ücret oluştur/değiştir
 Permission514=Ücretleri sil
 Permission517=Ücretleri çıkart
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Hizmet oku
 Permission532=Hizmet oluştur/değiştir
 Permission534=Hizmet sil
@@ -722,13 +730,13 @@ Permission538=Hizmet dışaaktar
 Permission701=Bağış oluştur/değiştir
 Permission702=Bağış sil
 Permission703=Bağış sil
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Gider raporlarını oku (kendinin veya emrindekilerinin)
+Permission772=Gider raporu oluştur/değiştir
+Permission773=Gider raporu sil
+Permission774=Bütün gider raporlarını oku (emrinde olmayanlarınkini de)
+Permission775=Gider raporu onayla
+Permission776=Ödeme gider raporu
+Permission779=Gider raporları dışaaktarma
 Permission1001=Stok oku
 Permission1002=Depo oluştur/değiştir
 Permission1003=Depo sil
@@ -746,6 +754,7 @@ Permission1185=Tedarikçi siparişi onayla
 Permission1186=Tedarikçi siparişi ver
 Permission1187=Tedarikçi siparişi alındı fişi
 Permission1188=Tedarikçi siparişi kapat
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Bir dışaaktarma sonucu al
 Permission1202=Dışaaktarma oluştur/değiştir
 Permission1231=Tedarikçi faturalarını oku
@@ -758,10 +767,10 @@ Permission1237=Tedarikçi siparişi ve ayrıntılarını dışaaktar
 Permission1251=Dış verilerin veritabanına toplu olarak alınmasını çalıştır (veri yükle)
 Permission1321=Müşteri faturalarını, özniteliklerin ve ödemelerini dışaaktar
 Permission1421=Müşteri siparişleri ve özniteliklerini dışaaktar
-Permission23001 = Planlı görev oku
-Permission23002 = Planlı görev oluştur/güncelle
-Permission23003 = Planlı görev sil
-Permission23004 = Planlı görev yürüt
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) oku
 Permission2402=Onun hesabına bağlı eylemler (etkinlikler veya görevler) oluştur/değiştir
 Permission2403=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) sil
@@ -1043,8 +1052,8 @@ MAIN_PROXY_PASS=Proxy sunucusunu kullanacak parola
 DefineHereComplementaryAttributes=Burada bütün öznitelikleri tanımlayın, yalnızca mevcut varsayılanları değil desteklenmenizi istediğiniz %s leri de.
 ExtraFields=Tamamlayıcı öznitelikler
 ExtraFieldsLines=Tamamlayıcı öznitelikler (satırlar)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Tamamlayıcı öznitelikler (sipariş satırları)
+ExtraFieldsSupplierInvoicesLines=Tamamlayıcı öznitelikler (fatura satırları)
 ExtraFieldsThirdParties=Ek öznitelikler (üçüncüparti)
 ExtraFieldsContacts=Ek öznitelikler (kişi/adres)
 ExtraFieldsMember=Tamamlayıcı öznitelikler (üye)
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=%s tarafından oluşturulan bir muhasebe kodunu getir:
 ModuleCompanyCodePanicum=Boş bir muhasebe kodu girin.
 ModuleCompanyCodeDigitaria=Muhasebe kodu üçüncü parti koduna bağlıdır. Kod üçüncü parti kodunun ilk 5 karakterini izleyen birinci konumda "C" karakterinden oluşmaktadır.
 UseNotifications=Bildirimleri kullanın
-NotificationsDesc=Eposta bildirimleri özelliği bazı Dolibarr etkinlikleri ile ilgili sessizce otomatik posta göndermenizi sağlar. Bildirim hedefleri bu şekilde tanımlanır:
* üçüncü parti kişileri başına (müşteri ya da tedarikçi), her seferinde bir üçüncü parti.
*
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Belge şablonları
 DocumentModelOdt=OpenDocuments şablonlarından belgeler oluşturun (OpenOffice, KOffice, TextEdit .ODT veya .ODS dosyaları)
 WatermarkOnDraft=Taslak belge üzerinde filigran
@@ -1173,12 +1182,12 @@ FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
 WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=Tedarikçi fiyat isteği modülü kurulumu
+AskPriceSupplierNumberingModules=Tedarikçi fiyat isteği numaralandırma modülü
+AskPriceSupplierPDFModules=Tedarikçi fiyat isteği belge modelleri
+FreeLegalTextOnAskPriceSupplier=Tedarikçi fiyat isteği üzerinde serbest metin
+WatermarkOnDraftAskPriceSupplier=Taslak tedarikçi fiyat istekleri üzerinde filigran (boşsa yok)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Fiyat isteklerinde hedef banka hesabı iste
 ##### Orders #####
 OrdersSetup=Sipariş yönetimi kurulumu
 OrdersNumberingModules=Sipariş numaralandırma modülü
@@ -1410,7 +1419,7 @@ BarcodeDescUPC=Barkod türü UPC
 BarcodeDescISBN=Barkod türü ISBN
 BarcodeDescC39=Barkod türü C39
 BarcodeDescC128=Barkod türü C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode
+GenbarcodeLocation=Bar kodu oluşturma komut satırı aracı (bazı bar kodu türleri için iç motor tarafından kullanılır). "genbarcode" ile uyumlu olmalıdır.
Örneğin: /usr/local/bin/genbarcode
 BarcodeInternalEngine=İç motor
 BarCodeNumberManager=Barkod sayılarını otomatik olarak tanımlayacak yönetici
 ##### Prelevements #####
@@ -1528,10 +1537,10 @@ CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel üç
 CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap
 CashDeskBankAccountForCheque= Ödemeleri çek ile almak için kullanılan varsayılan hesap
 CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+CashDeskDoNotDecreaseStock=Satış Noktasından bir satış yapıldığında stok azaltılmasını engelle ("hayır"sa POS tan yapılan her satışta stok eksiltilmesi yapılır, Stok modülündeki seçenek ayarı ne olursa olsun).
 CashDeskIdWareHouse=Depoyu stok azaltmada kullanmak için zorla ve sınırla
 StockDecreaseForPointOfSaleDisabled=Satış Noktasından stok eksiltme engelli
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=POS ta stok eksiltmesi toplu yönetmeyle uyumlu değil
 CashDeskYouDidNotDisableStockDecease=Satış Noktasından satış yapılırken stok eksiltilmesini engellemediniz. Bu durumda depo gereklidir.
 ##### Bookmark #####
 BookmarkSetup=Yerimi modülü kurulumu
@@ -1557,6 +1566,7 @@ SuppliersSetup=Tedarikçi modülü kurulumu
 SuppliersCommandModel=Eksiksiz tedarikçi sipariş şablonu (logo. ..)
 SuppliersInvoiceModel=Eksiksiz tedarikçi fatura şablonu (logo. ..)
 SuppliersInvoiceNumberingModel=Tedarikçi faturaları numaralandırma modelleri
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modülü kurulumu
 PathToGeoIPMaxmindCountryDataFile=Ülke çevirisi için Maxmind ip içeren dosya yolu. 
Örnekler:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat/GeoIP.dat
@@ -1597,7 +1607,12 @@ SortOrder=Sıralama düzeni
 Format=Biçim
 TypePaymentDesc=0:Müşteri ödeme türü, 1:Tedarikçi ödeme türü, 2:Hem müşteri hem de tedarikçi ödeme türü
 IncludePath=Yolu içerir (%s değişlende tanımlanır)
-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.
+ExpenseReportsSetup=Gider Raporları modülü Ayarları
+TemplatePDFExpenseReports=Gider raporu belgesi oluşturmak için belge şablonları
+NoModueToManageStockDecrease=Otomatik stok eksiltmesi yapabilecek hiçbir modül etkinleştirilmemiş. Stok eksiltmesi yalnızca elle girişle yapılacaktır.
+NoModueToManageStockIncrease=Otomatik stok arttırılması yapabilecek hiçbir modül etkinleştirilmemiş. Stok arttırılması yalnızca elle girişle yapılacaktır.
+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
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index d3398bfc410..1821f49cad3 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=%s Faturası doğrulandı
 InvoiceValidatedInDolibarrFromPos=POS tan doğrulanan fatura %s
 InvoiceBackToDraftInDolibarr=%s Faturasını taslak durumuna geri götür
 InvoiceDeleteDolibarr=%s faturası silindi
-OrderValidatedInDolibarr= %s Siparişi doğrulandı
+OrderValidatedInDolibarr=%s Siparişi doğrulandı
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=%s Siparişi iptal edildi
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=%s Siparişi onayladı
 OrderRefusedInDolibarr=Reddedilen teklif %s
 OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür
@@ -91,3 +94,5 @@ WorkingTimeRange=Çalışma saati aralığı
 WorkingDaysRange=Çalışma günleri aralığı
 AddEvent=Etkinlik oluştur
 MyAvailability=Uygunluğum
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 4f843b6a57b..77b0858125d 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -33,11 +33,11 @@ AllTime=Başlangıç
 Reconciliation=Uzlaşma
 RIB=Banka Hesap Numarası
 IBAN=IBAN numarası
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=IBAN Geçerli
+IbanNotValid=IBAN Geçersiz
 BIC=BIC/SWIFT numarası
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=BIC/SWIFT Geçerli
+SwiftNotValid=BIC/SWIFT Geçersiz
 StandingOrders=Ödeme talimatları
 StandingOrder=Ödeme talimatı
 Withdrawals=Para çekmeler
@@ -152,7 +152,7 @@ BackToAccount=Hesaba geri dön
 ShowAllAccounts=Tüm hesaplar için göster
 FutureTransaction=Gelecekteki işlem. Hiçbir şekilde uzlaştırılamaz.
 SelectChequeTransactionAndGenerate=Çek tahsilat makbuzunun içereceği çekleri seç/süz ve “Oluştur” a tıkla.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Uzlaştırma ile ilişkili banka hesap özetini seç. Sıralanabilir bir sayısal değer kullan: YYYYMM ya da YYYYMMDD
 EventualyAddCategory=Sonunda, kayıtları sınıflandırmak için bir kategori belirtin
 ToConciliate=Uzlaştırılacak mı?
 ThenCheckLinesAndConciliate=Sonra, banka hesap özetindeki kalemleri işaretleyin ve tıklayın
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index b4dfe964b99..b799ca33cd3 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -26,7 +26,7 @@ InvoiceReplacementAsk=Fatura değiştirme yapılacak fatura
 InvoiceReplacementDesc=Fatura değiştirme henüz tahsilat yapılmamış bir faturanın iptal edilmesi ve tamamen değiştirilmesi için kullanılır.

Not: Yalnızca ödeme yapılmamış faturalar değiştirilebilir. Değiştirdiğiniz fatura eğer henüz kapataılmamışsa, kullanılmamak üzere otomatik olarak kapatılacaktır.
 InvoiceAvoir=İade faturası
 InvoiceAvoirAsk=İade faturası fatura düzeltmek için kullanılır
-InvoiceAvoirDesc=İade Faturasıbir eksi fatura olup fatura tutarının gerçekte ödenen tutardan farklı olması durumunda kullanılır (çünkü müşteri yanlışlıkla fazla ödeme yapmıştır, ya da tamamını ödemeyecektir, örneğin bazı malları iade ettiğinden).
+InvoiceAvoirDesc=İade Faturası bir eksi fatura olup fatura tutarının gerçekte ödenen tutardan farklı olması durumunda kullanılır (çünkü müşteri yanlışlıkla fazla ödeme yapmıştır, ya da tamamını ödemeyecektir, örneğin bazı malları iade ettiğinden).
 invoiceAvoirWithLines=İlk faturadan alınan kalemlerle İade Faturası oluştur
 invoiceAvoirWithPaymentRestAmount=İlk faturanın ödenmemiş bakiyeli İade Faturası
 invoiceAvoirLineWithPaymentRestAmount=Ödenmemiş kalan tutar için İade Faturası
@@ -62,7 +62,7 @@ PaidBack=Geri ödenen
 DatePayment=Ödeme tarihi
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
-ConfirmConvertToReduc=Bu iade faturasını ya da nakit avans faturasını mutlak bir indirime dönüştürmek istiyor musunuz? 
Bu tutar diğer indirimlerin arasına kaydedilecek olup bu müşteri için mevcut ya da ileride kesilecek faturada indirim olarak kullanılabilecektir.
+ConfirmConvertToReduc=Bu iade faturasını ya da nakit avans faturasını mutlak bir indirime dönüştürmek istiyor musunuz? 
 Bu tutar diğer indirimlerin arasına kaydedilecek olup bu müşteri için mevcut ya da ileride kesilecek faturada indirim olarak kullanılabilecektir.
 SupplierPayments=Tedarikçi ödemeleri
 ReceivedPayments=Alınan ödemeler
 ReceivedCustomersPayments=Müşterilerden alınan ödemeler
@@ -74,13 +74,13 @@ PaymentsAlreadyDone=Halihazırda yapılmış ödemeler
 PaymentsBackAlreadyDone=Zaten yapılmış geri ödemeler
 PaymentRule=Ödeme kuralı
 PaymentMode=Ödeme türü
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentTerm=Ödeme koşulu
+PaymentConditions=Ödeme koşulları
+PaymentConditionsShort=Ödeme koşulları
 PaymentAmount=Ödeme tutarı
 ValidatePayment=Ödeme doğrula
 PaymentHigherThanReminderToPay=Ödeme hatırlatmasından daha yüksek ödeme
-HelpPaymentHigherThanReminderToPay=Dikkat, bir ya da daha çok faturanın ödeme tutarı ödenecek bakiyeden yüksektir.
Girişinizi düzeltin, aksi durumda her fazla ödenen fatura için bir iade faturası oluşturmayı onaylayın ve düşünün.
+HelpPaymentHigherThanReminderToPay=Dikkat, bir ya da daha çok faturanın ödeme tutarı ödenecek bakiyeden yüksektir.
 Girişinizi düzeltin, aksi durumda her fazla ödenen fatura için bir iade faturası oluşturmayı onaylayın ve düşünün.
 HelpPaymentHigherThanReminderToPaySupplier=Dikkat, bir ya da daha çok faturanın ödeme tutarı ödenecek bakiyeden yüksektir.
Girişinizi düzeltin, aksi durumda onaylayın.
 ClassifyPaid=Sınıflandırma ‘Ödendi’
 ClassifyPaidPartially=Sınıflandırma ‘Kısmen ödendi’
@@ -166,7 +166,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Bazı ülkelerde, bu seçenek
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Eğer diğerlerinin hiçbiri uymuyorsa bu seçimi kullanın
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Bir Kötü müşteri borçlarını ödemeyi reddeden müşteridir.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Bu seçenek, bazı ürün iadelerinden dolayı ödeme tamamlanamazsa, kullanılır.
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Bu seçeneği, eğer diğerlerinin hiçbiri uymazsa kullanın, örneğin aşağıdaki durumda:-istenen tutar çok önemli çünkü indirim unutulmuştur
Bütün durumlarda, istenen fazla tutar muhasebe sisteminde bir iade faturası oluşturularak düzeltilir.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Bu seçeneği, eğer diğerlerinin hiçbiri uymazsa kullanın, örneğin aşağıdaki durumda:
- bazı ürünlerin geri sevkedilmesinden dolayı ödeme tamalanamzsa
- istenen tutar çok önemli çünkü indirim unutulmuştur.
 Bütün durumlarda, istenen fazla tutar muhasebe sisteminde bir iade faturası oluşturularak düzeltilir.
 ConfirmClassifyAbandonReasonOther=Diğer
 ConfirmClassifyAbandonReasonOtherDesc=Diğer bütün durumlarda bu seçenek kullanılacaktır. Örneğin; bir fatura değiştirmeyi tasarladığınızda.
 ConfirmCustomerPayment=Bu ödeme girişini %s %s için onaylıyor musunuz?
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=İki yeni indirimin toplamı orijinal indir
 ConfirmRemoveDiscount=Bu indirimi kaldırmak istediğinizden emin misiniz?
 RelatedBill=İlgili fatura
 RelatedBills=İlgili faturalar
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Son ilgili fatura
 WarningBillExist=Uyarı, bir yada çok fatura zaten var
 
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index e440ab7c4f4..3eeda08ff73 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategori
-Categories=Kategoriler
-Rubrique=Kategori
-Rubriques=Kategoriler
-categories=kategoriler
-TheCategorie=Kategori
-NoCategoryYet=Bu türde oluşturulan Kategori yok
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=İçinde
 AddIn=Eklenti
 modify=değiştir
 Classify=Sınıflandır
-CategoriesArea=Kategoriler alanı
-ProductsCategoriesArea=Ürün/Hizmet kategorileri alanı
-SuppliersCategoriesArea=Tedarikçi kategorileri alanı
-CustomersCategoriesArea=Müşteri kategorileri alanı
-ThirdPartyCategoriesArea=Üçüncü parti kategorileri alanı
-MembersCategoriesArea=Üye kategorileri alanı
-ContactsCategoriesArea=Kişi kategorileri alanı
-MainCats=Ana kategoriler
+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=Alt kategoriler
 CatStatistics=İstatistikler
-CatList=Kategori Listesi
-AllCats=Tüm kategoriler
-ViewCat=Kategori görüntüle
-NewCat=Kategori ekle
-NewCategory=Yeni kategori
-ModifCat=Kategori değiştir
-CatCreated=Kategori oluşturuldu
-CreateCat=Kategori oluştur
-CreateThisCat=Bu kategoriyi oluştur
+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=Alanları doğrula
 NoSubCat=Alt kategori yok.
 SubCatOf=Alt kategori
-FoundCats=Kategoriler bulundu
-FoundCatsForName=Bu ad için kategoriler bulundu:
-FoundSubCatsIn=Kategori içinde alt kategoriler bulundu
-ErrSameCatSelected=Birkaç kez aynı kategoriyi seçtiniz
-ErrForgotCat=Kategori seçmeyi unuttunuz
+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=Alanlara bilgi girmeyi unuttunuz
 ErrCatAlreadyExists=Bu ad zaten kullanılıyor
-AddProductToCat=Bu ürünü bir kategoriye mi ekleyeceksiniz?
-ImpossibleAddCat=Kategori eklemek olanaksız
-ImpossibleAssociateCategory=Kategoriyle ilişkilendirmek olanaksız
+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 başarıyla eklendi.
-ObjectAlreadyLinkedToCategory=Öğe zaten bu kategoriye bağlıdır.
-CategorySuccessfullyCreated=Bu kategoriye %s başarı ile eklendi.
-ProductIsInCategories=Ürün/hizmet aşağıdaki kategorilere aittir
-SupplierIsInCategories=Üçüncü parti aşağıdaki tedarikçi kategorilerine aittir
-CompanyIsInCustomersCategories=Bu üçüncü parti aşağıdaki müşteri/aday kategorilerine aittir
-CompanyIsInSuppliersCategories=Bu üçüncü parti aşağıdaki tedarikçi kategorilerine aittir
-MemberIsInCategories=Bu üye, aşağıdaki üye kategorilerine aittir
-ContactIsInCategories=Bu kişi aşağıdaki kişi kategorilerine sahip
-ProductHasNoCategory=Bu ürün/hizmet herhangi bir kategoride yoktur
-SupplierHasNoCategory=Bu tedarikçi herhangi bir kategoride yoktur
-CompanyHasNoCategory=Bu firma herhangi bir kategoride yoktur
-MemberHasNoCategory=Bu üye herhangi bir kategoride yoktur
-ContactHasNoCategory=Bu kişi herhangi bir kategoride değil
-ClassifyInCategory=Kategoride Sınıflandır
+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=Hiçbiri
-NotCategorized=Kategorisiz
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Bu kategori zaten bu ilgi ile var
 ReturnInProduct=Ürün/hizmet kartına geri dön
 ReturnInSupplier=Tedarikçi kartına geri dön
@@ -66,22 +64,22 @@ ReturnInCompany=Müşteri/aday kartına geri dön
 ContentsVisibleByAll=İçerik herkes tarafından görülebilir
 ContentsVisibleByAllShort=Içerik herkes tarafından görülebilir
 ContentsNotVisibleByAllShort=İçerik herkes tarafından görülemez
-CategoriesTree=Kategori ağacı
-DeleteCategory=Kategori sil
-ConfirmDeleteCategory=Bu kategoriyi silmek istediğinizden emin misiniz?
-RemoveFromCategory=Kategori bağlantısını kaldır
-RemoveFromCategoryConfirm=İşlem ile kategori arasındaki bağlantıyı kaldırmak istediğinizden emin misiniz?
-NoCategoriesDefined=Tanımlı kategori yok
-SuppliersCategoryShort=Tedarikçi kategorisi
-CustomersCategoryShort=Müşteri kategorisi
-ProductsCategoryShort=Ürün kategorisi
-MembersCategoryShort=Üye kategorisi
-SuppliersCategoriesShort=Tedarikçi kategorileri
-CustomersCategoriesShort=Müşteri kategorileri
+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=Müşt./aday kategorileri
-ProductsCategoriesShort=Ürün kategorileri
-MembersCategoriesShort=Üye kategorileri
-ContactCategoriesShort=Kişi kategorileri
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Bu kategori herhangi bir ürün içermiyor.
 ThisCategoryHasNoSupplier=Bu kategori herhangi bir tedarikçi içermiyor.
 ThisCategoryHasNoCustomer=Bu kategori herhangi bir müşteri içermiyor.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Bu kategori herhangi bir kişi içermiyor.
 AssignedToCustomer=Bir müşteriye atanmış
 AssignedToTheCustomer=Müşteriye atanmış
 InternalCategory=İç kategori
-CategoryContents=Kategori içeriği
-CategId=Kategori kimliği
-CatSupList=Tedarikçi kategorileri listesi
-CatCusList=Müşteri/beklenti kategorileri listesi
-CatProdList=Ürün kategorileri Listesi
-CatMemberList=Üye kategorileri Listesi
-CatContactList=Kişi kategorileri ve kişi listesi
-CatSupLinks=Tedarikçiler ve kategoriler arasındaki bağlantılar
-CatCusLinks=Müşteriler/adaylar ve kategoriler arasındaki bağlantılar
-CatProdLinks=Ürünler/hizmetler ve kategoriler arasındaki bağlantılar
-CatMemberLinks=Üyeler ve kategoriler arasındaki bağlantılar
-DeleteFromCat=Kategoriden kaldır
+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=Resim silindi
 ConfirmDeletePicture=Resim silmeyi onayla
 ExtraFieldsCategories=Tamamlayıcı öznitelikler
-CategoriesSetup=Kategori ayarları
-CategorieRecursiv=Ana kategoriyle otomatik bağlantılı
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Etkinse, ürün bir alt kategoriye eklenirken aynı zamanda ana kategoriye de eklenecektir
 AddProductServiceIntoCategory=Aşağıdaki ürünü/hizmeti ekle
-ShowCategory=Kategori göster
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 88f8c321083..6666aa25183 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -51,7 +51,7 @@ StatusActionToDo=Yapılacaklar
 StatusActionDone=Tamamla
 MyActionsAsked=Kayıt ettiğim etkinlikler
 MyActionsToDo=Yapacağım etkinlikler
-MyActionsDone=Beni etkileyen etkinlikler
+MyActionsDone=Görevlendirildiğim etkinlikler
 StatusActionInProcess=İşlemde
 TasksHistoryForThisContact=Bu kişi için etkinlikler
 LastProspectDoNotContact=Görüşülmeyecek
@@ -62,7 +62,7 @@ LastProspectContactDone=Görüşme yapıldı
 DateActionPlanned=Planlanan etkinlik tarihi
 DateActionDone=Etkinliğin yapıldığı tarih
 ActionAskedBy=Etkinliği bildiren
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Etkinlik için görevlendirilen
 ActionDoneBy=Etkinliği yapan
 ActionUserAsk=Raporlayan
 ErrorStatusCantBeZeroIfStarted=Eğer Yapıldığı tarih alanı doluysa, etkinlik başlamıştır (veya bitmiştir),  bu durumda 'Durum' alanı 0%% olamaz.
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 6b452607545..2874d14febd 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -107,7 +107,7 @@ ProfId3Short=Prof id3
 ProfId4Short=Prof id4
 ProfId5Short=Prof id 5
 ProfId6Short=Prof. id 5
-ProfId1=Profesyonel ID 1
+ProfId1=Ticaret Sicil No
 ProfId2=Profesyonel ID 2
 ProfId3=Profesyonel ID 3
 ProfId4=Profesyonel ID 4
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index ef18a5fb522..5eeac707788 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Süresi dolmuş
 ServiceStatusClosed=Kapalı
 ServicesLegend=Hizmetler göstergesi
 Contracts=Sözleşmeler
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Sözleşmeler ve satırları
 Contract=Sözleşme
 NoContracts=Sözleşme yok
 MenuServices=Hizmetler
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 3a55dd2b134..824ad2f4fa5 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Son çalıştırma çıktısı
 CronLastResult=Son sonuç kodu
 CronListOfCronJobs=Planlı işler listesi
 CronCommand=Komut
-CronList=İş listesi
-CronDelete= Cron işi sil
-CronConfirmDelete= Bu cron işini silmek istediğinizden emin misiniz?
-CronExecute=İş başlat
-CronConfirmExecute= Şimdi bu işi yürütmek istediğinizden emin misiniz
-CronInfo= Planllanmış işi yürütecek görevi sağlayan işler
-CronWaitingJobs=Bekleyen işler
+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=İş
-CronNone= Hiçbiri
+CronNone=Hiçbiri
 CronDtStart=Başlama tarihi
 CronDtEnd=Son tarih
 CronDtNextLaunch=Sonraki yürütme
@@ -75,6 +75,7 @@ CronObjectHelp=Yüklenecek nesne adı. 
 Örneğin; Dolibarr Ürün nesnesi a
 CronMethodHelp=Çalıştırılacak nesne yöntemi. 
 Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/product.class.php, yöntem değeri fecth
 CronArgsHelp=Yöntem parametreleri. 
 Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/product.class.php, parametre değerleri 0, ProductRef olabilir
 CronCommandHelp=Yürütülecek sistem komut satırı.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Bilgi
 # Common
@@ -84,4 +85,4 @@ CronType_command=Kabuk komutu
 CronMenu=Kron
 CronCannotLoadClass=%s sınıfı ya da %s nesnesi yüklenemiyor
 UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Modül araçları - İş listesi" menüsüne gidin.
-TaskDisabled=Task disabled
+TaskDisabled=Görev engellendi
diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang
index 234a7e4c859..d9c9d4c6ba4 100644
--- a/htdocs/langs/tr_TR/donations.lang
+++ b/htdocs/langs/tr_TR/donations.lang
@@ -6,6 +6,8 @@ Donor=Bağışçı
 Donors=Bağışçılar
 AddDonation=Bir bağış oluştur
 NewDonation=Yeni bağış
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Bağış göster
 DonationPromise=Hibe sözü
 PromisesNotValid=Doğrulanmamış sözler
@@ -21,6 +23,8 @@ DonationStatusPaid=Bağış alındı
 DonationStatusPromiseNotValidatedShort=Taslak
 DonationStatusPromiseValidatedShort=Doğrulanmış
 DonationStatusPaidShort=Alınan
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Söz doğrula
 DonationReceipt=Bağış makbuzu
 BuildDonationReceipt=Makbuz oluştur
@@ -36,3 +40,4 @@ FrenchOptions=Fransa için seçenekler
 DONATION_ART200=Eğer ilgileniyorsanız CGI den 200 öğe göster
 DONATION_ART238=Eğer ilgileniyorsanız CGI den 238 öğe göster
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 269f6173807..384513df1f5 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Kaynak ve hedef banka hesapları farklı olmalıd
 ErrorBadThirdPartyName=Üçüncü parti adı için hatalı değer
 ErrorProdIdIsMandatory=Bu %s zorunludur
 ErrorBadCustomerCodeSyntax=Hatalı müşteri kodu
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Barkod için hatalı sözdizimi. Belki hatalı bir barkod türü ayarladınız ya da taranan değerle eşleşmeyen barkod numaralandırma maskesi tanımladınız.
 ErrorCustomerCodeRequired=Müşteri kodu gereklidir
 ErrorBarCodeRequired=Bar kod gerekli
 ErrorCustomerCodeAlreadyUsed=Müşteri kodu zaten kullanılmış
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Bu özelliğin çalışması için Javascript engel
 ErrorPasswordsMustMatch=Her iki yazdığınız şifrenin birbiriyle eşleşmesi gerekir
 ErrorContactEMail=Teknik bir hata oluştu. Lütfen, aşağıdaki %s Eposta ile yöneticiye danışın, mesajınızda %s hata kodunu belirtin ve hatta bir ekran görünümünü de eklerseniz daha iyi olur.
 ErrorWrongValueForField=%s alan numarası için yanlış değer ('%s' değeri '%s' regex kuralı ile uyuşmuyor)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
+ErrorFieldValueNotIn=%s alan sayısı için hatalı değer ('%s' değeri %s = %s tablosundaki %s alanı içinde mevcut değil)
 ErrorFieldRefNotIn=Alan numarası %s için yanlış değer (değer '%s' bir %s ref mevcut değildir)
 ErrorsOnXLines=% kaynak satırlarındaki hatalar
 ErrorFileIsInfectedWithAVirus=Virüs koruma programı dosyayı doğrulayamıyor (dosyaya bir virüs bulaşmış olabilir)
@@ -160,7 +160,13 @@ ErrorPriceExpressionInternal=İç hata '%s'
 ErrorPriceExpressionUnknown=Bilinmeyen hata '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Kaynak ve hedef depolar farklı olmalı
 ErrorTryToMakeMoveOnProductRequiringBatchData=Hata, parti/seri bilgisi gerektiren ürün için parti/seri bilgisi olmadan stok hareketi yapılmaya çalışılıyor.
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Bütün kabul girişleri bu eylemin yapılmasına izin verilmeden önce doğrulanmalıdır.
+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=Zorunlu kurulum parametreleri henüz tanımlanmamış
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 731c1b2d344..4fdb366c95d 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -156,7 +156,7 @@ LastStepDesc=Son adım: Burada yazılıma bağlanmayı düşün
 ActivateModule=%s modülünü etkinleştir
 ShowEditTechnicalParameters=Gelişmiş parametreleri (uzman modu) göstermek/düzenlemek için burayı tıklayın
 WarningUpgrade=Uyarı:\nÖnce bir veritabanı yedeklemesi yaptınız mı?\nBu son derece önerilir: örneğin; veritabanı sistemindeki bazı hatalar nedeniyle (örneğin mysql sürüm 5.5.40) bu işlem sırasında bazı veriler ve tablolar kaybolabilir. Bu yüzden taşımaya başlamadan önce veritabanının tam bir dökümünün olması son derece önerilir.\n\nTaşıma işlemini başlatmak için Tamam'a tıklayın...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+ErrorDatabaseVersionForbiddenForMigration=Veritabanınızın sürümü %s. Veritabanınızın yapısını değiştirirseniz veri kaybı yapacak bir kritik hata vardır, taşıma işlemi tarafından istenmesi gibi. Bu nedenle, veritabanınızı daha yüksek kararlı bir sürüme yükseltinceye kadar taşımaya izin verilmeyecektir (bilinen hatalar listesi sürümü: %s)
 
 #########
 # upgrade
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 128034c94d7..d59aeeb8f71 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Gönderilen tüm e-posta bildirimleri listesi
 MailSendSetupIs=Yapılandırma e postası '%s' için ayarlandı. Bu mod toplu epostalama için kullanılamaz.
 MailSendSetupIs2='%s' Modunu kullanmak için '%s' parametresini değiştirecekseniz, önce yönetici hesabı ile %sGiriş - Ayarlar - Epostalar%s menüsüne gitmelisiniz. Bu mod ile İnternet Servis Sağlayıcınız tarafından sağlanan SMTP sunucusu ayarlarını girebilir ve Toplu eposta özelliğini kullanabilirsiniz.
 MailSendSetupIs3=SMTP sunucusunun nasıl yapılandırılacağı konusunda sorunuz varsa, %s e sorabilirsiniz.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index cd5b2b24f7e..da8d095359b 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -141,7 +141,7 @@ Cancel=İptal
 Modify=Değiştir
 Edit=Düzenle
 Validate=Doğrula
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Doğrula ve onayla
 ToValidate=Doğrulanacak
 Save=Kaydet
 SaveAs=Farklı kaydet
@@ -159,7 +159,7 @@ Search=Ara
 SearchOf=Ara
 Valid=Geçerli
 Approve=Onayla
-Disapprove=Disapprove
+Disapprove=Onaylama
 ReOpen=Yeniden aç
 Upload=Dosya gönder
 ToLink=Bağlantı
@@ -221,7 +221,7 @@ Cards=Kartlar
 Card=Kart
 Now=Şimdi
 Date=Tarih
-DateAndHour=Date and hour
+DateAndHour=Tarih ve saat
 DateStart=Başlama tarihi
 DateEnd=Bitiş tarih
 DateCreation=Oluşturma tarihi
@@ -298,7 +298,7 @@ UnitPriceHT=Birim fiyat (net)
 UnitPriceTTC=Birim fiyat
 PriceU=B.F.
 PriceUHT=B.F. (net)
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=P.U. HT Gerekiyor
 PriceUTTC=B.F.
 Amount=Tutar
 AmountInvoice=Fatura tutarı
@@ -352,6 +352,7 @@ Status=Durum
 Favorite=Sık kullanılan
 ShortInfo=Bilgi.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. tedarikçi
 RefPayment=Ref. ödeme
 CommercialProposalsShort=Teklifler
@@ -394,8 +395,8 @@ Available=Mevcut
 NotYetAvailable=Henüz mevcut değil
 NotAvailable=Uygun değil
 Popularity=Popülerlik
-Categories=Kategoriler
-Category=Kategori
+Categories=Tags/categories
+Category=Tag/category
 By=Tarafından
 From=Başlama
 to=Bitiş
@@ -525,7 +526,7 @@ DateFromTo=%s den %s e kadar
 DateFrom=%s den
 DateUntil=%s e Kadar
 Check=Denetle
-Uncheck=Uncheck
+Uncheck=İşareti kaldır
 Internal=İç
 External=Dış
 Internals=İçler
@@ -693,7 +694,8 @@ PublicUrl=Genel URL
 AddBox=Kutu ekle
 SelectElementAndClickRefresh=Bir öğe seçin ve Yenile'ye tıkla
 PrintFile=%s Dosyasını Yazdır
-ShowTransaction=Show transaction
+ShowTransaction=İşlemi göster
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index d203ffa5a23..375c91d7e01 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -42,7 +42,7 @@ StatusOrderCanceled=İptal edilmiş
 StatusOrderDraft=Taslak (doğrulanması gerekir)
 StatusOrderValidated=Doğrulanmış
 StatusOrderOnProcess=Sipariş edildi - Teslime hazır
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Sipariş edildi - Kabul ya da doğrulama için beklemede
 StatusOrderProcessed=İşlenmiş
 StatusOrderToBill=Teslim edildi
 StatusOrderToBill2=Faturalanacak
@@ -59,12 +59,13 @@ MenuOrdersToBill=Teslim edilen siparişler
 MenuOrdersToBill2=Faturalanabilir siparişler
 SearchOrder=Sipariş ara
 SearchACustomerOrder=Müşteri siparişi ara
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Bir tedarikçi siparişi ara
 ShipProduct=Ürünü sevket
 Discount=İndirim
 CreateOrder=Sipariş oluştur
 RefuseOrder=Siparişi reddet
-ApproveOrder=Sipariş kabul et
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Doğrulamak amacıyla
 UnvalidateOrder=Siparişten doğrulamayı kaldır
 DeleteOrder=Sipariş sil
@@ -102,6 +103,8 @@ ClassifyBilled=Faturalı olarak sınıflandır
 ComptaCard=Muhasebe kartı
 DraftOrders=Taslak siparişler
 RelatedOrders=İlgili siparişler
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=İşlemdeki siparişler
 RefOrder=Sipariş ref.
 RefCustomerOrder=Müşteri sipariş ref.
@@ -118,6 +121,7 @@ PaymentOrderRef=Sipariş %s ödemesi
 CloneOrder=Siparişi klonla
 ConfirmCloneOrder=Bu %s siparişi klonlamak istediğinizden emin misiniz?
 DispatchSupplierOrder=%s tedarikçi siparişini al
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Müşteri siparişi izleme temsilcisi
 TypeContact_commande_internal_SHIPPING=Sevkiyat izleme temsilcisi
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index f8f84232e9d..b1cd3b07cb0 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Müdahale doğrulandı
 Notify_FICHINTER_SENTBYMAIL=Müdahale posta ile gönderildi
 Notify_BILL_VALIDATE=Müşteri faturası onaylandı
 Notify_BILL_UNVALIDATE=Müşteri faturasından doğrulama kaldırıldı
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Tedarikçi siparişi onaylandı
 Notify_ORDER_SUPPLIER_REFUSE=Tedarikçi siparişi reddedildi
 Notify_ORDER_VALIDATE=Müşteri siparişi onaylandı
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Teklif posta ile gönderildi
 Notify_BILL_PAYED=Müşteri faturası ödendi
 Notify_BILL_CANCEL=Müşteri faturası iptal edildi
 Notify_BILL_SENTBYMAIL=Müşteri faturası postayla gönderildi
-Notify_ORDER_SUPPLIER_VALIDATE=Tedarikçi faturası onaylandı
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Tedarikçi siparişi posta ile gönderildi
 Notify_BILL_SUPPLIER_VALIDATE=Tedarikçi faturası onaylandı
 Notify_BILL_SUPPLIER_PAYED=Tedarikçi faturası ödendi
@@ -47,20 +48,20 @@ Notify_PROJECT_CREATE=Proje oluşturma
 Notify_TASK_CREATE=Görev oluşturuldu
 Notify_TASK_MODIFY=Görev bilgileri değiştirildi
 Notify_TASK_DELETE=Görev silindi
-SeeModuleSetup=Modül kurulumuna bak
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Eklenen dosya/belge sayısı
 TotalSizeOfAttachedFiles=Eklenen dosyaların/belgelerin toplam boyutu
 MaxSize=Ençok boyut
 AttachANewFile=Yeni bir dosya/belge ekle
 LinkedObject=Bağlantılı nesne
 Miscellaneous=Çeşitli
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Bildirim sayısı (alıcı epostaları sayısı)
 PredefinedMailTest=Bu bir deneme postasıdır.\nİki satır enter tuşu ile ayrılmıştır.
 PredefinedMailTestHtml=Bu bir deneme postası (deneme sözcüğü koyu olmalı).
İki satır enter tuşu ile ayrılmıştır.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız  __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nFiyat isteği sunulmuştur__ASKREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Fatura %s doğrulanmıştır.
 EMailTextProposalValidated=Teklif % doğrulanmıştır.
 EMailTextOrderValidated=Sipariş %s doğrulanmıştır.
 EMailTextOrderApproved=Sipariş %s onaylanmıştır.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=%s Siparişi %s tarafından onaylanmıştır.
 EMailTextOrderRefused=%s Teklifi reddedilmiştir.
 EMailTextOrderRefusedBy=%s Teklifi %tarafından reddedilmiştir.
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index 24ea291a110..c7f701bb522 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Parti/Seri numarası
 l_eatby=Son yenme tarihi
 l_sellby=Son satış tarihi
 DetailBatchNumber=Parti/Seri ayrıntıları
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+DetailBatchFormat=Parti/Seri: %s - Son Yenme: %s - Son Satış: %s (Mik: %d)
 printBatch=Parti: %s
 printEatby=Son Yenme: %s
 printSellby=Son satış: %s
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index fdf8b1a3b98..52332a5fff5 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Önerilen enaz fiyat: %s
 PriceExpressionEditor=Fiyat ifadesi düzenleyici
 PriceExpressionSelected=Seçili fiyat ifadesi
 PriceExpressionEditorHelp1=Fiyat ayarlaması için "fiyat = 2 + 2" ya da "2 + 2". Terimleri ayırmak için ; kullan
-PriceExpressionEditorHelp2=EkAlanlara #options_myextrafieldkey# gibi değişkenlerle erişebilirsiniz
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=Ürün/hizmet ve tedarikçi fiyatlarının her ikisinde de bu değişkenler bulunmaktadır:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Ürün/hizmet fiyatında yalnızca: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Fiyat biçimi
 PriceNumeric=Sayı
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+DefaultPrice=Varsayılan fiyat
+ComposedProductIncDecStock=Ana değişimde stok Arttır/Eksilt
+ComposedProduct=Yan ürün
+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
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index aa33b4ca11a..57a81425bf3 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -8,10 +8,10 @@ SharedProject=Herkes
 PrivateProject=Proje ilgilileri
 MyProjectsDesc=Bu görünüm ilgilisi olduğunuz projelerle sınırlıdır (türü ne olursa olsun).
 ProjectsPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri içerir.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Bu görünüm, okumanıza izin verilen tüm proje ve görevleri sunar.
 ProjectsDesc=Bu görünüm tüm projeleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 MyTasksDesc=Bu görünüm ilgilisi olduğunuz projelerle ya da görevlerle sınırlıdır (türü ne olursa olsun).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Yalnızca açık projeler görünürdür (taslak ya da kapalı durumdaki projeler görünmez)
 TasksPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri ve görevleri içerir.
 TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 ProjectsArea=Projeler alanı
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Proje ile ilgili tedarikçi siparişlerinin
 ListSupplierInvoicesAssociatedProject=Proje ile ilgili tedarikçi faturalarının listesi
 ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi
 ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Bu proje ile ilişkili gider raporları listesi
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi
 ActivityOnProjectThisWeek=Projede bu haftaki etkinlik
 ActivityOnProjectThisMonth=Projede bu ayki etkinlik
@@ -131,14 +132,13 @@ UnlinkElement=Öğenin bağlantısını kaldır
 # Documents models
 DocumentModelBaleine=Eksiksiz bir proje rapor modeli (logo. ..)
 PlannedWorkload=Planlı işyükü
-PlannedWorkloadShort=Workload
-WorkloadOccupation=Workload assignation
-ProjectReferers=Yönlendirme nesneleri
+PlannedWorkloadShort=İşyükü
+WorkloadOccupation=İşyükü ataması
 SearchAProject=Bir proje ara
 ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır
 ProjectDraft=Taslak projeler
 FirstAddRessourceToAllocateTime=Zaman ayırmak için bir kaynak ilişkilendirin
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+InputPerDay=Günlük giriş
+InputPerWeek=Haftalık giriş
+InputPerAction=Eylem başına giriş
+TimeAlreadyRecorded=Bu görev ve kullanıcı %s için harcanan süre zaten kayıtlı
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index 1d5aa85d140..4bc47248b7f 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -10,4 +10,4 @@ SalariesPayments=Ücret ödemeleri
 ShowSalaryPayment=Ücret ödemesi göster
 THM=Ortalama saat ücreti
 TJM=Ortalama günlük ücret
-CurrentSalary=Current salary
+CurrentSalary=Güncel maaş
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 9a202a374f2..6b6781c4276 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Sevkiyat ref.
 Sending=Sevkiyat
 Sendings=Sevkiyatlar
+AllSendings=All Shipments
 Shipment=Sevkiyat
 Shipments=Sevkiyatlar
 ShowSending=Gönderimi göster
@@ -23,7 +24,7 @@ QtyOrdered=Sipariş mikt.
 QtyShipped=Sevkedilen mikt.
 QtyToShip=Sevk edilecek mikt.
 QtyReceived=Alınan mikt.
-KeepToShip=Remain to ship
+KeepToShip=Gönderilmek için kalır
 OtherSendingsForSameOrder=Bu sipariş için diğer sevkiyatlar
 DateSending=Sipariş gönderme tarihi
 DateSendingShort=Sipariş gönderme tarihi
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 8856d87badd..3360b2afbb7 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -47,7 +47,7 @@ PMPValue=Ağırlıklı ortalama fiyat
 PMPValueShort=AOF
 EnhancedValueOfWarehouses=Depolar değeri
 UserWarehouseAutoCreate=Bir kullanıcı oluştururken otomatik olarak bir stok oluştur
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Ürün stoku ve yan ürün stoku bağımsızdır
 QtyDispatched=Sevkedilen miktar
 QtyDispatchedShort=Dağıtılan mik
 QtyToDispatchShort=Dağıtılacak mik
@@ -111,7 +111,7 @@ WarehouseForStockDecrease=%s deposu stok eksiltme için kullanılacaktır
 WarehouseForStockIncrease=%s deposu stok arttırma için kullanılacaktır
 ForThisWarehouse=Bu depo için
 ReplenishmentStatusDesc=Bu liste istenen stoktan daha az stoklu bütün ürünler içindir (ya da eğer onay kutusunda "yalnızca uyarı" işaretliyse, uyarı değerinden az olan) ve bu farkı kapatmanız için tedarikçi siparişi oluşturmanızı önerir.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentOrdersDesc=Bu, öntanımlı ürünleri de içeren tüm açık tedarikçi siparişleri listesidir. Burada yalnızca öntanımlı ürünleri içeren açık siparişler, stokları etkileyebilir, görünür.
 Replenishments=İkmal
 NbOfProductBeforePeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) önceki miktarıdır
 NbOfProductAfterPeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) sonraki miktarıdır
@@ -131,4 +131,4 @@ IsInPackage=Pakette içerilir
 ShowWarehouse=Depo göster
 MovementCorrectStock=%s ürünü için stok içeriği düzeltmesi
 MovementTransferStock=%s ürününün başka bir depoya stok aktarılması
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Parti modülü açıksa burada kaynak depo tanımlanmalıdır. Hareket için parti/seri gereken ürün için hangi parti/serinin mevcut olduğunun listelenmesi için kullanılacaktır. Farklı depolardan ürün göndermek isterseniz, yalnızca sevkiyatı birkaç adımda yapın.
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index b4b16859cc1..87ead1dd32e 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Tedarikçi faturaları ve ödemeleri
 ExportDataset_fournisseur_3=Tedarikçi siparişleri ve sipariş satırları
 ApproveThisOrder=Bu siparişi onayla
 ConfirmApproveThisOrder=%s siparişini onaylamak istediğinizden emin misiniz?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Bu siparişi reddet
 ConfirmDenyingThisOrder=%s siparişini reddetmek istediğinizden emin misiniz?
 ConfirmCancelThisOrder=%s siparişini iptal etmek istediğinizden emin misiniz?
 AddCustomerOrder=Müşteri siparişi oluştur
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Tedarikçi siparişleri listesi
 MenuOrdersSupplierToBill=Faturalanacak tedarikçi siparişleri
 NbDaysToDelivery=Gün olarak teslim süresi
 DescNbDaysToDelivery=Sipariş ürün listesindeki en uzun teslim süresi
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index 30c0831f5ac..97448e921fb 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -1,126 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
+ExpenseReport=Gider raporu
+ExpenseReports=Gider raporları
+Trip=Gider raporu
+Trips=Gider raporları
+TripsAndExpenses=Giderler raporları
+TripsAndExpensesStatistics=Gider raporları istatistkleri
+TripCard=Gider raporu kartı
+AddTrip=Gider raporu oluştur
+ListOfTrips=Gider raporu listesi
 ListOfFees=Ücretler listesi
-NewTrip=New expense report
+NewTrip=Yeni gider raporu
 CompanyVisited=Ziyaret edilen firma/kuruluş
 Kilometers=Kilometre
 FeesKilometersOrAmout=Tutar ya da kilometre
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
+DeleteTrip=Gider raporu sil
+ConfirmDeleteTrip=Bu gider raporunu silmek istediğinizden emin misiniz?
+ListTripsAndExpenses=Giderler raporları listesi
+ListToApprove=Onay bekliyor
+ExpensesArea=Gider raporları alanı
+SearchATripAndExpense=Bir gider raporu ara
 ClassifyRefunded=Sınıflandırma 'İade edildi'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripSalarie=Informations user
-TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
-ConfirmDeleteLine=Are you sure you want to delete this line ?
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+ExpenseReportWaitingForApproval=Onay için yeni bir gider raporu sunulmuştur
+ExpenseReportWaitingForApprovalMessage=Yeni bir gider raporu sunulmuş olup onay için beklemektedir.\n- Kullanıcı: %s\n- Dönem: %s\nDoğrulamak için buraya tıklayın: %s
+TripId=Gider raporu kimliği
+AnyOtherInThisListCanValidate=Doğrulama için bilgilendirilecek kişi
+TripSociete=Firma bilgisi
+TripSalarie=Kullanıcı bilgisi
+TripNDF=Gider raporu bilgileri
+DeleteLine=Gider raporundan bir satır sil
+ConfirmDeleteLine=Bu satırı silmek istediğinizden emin misiniz?
+PDFStandardExpenseReports=Bu gider raporu için PDF belgesi oluşturulacak standart şablon
+ExpenseReportLine=Gider rapor satırı
 TF_OTHER=Diğer
-TF_TRANSPORTATION=Transportation
+TF_TRANSPORTATION=Nakliye
 TF_LUNCH=Öğle yemeği
 TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
+TF_TRAIN=Tren
+TF_BUS=Otobüs
+TF_CAR=Araba
+TF_PEAGE=Geçiş parası
+TF_ESSENCE=Yakıt
 TF_HOTEL=Hostel
-TF_TAXI=Taxi
+TF_TAXI=Taksi
 
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
-AucuneNDF=No expense reports found for this criteria
-AucuneLigne=There is no expense report declared yet
-AddLine=Add a line
-AddLineMini=Add
+ErrorDoubleDeclaration=Benzer bir tarih aralığı için başka bir gider raporu bildirdiniz.
+ListTripsAndExpenses=Giderler raporları listesi
+AucuneNDF=Bu kriter uyan hiç gider raporu bulunamadı
+AucuneLigne=Bildirilen hiç gider raporu yok
+AddLine=Satır ekle
+AddLineMini=Ekle
 
-Date_DEBUT=Period date start
-Date_FIN=Period date end
-ModePaiement=Payment mode
-Note=Note
-Project=Project
+Date_DEBUT=Dönem tarihi başı
+Date_FIN=Dönem tarihi sonu
+ModePaiement=Ödeme biçimi
+Note=Not
+Project=Proje
 
-VALIDATOR=User to inform for approbation
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
-REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+VALIDATOR=Onama için bilgilendirilecek kullanıcı
+VALIDOR=Onaylayan
+AUTHOR=Kaydeden
+AUTHORPAIEMENT=Ödeyen
+REFUSEUR=Reddeden
+CANCEL_USER=İptal eden
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Neden
+MOTIF_CANCEL=Neden
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_VALIDE=Validation date
-DateApprove=Approving date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
+DATE_REFUS=Ret tarihi
+DATE_SAVE=Onay tarihi
+DATE_VALIDE=Onay tarihi
+DateApprove=Onaylama tarihi
+DATE_CANCEL=İptal etme tarihi
+DATE_PAIEMENT=Ödeme tarihi
 
-Deny=Deny
-TO_PAID=Pay
-BROUILLONNER=Reopen
-SendToValid=Sent to approve
-ModifyInfoGen=Edit
-ValidateAndSubmit=Validate and submit for approval
+Deny=Ret
+TO_PAID=Öde
+BROUILLONNER=Yeniden aç
+SendToValid=Onay için gönder
+ModifyInfoGen=Düzenle
+ValidateAndSubmit=Doğrula ve onay için gönder
 
-NOT_VALIDATOR=You are not allowed to approve this expense report
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_VALIDATOR=Bu gider raporunu onaylama yetiniz yok
+NOT_AUTHOR=Bu gider raporunu yazan siz değilsiniz. İşlem iptal edildi.
 
-RefuseTrip=Deny an expense report
-ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+RefuseTrip=Bir gider raporu reddet
+ConfirmRefuseTrip=Bu gider raporunu reddetmek istediğinizden emin misiniz?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=Gider raporunu onayla
+ConfirmValideTrip=Bu gider raporunu onaylamak istediğinizden emin misiniz?
 
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+PaidTrip=Bir gider raporu öde
+ConfirmPaidTrip=Bu gider raporunun durumunu "Ödendi" olarak değiştirmek istediğinizden emin misiniz?
 
-CancelTrip=Cancel an expense report
-ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+CancelTrip=Bir gider raporu iptal et
+ConfirmCancelTrip=Bu gider raporunu iptal etmek istediğinizden emin misiniz?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+BrouillonnerTrip=Gider raporun geri "Taslak" durumuna döndür
+ConfirmBrouillonnerTrip=Bu gider raporunu "Taslak" durumuna döndürmek istediğinizden emin misiniz?
 
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+SaveTrip=Gider raporunu doğrula
+ConfirmSaveTrip=Bu gider raporunu doğrulamak istediğinizden emin misiniz?
 
-Synchro_Compta=NDF <-> Compte
+Synchro_Compta=NDF <-> Hesap
 
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
+TripSynch=Senkronizasyon: Gider Raporu <-> Cari Hesap
+TripToSynch=Hesaba işlenecek gider raporu
+AucuneTripToSynch="Ödendi" durumunda hiç gider raporu yok
+ViewAccountSynch=Hesabı incele
 
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
+ConfirmNdfToAccount=Bu gider raporunu geçerli hesaba işlemek istediğinizden emin misiniz?
+ndfToAccount=Gider raporu - Entegrasyon
 
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
+ConfirmAccountToNdf=Bu gider raporunu geçerli hesaptan silmek istediğinizden emin misini?
+AccountToNdf=Gider Raporu - Para çekme
 
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
+LINE_NOT_ADDED=Hiç satır eklenmedi:
+NO_PROJECT=Hiçbir proje seçilmemiştir.
+NO_DATE=Hiçbir tarih seçilmemiştir.
+NO_PRICE=Hiçbir fiyat belirtilmiştir.
 
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
+TripForValid=Doğrulanacak
+TripForPaid=Ödenecek
+TripPaid=Ödendi
 
-NoTripsToExportCSV=No expense report to export for this period.
+NoTripsToExportCSV=Bu dönem için dışaaktarılacak gider raporu yok.
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index c244a6aacf4..ea96fc8e07f 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index d45452deaa2..65adcd2c421 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index e7e9da7dc1b..b3778e84736 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLastRssInfos=Rss information
+BoxLastRssInfos=Інформація RSS
 BoxLastProducts=Last %s products/services
 BoxProductsAlertStock=Products in stock alert
 BoxLastProductsInContract=Last %s contracted products/services
@@ -7,46 +7,50 @@ BoxLastSupplierBills=Last supplier's invoices
 BoxLastCustomerBills=Last customer's invoices
 BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices
 BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices
-BoxLastProposals=Last commercial proposals
+BoxLastProposals=Останні комерційні пропозиції
 BoxLastProspects=Last modified prospects
 BoxLastCustomers=Last modified customers
 BoxLastSuppliers=Last modified suppliers
-BoxLastCustomerOrders=Last customer orders
+BoxLastCustomerOrders=Останні замовлення покупця
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Last books
-BoxLastActions=Last actions
-BoxLastContracts=Last contracts
-BoxLastContacts=Last contacts/addresses
-BoxLastMembers=Last members
+BoxLastActions=Останні дії
+BoxLastContracts=Останні контракти
+BoxLastContacts=Останні контакти / адреси
+BoxLastMembers=Останні учасники
 BoxFicheInter=Last interventions
 BoxCurrentAccounts=Opened accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
 BoxTitleLastBooks=Last %s recorded books
-BoxTitleNbOfCustomers=Number of clients
+BoxTitleNbOfCustomers=Кількість покупців
 BoxTitleLastRssInfos=Last %s news from %s
 BoxTitleLastProducts=Last %s modified products/services
 BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Last %s modified customer orders
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Last %s recorded suppliers
 BoxTitleLastCustomers=Last %s recorded customers
 BoxTitleLastModifiedSuppliers=Last %s modified suppliers
 BoxTitleLastModifiedCustomers=Last %s modified customers
-BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects
-BoxTitleLastPropals=Last %s recorded proposals
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=Last %s customer's invoices
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=Last %s supplier's invoices
-BoxTitleLastProspects=Last %s recorded prospects
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=Last %s modified prospects
 BoxTitleLastProductsInContract=Last %s products/services in a contract
-BoxTitleLastModifiedMembers=Last %s modified members
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Opened account's balances
 BoxTitleSalesTurnover=Sales turnover
-BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices
-BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices
+BoxTitleTotalUnpaidCustomerBills=Несплачені рахунки клієнта
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
 BoxMyLastBookmarks=My last %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
@@ -76,7 +80,8 @@ NoContractedProducts=No products/services contracted
 NoRecordedContracts=No recorded contracts
 NoRecordedInterventions=No recorded interventions
 BoxLatestSupplierOrders=Latest supplier orders
-BoxTitleLatestSupplierOrders=%s latest supplier orders
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=No recorded supplier order
 BoxCustomersInvoicesPerMonth=Customer invoices per month
 BoxSuppliersInvoicesPerMonth=Supplier invoices per month
@@ -87,5 +92,5 @@ NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
 ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
+ForCustomersOrders=Замовлення клієнтів
+ForProposals=Пропозиції
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/uk_UA/donations.lang
+++ b/htdocs/langs/uk_UA/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/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
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 7a211198822..957c62b923c 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -9,9 +9,9 @@ MailTargets=Targets
 MailRecipients=Recipients
 MailRecipient=Recipient
 MailTitle=Description
-MailFrom=Sender
+MailFrom=Відправник
 MailErrorsTo=Errors to
-MailReply=Reply to
+MailReply=Відповісти
 MailTo=Receiver(s)
 MailCC=Copy to
 MailCCC=Cached copy to
@@ -69,10 +69,10 @@ CloneEMailing=Clone Emailing
 ConfirmCloneEMailing=Are you sure you want to clone this emailing ?
 CloneContent=Clone message
 CloneReceivers=Cloner recipients
-DateLastSend=Date of last sending
-DateSending=Date sending
+DateLastSend=Дата останньої відправки
+DateSending=Дата відправки
 SentTo=Sent to %s
-MailingStatusRead=Read
+MailingStatusRead=Читати
 CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email %s  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
@@ -126,10 +126,10 @@ DeliveryReceipt=Delivery Receipt
 YouCanUseCommaSeparatorForSeveralRecipients=You can use the comma separator to specify several recipients.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
-TagSignature=Signature sending user
+TagSignature=Підпис відправника
 TagMailtoEmail=Recipient EMail
 # Module Notifications
-Notifications=Notifications
+Notifications=Оповіщення
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
 ANotificationsWillBeSent=1 notification will be sent by email
 SomeNotificationsWillBeSent=%s notifications will be sent by email
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 05b5f395001..4e4c5fba031 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/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 %s ?
 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
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/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.
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/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)
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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:
%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:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -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
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 69e1510ca44..014996eee65 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+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 was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-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=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+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=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+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=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-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
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/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= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/uz_UZ/donations.lang
+++ b/htdocs/langs/uz_UZ/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -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
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/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
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index f34681e8530..711c3e0752c 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -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
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/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 %s ?
 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
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/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.
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 44d0d89687a..03c11382a2d 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/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)
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 76900923d16..9d0f82a4cb0 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -13,7 +13,7 @@ ConfigAccountingExpert=Cấu hình của các chuyên gia kế toán mô-đun
 Journaux=Tạp chí
 JournalFinancial=Tạp chí tài chính
 Exports=Xuất khẩu
-Export=Export
+Export=Xuất dữ liệu
 Modelcsv=Mô hình xuất khẩu
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
 Selectmodelcsv=Chọn một mô hình xuất khẩu
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index a88043962f5..a4988430362 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Nút radio
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Danh sách các thông số phải như quan trọng, giá trị 

 ví dụ: 
 1, value1 
 2, value2 
 3, value3 
 ... 

 Để có danh sách tùy thuộc vào khác: 
 1, value1 | parent_list_code: parent_key 
 2, value2 | parent_list_code: parent_key
 ExtrafieldParamHelpcheckbox=Danh sách các thông số phải như quan trọng, giá trị 

 ví dụ: 
 1, value1 
 2, value2 
 3, value3 
 ...
 ExtrafieldParamHelpradio=Danh sách các thông số phải như quan trọng, giá trị 

 ví dụ: 
 1, value1 
 2, value2 
 3, value3 
 ...
@@ -494,6 +495,8 @@ Module500Name=Chi phí đặc biệt (thuế, đóng góp xã hội, cổ tức)
 Module500Desc=Quản lý chi phí đặc biệt như thuế, đóng góp xã hội, cổ tức và tiền lương
 Module510Name=Tiền lương
 Module510Desc=Quản lý lao động tiền lương và các khoản thanh toán
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Thông báo
 Module600Desc=Gửi thông báo EMail trên một số sự kiện kinh doanh Dolibarr để liên hệ của bên thứ ba (thiết lập được xác định trên mỗi thirdparty)
 Module700Name=Tài trợ
@@ -508,14 +511,14 @@ Module1400Name=Kế toán
 Module1400Desc=Kế toán quản trị (đôi bên)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Loại
-Module1780Desc=Quản lý danh mục (sản phẩm, nhà cung cấp và khách hàng)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Trình soạn thảo WYSIWYG
 Module2000Desc=Cho phép chỉnh sửa một số vùng văn bản bằng cách sử dụng một biên tập viên cao cấp
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Quản lý công việc theo lịch trình
+Module2300Desc=Scheduled job management
 Module2400Name=Chương trình nghị sự
 Module2400Desc=Sự kiện / nhiệm vụ và quản lý chương trình nghị sự
 Module2500Name=Quản lý nội dung điện tử
@@ -714,6 +717,11 @@ Permission510=Đọc Lương
 Permission512=Tạo / sửa đổi tiền lương
 Permission514=Xóa lương
 Permission517=Xuất khẩu lương
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Đọc thông tin dịch vụ
 Permission532=Tạo / thay đổi các dịch vụ
 Permission534=Xóa dịch vụ
@@ -746,6 +754,7 @@ Permission1185=Phê duyệt đơn đặt hàng nhà cung cấp
 Permission1186=Đơn đặt hàng nhà cung cấp thứ tự
 Permission1187=Xác nhận đã nhận đơn đặt hàng nhà cung cấp
 Permission1188=Xóa đơn đặt hàng nhà cung cấp
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Nhận kết quả của một xuất khẩu
 Permission1202=Tạo / Sửa đổi một xuất khẩu
 Permission1231=Đọc hóa đơn nhà cung cấp
@@ -758,10 +767,10 @@ Permission1237=Đơn đặt hàng nhà cung cấp xuất khẩu và chi tiết c
 Permission1251=Chạy nhập khẩu khối lượng của dữ liệu bên ngoài vào cơ sở dữ liệu (tải dữ liệu)
 Permission1321=Xuất dữ liệu Hóa đơn của khách hàng, các thuộc tính và thanh toán
 Permission1421=Xuất dữ liệu Đơn đặt hàng và các thuộc tính
-Permission23001 = Đọc thông tin Lịch trình công việc
-Permission23002 = Tạo / cập nhật theo lịch trình công việc
-Permission23003 = Xóa Lịch trình công việc
-Permission23004 = Thực hiện Lịch trình công việc
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Đọc hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
 Permission2402=Tạo / sửa đổi các hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
 Permission2403=Xóa hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Quay trở lại một mã số kế toán được x
 ModuleCompanyCodePanicum=Trả lại một mã kế toán sản phẩm nào.
 ModuleCompanyCodeDigitaria=Kế toán đang phụ thuộc vào mã của bên thứ ba. Các mã được bao gồm các ký tự "C" ở vị trí đầu tiên theo sau là 5 ký tự đầu tiên của mã của bên thứ ba.
 UseNotifications=Sử dụng thông báo
-NotificationsDesc=Email thông báo tính năng cho phép bạn để âm thầm gửi mail tự động, cho một số sự kiện Dolibarr. Mục tiêu của thông báo có thể được định nghĩa: 
 * Mỗi các bên thứ ba liên hệ (khách hàng hoặc nhà cung cấp), một bên thứ ba tại thời gian. 
 * Hoặc bằng cách thiết lập một địa chỉ email mục tiêu toàn cầu về trang thiết lập mô-đun.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=Tài liệu mẫu
 DocumentModelOdt=Tạo tài liệu từ OpenDocuments mẫu (.odt hoặc .ods tập tin cho OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Watermark vào dự thảo văn bản
@@ -1557,6 +1566,7 @@ SuppliersSetup=Thiết lập mô-đun nhà cung cấp
 SuppliersCommandModel=Hoàn thành mẫu đơn đặt hàng nhà cung cấp (logo ...)
 SuppliersInvoiceModel=Toàn bộ mẫu của nhà cung cấp hóa đơn (biểu tượng ...)
 SuppliersInvoiceNumberingModel=Nhà cung cấp hoá đơn đánh số mô hình
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Thiết lập mô-đun GeoIP MaxMind
 PathToGeoIPMaxmindCountryDataFile=Đường dẫn đến tập tin có chứa MaxMind ip dịch nước. 
 Ví dụ: 
 /usr/local/share/GeoIP/GeoIP.dat 
 /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
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index bb938979f9c..54b83d5ce8d 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Hoá đơn %s xác nhận
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Hoá đơn %s trở lại trạng thái soạn thảo
 InvoiceDeleteDolibarr=Hoá đơn %s bị xóa
-OrderValidatedInDolibarr= Thứ tự %s xác nhận
+OrderValidatedInDolibarr=Thứ tự %s xác nhận
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Thứ tự %s hủy bỏ
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Thứ tự %s đã được phê duyệt
 OrderRefusedInDolibarr=Thứ tự %s từ chối
 OrderBackToDraftInDolibarr=Thứ tự %s trở lại trạng thái soạn thảo
@@ -91,3 +94,5 @@ WorkingTimeRange=Phạm vi thời gian làm việc
 WorkingDaysRange=Ngày làm việc trong khoảng
 AddEvent=Tạo sự kiện
 MyAvailability=Sẵn có của tôi
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 88ea5adf51f..2811dca1571 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Hoá đơn
 Bills=Hoá đơn
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Hóa đơn khách hàng
+BillsCustomer=Hóa đơn khách hàng
+BillsSuppliers=Hóa đơn nhà cung cấp
+BillsCustomersUnpaid=Hóa đơn khách hàng chưa thanh toán
 BillsCustomersUnpaidForCompany=Hoá đơn chưa thanh toán của khách hàng cho %s
 BillsSuppliersUnpaid=Hoá đơn chưa thanh toán của nhà cung cấp
 BillsSuppliersUnpaidForCompany=Hoá đơn chưa thanh toán của nhà cung cấp cho %s
 BillsLate=Khoản thanh toán trễ
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Thống kê hóa đơn khách hàng
+BillsStatisticsSuppliers=Thống kê hóa đơn nhà cung cấp
 DisabledBecauseNotErasable=Vô hiệu hóa vì không thể bị xóa
 InvoiceStandard=Hóa đơn tiêu chuẩn
 InvoiceStandardAsk=Hóa đơn tiêu chuẩn
@@ -74,8 +74,8 @@ PaymentsAlreadyDone=Thanh toán đã được thực hiện
 PaymentsBackAlreadyDone=Thanh toán đã được thực hiện trở lại
 PaymentRule=Quy tắc thanh toán
 PaymentMode=Phương thức thanh toán
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
+PaymentTerm=Điều khoản thanh toán
+PaymentConditions=Điều khoản thanh toán
 PaymentConditionsShort=Payment terms
 PaymentAmount=Số tiền thanh toán
 ValidatePayment=Xác nhận thanh toán
@@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Tổng của hai giảm giá mới phải b
 ConfirmRemoveDiscount=Bạn có chắc là bạn muốn loại bỏ giảm giá này?
 RelatedBill=Hóa đơn liên quan
 RelatedBills=Hoá đơn liên quan
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Tất cả các hóa đơn
 WarningBillExist=Cảnh báo, một hoặc nhiều hóa đơn đã tồn tại
 
@@ -349,7 +351,7 @@ ChequeNumber=Kiểm tra N °
 ChequeOrTransferNumber=Kiểm tra / Chuyển N °
 ChequeMaker=Kiểm tra máy phát
 ChequeBank=Ngân hàng Kiểm tra
-CheckBank=Check
+CheckBank=Séc
 NetToBePaid=Net để được thanh toán
 PhoneNumber=Điện thoại
 FullPhoneNumber=Điện thoại
@@ -420,12 +422,12 @@ InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
-Progress=Progress
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
+Progress=Tiến trình
+ModifyAllLines=Sửa mọi dòng
+CreateNextSituationInvoice=Tạo vị trí tiếp theo
 NotLastInCycle=This invoice in not the last in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
+DisabledBecauseNotLastInCycle=Vị trí tiếp theo đã tồn tại
+DisabledBecauseFinal=Vị trí này là cuối cùng
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=Không có vị trí nào mở
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 70049b18354..329e7329918 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Danh mục
-Categories=Loại
-Rubrique=Danh mục
-Rubriques=Loại
-categories=loại
-TheCategorie=Các thể loại
-NoCategoryYet=Không có loại của loại hình này tạo ra
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Trong
 AddIn=Thêm vào
 modify=sửa đổi
 Classify=Phân loại
-CategoriesArea=Loại khu vực
-ProductsCategoriesArea=Khu vực sản phẩm / dịch vụ loại
-SuppliersCategoriesArea=Khu vực Nhà cung cấp loại
-CustomersCategoriesArea=Khu vực khách hàng mục
-ThirdPartyCategoriesArea=Khu vực bên thứ ba loại
-MembersCategoriesArea=Thành viên khu vực loại
-ContactsCategoriesArea=Khu vực Liên hệ loại
-MainCats=Loại chính
+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=Tiểu thể loại
 CatStatistics=Thống kê
-CatList=Danh sách các loại
-AllCats=Tất cả thể loại
-ViewCat=Xem thể loại
-NewCat=Thêm thể loại
-NewCategory=Thể loại mới
-ModifCat=Sửa đổi thể loại
-CatCreated=Loại tạo
-CreateCat=Tạo ra thể loại
-CreateThisCat=Tạo ra thể loại này
+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=Xác nhận các lĩnh vực
 NoSubCat=Không có tiểu thể loại.
 SubCatOf=Danh mục con
-FoundCats=Tìm thấy loại
-FoundCatsForName=Loại được tìm thấy cho tên:
-FoundSubCatsIn=Tiểu thể tìm thấy trong các loại
-ErrSameCatSelected=Bạn đã chọn cùng một loại nhiều lần
-ErrForgotCat=Bạn quên chọn thể loại
+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=Bạn quên thông báo cho các lĩnh vực
 ErrCatAlreadyExists=Tên này đã được sử dụng
-AddProductToCat=Thêm sản phẩm này vào một danh mục?
-ImpossibleAddCat=Không thể thêm các loại
-ImpossibleAssociateCategory=Không thể kết hợp các thể loại để
+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 đã được thêm thành công.
-ObjectAlreadyLinkedToCategory=Yếu tố đã được liên kết với thể loại này.
-CategorySuccessfullyCreated=Thể loại này %s đã được thêm thành công.
-ProductIsInCategories=Sản phẩm / dịch vụ để sở hữu loại sau
-SupplierIsInCategories=Sở hữu của bên thứ ba để cung cấp các loại sau đây
-CompanyIsInCustomersCategories=Bên thứ ba này sở hữu để sau khách hàng / khách hàng tiềm năng loại
-CompanyIsInSuppliersCategories=Bên thứ ba này sở hữu để sau nhà cung cấp các loại
-MemberIsInCategories=Thành viên này sở hữu để các thành viên sau đây loại
-ContactIsInCategories=Liên hệ này sở hữu để liên lạc sau loại
-ProductHasNoCategory=Đây sản phẩm / dịch vụ không có trong bất kỳ loại
-SupplierHasNoCategory=Nhà cung cấp này không có trong bất kỳ loại
-CompanyHasNoCategory=Công ty này không có trong bất kỳ loại
-MemberHasNoCategory=Thành viên này không có trong bất kỳ loại
-ContactHasNoCategory=Liên hệ này không có trong bất kỳ loại
-ClassifyInCategory=Phân loại trong thể loại
+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=Không
-NotCategorized=Nếu không có loại
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Thể loại này đã tồn tại với ref này
 ReturnInProduct=Về sản phẩm / dịch vụ thẻ
 ReturnInSupplier=Về thẻ nhà cung cấp
@@ -66,22 +64,22 @@ ReturnInCompany=Về khách hàng / thẻ tiềm năng
 ContentsVisibleByAll=Các nội dung sẽ được hiển thị tất cả
 ContentsVisibleByAllShort=Nội dung có thể nhìn thấy tất cả
 ContentsNotVisibleByAllShort=Nội dung không thể nhìn thấy bởi tất cả
-CategoriesTree=Loại cây
-DeleteCategory=Xóa thể loại
-ConfirmDeleteCategory=Bạn Bạn có chắc chắn muốn xóa thể loại này?
-RemoveFromCategory=Hủy bỏ liên kết với categorie
-RemoveFromCategoryConfirm=Bạn Bạn có chắc chắn muốn xóa liên kết giữa các giao dịch và danh mục?
-NoCategoriesDefined=Không có loại được xác định
-SuppliersCategoryShort=Loại nhà cung cấp
-CustomersCategoryShort=Loại khách hàng
-ProductsCategoryShort=Danh mục sản phẩm
-MembersCategoryShort=Loại thành viên
-SuppliersCategoriesShort=Nhà cung cấp các loại
-CustomersCategoriesShort=Khách hàng mục
+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. loại
-ProductsCategoriesShort=Danh mục sản phẩm
-MembersCategoriesShort=Thành viên loại
-ContactCategoriesShort=Liên hệ loại
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Thể loại này không chứa bất kỳ sản phẩm.
 ThisCategoryHasNoSupplier=Thể loại này không chứa bất kỳ nhà cung cấp.
 ThisCategoryHasNoCustomer=Thể loại này không chứa bất kỳ khách hàng.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Thể loại này không chứa bất kỳ liên lạc.
 AssignedToCustomer=Giao cho một khách hàng
 AssignedToTheCustomer=Giao cho khách hàng
 InternalCategory=Loại nội bộ
-CategoryContents=Danh mục nội dung
-CategId=Category id
-CatSupList=Danh sách các loại nhà cung cấp
-CatCusList=Danh sách khách hàng / loại khách hàng tiềm năng
-CatProdList=Danh sách sản phẩm loại
-CatMemberList=Danh sách thành viên loại
-CatContactList=Danh sách các hạng mục liên lạc và tiếp xúc
-CatSupLinks=Liên kết giữa nhà cung cấp và các loại
-CatCusLinks=Mối liên hệ giữa khách hàng / khách hàng tiềm năng và các loại
-CatProdLinks=Liên kết giữa các sản phẩm / dịch vụ và các loại
-CatMemberLinks=Liên kết giữa các thành viên và các loại
-DeleteFromCat=Di chuyển từ mục
+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=Ảnh xóa
 ConfirmDeletePicture=Xác nhận xoá hình ảnh?
 ExtraFieldsCategories=Thuộc tính bổ sung
-CategoriesSetup=Loại thiết lập
-CategorieRecursiv=Liên kết với các chủ đề chính tự động
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Nếu được kích hoạt, sản phẩm này cũng sẽ liên quan đến chủ đề chính khi thêm vào một tiểu thể loại
 AddProductServiceIntoCategory=Thêm sản phẩm / dịch vụ sau đây
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 20956d32a97..1698b670d91 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Bài đầu ra chạy
 CronLastResult=Cuối mã kết quả
 CronListOfCronJobs=Danh sách công việc dự kiến
 CronCommand=Lệnh
-CronList=Danh sách công việc
-CronDelete= Xóa công việc cron
-CronConfirmDelete= Bạn Bạn có chắc chắn muốn xóa công việc định kỳ này?
-CronExecute=Việc ra mắt
-CronConfirmExecute= Bạn có chắc chắn để thực hiện công việc này ngay bây giờ
-CronInfo= Việc cho phép để thực hiện nhiệm vụ đã được lên kế hoạch
-CronWaitingJobs=Wainting việc làm
+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=Công việc
-CronNone= Không
+CronNone=Không
 CronDtStart=Ngày bắt đầu
 CronDtEnd=Ngày kết thúc
 CronDtNextLaunch=Thực hiện tiếp theo
@@ -75,6 +75,7 @@ CronObjectHelp=Tên đối tượng để tải. 
 Đối với exemple phư
 CronMethodHelp=Phương pháp đối tượng để khởi động. 
 Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của phương pháp là fecth
 CronArgsHelp=Các đối số phương pháp. 
 Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của paramters có thể là 0, ProductRef
 CronCommandHelp=Các dòng lệnh hệ thống để thực thi.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Thông tin
 # Common
diff --git a/htdocs/langs/vi_VN/donations.lang b/htdocs/langs/vi_VN/donations.lang
index 3fd817258c2..a4b1a10ee1c 100644
--- a/htdocs/langs/vi_VN/donations.lang
+++ b/htdocs/langs/vi_VN/donations.lang
@@ -6,6 +6,8 @@ Donor=Nhà tài trợ
 Donors=Các nhà tài trợ
 AddDonation=Create a donation
 NewDonation=Thêm tài trợ mới
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Hiển thị tài trợ
 DonationPromise=Hứa tài trợ
 PromisesNotValid=Chưa xác nhận khoản tài trợ
@@ -21,6 +23,8 @@ DonationStatusPaid=Đã nhận được khoản tài trợ
 DonationStatusPromiseNotValidatedShort=Dự thảo
 DonationStatusPromiseValidatedShort=Đã xác nhận
 DonationStatusPaidShort=Đã nhận
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Xác nhận tài trợ
 DonationReceipt=Nhận tài trợ
 BuildDonationReceipt=Tạo Phiếu thu tài trợ
@@ -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
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 2f1ec444337..982dea2342d 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/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=Thiết lập các thông số bắt buộc chưa được xác định
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 89dd796dbf0..3bec956d767 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Liệt kê tất cả các thông báo email gửi
 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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 62ee8e2af29..55c30b98a9c 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -352,6 +352,7 @@ Status=Tình trạng
 Favorite=Yêu thích
 ShortInfo=Thông tin.
 Ref=Tài liệu tham khảo.
+ExternalRef=Ref. extern
 RefSupplier=Tài liệu tham khảo. nhà cung cấp
 RefPayment=Tài liệu tham khảo. thanh toán
 CommercialProposalsShort=Đề nghị thương mại
@@ -394,8 +395,8 @@ Available=Có sẵn
 NotYetAvailable=Chưa có
 NotAvailable=Không có sẵn
 Popularity=Phổ biến
-Categories=Loại
-Category=Danh mục
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=Từ
 to=để
@@ -694,6 +695,7 @@ AddBox=Thêm vào hộp
 SelectElementAndClickRefresh=Chọn một phần tử và nhấn 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=Thứ hai
 Tuesday=Thứ ba
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 16df451c547..340e3f907fa 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Giảm giá
 CreateOrder=Tạo đơn hàng
 RefuseOrder=Từ chối đơn hàng
-ApproveOrder=Chấp nhận đơn hàng
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Xác nhận đặt hàng
 UnvalidateOrder=Đơn hàng chưa xác nhận
 DeleteOrder=Xóa đơn hàng
@@ -102,6 +103,8 @@ ClassifyBilled=Phân loại hóa đơn
 ComptaCard=Thẻ kế toán
 DraftOrders=Dự thảo đơn đặt hàng
 RelatedOrders=Đơn đặt hàng liên quan
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Trong quá trình các đơn đặt hàng
 RefOrder=Số tham chiếu đơn hàng
 RefCustomerOrder=Số tham chiếu đơn đặt hàng của khách hàng
@@ -118,6 +121,7 @@ PaymentOrderRef=Thanh toán đơn đặt hàng %s
 CloneOrder=Sao chép đơn đặt hàng
 ConfirmCloneOrder=Bạn có chắc chắn bạn muốn sao chép đơn đặt hàng này %s ?
 DispatchSupplierOrder=Tiếp nhận đơn đặt hàng nhà cung cấp %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Đại diện theo dõi đơn đặt hàng
 TypeContact_commande_internal_SHIPPING=Đại diện theo dõi vận chuyển
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 7bbe0059342..06622eb717b 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Can thiệp xác nhận
 Notify_FICHINTER_SENTBYMAIL=Can thiệp gửi qua đường bưu điện
 Notify_BILL_VALIDATE=Hóa đơn khách hàng xác nhận
 Notify_BILL_UNVALIDATE=Hóa đơn của khách hàng unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Để nhà cung cấp đã được phê duyệt
 Notify_ORDER_SUPPLIER_REFUSE=Để nhà cung cấp từ chối
 Notify_ORDER_VALIDATE=Đơn đặt hàng được xác nhận
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Đề nghị thương mại gửi qua đường bưu đ
 Notify_BILL_PAYED=Hóa đơn của khách hàng payed
 Notify_BILL_CANCEL=Hóa đơn của khách hàng bị hủy bỏ
 Notify_BILL_SENTBYMAIL=Hóa đơn của khách hàng gửi qua đường bưu điện
-Notify_ORDER_SUPPLIER_VALIDATE=Nhà cung cấp để xác nhận
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Để nhà cung cấp gửi qua đường bưu điện
 Notify_BILL_SUPPLIER_VALIDATE=Nhà cung cấp hóa đơn xác nhận
 Notify_BILL_SUPPLIER_PAYED=Nhà cung cấp hóa đơn payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Dự án sáng tạo
 Notify_TASK_CREATE=Nhiệm vụ tạo
 Notify_TASK_MODIFY=Nhiệm vụ sửa đổi
 Notify_TASK_DELETE=Công tác xóa
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Số đính kèm tập tin / tài liệu
 TotalSizeOfAttachedFiles=Tổng dung lượng của các file đính kèm / tài liệu
 MaxSize=Kích thước tối đa
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Hóa đơn% s đã được xác nhận.
 EMailTextProposalValidated=Đề nghị% s đã được xác nhận.
 EMailTextOrderValidated=Trình tự% s đã được xác nhận.
 EMailTextOrderApproved=Trình tự% s đã được phê duyệt.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Trình tự% s đã được phê duyệt bởi% s.
 EMailTextOrderRefused=Trình tự% s đã bị từ chối.
 EMailTextOrderRefusedBy=Trình tự% s đã bị từ chối bởi% s.
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 4278c8abe94..45d964cbe14 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Giá đề nghị tối thiểu là: %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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index f818741658b..d82f0ae1e33 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Danh sách các hóa đơn của nhà cung
 ListContractAssociatedProject=Danh sách các hợp đồng được gắn với dự án
 ListFichinterAssociatedProject=Danh sách các sự can thiệp được gắn với dự án
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Danh sách các hoạt động được gắn với dự án
 ActivityOnProjectThisWeek=Các hoạt động của dự án trong tuần này
 ActivityOnProjectThisMonth=Các hoạt động của dự án trong tháng này
diff --git a/htdocs/langs/vi_VN/resource.lang b/htdocs/langs/vi_VN/resource.lang
index 32bdd92f884..29e3f914fbf 100644
--- a/htdocs/langs/vi_VN/resource.lang
+++ b/htdocs/langs/vi_VN/resource.lang
@@ -1,34 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Tài nguyên
+MenuResourceAdd=Tạo tài nguyên
+MenuResourcePlanning=Tài nguyên đang kế hoạch
+DeleteResource=Xóa tài nguyên
+ConfirmDeleteResourceElement=Xác nhận xóa tài nguyên này
+NoResourceInDatabase=Chưa có tài nguyên trong cơ sở dữ liệu
+NoResourceLinked=Chưa có tài nguyên được liên kết
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Danh sách tài nguyên
+ResourceSingular=Tài nguyên
+ResourceCard=Thẻ tài nguyên
+AddResource=Tạo tài nguyên
+ResourceFormLabel_ref=Tên tài nguyên
+ResourceType=Loại tài nguyên
+ResourceFormLabel_description=Mô tả tài nguyên
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Tài nguyên được liên kết tới các thành phần
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Hiển thị tài nguyên đang kế hoạch
+GotoDate=Đến ngày
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Các tài nguyên thành tố
+ResourceCreatedWithSuccess=Đã tạo tài nguyên thành công
+RessourceLineSuccessfullyDeleted=Đầu mối tài nguyên đã được xóa thành công
+RessourceLineSuccessfullyUpdated=Đầu mối tài nguyên đã được cập nhật thành công
+ResourceLinkedWithSuccess=Liên kết tài nguyên thành công
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Thẻ tài nguyên
+ConfirmDeleteResource=Xác nhận xóa tài nguyên này
+RessourceSuccessfullyDeleted=Đã xóa tài nguyên thành công
+DictionaryResourceType=Loại tài nguyên
 
-SelectResource=Select resource
+SelectResource=Chọn tài nguyên
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index c6581043f86..567a4ba2f52 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Tài liệu tham khảo. lô hàng
 Sending=Lô hàng
 Sendings=Lô hàng
+AllSendings=All Shipments
 Shipment=Lô hàng
 Shipments=Lô hàng
 ShowSending=Show Sending
@@ -15,7 +16,7 @@ SearchASending=Tìm kiếm hàng
 StatisticsOfSendings=Thống kê cho lô hàng
 NbOfSendings=Số lô hàng
 NumberOfShipmentsByMonth=Số lô hàng theo tháng
-SendingCard=Shipment card
+SendingCard=Thẻ hàng
 NewSending=Lô hàng mới
 CreateASending=Tạo một lô hàng
 CreateSending=Tạo lô hàng
@@ -23,7 +24,7 @@ QtyOrdered=Số lượng đặt hàng
 QtyShipped=Số lượng vận chuyển
 QtyToShip=Số lượng xuất xưởng
 QtyReceived=Số lượng nhận được
-KeepToShip=Remain to ship
+KeepToShip=Giữ tàu
 OtherSendingsForSameOrder=Lô hàng khác về đơn hàng này
 DateSending=Ngày gửi đơn đặt hàng
 DateSendingShort=Ngày gửi đơn đặt hàng
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index bd00d3e0e7b..6d54d374454 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Danh sách các đơn đặt hàng nhà cung cấp
 MenuOrdersSupplierToBill=Đơn đặt hàng nhà cung cấp cho hóa đơn
 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)
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index e363452059b..78957073466 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -47,7 +47,7 @@ RefusedData=Ngày từ chối
 RefusedReason=Lý do từ chối
 RefusedInvoicing=Thanh toán từ chối
 NoInvoiceRefused=Không sạc từ chối
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Hóa đơn bị từ chối (Khách hàng từ chối thanh toán)
 Status=Tình trạng
 StatusUnknown=Không biết
 StatusWaiting=Chờ
@@ -76,7 +76,7 @@ WithBankUsingRIB=Đối với tài khoản ngân hàng sử dụng RIB
 WithBankUsingBANBIC=Đối với tài khoản ngân hàng sử dụng IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Tài khoản ngân hàng để nhận Bỏ cuộc
 CreditDate=Về tín dụng
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Không thể tạo file biên lai rút tiền cho quốc gia của bạn %s (Quốc gia của bạn không được hỗ trợ)
 ShowWithdraw=Hiện Rút
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuy nhiên, nếu hóa đơn có ít nhất một thanh toán rút chưa qua chế biến, nó sẽ không được thiết lập như là trả tiền để cho phép quản lý thu hồi trước.
 DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 150b021dcae..8b3c55d91b6 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -142,7 +142,7 @@ Box=资讯框
 Boxes=资讯框
 MaxNbOfLinesForBoxes=资讯框最大行数
 PositionByDefault=默认顺序
-Position=Position
+Position=位置
 MenusDesc=菜单管理器定义两菜单中的内容(横向和纵向菜单栏)。
 MenusEditorDesc=菜单编辑器允许您定义个性化的菜单项。请谨慎使用，以免造成部分菜单项无法访问，影响 Dolibarr 的稳定性。
一些模块会添加菜单项(通常在 所有(All)菜单下)。如果您错误的移除了其中的一些菜单项，可以通过禁用/重新启用相应的模块来恢复。
 MenuForUsers=用户菜单
@@ -299,7 +299,7 @@ DoNotUseInProduction=请勿用于生产环境
 ThisIsProcessToFollow=以下为软体的安装过程：
 StepNb=第 %s 步骤
 FindPackageFromWebSite=搜索你需要的功能(例如在官方 %s )。
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=下载包 %S。
 UnpackPackageInDolibarrRoot=解压缩到 Dolibarr 的根目录  %s 下
 SetupIsReadyForUse=安装完成，Dolibarr 已可以使用此新组件。
 NotExistsDirect=未设置可选备用根目录。

@@ -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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -448,8 +449,8 @@ Module52Name=库存
 Module52Desc=产品库存的管理
 Module53Name=服务
 Module53Desc=服务的管理
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=合同/订阅
+Module54Desc=合同管理(服务或常规订阅)
 Module55Name=条码
 Module55Desc=条码的管理
 Module56Name=电话
@@ -494,6 +495,8 @@ Module500Name=特别费用（税，社会公益，股息）
 Module500Desc=特别费用如税收，社会公益，分红及工资管理
 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=所见即所得编辑器
 Module2000Desc=允许在一些文本编辑区中使用所见即所得编辑器
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=任务排程管理
+Module2300Desc=Scheduled job management
 Module2400Name=日程
 Module2400Desc=事件/任务和日程管理
 Module2500Name=电子内容管理
@@ -714,6 +717,11 @@ Permission510=查看工资
 Permission512=创建/修改工资
 Permission514=删除工资
 Permission517=导出工资
+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=导出采购订单及其详情
 Permission1251=导入大量外部数据到数据库(载入资料)
 Permission1321=导出销售账单、属性及其付款资讯
 Permission1421=导出销售订单及属性资讯
-Permission23001 = 阅读计划任务
-Permission23002 = 创建/更新计划任务
-Permission23003 = 删除计划任务
-Permission23004 = 执行计划任务
+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=根据以下编码原则返回会计编号: 
以 %s
 ModuleCompanyCodePanicum=只会回传一个空的会计编号
 ModuleCompanyCodeDigitaria=会计编号取决于第三方的编号。代码以C开头，后跟第三方单位的 5 位代码
 UseNotifications=使用通知
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page.
 ModelModules=文件模板
 DocumentModelOdt=从开放文档模板软件(OpenOffice, KOffice, TextEdit,...等)生成(.ODT，.ODS）模板文档。
 WatermarkOnDraft=为草稿文档加水印
@@ -1557,6 +1566,7 @@ SuppliersSetup=供应商模块设置
 SuppliersCommandModel=采购合同的完整模板(标识...)
 SuppliersInvoiceModel=采购账单的完整模板(标识...)
 SuppliersInvoiceNumberingModel=采购账单编号模块
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Maxmind Geoip 模块设置
 PathToGeoIPMaxmindCountryDataFile=包含Maxmind 国家/IP转换库的文件路径。
例如: /usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index 4e379a7415c..34f59b5dd9e 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/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
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 3f1380ab37d..aba7e1595c3 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -294,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
 
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index 2b0e2a388f3..69bd75a4ac8 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/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=%s是添加成功。
-ObjectAlreadyLinkedToCategory=元已链接到这一类。
-CategorySuccessfullyCreated=本分类%s已被添加成功。
-ProductIsInCategories=产品/服务，以拥有以下类别
-SupplierIsInCategories=第三方拥有对以下类别的供应商
-CompanyIsInCustomersCategories=这个第三方拥有对以下客户/前景类别
-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=返回到客户/前景卡
 ContentsVisibleByAll=内容将所有可见
 ContentsVisibleByAllShort=所有内容可见
 ContentsNotVisibleByAllShort=所有内容不可见
-CategoriesTree=Categories tree
-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=分类编号
-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=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
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 2cc313aad59..1d91917d229 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=最后运行结果
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=命令
-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=接下来执行
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=信息
 # Common
diff --git a/htdocs/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang
index 0cd5d256a2c..792ff432989 100644
--- a/htdocs/langs/zh_CN/donations.lang
+++ b/htdocs/langs/zh_CN/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
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index e4adeba918d..ddd31e68a0c 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/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=强制设置参数尚未定义
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 7ce895780f5..f285247cb51 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index ecfa96b7692..eda0b175528 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/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=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=星期二
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 973b5713bb8..41d8a87078e 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=航运产品
 Discount=折扣
 CreateOrder=创建订单
 RefuseOrder=拒绝订单
-ApproveOrder=接受订单
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=验证订单
 UnvalidateOrder=未验证订单
 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=克隆订单
 ConfirmCloneOrder=你确定要克隆这个订单%s吗 ？
 DispatchSupplierOrder=接收供应商的订单%s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代表跟进客户订单
 TypeContact_commande_internal_SHIPPING=代表跟进航运
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index e775c8b18fb..24695554bd0 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=干预验证
 Notify_FICHINTER_SENTBYMAIL=通过邮件发送的干预
 Notify_BILL_VALIDATE=客户发票验证
 Notify_BILL_UNVALIDATE=未经验证客户发票
+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=客户发票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=供应商发票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的
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 2ac2df060d9..0f455e6b8a9 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index ac970564116..7a9d56f4b1e 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/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=本月初对项目活动
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 2b316b2c21d..875bb69e4a4 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=号。装船
 Sending=装船
 Sendings=出货
+AllSendings=All Shipments
 Shipment=装船
 Shipments=出货
 ShowSending=Show Sending
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index fb95ba7355c..9d6a6e207eb 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/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)
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 5ce0072aebb..418fbd5385d 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/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

 for example : 
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

 for example : 
1,value1
2,value2
3,value3
...
@@ -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=讀取供應商發票(invoice)
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=執行外部資料大量匯入資料庫的功能(載入資料)
 Permission1321=匯出客戶的發票(invoice)、屬性及其付款資訊
 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=根據以下編碼原則返回會計編號: 
以 %s
 ModuleCompanyCodePanicum=只會回傳一個空的會計編號
 ModuleCompanyCodeDigitaria=會計代碼依賴於第三方的代碼。該代碼是字元組成的“C”的第一個位置的前5第三方代碼字元之後。
 UseNotifications=使用通知
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* 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:
* per third parties contacts (customers or suppliers), one contact at time.
* 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=完整的供應商發票(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模組設置
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/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
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index 081cd8dd75f..bd5c1ee90eb 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/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
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 85f3950552a..fc3b6fb731e 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -294,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
 
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 85497e00361..668b104c214 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/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=%s是添加成功。
-ObjectAlreadyLinkedToCategory=元已鏈接到這一類。
-CategorySuccessfullyCreated=本分類%s已被添加成功。
-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=刪除連接的分類標籤：
-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=客戶/潛在分類標籤
-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=內部類
-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
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index a2b5296ad01..aac41414f2c 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/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. 
 For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
 For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/zh_TW/donations.lang b/htdocs/langs/zh_TW/donations.lang
index 5f5db905084..432861fa8bf 100644
--- a/htdocs/langs/zh_TW/donations.lang
+++ b/htdocs/langs/zh_TW/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
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 4245e06fb04..e0cd34688ce 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/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
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 61cba6b14a7..31cd73cca94 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/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 '%s' 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 __SUPERVISOREMAIL__ 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
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 825700c91da..f2feec280dc 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/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=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=星期二
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index acf0e5c9696..d843668c5cd 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/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=你確定要複製這個 %s 訂單嗎?
 DispatchSupplierOrder=接收供應商的訂單%s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代替客戶下單
 TypeContact_commande_internal_SHIPPING=代替客戶寄送
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 49b687412d6..2cf747a9bd4 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/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=客戶發票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=供應商發票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拒絕
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 60d05dae9f0..756bdf38dc2 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/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 #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+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
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index d39fc8620ef..af14269d041 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/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=本月初對項目活動
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 55380896853..9e6201c8bee 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=出貨單編號
 Sending=出貨
 Sendings=出貨
+AllSendings=All Shipments
 Shipment=出貨
 Shipments=出貨
 ShowSending=Show Sending
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index b7f31a8d40a..23bc2d647a7 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/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)
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index e50fb9c8ea8..f4f46e263c2 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -394,7 +394,7 @@ if ($action == 'create')
 			 */
 			print '';
 
 			$quantite_commandee = $line->qty;
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 027f7ab3b89..52db876fbf0 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2007      Franky Van Liedekerke 
  * Copyright (C) 2011-2012 Philippe Grand	     
  * Copyright (C) 2013      Florian Henry		  	
- * Copyright (C) 2014      Marcos García         
+ * Copyright (C) 2014-2015 Marcos García         
  *
  * 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
@@ -990,6 +990,23 @@ class Livraison extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0);
 	}
 
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'livraison'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+
 }
 
 
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 8e280b2da75..670f2180bf0 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -425,15 +425,18 @@ if ($id > 0)
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			$i = 0; $total = 0;
+			$i = 0;
+            $total_insurance = 0;
+            $total_interest = 0;
+            $total_capital = 0;
 			echo '
';
 			$quantite_livree = $commande->livraisons[$line->id];
-			print $quantite_livree;;
+			print $quantite_livree;
 			print '
';
 			print '';
 			print '';
 			print '';
 			print '';
-			print '';
-			print '';
-      		print '';
+			print '';
+			print '';
+      		print '';
       		print '';
       		print '';
 
@@ -442,27 +445,31 @@ if ($id > 0)
 			{
 				$objp = $db->fetch_object($resql);
 				$var=!$var;
-				print "';
+				print "";
+				print '';
 				print '\n";
 				print "\n";
-				print '\n";
-				print '\n";
-        		print '\n";
+                print '\n";
+                print '\n";
+                print '\n";
 				print "";
-				$totalpaid += $objp->amount_capital;
+                $total_insurance += $objp->amount_insurance;
+                $total_interest += $objp->amount_interest;
+                $total_capital += $objp->amount_capital;
 				$i++;
 			}
 
+			$totalpaid = $total_insurance + $total_interest + $total_capital;
+
 			if ($object->paid == 0)
 			{
-				print '';
-				print '';
+				print '';
+				print '';
 
 				$staytopay = $object->capital - $totalpaid;
 
-				print '';
-				print '';
+				print '';
+				print '';
 			}
 			print "
'.$langs->trans("RefPayment").''.$langs->trans("Date").''.$langs->trans("Type").''.$langs->trans("Insurance").''.$langs->trans("Interest").''.$langs->trans("Capital").''.$langs->trans("Insurance").''.$langs->trans("Interest").''.$langs->trans("Capital").' 
";
-				print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'
'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$objp->paiement_type.' '.$objp->num_payment."'.price($objp->amount_insurance)." ".$langs->trans("Currency".$conf->currency)."'.price($objp->amount_interest)." ".$langs->trans("Currency".$conf->currency)."'.price($objp->amount_capital)." ".$langs->trans("Currency".$conf->currency)."'.price($objp->amount_insurance, 0, $langs, 0, 0, -1, $conf->currency)."'.price($objp->amount_interest, 0, $langs, 0, 0, -1, $conf->currency)."'.price($objp->amount_capital, 0, $langs, 0, 0, -1, $conf->currency)."
'.$langs->trans("AlreadyPaid").' :'.price($totalpaid).' '.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("AmountExpected").' :'.price($object->capital).' '.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("AlreadyPaid").' :'.price($totalpaid, 0, $langs, 0, 0, -1, $conf->currency).'
'.$langs->trans("AmountExpected").' :'.price($object->capital, 0, $langs, 0, 0, -1, $conf->currency).'
'.$langs->trans("RemainderToPay").' :'.price($staytopay).' '.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("RemainderToPay").' :'.price($staytopay, 0, $langs, 0, 0, -1, $conf->currency).'
";
 			$db->free($resql);
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index c2c0bba6381..85d0694b725 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -321,7 +321,7 @@ class Loan extends CommonObject
      *  Return label of loan status (unpaid, paid)
      *
      *  @param	int		$mode       	0=label, 1=short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label
-	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
      *  @return	string        			Label
      */
     function getLibStatut($mode=0,$alreadypaid=-1)
@@ -334,7 +334,7 @@ class Loan extends CommonObject
      *
      *  @param	int		$statut        	Id statut
      *  @param  int		$mode          	0=Label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label, 5=Short label + Picto
-	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
      *  @return string        			Label
      */
     function LibStatut($statut,$mode=0,$alreadypaid=-1)
@@ -447,7 +447,7 @@ class Loan extends CommonObject
 	 * Information on record
 	 *
 	 * @param	int		$id      Id of record
-	 * @return	void
+	 * @return	integer|null
 	 */
 	function info($id)
 	{
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 5c24621d802..51961e37e6e 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -391,7 +391,7 @@ class PaymentLoan extends CommonObject
      *      @param  string	$emetteur_banque    Name of bank
      *      @return int                 		<0 if KO, >0 if OK
      */
-    function addPaymentToBank($user,$mode,$label,$accountid,$emetteur_nom,$emetteur_banque)
+    function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
     {
         global $conf;
 
@@ -448,7 +448,7 @@ class PaymentLoan extends CommonObject
                 //$linkaddedforthirdparty=array();
                 if ($mode == 'payment_loan')
                 {
-                    $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/loan/card.php?id=', $this->type_libelle.(($this->label && $this->label!=$this->type_libelle)?' ('.$this->label.')':''),'loan');
+                    $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
                     if ($result <= 0) dol_print_error($this->db);
                 }
             }
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 788048a215b..3831f73a7ea 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -81,8 +81,8 @@ llxHeader("",$langs->trans("Loan"),$help_url);
 if ($object->id)
 {
 	$alreadypayed=$object->getSumPayment();
-	
-    $head = loan_prepare_head($object, $user);
+
+    $head = loan_prepare_head($object);
 
     dol_fiche_head($head, 'documents',  $langs->trans("Loan"), 0, 'bill');
 
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index ece4a5e0271..32e6ed57d2d 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -41,6 +41,9 @@ if ($user->societe_id > 0)
 	$socid = $user->societe_id;
 }
 
+$loan = new Loan($db);
+$loan->fetch($chid);
+
 /*
  * Actions
  */
@@ -92,6 +95,7 @@ if ($action == 'add_payment')
     		$payment = new PaymentLoan($db);
     		$payment->chid				= $chid;
     		$payment->datepaid			= $datepaid;
+            $payment->label             = $loan->label;
 			$payment->amount_capital	= GETPOST('amount_capital');
 			$payment->amount_insurance	= GETPOST('amount_insurance');
 			$payment->amount_interest	= GETPOST('amount_interest');
@@ -150,10 +154,6 @@ $form=new Form($db);
 // Form to create loan's payment
 if ($_GET["action"] == 'create')
 {
-
-	$loan = new Loan($db);
-	$loan->fetch($chid);
-
 	$total = $loan->capital;
 
 	print_fiche_titre($langs->trans("DoPayment"));
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index da0296e4b00..d0b80db1190 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -111,17 +111,17 @@ function test_sql_and_script_inject($val, $type)
 /**
  * Security: Return true if OK, false otherwise.
  *
- * @param		string		$var		Variable name
- * @param		string		$type		1=GET, 0=POST, 2=PHP_SELF
- * @return		boolean					true if there is an injection
+ * @param		string			$var		Variable name
+ * @param		string			$type		1=GET, 0=POST, 2=PHP_SELF
+ * @return		boolean||null				true if there is an injection. Stop code if injection found.
  */
-function analyse_sql_and_script(&$var, $type)
+function analyseVarsForSqlAndScriptsInjection(&$var, $type)
 {
     if (is_array($var))
     {
         foreach ($var as $key => $value)
         {
-            if (analyse_sql_and_script($value,$type))
+            if (analyseVarsForSqlAndScriptsInjection($value,$type))
             {
                 $var[$key] = $value;
             }
@@ -147,16 +147,16 @@ if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIRE
 if (! empty($_SERVER["PHP_SELF"]))
 {
     $morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
-    analyse_sql_and_script($morevaltochecklikepost,2);
+    analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
 }
 // Sanity check on GET parameters
 if (! empty($_SERVER["QUERY_STRING"]))
 {
     $morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
-    analyse_sql_and_script($morevaltochecklikeget,1);
+    analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
 }
 // Sanity check on POST
-analyse_sql_and_script($_POST,0);
+analyseVarsForSqlAndScriptsInjection($_POST,0);
 
 // This is to make Dolibarr working with Plesk
 if (! empty($_SERVER['DOCUMENT_ROOT'])) set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
@@ -975,7 +975,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         print "\n";
 		if (GETPOST('dol_basehref')) print ''."\n";
         // Displays meta
-        print ''."\n";      // Evite indexation par robots
+        print ''."\n";      				// Do not index
+        print '';	// Scale for mobile device
         print ''."\n";
 		if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) print ''."\n";	// Needed for Responsive Web Design
         $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index b031a190f44..715bfe7b35b 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -112,7 +112,7 @@ llxHeader('',$langs->trans("margesSetup"));
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("margesSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("margesSetup"),$linkback,'title_setup');
 
 
 $head = marges_admin_prepare_head();
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index d811f898c0b..eb3ac32c424 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -77,9 +77,9 @@ if ($id > 0 || ! empty($ref))
 	 */
 	if ($result > 0)
 	{
-		$head=product_prepare_head($object, $user);
+		$head=product_prepare_head($object);
 		$titre=$langs->trans("CardProduct".$object->type);
-		$picto=($object->type==1?'service':'product');
+		$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
 		dol_fiche_head($head, 'margin', $titre, 0, $picto);
 
 		print '';
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 70e1b49ad48..a217f34d939 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -309,7 +309,7 @@ $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($
 $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/studs.php',1).'?sondage='.$object->id_sondage;
+$url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$object->id_sondage;
 $urllink=''.$url.'';
 print $urllink;
 
@@ -367,7 +367,7 @@ if ($comments) {
 }
 else
 {
-	print $langs->trans("NoCommentYet").'
';;
+	print $langs->trans("NoCommentYet").'
';
 }
 
 print '
';
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 226bc0c0465..63242cb341c 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -480,7 +480,7 @@ $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($
 $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-$url=$urlwithouturlroot.dol_buildpath('/opensurvey/public/studs.php',1).'?sondage='.$numsondage;
+$url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$numsondage;
 $urlvcal=''.$url.'';
 print $urlvcal;
 
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index cacc0ad8155..ec2568c3858 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -79,7 +79,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 	$testdate = false;
 	$champdatefin = dol_mktime(0,0,0,GETPOST('champdatefinmonth'),GETPOST('champdatefinday'),GETPOST('champdatefinyear'));
 
-	if (GETPOST('champdatefin') && ($champdatefin > 0))	// A date was provided
+	if ($champdatefin && ($champdatefin > 0))	// A date was provided
 	{
 		// Expire date is not before today
 		if ($champdatefin >= dol_now())
@@ -90,16 +90,17 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 		else
 		{
 			$testdate = true;
+			$_SESSION['champdatefin'] = dol_print_date($champdatefin,'dayrfc');
 			//$testdate = false;
 			//$_SESSION['champdatefin'] = dol_print_date($champdatefin,'dayrfc');
-			//setEventMessage($langs->trans('ExpiredDate'),'errors');
+			setEventMessage($langs->trans('ExpiredDate'),'warnings');
 		}
 	}
 
 	if (! $testdate) {
 		setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("ExpireDate")), 'errors');
 	}
-
+	
 	if ($titre && $testdate)
 	{
 		if (! empty($creation_sondage_date))
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 19ce68c750c..42f81685f8a 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -91,7 +91,7 @@ if (empty($conf->global->PAYBOX_IBS_DEVISE)) $conf->global->PAYBOX_IBS_DEVISE=$I
 llxHeader();
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'title_setup');
 
 print $langs->trans("PayBoxDesc")."
\n";
 
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 2e8ab4bf0b8..5eb4549f0fa 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -415,26 +415,45 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re
 
 }
 
-/*
- '-------------------------------------------------------------------------------------------------------------------------------------------
- ' Purpose:     Prepares the parameters for the SetExpressCheckout API Call.
- ' Inputs:
- '      paymentAmount:      Total value of the shopping cart
- '      currencyCodeType:   Currency code value the PayPal API
- '      paymentType:        paymentType has to be one of the following values: Sale or Order or Authorization
- '      returnURL:          the page where buyers return to after they are done with the payment review on PayPal
- '      cancelURL:          the page where buyers return to when they cancel the payment review on PayPal
- '      shipToName:     the Ship to name entered on the merchant's site
- '      shipToStreet:       the Ship to Street entered on the merchant's site
- '      shipToCity:         the Ship to City entered on the merchant's site
- '      shipToState:        the Ship to State entered on the merchant's site
- '      shipToCountryCode:  the Code for Ship to Country entered on the merchant's site
- '      shipToZip:          the Ship to ZipCode entered on the merchant's site
- '      shipToStreet2:      the Ship to Street2 entered on the merchant's site
- '      phoneNum:           the phoneNum  entered on the merchant's site
- '      email:              the buyer email
- '      desc:               Product description
- '--------------------------------------------------------------------------------------------------------------------------------------------
+/**
+ *-------------------------------------------------------------------------------------------------------------------------------------------
+ * Purpose:     Prepares the parameters for the SetExpressCheckout API Call.
+ * Inputs:
+ *      paymentAmount:      Total value of the shopping cart
+ *      currencyCodeType:   Currency code value the PayPal API
+ *      paymentType:        paymentType has to be one of the following values: Sale or Order or Authorization
+ *      returnURL:          the page where buyers return to after they are done with the payment review on PayPal
+ *      cancelURL:          the page where buyers return to when they cancel the payment review on PayPal
+ *      shipToName:     the Ship to name entered on the merchant's site
+ *      shipToStreet:       the Ship to Street entered on the merchant's site
+ *      shipToCity:         the Ship to City entered on the merchant's site
+ *      shipToState:        the Ship to State entered on the merchant's site
+ *      shipToCountryCode:  the Code for Ship to Country entered on the merchant's site
+ *      shipToZip:          the Ship to ZipCode entered on the merchant's site
+ *      shipToStreet2:      the Ship to Street2 entered on the merchant's site
+ *      phoneNum:           the phoneNum  entered on the merchant's site
+ *      email:              the buyer email
+ *      desc:               Product description
+ *
+ * @param 	double 			$paymentAmount		Payment amount
+ * @param 	string 			$currencyCodeType	Currency
+ * @param 	string 			$paymentType		Payment type
+ * @param 	string 			$returnURL			Return Url
+ * @param 	string 			$cancelURL			Cancel Url
+ * @param 	string 			$tag				Tag
+ * @param 	string 			$solutionType		Type
+ * @param 	string 			$landingPage		Landing page
+ * @param	string			$shipToName			Ship to name
+ * @param	string			$shipToStreet		Ship to street
+ * @param	string			$shipToCity			Ship to city
+ * @param	string			$shipToState		Ship to state
+ * @param	string			$shipToCountryCode	Ship to country code
+ * @param	string			$shipToZip			Ship to zip
+ * @param	string			$shipToStreet2		Ship to street2
+ * @param	string			$phoneNum			Phone
+ * @param	string			$email				Email
+ * @param	string			$desc				Description
+ * @return	array								Array
  */
 function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum, $email='', $desc='')
 {
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 572b5f1a379..36727048fc4 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -107,7 +107,7 @@ $form = new Form($db);
 llxHeader('',$langs->trans("PrintingSetup"));
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($langs->trans("PrintingSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("PrintingSetup"),$linkback,'title_setup');
 
 $head=printingadmin_prepare_head($mode);
 
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index e8669f44585..48795fbab4c 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -30,8 +30,8 @@ llxHeader("",$langs->trans("Printing"));
 print_fiche_titre($langs->trans("Printing"));
 
 // List Jobs from printing modules
-//$printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD);
-//$printer->list_jobs('commande');
+$printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD);
+$printer->list_jobs('commande');
 
 llxFooter();
 
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 2d0c1cca468..95394fe7fab 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -54,6 +54,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity');
 }
 
+// Clean param
+if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) $conf->global->PRODUIT_MULTIPRICES_LIMIT = 5;
+
+
 
 /*
  * Actions
@@ -155,6 +159,10 @@ else if ($action == 'viewProdTextsInThirdpartyLanguage')
 	$view = GETPOST('activate_viewProdTextsInThirdpartyLanguage','alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE", $view,'chaine',0,'',$conf->entity);
 }
+elseif ($action == 'mergePropalProductCard') {
+	$view = GETPOST('activate_mergePropalProductCard','alpha');
+	$res = dolibarr_set_const($db, "PRODUIT_PDF_MERGE_PROPAL", $view,'chaine',0,'',$conf->entity);
+}
 else if ($action == 'usesearchtoselectproduct')
 {
 	$usesearch = GETPOST('activate_usesearchtoselectproduct','alpha');
@@ -208,7 +216,7 @@ else if (empty($conf->service->enabled))
 llxHeader('',$title);
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($title,$linkback,'setup');
+print_fiche_titre($title,$linkback,'title_setup');
 
 $head = product_admin_prepare_head();
 dol_fiche_head($head, 'general', $tab, 0, 'product');
@@ -424,6 +432,21 @@ print '';
 print '';
 print '';
 
+// Activate propal merge produt card
+$var=!$var;
+print '';
+print '';
+print '';
+print '';
+print '';
+print '';
+print '';
+print '';
+
 // View product description in thirdparty language
 if (! empty($conf->global->MAIN_MULTILANGS))
 {
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index 1fc46069241..f610b51fe81 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -78,7 +78,7 @@ llxHeader('',$title);
 
 
 $linkback=''.$langs->trans("BackToModuleList").'';
-print_fiche_titre($title,$linkback,'setup');
+print_fiche_titre($title,$linkback,'title_setup');
 
 
 $head = product_admin_prepare_head();
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 84dacf8db43..26ad4dba807 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -246,7 +246,7 @@ $title = $langs->trans('ModulesSystemTools');
 
 llxHeader('',$title);
 
-print_fiche_titre($title,'','setup');
+print_fiche_titre($title,'','title_setup');
 
 print $langs->trans("ProductVatMassChangeDesc").'

';
 
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 3537dc288a9..260c8996fc4 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -138,12 +138,12 @@ class ActionsCardProduct
 
 		if ($action == 'view')
 		{
-            $head = product_prepare_head($this->object,$user);
+            $head = product_prepare_head($this->object);
 
             $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref');
 
     		$titre=$langs->trans("CardProduct".$this->object->type);
-    		$picto=($this->object->type==1?'service':'product');
+    		$picto=($this->object->type==Product::TYPE_SERVICE?'service':'product');
     		$this->tpl['showhead']=dol_get_fiche_head($head, 'card', $titre, 0, $picto);
             $this->tpl['showend']=dol_get_fiche_end();
 
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index cbb9e10750c..f7de783cd99 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -67,7 +67,7 @@ class ActionsCardService
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
 	 *    @param	string	$action    Type of action
-	 *    @param	string	$id			Id of object
+	 *    @param	integer	$id			Id of object
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
@@ -137,12 +137,12 @@ class ActionsCardService
 
 		if ($action == 'view')
 		{
-            $head = product_prepare_head($this->object,$user);
+            $head = product_prepare_head($this->object);
 
             $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref');
 
     		$titre=$langs->trans("CardProduct".$this->object->type);
-    		$picto=($this->object->type==1?'service':'product');
+    		$picto=($this->object->type==Product::TYPE_SERVICE?'service':'product');
     		$this->tpl['showhead']=dol_get_fiche_head($head, 'card', $titre, 0, $picto);
             $this->tpl['showend']=dol_get_fiche_end();
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 0a74845a763..3ac70c6bda6 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1,6 +1,6 @@
 
- * Copyright (C) 2004-2014	Laurent Destailleur		
+ * Copyright (C) 2004-2015	Laurent Destailleur		
  * Copyright (C) 2005		Eric Seigne				
  * Copyright (C) 2005-2014	Regis Houssin			
  * Copyright (C) 2006		Andre Cianfarani		
@@ -11,6 +11,7 @@
  * Copyright (C) 2011-2014	Alexandre Spangaro		
  * Copyright (C) 2014		Cédric Gross			
  * Copyright (C) 2014		Ferran Marcet			
+ * Copyright (C) 2015           Jean-François Ferry		
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,6 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->facture->enabled))  require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -271,6 +273,16 @@ if (empty($reshook))
 
             if ($id > 0)
             {
+				// Category association
+				$categories = GETPOST('categories');
+				if(!empty($categories)) {
+					$cat = new Categorie($db);
+					foreach($categories as $id_category) {
+						$cat->fetch($id_category);
+						$cat->add_type($object, 'product');
+					}
+				}
+				
                 header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
                 exit;
             }
@@ -349,6 +361,23 @@ if (empty($reshook))
                 {
                     if ($object->update($object->id, $user) > 0)
                     {
+						// Category association
+						// First we delete all categories association
+						$sql  = "DELETE FROM ".MAIN_DB_PREFIX."categorie_product";
+						$sql .= " WHERE fk_product = ".$object->id;
+						$db->query($sql);
+						
+						// Then we add the associated categories
+						$categories = GETPOST('categories');
+						if(!empty($categories)) {
+							$cat = new Categorie($db);
+							
+							foreach($categories as $id_category) {
+								$cat->fetch($id_category);
+								$cat->add_type($object, 'product');
+							}
+						}
+						
                         $action = 'view';
                     }
                     else
@@ -461,7 +490,7 @@ if (empty($reshook))
     if ($action == 'confirm_delete' && $confirm != 'yes') { $action=''; }
     if ($action == 'confirm_delete' && $confirm == 'yes')
     {
-        if (($object->type == 0 && $user->rights->produit->supprimer) || ($object->type == 1 && $user->rights->service->supprimer))
+        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
         {
             $result = $object->delete($object->id);
         }
@@ -768,8 +797,8 @@ if (GETPOST("cancel") == $langs->trans("Cancel"))
  */
 
 $helpurl='';
-if (GETPOST("type") == '0' || ($object->type == '0')) $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
-if (GETPOST("type") == '1' || ($object->type == '1')) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
+if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
+if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
 
 if (isset($_GET['type'])) $title = $langs->trans('CardProduct'.GETPOST('type'));
 else $title = $langs->trans('ProductServiceCard');
@@ -838,7 +867,10 @@ else
 
         if ($type==1) $title=$langs->trans("NewService");
         else $title=$langs->trans("NewProduct");
-        print_fiche_titre($title);
+        $linkback="";
+        print_fiche_titre($title,$linkback,'title_products.png');
+
+        dol_fiche_head('');
 
         print '
'.$langs->trans("MergePropalProductCard").'';
+print $form->selectyesno("activate_mergePropalProductCard",$conf->global->PRODUIT_PDF_MERGE_PROPAL,1);
+print '';
+print '';
+print '
';
         print '';
@@ -1001,6 +1033,13 @@ else
         $doleditor->Create();
 
         print "";
+
+		// Categories
+		print '";
+
         print '
'.$langs->trans("Categories").'';
+		$cate_arbo = $form->select_all_categories(0, '', 'parent', 64, 0, 1);
+		print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, 250);
+		print "
';
 
         print '
';
@@ -1058,6 +1097,8 @@ else
             print '
';
         //}
 
+        dol_fiche_end();
+
         print '
';
 
         print '';
@@ -1193,7 +1234,7 @@ else
             }*/
 
             // Nature
-            if($object->type!=1)
+            if($object->type!= Product::TYPE_SERVICE)
             {
                 print ''.$langs->trans("Nature").'';
                 $statutarray=array('-1'=>' ', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
@@ -1268,6 +1309,18 @@ else
             $doleditor->Create();
 
             print "";
+
+			// Categories
+			print ''.$langs->trans("Categories").'';
+			$cate_arbo = $form->select_all_categories(0, '', 'parent', 64, 0, 1);
+			$c = new Categorie($db);
+			$cats = $c->containing($object->id,0);
+			foreach($cats as $cat) {
+				$arrayselected[] = $cat->id;
+			}
+			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, 250);
+			print "";
+
             print '';
 
             print '
';
@@ -1306,9 +1359,9 @@ else
         // Fiche en mode visu
         else
 		{
-            $head=product_prepare_head($object, $user);
+            $head=product_prepare_head($object);
             $titre=$langs->trans("CardProduct".$object->type);
-            $picto=($object->type==1?'service':'product');
+            $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
             dol_fiche_head($head, 'card', $titre, 0, $picto);
 
             $showphoto=$object->is_photo_available($conf->product->multidir_output[$object->entity]);
@@ -1331,7 +1384,7 @@ else
             $nblignes=7;
             if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled)) $nblignes++;
             if ($showbarcode) $nblignes+=2;
-            if ($object->type!=1) $nblignes++;
+            if ($object->type!= Product::TYPE_SERVICE) $nblignes++;
             if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) $nblignes+=2;
             if ($object->isservice()) $nblignes++;
             else $nblignes+=4;
@@ -1464,7 +1517,7 @@ else
             print '';
 
             // Nature
-            if($object->type!=1)
+            if($object->type!= Product::TYPE_SERVICE)
             {
                 print ''.$langs->trans("Nature").'';
                 print $object->getLibFinished();
@@ -1557,6 +1610,19 @@ else
             print ''.$langs->trans("Note").''.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).''."\n";
             print ' '."\n";
 
+			// Categories
+			print ''.$langs->trans("Categories").'';
+			$cat = new Categorie($db);
+			$categories = $cat->containing($object->id,0);
+			$catarray = $form->select_all_categories(0, '', 'parent', 64, 0, 1);
+			
+			$toprint = array();
+			foreach($categories as $c) {
+				$toprint[] = $catarray[$c->id];
+			}
+			print implode('
', $toprint);
+			print "";
+
             print "\n";
 
             dol_fiche_end();
@@ -1628,8 +1694,8 @@ if (empty($reshook))
 	    }
 	    $object_is_used = $object->isObjectUsed($object->id);
 
-	    if (($object->type == 0 && $user->rights->produit->supprimer)
-	    || ($object->type == 1 && $user->rights->service->supprimer))
+	    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
+	    || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
 	    {
 	        if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
 	        {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d08ed699b7f..184560b7aad 100755
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2007-2011	Jean Heimburger			
  * Copyright (C) 2010-2013	Juanjo Menent			
  * Copyright (C) 2013-2014	Cedric GROSS			
- * Copyright (C) 2013-2014	Marcos García			
+ * Copyright (C) 2013-2015	Marcos García			
  * Copyright (C) 2011-2014	Alexandre Spangaro		
  * Copyright (C) 2014		Henry Florian			
  * Copyright (C) 2014		Philippe Grand			
@@ -61,8 +61,12 @@ class Product extends CommonObject
 	var $libelle;            // TODO deprecated
 	var $label;
 	var $description;
-	//! Type 0 for regular product, 1 for service (Advanced feature: 2 for assembly kit, 3 for stock kit)
-	var $type;
+
+	/**
+	 * Check TYPE constants
+	 * @var int
+	 */
+	var $type = self::TYPE_PRODUCT;
 	//! Selling price
 	var $price;				// Price net
 	var $price_ttc;			// Price with tax
@@ -171,6 +175,23 @@ class Product extends CommonObject
 
     var $fk_price_expression;
 
+	/**
+	 * Regular product
+	 */
+	const TYPE_PRODUCT = 0;
+	/**
+	 * Service
+	 */
+	const TYPE_SERVICE = 1;
+	/**
+	 * Advanced feature: assembly kit
+	 */
+	const TYPE_ASSEMBLYKIT = 2;
+	/**
+	 * Advanced feature: stock kit
+	 */
+	const TYPE_STOCKKIT = 3;
+
 	/**
 	 *  Constructor
 	 *
@@ -233,7 +254,6 @@ class Product extends CommonObject
 		// Clean parameters
 		$this->ref = dol_string_nospecial(trim($this->ref));
 		$this->libelle = trim($this->libelle);
-		if (empty($this->type)) $this->type=0;
 		$this->price_ttc=price2num($this->price_ttc);
 		$this->price=price2num($this->price);
 		$this->price_min_ttc=price2num($this->price_min_ttc);
@@ -795,7 +815,7 @@ class Product extends CommonObject
 			$this->error = "Object must be fetched before calling delete";
 			return -1;
 		}
-		if (($this->type == 0 && empty($user->rights->produit->supprimer)) || ($this->type == 1 && empty($user->rights->service->supprimer)))
+		if (($this->type == Product::TYPE_PRODUCT && empty($user->rights->produit->supprimer)) || ($this->type == Product::TYPE_SERVICE && empty($user->rights->service->supprimer)))
 		{
 			$this->error = "ErrorForbidden";
 			return 0;
@@ -1126,6 +1146,9 @@ class Product extends CommonObject
 
 		$now=dol_now();
 
+		// Clean parameters
+		if (empty($this->price_by_qty)) $this->price_by_qty=0;
+
 		// Add new price
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,tosell,tva_tx,recuperableonly,";
 		$sql.= " localtax1_tx, localtax2_tx, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
@@ -1133,7 +1156,7 @@ class Product extends CommonObject
 		$sql.= " ".$this->localtax1_tx.",".$this->localtax2_tx.",".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0?$this->fk_price_expression:'null');
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."_log_price", LOG_DEBUG);
+		dol_syslog(get_class($this)."::_log_price", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if(! $resql)
 		{
@@ -1160,7 +1183,7 @@ class Product extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price";
 		$sql.= " WHERE rowid=".$rowid;
 
-		dol_syslog(get_class($this)."log_price_delete", LOG_DEBUG);
+		dol_syslog(get_class($this)."::log_price_delete", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -1295,7 +1318,7 @@ class Product extends CommonObject
 
 		$id=$this->id;
 
-		dol_syslog(get_class($this)."update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase." newminprice=".$newminprice." level=".$level." npr=".$newnpr);
+		dol_syslog(get_class($this)."::update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase." newminprice=".$newminprice." level=".$level." npr=".$newnpr);
 
 		// Clean parameters
 		if (empty($this->tva_tx))  $this->tva_tx=0;
@@ -1373,7 +1396,7 @@ class Product extends CommonObject
             $sql.= " recuperableonly='".$newnpr."'";
 			$sql.= " WHERE rowid = ".$id;
 
-			dol_syslog(get_class($this)."update_price", LOG_DEBUG);
+			dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -1563,7 +1586,7 @@ class Product extends CommonObject
 				$this->db->free($resql);
 
 
-				// Retrieve all extrafield for thirdparty
+				// Retreive all extrafield for current object
 				// fetch optionals attributes and labels
 				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
 				$extrafields=new ExtraFields($this->db);
@@ -2932,8 +2955,8 @@ class Product extends CommonObject
 		$result='';
         $newref=$this->ref;
         if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle');
-        if ($this->type == 0) $label = '' . $langs->trans("ShowProduct") . '';
-        if ($this->type == 1) $label = '' . $langs->trans("ShowService") . '';
+        if ($this->type == Product::TYPE_PRODUCT) $label = '' . $langs->trans("ShowProduct") . '';
+        if ($this->type == Product::TYPE_SERVICE) $label = '' . $langs->trans("ShowService") . '';
         if (! empty($this->ref))
             $label .= '
' . $langs->trans('ProductRef') . ': ' . $this->ref;
         if (! empty($this->label))
@@ -2968,8 +2991,8 @@ class Product extends CommonObject
         }
 
 		if ($withpicto) {
-			if ($this->type == 0) $result.=($link.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$linkend.' ');
-			if ($this->type == 1) $result.=($link.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$linkend.' ');
+			if ($this->type == Product::TYPE_PRODUCT) $result.=($link.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$linkend.' ');
+			if ($this->type == Product::TYPE_SERVICE) $result.=($link.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$linkend.' ');
 		}
 		$result.=$link.$newref.$linkend;
 		return $result;
@@ -3123,6 +3146,8 @@ class Product extends CommonObject
 			else
 			{
 			    $this->error=$movementstock->error;
+			    $this->errors=$movementstock->errors;
+
 				$this->db->rollback();
 				return -1;
 			}
@@ -3175,9 +3200,10 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *    Load information about stock of a product into stock_warehouse[] and stock_reel
+	 *    Load information about stock of a product into stock_reel, stock_warehouse[] (including stock_warehouse[idwarehouse]->detail_batch for batch products)
 	 *
-	 *    @return     int             < 0 if KO, > 0 if OK
+	 *    @return     	int             < 0 if KO, > 0 if OK
+	 *    @see			load_virtual_stock, getBatchInfo
 	 */
 	function load_stock()
 	{
@@ -3225,9 +3251,10 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *    Load information about virtual stock of a product
+	 *    Load information about objects that are delat between physical and virtual stock of a product
 	 *
-	 *    @return     int             < 0 if KO, > 0 if OK
+	 *    @return   int             < 0 if KO, > 0 if OK
+	 *    @see		load_stock, getBatchInfo
 	 */
     function load_virtual_stock()
     {
@@ -3283,6 +3310,44 @@ class Product extends CommonObject
         }
     }
 
+
+	/**
+	 *  Load existing information about a serial
+	 *
+	 *	@param		string		$batch		Lot/serial number
+	 *  @return     array					Array with record into product_batch
+	 *  @see		load_stock, load_virtual_stock
+	 */
+    function loadBatchInfo($batch)
+    {
+    	$result=array();
+
+    	$sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) FROM ".MAIN_DB_PREFIX."product_batch as pb, ".MAIN_DB_PREFIX."product_stock as ps";
+    	$sql.= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".$this->id." AND pb.batch = '".$this->db->escape($batch)."'";
+    	$sql.= " GROUP BY pb.batch, pb.eatby, pb.sellby";
+    	dol_syslog(get_class($this)."::loadBatchInfo load first entry found for lot/serial = ".$batch, LOG_DEBUG);
+    	$resql = $this->db->query($sql);
+    	if ($resql)
+    	{
+    		$num = $this->db->num_rows($resql);
+    		$i=0;
+    		while ($i < $num)
+    		{
+    			$obj = $this->db->fetch_object($resql);
+				$result[]=array('batch'=>$batch, 'eatby'=>$this->db->jdate($obj->eatby), 'sellby'=>$this->db->jdate($obj->sellby), 'qty'=>$obj->qty);
+				$i++;
+    		}
+    		return $result;
+    	}
+    	else
+    	{
+    		dol_print_error($this->db);
+    		$this->db->rollback();
+    		return array();
+    	}
+    }
+
+
 	/**
 	 *  Move an uploaded file described into $file array into target directory $sdir.
 	 *
@@ -3666,7 +3731,7 @@ class Product extends CommonObject
      */
 	function isproduct()
 	{
-		return ($this->type != 1 ? true : false);
+		return ($this->type == Product::TYPE_PRODUCT ? true : false);
 	}
 
     /**
@@ -3676,7 +3741,7 @@ class Product extends CommonObject
      */
 	function isservice()
 	{
-		return ($this->type == 1 ? true : false);
+		return ($this->type == Product::TYPE_SERVICE ? true : false);
 	}
 
     /**
@@ -3733,7 +3798,6 @@ class Product extends CommonObject
         $this->tosell=1;
         $this->tobuy=1;
 		$this->tobatch=0;
-        $this->type=0;
         $this->note='This is a comment (private)';
 
         $this->barcode=-1;	// Create barcode automatically
@@ -3783,4 +3847,22 @@ class Product extends CommonObject
 
 		return $maxpricesupplier;
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'product_customer_price',
+			'product_customer_price_log'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index d6d848b8ef1..ee49302407d 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -462,7 +462,7 @@ class Productbatch extends CommonObject
     /**
      * Return all batch detail records for given product and warehouse
      *
-     *  @param	obj			$db    database object
+     *  @param	DoliDB			$db    database object
      *  @param	int			$fk_product_stock    id product_stock for objet
      *  @param	int			$with_qty    doesn't return line with 0 quantity
 	 *  @return int          	<0 if KO, >0 if OK
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
new file mode 100644
index 00000000000..b2b7296d311
--- /dev/null
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -0,0 +1,656 @@
+
+ * Copyright (C) 2015 		Florian HENRY 			
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ *  \file       htdocs/product/class/propalmergepdfproduct.class.php
+ *  \ingroup    product
+ *  \brief      This file is an CRUD class file (Create/Read/Update/Delete)
+ */
+
+require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
+
+
+
+/**
+ *	Put here description of your class
+ */
+class Propalmergepdfproduct extends CommonObject
+{
+	var $db;							//!< To store db handler
+	var $error;							//!< To return error code (or message)
+	var $errors=array();				//!< To return several error codes (or messages)
+	var $element='propal_merge_pdf_product';			//!< Id that identify managed objects
+	var $table_element='propal_merge_pdf_product';		//!< Name of table without prefix where object is stored
+
+    var $id;
+    
+	var $fk_product;
+	var $file_name;
+	var $fk_user_author;
+	var $fk_user_mod;
+	var $datec='';
+	var $tms='';
+	var $import_key;
+	var $lang;
+	
+	var $lines=array();
+
+    
+
+
+    /**
+     *  Constructor
+     *
+     *  @param	DoliDb		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        return 1;
+    }
+
+
+    /**
+     *  Create object into database
+     *
+     *  @param	User	$user        User that creates
+     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+     *  @return int      		   	 <0 if KO, Id of created object if OK
+     */
+    function create($user, $notrigger=0)
+    {
+    	global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+        
+		if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
+		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
+		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
+		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
+		if (isset($this->lang)) $this->lang=trim($this->lang);
+		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+
+        
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+        // Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_merge_pdf_product(";
+		
+		$sql.= "fk_product,";
+		$sql.= "file_name,";
+		if ($conf->global->MAIN_MULTILANGS) {
+			$sql.= "lang,";
+		}
+		$sql.= "fk_user_author,";
+		$sql.= "fk_user_mod,";
+		$sql.= "datec";
+
+		
+        $sql.= ") VALUES (";
+        
+		$sql.= " ".(! isset($this->fk_product)?'NULL':"'".$this->fk_product."'").",";
+		$sql.= " ".(! isset($this->file_name)?'NULL':"'".$this->db->escape($this->file_name)."'").",";
+		if ($conf->global->MAIN_MULTILANGS) {
+			$sql.= " ".(! isset($this->lang)?'NULL':"'".$this->db->escape($this->lang)."'").",";
+		}
+		$sql.= " ".$user->id.",";
+		$sql.= " ".$user->id.",";
+		$sql.= " '".$this->db->idate(dol_now())."'";
+
+        
+		$sql.= ")";
+
+		$this->db->begin();
+
+	   	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+        $resql=$this->db->query($sql);
+    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
+
+			if (! $notrigger)
+			{
+	            // Uncomment this and change MYOBJECT to your own tag if you
+	            // want this action calls a trigger.
+
+	            //// Call triggers
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            //$interface=new Interfaces($this->db);
+	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+	            //// End call triggers
+			}
+        }
+
+        // Commit or rollback
+        if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+            return $this->id;
+		}
+    }
+
+
+    /**
+     *  Load object in memory from the database
+     *
+     *  @param	int		$id    Id object
+     *  @return int          	<0 if KO, >0 if OK
+     */
+    function fetch($id)
+    {
+    	global $langs,$conf;
+    	
+        $sql = "SELECT";
+		$sql.= " t.rowid,";
+		
+		$sql.= " t.fk_product,";
+		$sql.= " t.file_name,";
+		$sql.= " t.lang,";
+		$sql.= " t.fk_user_author,";
+		$sql.= " t.fk_user_mod,";
+		$sql.= " t.datec,";
+		$sql.= " t.tms,";
+		$sql.= " t.import_key";
+
+		
+        $sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+        $sql.= " WHERE t.rowid = ".$id;
+
+    	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id    = $obj->rowid;
+                
+				$this->fk_product = $obj->fk_product;
+				$this->file_name = $obj->file_name;
+				if ($conf->global->MAIN_MULTILANGS) {
+					$this->lang = $obj->lang;
+				}
+				$this->fk_user_author = $obj->fk_user_author;
+				$this->fk_user_mod = $obj->fk_user_mod;
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->tms = $this->db->jdate($obj->tms);
+				$this->import_key = $obj->import_key;
+
+                
+            }
+            $this->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+      	    $this->error="Error ".$this->db->lasterror();
+            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+    
+    /**
+     *  Load object in memory from the database
+     *
+     *  @param	int		$id    Id object
+     *  @param	string	$lang  lang string id
+     *  @return int          	<0 if KO, >0 if OK
+     */
+    function fetch_by_product($product_id, $lang='')
+    {
+    	global $langs,$conf;
+    	
+    	$sql = "SELECT";
+    	$sql.= " t.rowid,";
+    
+    	$sql.= " t.fk_product,";
+    	$sql.= " t.file_name,";
+    	$sql.= " t.lang,";
+    	$sql.= " t.fk_user_author,";
+    	$sql.= " t.fk_user_mod,";
+    	$sql.= " t.datec,";
+    	$sql.= " t.tms,";
+    	$sql.= " t.import_key";
+    
+    
+    	$sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+    	$sql.= " WHERE t.fk_product = ".$product_id;
+    	if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
+    		$sql.= " AND t.lang = '".$lang."'";
+    	}
+    
+    	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+    	$resql=$this->db->query($sql);
+    	if ($resql)
+    	{
+    		if ($this->db->num_rows($resql))
+    		{
+    			while($obj = $this->db->fetch_object($resql)) {
+    
+    				$line = new PropalmergepdfproductLine();
+    				
+	    			$line->id    = $obj->rowid;
+	    
+	    			$line->fk_product = $obj->fk_product;
+	    			$line->file_name = $obj->file_name;
+	    			if ($conf->global->MAIN_MULTILANGS) {
+	    				$line->lang = $obj->lang;
+	    			}
+	    			$line->fk_user_author = $obj->fk_user_author;
+	    			$line->fk_user_mod = $obj->fk_user_mod;
+	    			$line->datec = $this->db->jdate($obj->datec);
+	    			$line->tms = $this->db->jdate($obj->tms);
+	    			$line->import_key = $obj->import_key;
+	    			
+	    			
+	    			if ($conf->global->MAIN_MULTILANGS) {
+	    				$this->lines[$obj->file_name.'_'.$obj->lang]=$line;
+	    			}else {
+	    				$this->lines[$obj->file_name]=$line;
+	    			}
+	    			
+    			
+    			}
+    
+    
+    		}
+    		$this->db->free($resql);
+    
+    		return 1;
+    	}
+    	else
+    	{
+    		$this->error="Error ".$this->db->lasterror();
+    		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
+    		return -1;
+    	}
+    }
+
+
+    /**
+     *  Update object into database
+     *
+     *  @param	User	$user        User that modifies
+     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+     *  @return int     		   	 <0 if KO, >0 if OK
+     */
+    function update($user=0, $notrigger=0)
+    {
+    	global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+        
+		if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
+		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
+		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
+		if (isset($this->lang)) $this->lang=trim($this->lang);
+		
+
+        
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
+        
+		$sql.= " fk_product=".(isset($this->fk_product)?$this->fk_product:"null").",";
+		$sql.= " file_name=".(isset($this->file_name)?"'".$this->db->escape($this->file_name)."'":"null").",";
+		if ($conf->global->MAIN_MULTILANGS) {
+			$sql.= " lang=".(isset($this->lang)?"'".$this->db->escape($this->lang)."'":"null").",";
+		}
+		$sql.= " fk_user_mod=".$user->id;
+
+        
+        $sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+        $resql = $this->db->query($sql);
+    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+	            // Uncomment this and change MYOBJECT to your own tag if you
+	            // want this action calls a trigger.
+
+	            //// Call triggers
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            //$interface=new Interfaces($this->db);
+	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+	            //// End call triggers
+	    	}
+		}
+
+        // Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+    }
+
+
+ 	/**
+	 *  Delete object in database
+	 *
+     *	@param  User	$user        User that deletes
+     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		$this->db->begin();
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+		        // want this action calls a trigger.
+
+		        //// Call triggers
+		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+		        //$interface=new Interfaces($this->db);
+		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+		        //// End call triggers
+			}
+		}
+
+		if (! $error)
+		{
+    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
+    		$sql.= " WHERE rowid=".$this->id;
+
+    		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+    		$resql = $this->db->query($sql);
+        	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+
+        // Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+	
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param  User	$user        User that deletes
+	 *	@param  int		$product_id	 product_id
+	 *  @param  string	$lang_id	 language
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	function delete_by_product($user, $product_id, $lang_id='',  $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+	
+		$this->db->begin();
+	
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+	
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+	
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
+			$sql.= " WHERE fk_product=".$product_id;
+			
+			if ($conf->global->MAIN_MULTILANGS && !empty($lang_id)) {
+				$sql.= " AND lang='".$lang_id."'";
+			}
+	
+			dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+	
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+	
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param  User	$user        User that deletes
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	function delete_by_file($user)
+	{
+		global $conf, $langs;
+		$error=0;
+	
+		$this->db->begin();
+	
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+	
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+	
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
+			$sql.= " WHERE fk_product=".$this->fk_product." AND file_name='".$this->db->escape($this->file_name)."'";
+	
+			dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+	
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+
+	/**
+	 *	Load an object from its id and create a new one in database
+	 *
+	 *	@param	int		$fromid     Id of object to clone
+	 * 	@return	int					New id of clone
+	 */
+	function createFromClone($fromid)
+	{
+		global $user,$langs;
+
+		$error=0;
+
+		$object=new Propalmergepdfproduct($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		$object->id=0;
+		$object->statut=0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$result=$object->create($user);
+
+		// Other options
+		if ($result < 0)
+		{
+			$this->error=$object->error;
+			$error++;
+		}
+
+		if (! $error)
+		{
+
+
+		}
+
+		// End
+		if (! $error)
+		{
+			$this->db->commit();
+			return $object->id;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Initialise object with example values
+	 *	Id must be 0 if object instance is a specimen
+	 *
+	 *	@return	void
+	 */
+	function initAsSpecimen()
+	{
+		$this->id=0;
+		
+		$this->fk_product='';
+		$this->file_name='';
+		$this->fk_user_author='';
+		$this->fk_user_mod='';
+		$this->datec='';
+		$this->tms='';
+		$this->import_key='';
+
+		
+	}
+
+}
+
+class PropalmergepdfproductLine{
+	var $id;
+	
+	var $fk_product;
+	var $file_name;
+	var $lang;
+	var $fk_user_author;
+	var $fk_user_mod;
+	var $datec='';
+	var $tms='';
+	var $import_key;
+
+	function __construct() {
+		return 1;
+	}
+
+}
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 53f79266c25..773d08fae72 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -174,9 +174,9 @@ if ($action == 'search')
 
 llxHeader("","",$langs->trans("CardProduct".$object->type));
 
-$head=product_prepare_head($object, $user);
+$head=product_prepare_head($object);
 $titre=$langs->trans("CardProduct".$object->type);
-$picto=($object->type==1?'service':'product');
+$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
 dol_fiche_head($head, 'subproduct', $titre, 0, $picto);
 
 
@@ -207,7 +207,7 @@ if ($id > 0 || ! empty($ref))
 		print '';
 
 		// Nature
-		if($object->type!=1)
+		if($object->type!=Product::TYPE_SERVICE)
 		{
 			print ''.$langs->trans("Nature").'';
 			print $object->getLibFinished();
@@ -268,7 +268,7 @@ if ($id > 0 || ! empty($ref))
 				$productstatic->type=$value["fk_product_type"];
 				$productstatic->ref=$value['label'];
 				print '';
-				print ''.$productstatic->getNomUrl(1,'composition').'';;
+				print ''.$productstatic->getNomUrl(1,'composition').'';
 				print '';
 			}
 			print '';
@@ -474,7 +474,7 @@ if ($id > 0 || ! empty($ref))
 						// check if a product is not already a parent product of this one
 						$prod_arbo=new Product($db);
 						$prod_arbo->id=$objp->rowid;
-						if ($prod_arbo->type==2 || $prod_arbo->type==3)
+						if ($prod_arbo->type==Product::TYPE_ASSEMBLYKIT || $prod_arbo->type== Product::TYPE_STOCKKIT)
 						{
 							$is_pere=0;
 							$prod_arbo->get_sousproduits_arbo();
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index e46dc0384b2..615f4accf70 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -33,6 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
+	require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
 
 $langs->load("other");
 $langs->load("products");
@@ -84,8 +86,70 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
+	//Delete line if product propal merge is linked to a file
+	if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
+		if ($action == 'confirm_deletefile' && $confirm == 'yes')
+		{
+			print 'toto';
+			//extract file name
+			$urlfile = GETPOST('urlfile', 'alpha');
+			$filename = basename($urlfile);
+			$filetomerge = new Propalmergepdfproduct($db);
+			$filetomerge->fk_product=$object->id;
+			$filetomerge->file_name=$filename;
+			$result=$filetomerge->delete_by_file($user);
+			if ($result<0) {
+				setEventMessage($filetomerge->error,'errors');
+			}
+		}
+	}
+	
 	// Action sending file
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_pre_headers.tpl.php';
+
+}
+
+if ($action=='filemerge') {
+	$is_refresh = GETPOST('refresh');
+	if (empty($is_refresh)) {
+		
+		$filetomerge_file_array = GETPOST('filetoadd');
+			
+		$filetomerge_file_array = GETPOST('filetoadd');
+			
+		if ($conf->global->MAIN_MULTILANGS) {
+			$lang_id = GETPOST('lang_id');
+		}
+		
+		// Delete all file already associated
+		$filetomerge = new Propalmergepdfproduct($db);
+	
+		if ($conf->global->MAIN_MULTILANGS) {
+			$result=$filetomerge->delete_by_product($user, $object->id, $lang_id);
+		} else {
+			$result=$filetomerge->delete_by_product($user, $object->id);
+		}
+		if ($result<0) {
+			setEventMessage($filetomerge->error,'errors');
+		}
+	
+		// for each file checked add it to the product
+		if (is_array($filetomerge_file_array)) {
+			foreach ( $filetomerge_file_array as $filetomerge_file ) {
+				$filetomerge->fk_product = $object->id;
+				$filetomerge->file_name = $filetomerge_file;
+	
+				if ($conf->global->MAIN_MULTILANGS) {
+					$filetomerge->lang = $lang_id;
+				}
+	
+				$result=$filetomerge->create($user);
+				if ($result<0) {
+					setEventMessage($filetomerge->error,'errors');
+				}
+			}
+		}
+	}
 }
 
 
@@ -100,9 +164,9 @@ llxHeader("","",$langs->trans("CardProduct".$object->type));
 
 if ($object->id)
 {
-	$head=product_prepare_head($object, $user);
+	$head=product_prepare_head($object);
 	$titre=$langs->trans("CardProduct".$object->type);
-	$picto=($object->type==1?'service':'product');
+	$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
 	dol_fiche_head($head, 'documents', $titre, 0, $picto);
 
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -142,13 +206,139 @@ if ($object->id)
     print ''.$langs->trans("NbOfAttachedFiles").''.count($filearray).'';
     print ''.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'';
     print '';
-
+    
     print '
';
 
     $modulepart = 'produit';
-    $permission = (($object->type == 0 && $user->rights->produit->creer) || ($object->type == 1 && $user->rights->service->creer));
+    $permission = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    
+    
+    //Merge propal PDF docuemnt PDF files
+    if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
+    {
+    	$filetomerge = new Propalmergepdfproduct($db);
+    
+    	if ($conf->global->MAIN_MULTILANGS) {
+    		$lang_id = GETPOST('lang_id');
+    		$result = $filetomerge->fetch_by_product($object->id, $lang_id);
+    	} else {
+    		$result = $filetomerge->fetch_by_product($object->id);
+    	}
+    
+    	$form = new Form($db);
+    	 
+    	$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
+    
+    	// For each file build select list with PDF extention
+    	if (count($filearray) > 0) {
+    		print '
';
+    		// Actual file to merge is :
+    		if (count($filetomerge->lines) > 0) {
+    			print $langs->trans('PropalMergePdfProductActualFile');
+    		}
+    	  
+    		print '
';
+    		print '';
+    		print '';
+    		if (count($filetomerge->lines) == 0) {
+    			print $langs->trans('PropalMergePdfProductChooseFile');
+    		}
+    	  
+    		print  '';
+    	  
+    		// Get language
+    		if ($conf->global->MAIN_MULTILANGS) {
+    
+    			$langs->load("languages");
+    
+    			print  '';
+    		}
+    	  
+    		$style = 'impair';
+    		foreach ( $filearray as $filetoadd ) {
+    
+    			if ($ext = pathinfo($filetoadd['name'], PATHINFO_EXTENSION) == 'pdf') {
+    				 
+    				if ($style == 'pair') {
+    					$style = 'impair';
+    				} else {
+    					$style = 'pair';
+    				}
+    				 
+    				$checked = '';
+    				$filename = $filetoadd['name'];
+    				 
+    				if ($conf->global->MAIN_MULTILANGS) {
+    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) {
+    						$filename = $filetoadd['name'] . ' - ' . $langs->trans('Language_' . $delauft_lang);
+    						$checked = ' checked="checked" ';
+    					}
+    				} else {
+    					if (array_key_exists($filetoadd['name'], $filetomerge->lines)) {
+    						$checked = ' checked="checked" ';
+    					}
+    				}
+    				 
+    				print  '';
+    			}
+    		}
+    		print  '';
+    		print  '
';
+    
+    			$delauft_lang = (empty($lang_id)) ? $langs->getDefaultLang() : $lang_id;
+    
+    			$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
+    
+    			print  '';
+    
+    			if ($conf->global->MAIN_MULTILANGS) {
+    				print  '';
+    			}
+    
+    			print  '
';
+    				 
+    				print  '' . $filename . '';
+    				print  '
';
+    	  
+    		print  '';
+    		print  '
';
+    	  
+    		print  '
';
+    	}
+    }
+    
 }
 else
 {
@@ -157,4 +347,4 @@ else
 
 
 llxFooter();
-$db->close();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index b360829a341..9d7a9215ef1 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -43,6 +43,7 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $rowid=GETPOST('rowid','int');
 $action=GETPOST('action', 'alpha');
+$cancel=GETPOST('cancel', 'alpha');
 $socid=GETPOST('socid', 'int');
 $backtopage=GETPOST('backtopage','alpha');
 $error=0;
@@ -77,6 +78,8 @@ if (! $sortorder) $sortorder="ASC";
  * Actions
  */
 
+if ($cancel) $action='';
+
 $parameters=array('socid'=>$socid, 'id_prod'=>$id);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -97,59 +100,70 @@ if (empty($reshook))
 		}
 	}
 
-if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
-{
-    $id_fourn=GETPOST("id_fourn");
-    if (empty($id_fourn)) $id_fourn=GETPOST("search_id_fourn");
-    $ref_fourn=GETPOST("ref_fourn");
-    if (empty($ref_fourn)) $ref_fourn=GETPOST("search_ref_fourn");
-    $quantity=GETPOST("qty");
-	$remise_percent=price2num(GETPOST('remise_percent','alpha'));
-    $npr = preg_match('/\*/', $_POST['tva_tx']) ? 1 : 0 ;
-    $tva_tx = str_replace('*','', GETPOST('tva_tx','alpha'));
-    $tva_tx = price2num($tva_tx);
-	$price_expression = GETPOST('eid', 'int') ? GETPOST('eid', 'int') : ''; // Discard expression if not in expression mode
-	$delivery_time_days = GETPOST('delivery_time_days', 'int') ? GETPOST('delivery_time_days', 'int') : '';
+	if ($action == 'updateprice')
+	{
+		$id_fourn=GETPOST("id_fourn");
+		if (empty($id_fourn)) $id_fourn=GETPOST("search_id_fourn");
+		$ref_fourn=GETPOST("ref_fourn");
+		if (empty($ref_fourn)) $ref_fourn=GETPOST("search_ref_fourn");
+		$quantity=GETPOST("qty");
+		$remise_percent=price2num(GETPOST('remise_percent','alpha'));
+		$npr = preg_match('/\*/', $_POST['tva_tx']) ? 1 : 0 ;
+		$tva_tx = str_replace('*','', GETPOST('tva_tx','alpha'));
+		$tva_tx = price2num($tva_tx);
+		$price_expression = GETPOST('eid', 'int') ? GETPOST('eid', 'int') : ''; // Discard expression if not in expression mode
+		$delivery_time_days = GETPOST('delivery_time_days', 'int') ? GETPOST('delivery_time_days', 'int') : '';
 
-    if ($tva_tx == '')
-    {
-		$error++;
-	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("VATRateForSupplierProduct")), 'errors');
-    }
-	if (empty($quantity))
-	{
-		$error++;
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")), 'errors');
-	}
-	if (empty($ref_fourn))
-	{
-		$error++;
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("RefSupplier")), 'errors');
-	}
-	if ($id_fourn <= 0)
-	{
-		$error++;
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Supplier")), 'errors');
-	}
-	if ($_POST["price"] < 0 || $_POST["price"] == '')
-	{
-		if ($price_expression === '')	// Return error of missing price only if price_expression not set
+		if ($tva_tx == '')
 		{
 			$error++;
-			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors');
+			$langs->load("errors");
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("VATRateForSupplierProduct")), 'errors');
 		}
-		else
+		if (! is_numeric($tva_tx))
 		{
-			$_POST["price"] = 0;
+			$error++;
+			$langs->load("errors");
+			setEventMessage($langs->trans("ErrorFieldMustBeANumeric",'eeee'), 'errors');
 		}
-	}
-	
+		if (empty($quantity))
+		{
+			$error++;
+			$langs->load("errors");
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")), 'errors');
+		}
+		if (empty($ref_fourn))
+		{
+			$error++;
+			$langs->load("errors");
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("RefSupplier")), 'errors');
+		}
+		if ($id_fourn <= 0)
+		{
+			$error++;
+			$langs->load("errors");
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Supplier")), 'errors');
+		}
+		if ($_POST["price"] < 0 || $_POST["price"] == '')
+		{
+			if ($price_expression === '')	// Return error of missing price only if price_expression not set
+			{
+				$error++;
+				$langs->load("errors");
+				setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors');
+			}
+			else
+			{
+				$_POST["price"] = 0;
+			}
+		}
+
 		$product = new ProductFournisseur($db);
 		$result=$product->fetch($id);
 		if ($result <= 0)
 		{
 			$error++;
-			setEventMessage($product->error, 'errors');
+			setEventMessages($product->error, $product->errors, 'errors');
 		}
 
 		if (! $error)
@@ -187,11 +201,11 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
 				{
 
 					$error++;
-					setEventMessage($product->error, 'errors');
+					setEventMessage($product->error, $product->errors, 'errors');
 				}
 				else
 				{
-					if ($price_expression !== '') 
+					if ($price_expression !== '')
 					{
 						//Check the expression validity by parsing it
 						$priceparser = new PriceParser($db);
@@ -222,13 +236,10 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
 				$db->rollback();
 			}
 		}
-	}
-
-	if (GETPOST('cancel') == $langs->trans("Cancel"))
-	{
-		$action = '';
-		header("Location: fournisseurs.php?id=".$_GET["id"]);
-		exit;
+		else
+		{
+			$action = 'add_price';
+		}
 	}
 }
 
@@ -253,13 +264,9 @@ if ($id || $ref)
 	{
 		if ($action <> 'edit' && $action <> 're-edit')
 		{
-			/*
-			 *  En mode visu
-			 */
-
-			$head=product_prepare_head($product, $user);
+			$head=product_prepare_head($product);
 			$titre=$langs->trans("CardProduct".$product->type);
-			$picto=($product->type==1?'service':'product');
+			$picto=($product->type== Product::TYPE_SERVICE?'service':'product');
 			dol_fiche_head($head, 'suppliers', $titre, 0, $picto);
 
 
@@ -323,8 +330,10 @@ if ($id || $ref)
 					$supplier->fetch($socid);
 					print $supplier->getNomUrl(1);
 					print '';
-					print '';				
+					print '';
 					print '';
+					print '';
+					print '';
 				}
 				else
 				{
@@ -380,7 +389,7 @@ if ($id || $ref)
 				{
 					print '';
 				}
-				print '';				
+				print '';
 
 				// Vat rate
 				$default_vat='';
@@ -450,7 +459,7 @@ if ($id || $ref)
 				print '';
 				print '';
 
-				
+
 				// Delai livraison jours
 				print '';
 				print ''.$langs->trans('NbDaysToDelivery').'';
@@ -487,11 +496,7 @@ if ($id || $ref)
 				print '';
 			}
 
-			/* ************************************************************************** */
-			/*                                                                            */
-			/* Barre d'action                                                             */
-			/*                                                                            */
-			/* ************************************************************************** */
+			// Actions buttons
 
 			print "\n
\n";
 
@@ -523,13 +528,9 @@ if ($id || $ref)
 				print_liste_field_titre($langs->trans("QtyMin"),$_SERVER["PHP_SELF"],"pfp.quantity","",$param,'align="right"',$sortfield,$sortorder);
 				print ''.$langs->trans("VATRate").'';
 				print ''.$langs->trans("PriceQtyMinHT").'';
-				// Charges ????
-				if ($conf->global->PRODUCT_CHARGES)
-				{
-					if (! empty($conf->margin->enabled)) print ''.$langs->trans("Charges").'';
-				}
 				print_liste_field_titre($langs->trans("UnitPriceHT"),$_SERVER["PHP_SELF"],"pfp.unitprice","",$param,'align="right"',$sortfield,$sortorder);
 				print ''.$langs->trans("DiscountQtyMin").'';
+				print_liste_field_titre($langs->trans("NbDaysToDelivery"),$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder);
 				// Charges ????
 				if ($conf->global->PRODUCT_CHARGES)
 				{
@@ -601,6 +602,11 @@ if ($id || $ref)
 						print price2num($productfourn->fourn_remise_percent).'%';
 						print '';
 
+						// Delivery delay
+						print '';
+						print $productfourn->delivery_time_days;
+						print '';
+
 						// Charges ????
 						if ($conf->global->PRODUCT_CHARGES)
 						{
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 90ec2e76fd1..c14d27deb9d 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -1,8 +1,9 @@
 
- * Copyright (C) 2004-2011	Laurent Destailleur		
+ * Copyright (C) 2004-2015	Laurent Destailleur		
  * Copyright (C) 2005-2014	Regis Houssin			
  * Copyright (C)      2014	Charles-Fr BENKE		
+ * Copyright (C) 2015           Jean-François Ferry		
  *
  * 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
@@ -67,7 +68,8 @@ if ((isset($_GET["type"]) && $_GET["type"] == 1) || empty($conf->product->enable
 
 llxHeader("",$langs->trans("ProductsAndServices"),$helpurl);
 
-print_fiche_titre($transAreaType);
+$linkback="";
+print_fiche_titre($transAreaType,$linkback,'title_products.png');
 
 
 print '
';
@@ -383,7 +385,6 @@ function activitytrim($product_type)
 	$result = $db->query($sql);
 	if ($result)
 	{
-		//$tmpyear=$beginyear; // FIXME $beginyear is not defined
 		$tmpyear=0;
 		$trim1=0;
 		$trim2=0;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index f9503778411..2f61a07fa60 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2013      Cédric Salvador      
  * Copyright (C) 2013      Florian Henry        
  * Copyright (C) 2013      Adolfo segura        
+ * Copyright (C) 2015       Jean-François Ferry	
  *
  * 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
@@ -239,7 +240,7 @@ else
     	$param.=($search_categ?"&search_categ=".$search_categ:"");
     	$param.=isset($type)?"&type=".$type:"";
 
-    	print_barre_liste($texte, $page, "list.php", $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
+    	print_barre_liste($texte, $page, "list.php", $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,'title_products.png');
 
     	if (! empty($catid))
     	{
@@ -476,8 +477,11 @@ else
     					{
     						if ($product_fourn->product_fourn_price_id > 0)
     						{
-    							$htmltext=$product_fourn->display_price_product_fournisseur();
-    							if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) print $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext);
+    							if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
+    							{
+    								$htmltext=$product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
+    								print $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext);
+    							}
     							else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
     						}
     					}
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index 0ae65a7dec6..c6245cf203c 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -100,9 +100,9 @@ if ($object->id)
 	/*
 	 *  En mode visu
 	*/
-	$head=product_prepare_head($object, $user);
+	$head=product_prepare_head($object);
 	$titre=$langs->trans("CardProduct".$object->type);
-	$picto=($object->type==1?'service':'product');
+	$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
 	dol_fiche_head($head, 'photos', $titre, 0, $picto);
 
 	/*
@@ -145,8 +145,8 @@ if ($object->id)
 
 
 	$permtoedit=0;
-	if ($user->rights->produit->creer && $object->type == 0) $permtoedit=1;
-	if ($user->rights->service->creer && $object->type == 1) $permtoedit=1;
+	if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoedit=1;
+	if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoedit=1;
 	if (empty($conf->global->MAIN_UPLOAD_DOC)) $permtoedit=0;
 
 	/* ************************************************************************** */
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 376647834b5..8f419aa3679 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004      Eric Seigne          
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2014      Marcos García        
+ * Copyright (C) 2015       Jean-François Ferry	
  *
  * 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
@@ -74,7 +75,7 @@ else if ($type == '1')
 
 llxHeader('','',$helpurl);
 
-print_fiche_titre($title, $mesg);
+print_fiche_titre($title, $mesg,'title_products.png');
 
 
 $param = '';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index f6cd6187e85..2c9ab9a7794 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -51,12 +51,14 @@ $eid = GETPOST('eid', 'int');
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if ($user->societe_id)
-	$socid = $user->societe_id;
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 $object = new Product($db);
 
+// Clean param
+if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) $conf->global->PRODUIT_MULTIPRICES_LIMIT = 5;
+
 $error=0;
 
 
@@ -119,7 +121,8 @@ if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit-
 		$newprice = $newprice_min; //Set price same as min, the user will not see the
 	}
 
-	if ($object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0) {
+	if ($object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0)
+	{
 		if ($object->fk_price_expression != 0) {
 			//Check the expression validity by parsing it
 			$priceparser = new PriceParser($db);
@@ -130,7 +133,8 @@ if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit-
 				setEventMessage($priceparser->translatedError(), 'errors');
 			}
 		}
-		if (empty($error) && ! empty($conf->dynamicprices->enabled)) {
+		if (empty($error) && ! empty($conf->dynamicprices->enabled))
+		{
 			$ret=$object->setPriceExpression($object->fk_price_expression);
 			if ($ret < 0)
 			{
@@ -139,7 +143,8 @@ if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit-
 				setEventMessage($object->error, 'errors');
 			}
 		}
-		if (empty($error)) {
+		if (empty($error))
+		{
 			$action = '';
 			setEventMessage($langs->trans("RecordSaved"));
 		}
@@ -147,7 +152,10 @@ if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit-
 		$action = 'edit_price';
 		setEventMessage($object->error, 'errors');
 	}
-} else if ($action == 'delete' && $user->rights->produit->supprimer) {
+}
+
+if ($action == 'delete' && $user->rights->produit->supprimer)
+{
 	$result = $object->log_price_delete($user, $_GET ["lineid"]);
 	if ($result < 0) {
 		setEventMessage($object->error, 'errors');
@@ -345,9 +353,9 @@ if (! empty($id) || ! empty($ref))
 
 llxHeader("", "", $langs->trans("CardProduct" . $object->type));
 
-$head = product_prepare_head($object, $user);
+$head = product_prepare_head($object);
 $titre = $langs->trans("CardProduct" . $object->type);
-$picto = ($object->type == 1 ? 'service' : 'product');
+$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 dol_fiche_head($head, 'price', $titre, 0, $picto);
 
 print '';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index ab184cdf943..be38eda6b2d 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -1,6 +1,6 @@
 
- * Copyright (C) 2004-2011 Laurent Destailleur  
+ * Copyright (C) 2004-2015 Laurent Destailleur  
  * Copyright (C) 2005-2012 Regis Houssin        
  * Copyright (C) 2013      Cédric Salvador      
  *
@@ -102,13 +102,12 @@ $title=$langs->trans("ProductsAndServices");
 
 $sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
 $sql.= ' p.fk_product_type, p.tms as datem,';
-$sql.= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte,';
+$sql.= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
 $sql.= ' SUM(s.reel) as stock_physique';
-$sql .= ', p.desiredstock';
-$sql.= ' FROM ('.MAIN_DB_PREFIX.'product as p';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
+$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s on p.rowid = s.fk_product';
 // We'll need this table joined to the select in order to filter by categ
 if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
-$sql.= ') LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s on p.rowid = s.fk_product';
 $sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
 if ($search_categ) $sql.= " AND p.rowid = cp.fk_product";	// Join for the needed table to filter by categ
 if ($sall)
@@ -156,10 +155,8 @@ if ($search_categ)
 	$sql .= " AND cp.fk_categorie = ".$db->escape($search_categ);
 }
 $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
-$sql.= " p.fk_product_type, p.tms,";
-$sql.= " p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte";
-$sql .= ", p.desiredstock";
-if ($toolowstock) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte";    // Not used yet
+$sql.= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
+if ($toolowstock) $sql.= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";    // Not used yet
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit + 1, $offset);
 $resql = $db->query($sql);
@@ -247,19 +244,19 @@ if ($resql)
 	print_liste_field_titre($langs->trans("DesiredStock"), $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stock_physique",$param,"",'align="right"',$sortfield,$sortorder);
 	// TODO Add info of running suppliers/customers orders
-	//print_liste_field_titre($langs->trans("TheoreticalStock"),"reassort.php", "stock_theorique",$param,"",'align="right"',$sortfield,$sortorder);
+	//print_liste_field_titre($langs->trans("TheoreticalStock"),$_SERVER["PHP_SELF"], "stock_theorique",$param,"",'align="right"',$sortfield,$sortorder);
 	print '';
-	print_liste_field_titre($langs->trans("Sell"),"reassort.php", "p.tosell",$param,"",'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Buy"),"reassort.php", "p.tobuy",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Sell"),$_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Buy"),$_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="right"',$sortfield,$sortorder);
 	print "\n";
 
 	// Lignes des champs de filtre
 	print '';
 	print '';
 	print '';
 	if (! empty($conf->service->enabled) && $type == 1)
 	{
@@ -267,6 +264,7 @@ if ($resql)
 		print ' ';
 		print '';
 	}
+	// Lot/Serial
 	print '';
 	print '';
 	print '';
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
new file mode 100644
index 00000000000..451e4302f05
--- /dev/null
+++ b/htdocs/product/reassortlot.php
@@ -0,0 +1,388 @@
+
+ * Copyright (C) 2004-2015 Laurent Destailleur  
+ * Copyright (C) 2005-2012 Regis Houssin        
+ * Copyright (C) 2013      Cédric Salvador      
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ *  \file       htdocs/product/reassortlot.php
+ *  \ingroup    produit
+ *  \brief      Page to list stocks
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+
+$langs->load("products");
+$langs->load("stocks");
+$langs->load("productbatch");
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit|service');
+
+
+$action=GETPOST('action','alpha');
+$sref=GETPOST("sref");
+$snom=GETPOST("snom");
+$sall=GETPOST("sall");
+$type=GETPOST("type","int");
+$sbarcode=GETPOST("sbarcode");
+$search_batch=GETPOST('search_batch');
+$catid=GETPOST('catid','int');
+$toolowstock=GETPOST('toolowstock');
+$tosell = GETPOST("tosell");
+$tobuy = GETPOST("tobuy");
+$fourn_id = GETPOST("fourn_id",'int');
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (! $sortfield) $sortfield="stock_physique";
+if (! $sortorder) $sortorder="ASC";
+$limit = $conf->liste_limit;
+$offset = $limit * $page ;
+
+// Load sale and categ filters
+$search_sale = GETPOST("search_sale");
+$search_categ = GETPOST("search_categ");
+
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$canvas=GETPOST("canvas");
+$objcanvas=null;
+if (! empty($canvas))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db,$action);
+	$objcanvas->getCanvas('product','list',$canvas);
+}
+
+if (! empty($_POST["button_removefilter_x"]))
+{
+    $sref="";
+    $snom="";
+    $sall="";
+    $search_sale="";
+    $search_categ="";
+    $type="";
+    $catid='';
+    $toolowstock='';
+}
+
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+$htmlother=new FormOther($db);
+
+$title=$langs->trans("ProductsAndServices");
+
+$sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
+$sql.= ' p.fk_product_type, p.tms as datem,';
+$sql.= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
+$sql.= ' s.fk_entrepot,';
+$sql.= ' pb.batch, pb.eatby, pb.sellby,';
+$sql.= ' SUM(pb.qty) as stock_physique';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
+$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s on p.rowid = s.fk_product';
+$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_batch as pb on pb.fk_product_stock = s.rowid';
+// We'll need this table joined to the select in order to filter by categ
+if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
+$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+if ($search_categ) $sql.= " AND p.rowid = cp.fk_product";	// Join for the needed table to filter by categ
+if ($sall)
+{
+	$sql.= " AND (p.ref LIKE '%".$db->escape($sall)."%' OR p.label LIKE '%".$db->escape($sall)."%' OR p.description LIKE '%".$db->escape($sall)."%' OR p.note LIKE '%".$db->escape($sall)."%')";
+}
+// if the type is not 1, we show all products (type = 0,2,3)
+if (dol_strlen($type))
+{
+    if ($type==1)
+    {
+        $sql.= " AND p.fk_product_type = '1'";
+    }
+    else
+    {
+        $sql.= " AND p.fk_product_type <> '1'";
+    }
+}
+if ($sref)     $sql.= " AND p.ref LIKE '%".$sref."%'";
+if ($sbarcode) $sql.= " AND p.barcode LIKE '%".$sbarcode."%'";
+if ($snom)     $sql.= " AND p.label LIKE '%".$db->escape($snom)."%'";
+if (! empty($tosell))
+{
+	$sql.= " AND p.tosell = ".$tosell;
+}
+if (! empty($tobuy))
+{
+    $sql.= " AND p.tobuy = ".$tobuy;
+}
+if (! empty($canvas))
+{
+    $sql.= " AND p.canvas = '".$db->escape($canvas)."'";
+}
+if($catid)
+{
+	$sql.= " AND cp.fk_categorie = ".$catid;
+}
+if ($fourn_id > 0)
+{
+	$sql.= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$fourn_id;
+}
+// Insert categ filter
+if ($search_categ)
+{
+	$sql .= " AND cp.fk_categorie = ".$db->escape($search_categ);
+}
+if ($search_batch)
+{
+	$sql .= " AND pb.batch LIKE '%".$db->escape($search_batch)."%'";
+}
+$sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
+$sql.= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
+$sql.= " s.fk_entrepot,";
+$sql.= " pb.batch, pb.eatby, pb.sellby";
+if ($toolowstock) $sql.= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";    // Not used yet
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($limit + 1, $offset);
+$resql = $db->query($sql);
+
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$i = 0;
+
+	if ($num == 1 && ($sall or $snom or $sref))
+	{
+		$objp = $db->fetch_object($resql);
+		header("Location: card.php?id=$objp->rowid");
+		exit;
+	}
+
+	$helpurl='';
+	$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
+
+	if (isset($type))
+	{
+		if ($type==1) { $texte = $langs->trans("Services"); }
+		else { $texte = $langs->trans("Products"); }
+	} else {
+		$texte = $langs->trans("ProductsAndServices");
+	}
+	$texte.=' ('.$langs->trans("StocksByLotSerial").')';
+
+
+	llxHeader("",$title,$helpurl,$texte);
+
+	if ($sref || $snom || $sall || GETPOST('search'))
+	{
+		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num);
+	}
+	else
+	{
+		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num);
+	}
+
+	if (! empty($catid))
+	{
+		print "
";
+		$c = new Categorie($db);
+		$c->fetch($catid);
+		$ways = $c->print_all_ways(' > ','product/reassortlot.php');
+		print " > ".$ways[0]."
\n";
+		print "

";
+	}
+
+	print '
';
+	print '';
+	print '';
+	print '';
+	print '';
+
+	print '
 
';
-	print '';
+	print '';
 	print '';
-	print '';
+	print '';
 	print '   
';
+
+	// Filter on categories
+ 	$moreforfilter='';
+	if (! empty($conf->categorie->enabled))
+	{
+	 	$moreforfilter.=$langs->trans('Categories'). ': ';
+		$moreforfilter.=$htmlother->select_categories(0,$search_categ,'search_categ');
+	 	$moreforfilter.='           ';
+	}
+	//$moreforfilter.=$langs->trans("StockTooLow").' ';
+ 	if ($moreforfilter)
+	{
+		print '';
+		print '';
+	}
+
+	$param="&tosell=$tosell&tobuy=$tobuy".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref&batch=$batch&eatby=$eatby&sellby=$sellby";
+
+	// Lignes des titres
+	print "";
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
+	if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Warehouse"), $_SERVER["PHP_SELF"], "",$param,"",'',$sortfield,$sortorder);
+	//print_liste_field_titre($langs->trans("DesiredStock"), $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Batch"), $_SERVER["PHP_SELF"], "pb.batch",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("l_eatby"), $_SERVER["PHP_SELF"], "pb.eatby",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("l_sellby"), $_SERVER["PHP_SELF"], "pb.sellby",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stock_physique",$param,"",'align="right"',$sortfield,$sortorder);
+	// TODO Add info of running suppliers/customers orders
+	//print_liste_field_titre($langs->trans("TheoreticalStock"),$_SERVER["PHP_SELF"], "stock_theorique",$param,"",'align="right"',$sortfield,$sortorder);
+	print '';
+	print_liste_field_titre($langs->trans("Sell"),$_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Buy"),$_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="right"',$sortfield,$sortorder);
+	print "\n";
+
+	// Lignes des champs de filtre
+	print '';
+	print '';
+	print '';
+	if (! empty($conf->service->enabled) && $type == 1)
+	{
+		print '';
+	}
+	print '';
+	print '';
+	print '';
+	print '';
+	print '';
+	print '';
+	print '';
+	print '';
+	print '';
+
+	$product_static=new Product($db);
+	$warehousetmp=new Entrepot($db);
+
+	$var=True;
+	while ($i < min($num,$limit))
+	{
+		$objp = $db->fetch_object($resql);
+
+		// Multilangs
+		if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+		{
+			$sql = "SELECT label";
+			$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
+			$sql.= " WHERE fk_product=".$objp->rowid;
+			$sql.= " AND lang='". $langs->getDefaultLang() ."'";
+			$sql.= " LIMIT 1";
+
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$objtp = $db->fetch_object($result);
+				if (! empty($objtp->label)) $objp->label = $objtp->label;
+			}
+		}
+
+		$var=!$var;
+		print '';
+		print '';
+
+		if (! empty($conf->service->enabled) && $type == 1)
+		{
+			print '';
+		}
+		//print '';
+		//print '';
+		//print '';
+
+		// Warehouse
+		print '';
+		print '';
+		print '';
+		print '';
+		print '';
+		print '';
+		print '';
+        print '';
+		print "\n";
+		$i++;
+	}
+
+	print "
';
+	    print $moreforfilter;
+	    print '
 
';
+	print '';
+	print '';
+	print '';
+	print '';
+		print ' ';
+		print '      ';
+	print '';
+	print '';
+	print '
';
+		$product_static->ref=$objp->ref;
+		$product_static->id=$objp->rowid;
+        $product_static->label = $objp->label;
+		$product_static->type=$objp->fk_product_type;
+		print $product_static->getNomUrl(1,'',16);
+		//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
+		print ''.$objp->label.'';
+			if (preg_match('/([0-9]+)y/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear");
+			elseif (preg_match('/([0-9]+)m/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth");
+			elseif (preg_match('/([0-9]+)d/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay");
+			else print $objp->duration;
+			print ''.$objp->stock_theorique.''.$objp->seuil_stock_alerte.''.$objp->desiredstock.'';
+		$warehousetmp->fetch($obj->fk_entrepot);
+		print $warehousetmp->getNomUrl(1);
+		print ''.$objp->batch.''.dol_print_date($db->jdate($objp->eatby), 'day').''.dol_print_date($db->jdate($objp->sellby), 'day').'';
+        //if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
+		print $objp->stock_physique;
+		print ''.$langs->trans("Movements").''.$product_static->LibStatut($objp->statut,5,0).''.$product_static->LibStatut($objp->tobuy,5,1).'
";
+	print '';
+
+	if ($num > $conf->liste_limit)
+	{
+		if ($sref || $snom || $sall || GETPOST('search'))
+		{
+	  		print_barre_liste('', $page, "reassort.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num, 0, '');
+		}
+		else
+		{
+	  		print_barre_liste('', $page, "reassort.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":"")."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num, 0, '');
+		}
+	}
+
+	$db->free($resql);
+
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 9600e6c0a44..ce161a1af60 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -67,9 +67,9 @@ if (! empty($id) || ! empty($ref))
 
 	if ($result)
 	{
-		$head=product_prepare_head($object, $user);
+		$head=product_prepare_head($object);
 		$titre=$langs->trans("CardProduct".$object->type);
-		$picto=($object->type==1?'service':'product');
+		$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
 
 		dol_fiche_head($head, 'stats', $titre, 0, $picto);
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 49a443938ab..7dcf6139534 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -89,9 +89,9 @@ if ($id > 0 || ! empty($ref))
 
 	if ($result > 0)
 	{
-		$head=product_prepare_head($product, $user);
+		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
-		$picto=($product->type==1?'service':'product');
+		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
@@ -126,7 +126,7 @@ if ($id > 0 || ! empty($ref))
 
 		print '
';
 
-		if ($user->rights->commande->lire) 
+		if ($user->rights->commande->lire)
 		{
 			$sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, c.rowid, d.total_ht as total_ht, c.ref,";
 			$sql .= " c.ref_client,";
@@ -147,7 +147,7 @@ if ($id > 0 || ! empty($ref))
 			if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 			$sql.= " ORDER BY $sortfield $sortorder ";
-	            
+
 	        //Calcul total qty and amount for global if full scan list
 	        $total_ht=0;
 	        $total_qty=0;
@@ -162,21 +162,21 @@ if ($id > 0 || ! empty($ref))
 	        		}
 	        	}
 	        }
-	            
+
 			$sql.= $db->plimit($conf->liste_limit +1, $offset);
-	
+
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-	 			
+
 				if (! empty($id))
 	            	$option .= '&id='.$product->id;
 	            if (! empty($search_month))
 	            	$option .= '&search_month='.$search_month;
 	            if (! empty($search_year))
 	            	$option .= '&search_year='.$search_year;
-	            
+
 	            print '
' . "\n";
 	            if (! empty($sortfield))
 	            	print '';
@@ -186,7 +186,7 @@ if ($id > 0 || ! empty($ref))
 	            	print '';
 	            	$option .= '&page=' . $page;
 	            }
-	
+
 				print_barre_liste($langs->trans("CustomersOrders"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num,$totalrecords,'');
 				print '
';
 			    print $langs->trans('Period').' ('.$langs->trans("OrderDate") .') - ';
@@ -197,7 +197,7 @@ if ($id > 0 || ! empty($ref))
 				print '';
 			    print '
';
 				print '
';
-	
+
 				$i = 0;
 	            print '';
 				print '';
@@ -209,7 +209,7 @@ if ($id > 0 || ! empty($ref))
 				print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"c.total_ht","",$option,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"c.fk_statut","",$option,'align="right"',$sortfield,$sortorder);
 				print "\n";
-	
+
 				if ($num > 0)
 				{
 					$var=True;
@@ -217,7 +217,7 @@ if ($id > 0 || ! empty($ref))
 					{
 						$objp = $db->fetch_object($result);
 						$var=!$var;
-	
+
 						print '';
 	 					print '";
 						print  '\n";
 	                    print '\n";
-						print '';
+						print '';
 						print "\n";
 						$i++;
-	                        
+
 	                    if (!empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	                        $total_ht+=$objp->total_ht;
 	                        $total_qty+=$objp->qty;
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 8cbdea41495..e6ced5ad905 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -46,7 +46,7 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array (
-		'productstatssupplyorder' 
+		'productstatssupplyorder'
 ));
 
 $mesg = '';
@@ -76,7 +76,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) {
  * View
  */
 
-$commandefournstatic = new CommandeFournisseur($db);
+$supplierorderstatic = new CommandeFournisseur($db);
 $societestatic = new Societe($db);
 
 $form = new Form($db);
@@ -85,55 +85,55 @@ $formother = new FormOther($db);
 if ($id > 0 || ! empty($ref)) {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-	
+
 	$parameters = array (
-			'id' => $id 
+			'id' => $id
 	);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0)
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	
+
 	llxHeader("", "", $langs->trans("CardProduct" . $product->type));
-	
+
 	if ($result > 0) {
-		$head = product_prepare_head($product, $user);
+		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
-		$picto = ($product->type == 1 ? 'service' : 'product');
+		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
-		
+
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0)
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		
+
 		print '
';
 	                    $orderstatic->id=$objp->commandeid;
@@ -232,10 +232,10 @@ if ($id > 0 || ! empty($ref))
 						print dol_print_date($db->jdate($objp->date_commande))."'.$objp->qty."'.price($objp->total_ht)."'.$commandestatic->LibStatut($objp->statut,$objp->facture,5).''.$orderstatic->LibStatut($objp->statut,$objp->facture,5).'
';
-		
+
 		// Reference
 		print '';
 		print '';
 		print '';
-		
+
 		// Libelle
 		print '';
 		print '';
-		
+
 		// Status (to sell)
 		print '';
-		
+
 		// Status (to buy)
 		print '';
-		
+
 		show_stats_for_company($product, $socid);
-		
+
 		print "
' . $langs->trans("Ref") . '';
 		print $form->showrefnav($product, 'ref', '', 1, 'ref');
 		print '
' . $langs->trans("Label") . '' . $product->libelle . '
' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')';
 		print $product->getLibStatut(2, 0);
 		print '
' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')';
 		print $product->getLibStatut(2, 1);
 		print '
";
-		
+
 		print '
';
-		
+
 		if ($user->rights->fournisseur->commande->lire) {
 			$sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,";
 			$sql .= " c.rowid, d.total_ht as total_ht, c.ref,";
@@ -158,7 +158,7 @@ if ($id > 0 || ! empty($ref)) {
 			if ($socid)
 				$sql .= " AND c.fk_soc = " . $socid;
 			$sql .= " ORDER BY $sortfield $sortorder ";
-			
+
 			// Calcul total qty and amount for global if full scan list
 			$total_ht = 0;
 			$total_qty = 0;
@@ -173,20 +173,20 @@ if ($id > 0 || ! empty($ref)) {
 					}
 				}
 			}
-			
+
 			$sql .= $db->plimit($conf->liste_limit + 1, $offset);
-			
+
 			$result = $db->query($sql);
 			if ($result) {
 				$num = $db->num_rows($result);
-				
+
 				if (! empty($id))
 					$option .= '&id=' . $product->id;
 				if (! empty($search_month))
 					$option .= '&search_month=' . $search_month;
 				if (! empty($search_year))
 					$option .= '&search_year=' . $search_year;
-				
+
 				print '' . "\n";
 				if (! empty($sortfield))
 					print '';
@@ -196,7 +196,7 @@ if ($id > 0 || ! empty($ref)) {
 					print '';
 					$option .= '&page=' . $page;
 				}
-				
+
 				print_barre_liste($langs->trans("SuppliersOrders"), $page, $_SERVER["PHP_SELF"], "&id=$product->id", $sortfield, $sortorder, '', $num, $totalrecords, '');
 				print '
';
 				print $langs->trans('Period') . ' (' . $langs->trans("OrderDate") . ') - ';
@@ -207,7 +207,7 @@ if ($id > 0 || ! empty($ref)) {
 				print '';
 				print '
';
 				print '
';
-				
+
 				$i = 0;
 				print '';
 				print '';
@@ -219,19 +219,19 @@ if ($id > 0 || ! empty($ref)) {
 				print_liste_field_titre($langs->trans("AmountHT"), $_SERVER["PHP_SELF"], "c.total_ht", "", $option, 'align="right"', $sortfield, $sortorder);
 				print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "c.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
 				print "\n";
-				
+
 				if ($num > 0) {
 					$var = True;
 					while ( $i < $num && $i < $conf->liste_limit ) {
 						$objp = $db->fetch_object($result);
 						$var = ! $var;
-						
+
 						print '';
 						print '\n";
 						$societestatic->fetch($objp->socid);
 						print '';
@@ -240,10 +240,10 @@ if ($id > 0 || ! empty($ref)) {
 						print dol_print_date($db->jdate($objp->date_commande)) . "";
 						print '\n";
 						print '\n";
-						print '';
+						print '';
 						print "\n";
 						$i ++;
-						
+
 						if (! empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 							$total_ht += $objp->total_ht;
 							$total_qty += $objp->qty;
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 189ead2eaa2..d098ca3399b 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -79,9 +79,9 @@ if ($id > 0 || ! empty($ref))
 
 	if ($result > 0)
 	{
-		$head=product_prepare_head($product,$user);
+		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
-		$picto=($product->type==1?'service':'product');
+		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 2ae8164b0f9..1f4e9b985e5 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -90,9 +90,9 @@ if ($id > 0 || ! empty($ref))
 
 	if ($result > 0)
 	{
-		$head=product_prepare_head($product, $user);
+		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
-		$picto=($product->type==1?'service':'product');
+		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
@@ -148,7 +148,7 @@ if ($id > 0 || ! empty($ref))
             if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
             if ($socid) $sql.= " AND f.fk_soc = ".$socid;
             $sql.= " ORDER BY $sortfield $sortorder ";
-            
+
             //Calcul total qty and amount for global if full scan list
             $total_ht=0;
             $total_qty=0;
@@ -163,21 +163,21 @@ if ($id > 0 || ! empty($ref))
             		}
             	}
             }
-            
+
             $sql.= $db->plimit($conf->liste_limit +1, $offset);
 
             $result = $db->query($sql);
-            if ($result) 
+            if ($result)
 			{
                 $num = $db->num_rows($result);
-                
+
                 if (! empty($id))
                 	$option .= '&id='.$product->id;
                 if (! empty($search_month))
                 	$option .= '&search_month='.$search_month;
                 if (! empty($search_year))
                 	$option .= '&search_year='.$search_year;
-                
+
                 print '' . "\n";
                 if (! empty($sortfield))
                 	print '';
@@ -187,7 +187,7 @@ if ($id > 0 || ! empty($ref))
                 	print '';
                 	$option .= '&page=' . $page;
                 }
-                
+
                 print_barre_liste($langs->trans("CustomersInvoices"),$page,$_SERVER["PHP_SELF"],"&id=".$product->id,$sortfield,$sortorder,'',$num,$totalrecords,'');
                 print '
';
                 print $langs->trans('Period').' ('.$langs->trans("DateInvoice") .') - ';
@@ -235,7 +235,7 @@ if ($id > 0 || ! empty($ref))
                         print '
';
                         print "\n";
                         $i++;
-                        
+
                         if (!empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
                         	$total_ht+=$objp->total_ht;
                         	$total_qty+=$objp->qty;
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 2e8e84621ba..debb0698c44 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -82,52 +82,52 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-	
+
 	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	
+
 	llxHeader("", "", $langs->trans("CardProduct" . $product->type));
-	
+
 	if ($result > 0)
 	{
-		$head = product_prepare_head($product, $user);
+		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
-		$picto = ($product->type == 1 ? 'service' : 'product');
+		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
-		
+
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		
+
 		print '
';
-						$commandestatic->id = $objp->commandeid;
-						$commandestatic->ref = $objp->ref;
-						$commandestatic->statut = $objp->statut;
-						print $commandestatic->getNomUrl(1);
+						$supplierorderstatic->id = $objp->commandeid;
+						$supplierorderstatic->ref = $objp->ref;
+						$supplierorderstatic->statut = $objp->statut;
+						print $supplierorderstatic->getNomUrl(1);
 						print "' . $societestatic->getNomUrl(1) . '' . $objp->qty . "' . price($objp->total_ht) . "' . $commandestatic->getLibStatut(4) . '' . $supplierorderstatic->getLibStatut(4) . '
'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'
';
-		
+
 		// Reference
 		print '';
 		print '';
 		print '';
-		
+
 		// Libelle
 		print '';
 		print '';
-		
+
 		// Status (to sell)
 		print '';
-		
+
 		// Status (to buy)
 		print '';
-		
+
 		show_stats_for_company($product, $socid);
-		
+
 		print "
' . $langs->trans("Ref") . '';
 		print $form->showrefnav($product, 'ref', '', 1, 'ref');
 		print '
' . $langs->trans("Label") . '' . $product->libelle . '
' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')';
 		print $product->getLibStatut(2, 0);
 		print '
' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')';
 		print $product->getLibStatut(2, 1);
 		print '
";
-		
+
 		print '
';
-		
+
 		if ($user->rights->fournisseur->facture->lire)
 		{
 			$sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, f.ref, d.total_ht as total_ht,";
@@ -142,14 +142,14 @@ if ($id > 0 || ! empty($ref))
 			$sql .= " AND f.entity = " . $conf->entity;
 			$sql .= " AND d.fk_facture_fourn = f.rowid";
 			$sql .= " AND d.fk_product =" . $product->id;
-			if (! empty($search_month))	
+			if (! empty($search_month))
 				$sql .= ' AND MONTH(f.datef) IN (' . $search_month . ')';
-			if (! empty($search_year)) 
+			if (! empty($search_year))
 				$sql .= ' AND YEAR(f.datef) IN (' . $search_year . ')';
 			if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
 			if ($socid) $sql .= " AND f.fk_soc = " . $socid;
 			$sql .= " ORDER BY $sortfield $sortorder ";
-			
+
 			// Calcul total qty and amount for global if full scan list
 			$total_ht = 0;
 			$total_qty = 0;
@@ -164,21 +164,21 @@ if ($id > 0 || ! empty($ref))
 					}
 				}
 			}
-			
+
 			$sql .= $db->plimit($conf->liste_limit + 1, $offset);
-			
+
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-				
+
 				if (! empty($id))
 					$option .= '&id=' . $product->id;
 				if (! empty($search_month))
 					$option .= '&search_month=' . $search_month;
 				if (! empty($search_year))
 					$option .= '&search_year=' . $search_year;
-				
+
 				print '' . "\n";
 				if (! empty($sortfield))
 					print '';
@@ -199,7 +199,7 @@ if ($id > 0 || ! empty($ref))
 				print '';
 				print '
';
 				print '';
-				
+
 				$i = 0;
 				print '';
 				print '';
@@ -211,7 +211,7 @@ if ($id > 0 || ! empty($ref))
 				print_liste_field_titre($langs->trans("AmountHT"), $_SERVER["PHP_SELF"], "f.total_ht", "", $option, 'align="right"', $sortfield, $sortorder);
 				print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
 				print "\n";
-				
+
 				if ($num > 0)
 				{
 					$var = True;
@@ -219,7 +219,7 @@ if ($id > 0 || ! empty($ref))
 					{
 						$objp = $db->fetch_object($result);
 						$var = ! $var;
-						
+
 						print '';
 						print '';
 						print "\n";
 						$i ++;
-						
+
 						if (! empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 							$total_ht += $objp->total_ht;
 							$total_qty += $objp->qty;
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 10fd8247204..1776ba571e0 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -80,52 +80,52 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-	
+
 	$parameters = array ('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	
+
 	llxHeader("", "", $langs->trans("CardProduct" . $product->type));
-	
+
 	if ($result > 0)
 	{
-		$head = product_prepare_head($product, $user);
+		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
-		$picto = ($product->type == 1 ? 'service' : 'product');
+		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
-		
+
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		
+
 		print '
';
 						$supplierinvoicestatic->id = $objp->facid;
@@ -236,7 +236,7 @@ if ($id > 0 || ! empty($ref))
 						print '' . $supplierinvoicestatic->LibStatut($objp->paye, $objp->statut, 5) . '
';
-		
+
 		// Reference
 		print '';
 		print '';
 		print '';
-		
+
 		// Libelle
 		print '';
 		print '';
-		
+
 		// Status (to sell)
 		print '';
-		
+
 		// Status (to buy)
 		print '';
-		
+
 		show_stats_for_company($product, $socid);
-		
+
 		print "
' . $langs->trans("Ref") . '';
 		print $form->showrefnav($product, 'ref', '', 1, 'ref');
 		print '
' . $langs->trans("Label") . '' . $product->libelle . '
' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')';
 		print $product->getLibStatut(2, 0);
 		print '
' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')';
 		print $product->getLibStatut(2, 1);
 		print '
";
-		
+
 		print '';
-		
+
 		if ($user->rights->propale->lire) {
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,";
 			$sql .= " p.ref_client,";
@@ -150,7 +150,7 @@ if ($id > 0 || ! empty($ref))
 			if ($socid)
 				$sql .= " AND p.fk_soc = " . $socid;
 			$sql .= " ORDER BY $sortfield $sortorder ";
-			
+
 			// Calcul total qty and amount for global if full scan list
 			$total_ht = 0;
 			$total_qty = 0;
@@ -165,21 +165,21 @@ if ($id > 0 || ! empty($ref))
 					}
 				}
 			}
-			
+
 			$sql .= $db->plimit($conf->liste_limit + 1, $offset);
-			
+
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-				
+
 				if (! empty($id))
 					$option .= '&id=' . $product->id;
 				if (! empty($search_month))
 					$option .= '&search_month=' . $search_month;
 				if (! empty($search_year))
 					$option .= '&search_year=' . $search_year;
-				
+
 				print '' . "\n";
 				if (! empty($sortfield))
 					print '';
@@ -189,7 +189,7 @@ if ($id > 0 || ! empty($ref))
 					print '';
 					$option .= '&page=' . $page;
 				}
-				
+
 				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], "&id=$product->id", $sortfield, $sortorder, '', $num, $totalrecords, '');
 				print '
';
 				print $langs->trans('Period') . ' (' . $langs->trans("DatePropal") . ') - ';
@@ -200,7 +200,7 @@ if ($id > 0 || ! empty($ref))
 				print '';
 				print '
';
 				print '';
-				
+
 				$i = 0;
 				print '';
 				print '';
@@ -211,7 +211,7 @@ if ($id > 0 || ! empty($ref))
 				print_liste_field_titre($langs->trans("AmountHT"), $_SERVER["PHP_SELF"], "p.total", "", $option, 'align="right"', $sortfield, $sortorder);
 				print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "p.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
 				print "\n";
-				
+
 				if ($num > 0)
 				{
 					$var = True;
@@ -219,7 +219,7 @@ if ($id > 0 || ! empty($ref))
 					{
 						$objp = $db->fetch_object($result);
 						$var = ! $var;
-						
+
 						print '';
 						print '';
 						print "\n";
 						$i ++;
-						
+
 						if (! empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 							$total_ht += $objp->total_ht;
 							$total_qty += $objp->qty;
 						}
 					}
-				}		
+				}
 			print '';
 			print '';
 			print '';
@@ -251,12 +251,12 @@ if ($id > 0 || ! empty($ref))
 			print '';
 			print "
';
 						$propalstatic->id=$objp->propalid;
@@ -236,13 +236,13 @@ if ($id > 0 || ! empty($ref))
 						print '' . $propalstatic->LibStatut($objp->statut, 5) . '
' . $langs->trans('Total') . '
";
 			print '';
-			print '
';		
+			print '
';
 		} else {
 			dol_print_error($db);
 		}
 		$db->free($result);
-		}		
+		}
 	}
 } else {
 	dol_print_error();
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 1994b4ad6c2..2e9fcfab68e 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -67,16 +67,16 @@ class MouvementStock extends CommonObject
 	 *	@param		date	$eatby			eat-by date
 	 *	@param		date	$sellby			sell-by date
 	 *	@param		string	$batch			batch number
-	 *	@param		boolean	$skip_sellby	If set to true, stock mouvement is done without impacting batch record
+	 *	@param		boolean	$skip_batch		If set to true, stock movement is done without impacting batch record
 	 *	@return		int						<0 if KO, 0 if fk_product is null, >0 if OK
 	 */
-	function _create($user, $fk_product, $entrepot_id, $qty, $type, $price=0, $label='', $inventorycode='', $datem='',$eatby='',$sellby='',$batch='',$skip_sellby=false)
+	function _create($user, $fk_product, $entrepot_id, $qty, $type, $price=0, $label='', $inventorycode='', $datem='',$eatby='',$sellby='',$batch='',$skip_batch=false)
 	{
 		global $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$error = 0;
-		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode");
+		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch);
 
 		// Clean parameters
 		if (empty($price)) $price=0;
@@ -84,6 +84,16 @@ class MouvementStock extends CommonObject
 
 		// Check parameters
 		if (empty($fk_product)) return 0;
+		if ($eatby < 0)
+		{
+			$this->errors[]='ErrorBadValueForParameterEatBy';
+			return -1;
+		}
+		if ($sellby < 0)
+		{
+			$this->errors[]='ErrorBadValueForParameterEatBy';
+			return -1;
+		}
 
 		// Set properties of movement
 		$this->product_id = $fk_product;
@@ -91,7 +101,7 @@ class MouvementStock extends CommonObject
 		$this->qty = $qty;
 		$this->type = $type;
 
-		$this->db->begin();
+		$mvid = 0;
 
 		$product = new Product($this->db);
 		$result=$product->fetch($fk_product);
@@ -100,24 +110,74 @@ class MouvementStock extends CommonObject
 			dol_print_error('',"Failed to fetch product");
 			return -1;
 		}
+
+		$this->db->begin();
+
 		$product->load_stock();
 
 		// Test if product require batch data. If yes, and there is not, we throw an error.
-		if ($product->hasbatch() && ! $skip_sellby)
+		if (! empty($conf->productbatch->enabled) && $product->hasbatch() && ! $skip_batch)
 		{
-			if (empty($batch) && empty($eatby) && empty($sellby))
+			//if (empty($batch) && empty($eatby) && empty($sellby))
+			if (empty($batch))
 			{
-				$this->errors[]="ErrorTryToMakeMoveOnProductRequiringBatchData";
+				$this->errors[]=$langs->trans("ErrorTryToMakeMoveOnProductRequiringBatchData", $product->name);
 				dol_syslog("Try to make a movement of a product with status_batch on without any batch data");
 
 				$this->db->rollback();
 				return -2;
 			}
+
+			// If a serial number is provided, we check that sellby and eatby match already existing serial
+			$sql = "SELECT pb.rowid, pb.batch, pb.eatby, pb.sellby FROM ".MAIN_DB_PREFIX."product_batch as pb, ".MAIN_DB_PREFIX."product_stock as ps";
+			$sql.= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".$fk_product." AND pb.batch = '".$this->db->escape($batch)."'";
+            dol_syslog(get_class($this)."::_create scan serial for this product to check if eatby and sellby match", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+            	$num = $this->db->num_rows($resql);
+            	$i=0;
+            	while ($i < $num)
+            	{
+            		$obj = $this->db->fetch_object($resql);
+            		if ($this->db->jdate($obj->eatby) != $eatby)
+            		{
+						$this->errors[]=$langs->trans("ThisSerialAlreadyExistWithDifferentDate", $batch, $this->db->jdate($obj->eatby), $eatby);
+						dol_syslog($langs->trans("ThisSerialAlreadyExistWithDifferentDate", $batch, $this->db->jdate($obj->eatby), $eatby));
+						$this->db->rollback();
+            			return -3;
+            		}
+            		if ($this->db->jdate($obj->sellby) != $sellby)
+            		{
+						$this->errors[]=$langs->trans("ThisSerialAlreadyExistWithDifferentDate", $batch, $this->db->jdate($obj->sellby), $sellby);
+						dol_syslog($langs->trans("ThisSerialAlreadyExistWithDifferentDate", $batch, $this->db->jdate($obj->sellby), $sellby));
+						$this->db->rollback();
+            			return -3;
+            		}
+            		$i++;
+            	}
+            }
+            else
+			{
+            	dol_print_error($this->db);
+            	$this->db->rollback();
+            	return -1;
+			}
+		}
+
+		// TODO Check qty is ok for stock move.
+		if (! empty($conf->productbatch->enabled) && $product->hasbatch() && ! $skip_batch)
+		{
+
+		}
+		else
+		{
+
 		}
 
 		// Define if we must make the stock change (If product type is a service or if stock is used also for services)
 		$movestock=0;
-		if ($product->type != 1 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock=1;
+		if ($product->type != Product::TYPE_SERVICE || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock=1;
 
 		if ($movestock && $entrepot_id > 0)	// Change stock for current product, change for subproduct is done after
 		{
@@ -129,8 +189,6 @@ class MouvementStock extends CommonObject
 				$fk_origin = 0;
 			}
 
-			$mvid = 0;
-
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."stock_mouvement(";
 			$sql.= " datem, fk_product, batch, eatby, sellby,";
 			$sql.= " fk_entrepot, value, type_mouvement, fk_user_author, label, inventorycode, price, fk_origin, origintype";
@@ -157,7 +215,7 @@ class MouvementStock extends CommonObject
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->errors[]=$this->db->lasterror();
 				$error = -1;
 			}
 
@@ -190,7 +248,7 @@ class MouvementStock extends CommonObject
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->errors[]=$this->db->lasterror();
 					$error = -2;
 				}
 			}
@@ -212,7 +270,7 @@ class MouvementStock extends CommonObject
 					$resql=$this->db->query($sql);
 					if (! $resql)
 					{
-						$this->error=$this->db->lasterror();
+						$this->errors[]=$this->db->lasterror();
 						$error = -4;
 					}
 			*/
@@ -266,7 +324,7 @@ class MouvementStock extends CommonObject
 				$resql=$this->db->query($sql);
 				if (! $resql)
 				{
-					$this->error=$this->db->lasterror();
+					$this->errors[]=$this->db->lasterror();
 					$error = -3;
 				}
 				else if(empty($fk_product_stock))
@@ -276,8 +334,8 @@ class MouvementStock extends CommonObject
 
 			}
 
-			// Update detail stock for sell-by date
-			if (($product->hasbatch()) && (! $error) && (! $skip_sellby))
+			// Update detail stock for batch product
+			if (! $error && ! empty($conf->productbatch->enabled) && $product->hasbatch() && ! $skip_batch)
 			{
 				$param_batch=array('fk_product_stock' =>$fk_product_stock, 'eatby'=>$eatby, 'sellby'=>$sellby, 'batchnumber'=>$batch);
 				$result=$this->_create_batch($param_batch, $qty);
@@ -296,7 +354,7 @@ class MouvementStock extends CommonObject
 				$resql=$this->db->query($sql);
 				if (! $resql)
 				{
-					$this->error=$this->db->lasterror();
+					$this->errors[]=$this->db->lasterror();
 					$error = -4;
 				}
 			}
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index dc394f898dc..aacdedc3668 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -27,6 +27,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
 $langs->load("stocks");
+$langs->load("productbatch");
 
 // Security check
 $result=restrictedArea($user,'stock');
@@ -112,7 +113,7 @@ print '
';
 $max=10;
 $sql = "SELECT p.rowid, p.label as produit,";
 $sql.= " e.label as stock, e.rowid as entrepot_id,";
-$sql.= " m.value, m.datem";
+$sql.= " m.value as qty, m.datem, m.batch, m.eatby, m.sellby";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= ", ".MAIN_DB_PREFIX."stock_mouvement as m";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";
@@ -133,6 +134,12 @@ if ($resql)
 	print "";
 	print ''.$langs->trans("LastMovements",min($num,$max)).'';
 	print ''.$langs->trans("Product").'';
+	if (! empty($conf->productbatch->enabled))
+	{
+		print ''.$langs->trans("Batch").'';
+		print ''.$langs->trans("l_eatby").'';
+		print ''.$langs->trans("l_sellby").'';
+	}
 	print ''.$langs->trans("Warehouse").'';
 	print ''.$langs->trans("FullList").'';
 	print "\n";
@@ -148,12 +155,18 @@ if ($resql)
 		print "rowid\">";
 		print img_object($langs->trans("ShowProduct"),"product").' '.$objp->produit;
 		print "\n";
+		if (! empty($conf->productbatch->enabled))
+		{
+			print ''.$objp->batch.'';
+			print ''.dol_print_date($db->jdate($objp->eatby),'day').'';
+			print ''.dol_print_date($db->jdate($objp->sellby),'day').'';
+		}
 		print '';
 		print img_object($langs->trans("ShowWarehouse"),"stock").' '.$objp->stock;
 		print "\n";
 		print '';
-		if ($objp->value > 0) print '+';
-		print $objp->value.'';
+		if ($objp->qty > 0) print '+';
+		print $objp->qty.'';
 		print "\n";
 		$i++;
 	}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index f6417b389e1..fcc7412c061 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -1,6 +1,6 @@
 
- * Copyright (C) 2004-2014	Laurent Destailleur		
+ * Copyright (C) 2004-2015	Laurent Destailleur		
  * Copyright (C) 2005-2014	Regis Houssin			
  *
  * This program is free software; you can redistribute it and/or modify
@@ -51,6 +51,8 @@ $year = strftime("%Y",time());
  *	View
  */
 
+$form=new Form($db);
+
 $sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays,";
 $sql.= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
@@ -118,7 +120,11 @@ if ($result)
             // Selling value
             print '';
             if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue,'MT'),1);
-            else print $langs->trans("Variable");
+            else
+			{
+				$htmltext=$langs->trans("OptionMULTIPRICESIsOn");
+            	print $form->textwithtooltip($langs->trans("Variable"),$htmltext);
+			}
             print '';
             // Status
             print ''.$entrepot->LibStatut($objp->statut,5).'';
@@ -134,7 +140,14 @@ if ($result)
 		print '';
         print ''.$langs->trans("Total").'';
         print ''.price(price2num($total,'MT'),1,$langs,0,0,-1,$conf->currency).'';
-        print ''.price(price2num($totalsell,'MT'),1,$langs,0,0,-1,$conf->currency).'';
+        print '';
+		if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($totalsell,'MT'),1,$langs,0,0,-1,$conf->currency);
+        else
+		{
+			$htmltext=$langs->trans("OptionMULTIPRICESIsOn");
+           	print $form->textwithtooltip($langs->trans("Variable"),$htmltext);
+		}
+        print '';
         print ' ';
         print "\n";
 	}
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 8a0b7297e2f..7b3d41c9911 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -1,6 +1,6 @@
 
- * Copyright (C) 2014	Regis Houssin		
+/* Copyright (C) 2013-2015 Laurent Destaileur	
+ * Copyright (C) 2014	   Regis Houssin		
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,6 +47,7 @@ $action = GETPOST('action','alpha');
 $id_product = GETPOST('productid', 'int');
 $id_sw = GETPOST('id_sw', 'int');
 $id_tw = GETPOST('id_tw', 'int');
+$batch = GETPOST('batch');
 $qty = GETPOST('qty');
 $idline = GETPOST('idline');
 
@@ -79,11 +80,6 @@ if ($action == 'addline')
 		$error++;
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Product")),'errors');
 	}
-	if (! $qty)
-	{
-		$error++;
-	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Qty")),'errors');
-	}
 	if (! ($id_sw > 0))
 	{
 		$error++;
@@ -100,12 +96,47 @@ if ($action == 'addline')
 		$langs->load("errors");
 		setEventMessage($langs->trans("ErrorWarehouseMustDiffers"),'errors');
 	}
+	if (! $qty)
+	{
+		$error++;
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Qty")),'errors');
+	}
+
+	// Check a batch number is provided if product need it
+	if (! $error)
+	{
+		$producttmp=new Product($db);
+		$producttmp->fetch($id_product);
+		if ($producttmp->hasbatch())
+		{
+			if (empty($batch))
+			{
+				$error++;
+				setEventMessage($langs->trans("ErrorTryToMakeMoveOnProductRequiringBatchData"), 'errors');
+			}
+		}
+	}
+
+	// TODO Check qty is ok for stock move. Note qty may not be enough yet, but we make a check now to report a warning.
+	// What is important is to have qty when doing action 'createmovements'
+	if (! $error)
+	{
+		// Warning, don't forget lines already added into the $_SESSION['massstockmove']
+		if ($producttmp->hasbatch())
+		{
+
+		}
+		else
+		{
+
+		}
+	}
 
 	if (! $error)
 	{
 		if (count(array_keys($listofdata)) > 0) $id=max(array_keys($listofdata)) + 1;
 		else $id=1;
-		$listofdata[$id]=array('id'=>$id, 'id_product'=>$id_product, 'qty'=>$qty, 'id_sw'=>$id_sw, 'id_tw'=>$id_tw);
+		$listofdata[$id]=array('id'=>$id, 'id_product'=>$id_product, 'qty'=>$qty, 'id_sw'=>$id_sw, 'id_tw'=>$id_tw, 'batch'=>$batch);
 		$_SESSION['massstockmove']=json_encode($listofdata);
 
 		unset($id_product);
@@ -145,6 +176,9 @@ if ($action == 'createmovements')
 			$id_sw=$val['id_sw'];
 			$id_tw=$val['id_tw'];
 			$qty=price2num($val['qty']);
+			$batch=$val['batch'];
+			$dlc=-1;		// They are loaded later from serial
+			$dluo=-1;		// They are loaded later from serial
 
 			if (! $error && $id_sw <> $id_tw && is_numeric($qty) && $id_product)
 			{
@@ -154,39 +188,98 @@ if ($action == 'createmovements')
 
 				// Define value of products moved
 				$pricesrc=0;
-				if (isset($product->stock_warehouse[$id_sw]->pmp)) $pricesrc=$product->stock_warehouse[$id_sw]->pmp;
+				if (! empty($product->pmp)) $pricesrc=$product->pmp;
 				$pricedest=$pricesrc;
 
 				//print 'price src='.$pricesrc.', price dest='.$pricedest;exit;
 
-				// Remove stock
-				$result1=$product->correct_stock(
-	    			$user,
-	    			$id_sw,
-	    			$qty,
-	    			1,
-	    			GETPOST("label"),
-	    			$pricesrc
-				);
-				if ($result1 < 0)
+				if (empty($conf->productbatch->enabled) || ! $product->hasbatch())		// If product does not need lot/serial
 				{
-					$error++;
-					setEventMessage($product->errors,'errors');
-				}
+					// Remove stock
+					$result1=$product->correct_stock(
+		    			$user,
+		    			$id_sw,
+		    			$qty,
+		    			1,
+		    			GETPOST("label"),
+		    			$pricesrc,
+						GETPOST("codemove")
+					);
+					if ($result1 < 0)
+					{
+						$error++;
+						setEventMessage($product->errors,'errors');
+					}
 
-				// Add stock
-				$result2=$product->correct_stock(
-	    			$user,
-	    			$id_tw,
-	    			$qty,
-	    			0,
-	    			GETPOST("label"),
-	    			$pricedest
-				);
-				if ($result2 < 0)
+					// Add stock
+					$result2=$product->correct_stock(
+		    			$user,
+		    			$id_tw,
+		    			$qty,
+		    			0,
+		    			GETPOST("label"),
+		    			$pricedest,
+						GETPOST("codemove")
+					);
+					if ($result2 < 0)
+					{
+						$error++;
+						setEventMessage($product->errors,'errors');
+					}
+				}
+				else
 				{
-					$error++;
-					setEventMessage($product->errors,'errors');
+					$arraybatchinfo=$product->loadBatchInfo($batch);
+					if (count($arraybatchinfo) > 0)
+					{
+						$firstrecord = array_shift($arraybatchinfo);
+						$dlc=$firstrecord['eatby'];
+						$dluo=$firstrecord['sellby'];
+						//var_dump($batch); var_dump($arraybatchinfo); var_dump($firstrecord); var_dump($dlc); var_dump($dluo); exit;
+					}
+					else
+					{
+						$dlc='';
+						$dluo='';
+					}
+
+					// Remove stock
+					$result1=$product->correct_stock_batch(
+		    			$user,
+		    			$id_sw,
+		    			$qty,
+		    			1,
+		    			GETPOST("label"),
+		    			$pricesrc,
+						$dlc,
+						$dluo,
+						$batch,
+						GETPOST("codemove")
+					);
+					if ($result1 < 0)
+					{
+						$error++;
+						setEventMessage($product->errors,'errors');
+					}
+
+					// Add stock
+					$result2=$product->correct_stock_batch(
+		    			$user,
+		    			$id_tw,
+		    			$qty,
+		    			0,
+		    			GETPOST("label"),
+		    			$pricedest,
+						$dlc,
+						$dluo,
+						$batch,
+						GETPOST("codemove")
+					);
+					if ($result2 < 0)
+					{
+						$error++;
+						setEventMessage($product->errors,'errors');
+					}
 				}
 			}
 			else
@@ -254,6 +347,10 @@ $param='';
 
 print '';
 print getTitleFieldOfList($langs->trans('ProductRef'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder);
+if ($conf->productbatch->enabled)
+{
+	print getTitleFieldOfList($langs->trans('Batch'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder);
+}
 print getTitleFieldOfList($langs->trans('WarehouseSource'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder);
 print getTitleFieldOfList($langs->trans('WarehouseTarget'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder);
 print getTitleFieldOfList($langs->trans('Qty'),0,$_SERVER["PHP_SELF"],'',$param,'','align="center" class="tagtd"',$sortfield,$sortorder);
@@ -276,6 +373,13 @@ else
 }
 print $form->select_produits($id_product,'productid',$filtertype,$limit);
 print '';
+// Batch number
+if ($conf->productbatch->enabled)
+{
+	print '';
+	print '';
+	print '';
+}
 // In warehouse
 print '';
 print $formproduct->selectWarehouses($id_sw,'id_sw','',1);
@@ -301,13 +405,16 @@ foreach($listofdata as $key => $val)
 	$warehousestatict->fetch($val['id_tw']);
 
 	print '';
-	print ''.$productstatic->getNomUrl(1).'';
 	print '';
-	$oldref=$productstatic->ref;
-	$productstatic->ref=$productstatic->label;
 	print $productstatic->getNomUrl(1);
-	$productstatic->ref=$oldref;
+	print ' - '.$productstatic->label;
 	print '';
+	if ($conf->productbatch->enabled)
+	{
+		print '';
+		print $val['batch'];
+		print '';
+	}
 	print '';
 	print $warehousestatics->getNomUrl(1);
 	print '';
@@ -333,9 +440,16 @@ print '';
 print '';
 
 // Button to record mass movement
+$codemove=GETPOST('codemove');
 $labelmovement=GETPOST("label")?GETPOST('label'):$langs->trans("StockTransfer").' '.dol_print_date($now,'%Y-%m-%d %H:%M');
 
 print '';
+	print '';
+	print '';
+	print '';
+	print '';
 	print '';
 	print '';
 	print '';
-		print '';
-		print '';
+	    print_liste_field_titre($langs->trans("BatchNumberShort"),$_SERVER["PHP_SELF"],'m.batch','',$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("l_eatby"),$_SERVER["PHP_SELF"],'m.eatby','',$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("l_sellby"),$_SERVER["PHP_SELF"],'m.sellby','',$param,'align="center"',$sortfield,$sortorder);
 	}
     print_liste_field_titre($langs->trans("Warehouse"),$_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder);	// We are on a specific warehouse card, no filter on other should be possible
     print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"], "m.fk_user_author","",$param,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("InventoryCode"),$_SERVER["PHP_SELF"], "m.inventorycode","",$param,"",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("InventoryCodeShort"),$_SERVER["PHP_SELF"], "m.inventorycode","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("LabelMovement"),$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Units"),$_SERVER["PHP_SELF"], "m.value","",$param,'align="right"',$sortfield,$sortorder);
@@ -473,13 +459,13 @@ if ($resql)
     // Batch
 	if (! empty($conf->productbatch->enabled))
 	{
-		print '';
+		print '';
 		print '';
 		print '';
 	}
     // Warehouse
     print '';
     // Author
     print '';
     // Label of movement
     print '';
     // Origin of movement
     print '';
+	    		print '';
 	            print '';
 	            print '';
 		}
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 044da6c9aa4..40d9ef7e060 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -5,8 +5,9 @@
  * Copyright (C) 2005      Simon TOSSER         
  * Copyright (C) 2005-2009 Regis Houssin        
  * Copyright (C) 2013      Cédric Salvador      
- * Copyright (C) 2013      Juanjo Menent	    
+ * Copyright (C) 2013-2015 Juanjo Menent	    
  * Copyright (C) 2014-2015 Cédric Gross         
+ * Copyright (C) 2015      Marcos García        
  *
  * 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
@@ -383,9 +384,9 @@ if ($id > 0 || $ref)
 
 	if ($result > 0)
 	{
-		$head=product_prepare_head($product, $user);
+		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
-		$picto=($product->type==1?'service':'product');
+		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
 		dol_fiche_head($head, 'stock', $titre, 0, $picto);
 
 		dol_htmloutput_events();
@@ -431,7 +432,9 @@ if ($id > 0 || $ref)
 
 		// PMP
 		print '';
-		print '';
+		print '';
 		print '';
 
 		// Minimum Price
@@ -540,7 +543,8 @@ if ($id > 0 || $ref)
         }
 
         // Number of supplier order running
-        if (! empty($conf->fournisseur->enabled)) {
+        if (! empty($conf->fournisseur->enabled))
+        {
             if ($found) print '
'; else $found=1;
             $result=$product->load_stats_commande_fournisseur(0,'3,4');
             print $langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$product->stats_commande_fournisseur['qty'];
@@ -550,7 +554,8 @@ if ($id > 0 || $ref)
         }
 
 	    // Number of product from supplier order already received (partial receipt)
-        if (! empty($conf->fournisseur->enabled)) {
+        if (! empty($conf->fournisseur->enabled))
+        {
             if ($found) print '
'; else $found=1;
             print $langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$product->stats_reception['qty'];
         }
@@ -800,7 +805,7 @@ if (empty($action) && $product->id)
 {
     print "
\n";
 
-    if ($user->rights->stock->creer)
+    if ($user->rights->stock->mouvement->creer)
     {
         print ''.$langs->trans("StockCorrection").'';
     }
@@ -818,8 +823,9 @@ if (empty($action) && $product->id)
 
 
 /*
- * Stock detail
+ * Stock detail (by warehouse). Do not go down into batch.
  */
+
 print '
'.$langs->trans("InventoryCode").'';
+	print '';
+	print '
'.$langs->trans("LabelMovement").'';
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 44cf9df493f..a27713d8b0f 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -1,7 +1,8 @@
 
- * Copyright (C) 2004-2013	Laurent Destailleur		
+ * Copyright (C) 2004-2015	Laurent Destailleur		
  * Copyright (C) 2005-2014	Regis Houssin			
+ * Copyright (C) 2015		Juanjo Menent			
  *
  * 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
@@ -52,6 +53,7 @@ $search_product = trim(GETPOST("search_product"));
 $search_warehouse = trim(GETPOST("search_warehouse"));
 $search_inventorycode = trim(GETPOST("search_inventorycode"));
 $search_user = trim(GETPOST("search_user"));
+$search_batch = trim(GETPOST("search_batch"));
 $page = GETPOST("page",'int');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -70,6 +72,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
     $search_product="";
     $search_warehouse="";
     $search_user="";
+    $search_batch="";
     $sall="";
 }
 
@@ -147,34 +150,17 @@ else if ($year > 0)
 {
     $sql.= " AND m.datem BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 }
-if (! empty($search_movement))
-{
-    $sql.= " AND m.label LIKE '%".$db->escape($search_movement)."%'";
-}
-if (! empty($search_inventorycode))
-{
-    $sql.= " AND m.inventorycode LIKE '%".$db->escape($search_inventorycode)."%'";
-}
-if (! empty($search_product_ref))
-{
-    $sql.= " AND p.ref LIKE '%".$db->escape($search_product_ref)."%'";
-}
-if (! empty($search_product))
-{
-    $sql.= " AND p.label LIKE '%".$db->escape($search_product)."%'";
-}
-if (! empty($search_warehouse))
-{
-    $sql.= " AND e.label LIKE '%".$db->escape($search_warehouse)."%'";
-}
-if (! empty($search_user))
-{
-    $sql.= " AND u.login LIKE '%".$db->escape($search_user)."%'";
-}
 if ($idproduct > 0)
 {
     $sql.= " AND p.rowid = '".$idproduct."'";
 }
+if (! empty($search_movement))      $sql.= " AND m.label LIKE '%".$db->escape($search_movement)."%'";
+if (! empty($search_inventorycode)) $sql.= " AND m.inventorycode LIKE '%".$db->escape($search_inventorycode)."%'";
+if (! empty($search_product_ref))   $sql.= " AND p.ref LIKE '%".$db->escape($search_product_ref)."%'";
+if (! empty($search_product))       $sql.= " AND p.label LIKE '%".$db->escape($search_product)."%'";
+if (! empty($search_warehouse))     $sql.= " AND e.label LIKE '%".$db->escape($search_warehouse)."%'";
+if (! empty($search_user))          $sql.= " AND u.login LIKE '%".$db->escape($search_user)."%'";
+if (! empty($search_batch))         $sql.= " AND m.batch LIKE '%".$db->escape($search_batch)."%'";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit+1, $offset);
 
@@ -400,7 +386,7 @@ if ($resql)
     {
         print "
\n";
 
-        if ($user->rights->stock->creer)
+        if ($user->rights->stock->mouvement->creer)
         {
             print ''.$langs->trans("StockCorrection").'';
         }
@@ -439,13 +425,13 @@ if ($resql)
 	if (! empty($conf->productbatch->enabled))
 	{
 		$langs->load("productbatch");
-	    print '
'.$langs->trans("batch_number").''.$langs->trans("l_eatby").''.$langs->trans("l_sellby").'';
-    print '';
+    print '';
     print '';
@@ -491,7 +477,7 @@ if ($resql)
     print '';
-    print '';
+    print '';
     print '';
@@ -543,7 +529,7 @@ if ($resql)
         // Batch
     	if (! empty($conf->productbatch->enabled))
 		{
-	    		print ''.$objp->batch.''.$objp->batch.''. dol_print_date($objp->eatby,'day') .''. dol_print_date($objp->sellby,'day') .'
'.$langs->trans("AverageUnitPricePMP").''.price($product->pmp).' '.$langs->trans("HT").'';
+		if ($product->pmp > 0) print price($product->pmp).' '.$langs->trans("HT");
+		print '
';
 print '';
 print '';
@@ -867,9 +873,9 @@ if ($resql)
 		print '';
 		print '';
 		// PMP
-		print ''; // Ditto : Show PMP from movement or from product
+		print '';
 		// Value purchase
-		print ''; // Ditto : Show PMP from movement or from product
+		print '';
         // Sell price
 		print '';
         // Value sell
         print ''; // Ditto : Show PMP from movement or from product
+        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT'),1).'';
         else print $langs->trans("Variable");
 		print ''; ;
 		$total += $obj->reel;
 		if (price2num($product->pmp)) $totalwithpmp += $obj->reel;
-		$totalvalue = $totalvalue + ($product->pmp*$obj->reel); // Ditto : Show PMP from movement or from product
-        $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel); // Ditto : Show PMP from movement or from product
+		$totalvalue = $totalvalue + ($product->pmp*$obj->reel);
+        $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel);
 		//Batch Detail
 		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch())
 		{
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 289c3c31457..0f935c0154c 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -536,9 +536,11 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		//virtual stock to compute the stock to buy value
 		$stocktobuy = max(max($objp->desiredstock, $objp->alertstock) - $stock - $ordered, 0);
 		$disabled = '';
-		if($ordered > 0) {
-			$compare = $usevirtualstock ? $stock : $stock + $ordered;
-			if($compare >= $objp->desiredstock) {
+		if ($ordered > 0)
+		{
+			$stockforcompare = $usevirtualstock ? $stock : $stock + $ordered;
+			if ($stockforcompare >= $objp->desiredstock)
+			{
 				$picto = img_picto('', './img/yes', '', 1);
 				$disabled = 'disabled="disabled"';
 			}
@@ -546,7 +548,8 @@ while ($i < ($limit ? min($num, $limit) : $num))
 				$picto = img_picto('', './img/no', '', 1);
 			}
 		} else {
-			$picto = img_picto('', './img/no', '', 1);
+			//$picto = img_help('',$langs->trans("NoPendingReceptionOnSupplierOrder"));
+			$picto = img_picto($langs->trans("NoPendingReceptionOnSupplierOrder"), './img/no', '', 1);
 		}
 
 		print '';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 6f5cb7ae578..871ec4d30f1 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -31,7 +31,7 @@ $langs->load("stocks");
 // Security check
 $result=restrictedArea($user,'stock');
 
-$sref=GETPOST("sref");;
+$sref=GETPOST("sref");
 $snom=GETPOST("snom");
 $sall=GETPOST("sall");
 
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 34b38fe8919..413cb589dff 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -143,7 +143,7 @@ $cancel != $langs->trans("Cancel") &&
 	$product->fetch($id);
 	$langtodelete=GETPOST('langdel','alpha');
 
-	
+
 	if ( $product->delMultiLangs($langtodelete) > 0 )
 	{
 		$action = '';
@@ -168,9 +168,9 @@ llxHeader("","",$langs->trans("Translation"));
 $form = new Form($db);
 $formadmin=new FormAdmin($db);
 
-$head=product_prepare_head($product, $user);
+$head=product_prepare_head($product);
 $titre=$langs->trans("CardProduct".$product->type);
-$picto=($product->type==1?'service':'product');
+$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
 dol_fiche_head($head, 'translation', $titre, 0, $picto);
 
 print '
'.$langs->trans("Warehouse").''.$langs->trans("NumberOfUnit").''.$entrepotstatic->getNomUrl(1).''.$obj->reel.($obj->reel<0?' '.img_warning():'').''.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').''.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').''.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').''.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').'';
         if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1);
@@ -877,13 +883,13 @@ if ($resql)
         print '';
-        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT'),1).'
';
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index f98a393e188..845e99e54a0 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -55,7 +55,7 @@ if ($mine) $title=$langs->trans("MyActivities");
 
 llxHeader("",$title);
 
-print_fiche_titre($title);
+print_fiche_titre($title, '', 'title_project');
 
 if ($mine) print $langs->trans("MyTasksDesc").'

';
 else
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 9c55874a762..0a6c1ae5d2d 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -48,11 +48,33 @@ $socid=0;
 if ($user->societe_id > 0) $socid=$user->societe_id;
 $result = restrictedArea($user, 'projet', $projectid);
 
+$now=dol_now();
+$nowtmp=dol_getdate($now);
+$nowday=$nowtmp['mday'];
+$nowmonth=$nowtmp['mon'];
+$nowyear=$nowtmp['year'];
+
+$year=GETPOST('reyear')?GETPOST('reyear'):(GETPOST("year","int")?GETPOST("year","int"):date("Y"));
+$month=GETPOST('remonth')?GETPOST('remonth'):(GETPOST("month","int")?GETPOST("month","int"):date("m"));
+$day=GETPOST('reday')?GETPOST('reday'):(GETPOST("day","int")?GETPOST("day","int"):date("d"));
+$day = (int) $day;
+$week=GETPOST("week","int")?GETPOST("week","int"):date("W");
+
+$daytoparse = $now;
+if ($year && $month && $day) $daytoparse=dol_mktime(0, 0, 0, $month, $day, $year);
+
 
 /*
  * Actions
  */
 
+if (GETPOST('submitdateselect'))
+{
+	$daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+
+	$action = '';
+}
+
 if ($action == 'addtime' && $user->rights->projet->creer)
 {
     $task = new Task($db);
@@ -133,6 +155,16 @@ $projectstatic=new Project($db);
 $project = new Project($db);
 $taskstatic = new Task($db);
 
+$prev = dol_getdate($daytoparse - (24 * 3600));
+$prev_year  = $prev['year'];
+$prev_month = $prev['mon'];
+$prev_day   = $prev['mday'];
+
+$next = dol_getdate($daytoparse + (24 * 3600));
+$next_year  = $next['year'];
+$next_month = $next['mon'];
+$next_day   = $next['mday'];
+
 $title=$langs->trans("TimeSpent");
 if ($mine) $title=$langs->trans("MyTimeSpent");
 
@@ -157,10 +189,21 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$usertoprocess,($projec
 
 llxHeader("",$title,"");
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
 
 
-print '';
+// Show navigation bar
+$nav ="".img_previous($langs->trans("Previous"))."\n";
+$nav.=" ".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"day")." \n";
+$nav.="".img_next($langs->trans("Next"))."\n";
+$nav.="   (".$langs->trans("Today").")";
+$nav.='
'.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' ';
+$nav.=' ';
+
+$picto='calendarweek';
+
+
+print 'id > 0 ? '?id='.$project->id : '').'">';
 print '';
 print '';
 print '';
@@ -169,13 +212,15 @@ $head=project_timesheet_prepare_head($mode);
 dol_fiche_head($head, 'inputperday', '', 0, 'task');
 
 // Show description of content
-if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

';
+if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'
';
 else
 {
-	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

';
-	else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'

';
+	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'
';
+	else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'
';
 }
-
+print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'
';
+print '
';
+print "\n";
 
 // Filter on user
 /*	dol_fiche_head('');
@@ -197,6 +242,10 @@ else
 	dol_fiche_end();
 */
 
+
+print '
'.$nav.'
';
+
+
 print '
';
 print '';
 print '';
@@ -207,7 +256,7 @@ print '';
 print '';
 if ($usertoprocess->id == $user->id) print '';
 else print '';
-print '';
+print '';
 print '';
 print "\n";
 
@@ -217,7 +266,7 @@ $restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJEC
 if (count($tasksarray) > 0)
 {
 	$j=0;
-	projectLinesPerDay($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask);
+	projectLinesPerDay($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $daytoparse);
 }
 else
 {
@@ -234,6 +283,13 @@ print '';
 print '';
 
 
+print '';
+
+
 llxFooter();
 
 $db->close();
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index b7ab0a8bd71..063045f8577 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -49,12 +49,15 @@ if ($user->societe_id > 0) $socid=$user->societe_id;
 $result = restrictedArea($user, 'projet', $projectid);
 
 $now=dol_now();
-
-$year=GETPOST("year","int")?GETPOST("year","int"):date("Y");
-$month=GETPOST("month","int")?GETPOST("month","int"):date("m");
-$week=GETPOST("week","int")?GETPOST("week","int"):date("W");
-$day=GETPOST("day","int")?GETPOST("day","int"):date("d");
+$nowtmp=dol_getdate($now);
+$nowday=$nowtmp['mday'];
+$nowmonth=$nowtmp['mon'];
+$nowyear=$nowtmp['year'];
+$year=GETPOST('reyear')?GETPOST('reyear'):(GETPOST("year","int")?GETPOST("year","int"):date("Y"));
+$month=GETPOST('remonth')?GETPOST('remonth'):(GETPOST("month","int")?GETPOST("month","int"):date("m"));
+$day=GETPOST('reday')?GETPOST('reday'):(GETPOST("day","int")?GETPOST("day","int"):date("d"));
 $day = (int) $day;
+$week=GETPOST("week","int")?GETPOST("week","int"):date("W");
 
 $startdayarray=dol_get_first_day_week($day, $month, $year);
 
@@ -83,6 +86,13 @@ $usertoprocess=$user;
  * Actions
  */
 
+if (GETPOST('submitdateselect'))
+{
+	$daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+
+	$action = '';
+}
+
 if ($action == 'addtime' && $user->rights->projet->creer)
 {
     $task = new Task($db);
@@ -173,19 +183,18 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$usertoprocess,($projec
 
 llxHeader("",$title,"",'','','',array('/core/js/timesheet.js'));
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
 
 
-$tmpday = $first_day;
-
 // Show navigation bar
 $nav ="".img_previous($langs->trans("Previous"))."\n";
-$nav.=" ".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
-$nav.=" \n";
+$nav.=" ".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week." \n";
 $nav.="".img_next($langs->trans("Next"))."\n";
 $nav.="   (".$langs->trans("Today").")";
-$picto='calendarweek';
+$nav.='
'.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' ';
+$nav.=' ';
 
+$picto='calendarweek';
 
 print '';
 print '';
@@ -199,12 +208,14 @@ $head=project_timesheet_prepare_head($mode);
 dol_fiche_head($head, 'inputperweek', '', 0, 'task');
 
 // Show description of content
-if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

';
+if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'
';
 else
 {
-	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

';
-	else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'

';
+	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'
';
+	else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'
';
 }
+print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'
';
+print '
';
 print "\n";
 
 // Filter on user
@@ -248,6 +259,7 @@ for($i=0;$i<7;$i++)
 {
 	print '';
 }
+print '';
 
 print "\n";
 
@@ -268,11 +280,12 @@ if (count($tasksarray) > 0)
                 
+                ';
 }
 else
 {
-	print '';
+	print '';
 }
 print "
'.$langs->trans("Project").''.$langs->trans("ProgressDeclared").''.$langs->trans("TimeSpent").''.$langs->trans("TimeSpentByYou").''.$langs->trans("TimeSpentByUser").''.$langs->trans("DateAndHour").''.$langs->trans("HourStart").''.$langs->trans("Duration").'
'.dol_print_date($startday + ($i * 3600 * 24), '%a').'
'.dol_print_date($startday + ($i * 3600 * 24), 'day').'
 

                 
 

                 
 

     
'.$langs->trans("NoTasks").'
'.$langs->trans("NoTasks").'
";
 
@@ -287,6 +300,7 @@ print '
';
 
 print ''."\n\n";
 
+
 $modeinput='hours';
 
 print '